From be408d89cd27fe9c3a2d9da5f3ac136e52e75cdf Mon Sep 17 00:00:00 2001
From: Yehowshua Immanuel <yehowshua@joyofhardware.com>
Date: Tue, 31 Dec 2024 21:21:28 -0500
Subject: [PATCH] now seemingly properly handling back navigation

---
 README.md               | 1 +
 frontend/src/Header.elm | 7 ++++++-
 frontend/src/Main.elm   | 9 ++++-----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 3a631b7..d26dfa4 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,7 @@ Now open `http://127.0.0.1:8080` in your browser.
 # TODO
 
  - [x] Add Makefile
+ - [ ] Clicking in upper left should go to landing page.
  - [ ] Add GPLV3 License
  - [ ] Add `make release` target that is nix ready...
  - [ ] Determine if `src/Body.elm` or pages in `src/Page` should have subscription functions
diff --git a/frontend/src/Header.elm b/frontend/src/Header.elm
index 4f7dd33..9c7c8db 100644
--- a/frontend/src/Header.elm
+++ b/frontend/src/Header.elm
@@ -27,6 +27,11 @@ view model =
                 { url = "/" ++ string
                 , label = Element.text string
                 }
+        title = Element.link
+            [Element.alignLeft]
+            { url = "/"
+            , label = Element.text "Elm Example App"
+            }
 
         products  = headerButton "Products"
         resources = headerButton "Resources"
@@ -37,7 +42,7 @@ view model =
                  Element.spacing 15,
                  Element.paddingXY 30 25,
                  dropShadow]
-                [ Element.el [Element.alignLeft] (Element.text "Elm Example App")
+                [ title
                 , products
                 , resources
                 , about
diff --git a/frontend/src/Main.elm b/frontend/src/Main.elm
index 9b556d7..70e403a 100644
--- a/frontend/src/Main.elm
+++ b/frontend/src/Main.elm
@@ -50,13 +50,12 @@ update msg model =
             in
                 ( {model | page = newPage}, cmd |> Cmd.map Body )
         UrlChanged url  ->
-            ( {model | url = url}, Cmd.none )
-        UrlRequest (Browser.Internal url) ->
             let
-                -- newModel = Body.handleRoute url.path
-                newModel = {model | page = Body.handleRoute url.path}
+                newModel = {model | page = Body.handleRoute url.path, url = url}
             in
-                ( newModel, Browser.Navigation.pushUrl model.key (Url.toString url) )
+            ( newModel, Cmd.none )
+        UrlRequest (Browser.Internal url) ->
+            ( model, Browser.Navigation.pushUrl model.key (Url.toString url) )
         _ -> (model, Cmd.none)
 
 subscriptions : Model -> Sub Msg