Move AppHeader back up to App

src/UI/PageLayout.elm

@@ -2,7 +2,6 @@ module UI.PageLayout exposing (..)
 
 import Html exposing (Html, div, header, section)
 import Html.Attributes exposing (class, classList)
-import UI.AppHeader as AppHeader exposing (AppHeader)
 import UI.Sidebar as Sidebar
 
 
@@ -16,18 +15,16 @@ type PageContent msg
 
 type PageLayout msg
     = HeroLayout
-        { header : AppHeader msg
-        , hero : PageHero msg
+        { hero : PageHero msg
         , content :
             PageContent msg
         }
     | SidebarLayout
-        { header : AppHeader msg
-        , sidebar : List (Html msg)
+        { sidebar : List (Html msg)
         , sidebarToggled : Bool
         , content : PageContent msg
         }
-    | FullLayout { header : AppHeader msg, content : PageContent msg }
+    | FullLayout { content : PageContent msg }
 
 
 
@@ -47,25 +44,22 @@ viewContent (PageContent content) =
 view : PageLayout msg -> Html msg
 view page =
     case page of
-        HeroLayout { header, hero, content } ->
+        HeroLayout { hero, content } ->
             div [ class "page hero-layout" ]
-                [ AppHeader.view header
-                , viewHero hero
+                [ viewHero hero
                 , viewContent content
                 ]
 
-        SidebarLayout { header, sidebar, sidebarToggled, content } ->
+        SidebarLayout { sidebar, sidebarToggled, content } ->
             div
                 [ class "page sidebar-layout"
                 , classList [ ( "sidebar-toggled", sidebarToggled ) ]
                 ]
-                [ AppHeader.view header
-                , Sidebar.view sidebar
+                [ Sidebar.view sidebar
                 , viewContent content
                 ]
 
-        FullLayout { header, content } ->
+        FullLayout { content } ->
             div [ class "page full-layout" ]
-                [ AppHeader.view header
-                , viewContent content
+                [ viewContent content
                 ]

src/UnisonLocal/App.elm

@@ -754,33 +754,37 @@ viewModal model =
 
 viewAppLoading : Html msg
 viewAppLoading =
-    PageLayout.view
-        (PageLayout.SidebarLayout
-            { header = AppHeader.appHeader (appTitle Nothing)
-            , sidebar = []
-            , sidebarToggled = False
-            , content = PageLayout.PageContent []
-            }
-        )
+    div [ id "app" ]
+        [ AppHeader.view (AppHeader.appHeader (appTitle Nothing))
+        , PageLayout.view
+            (PageLayout.SidebarLayout
+                { sidebar = []
+                , sidebarToggled = False
+                , content = PageLayout.PageContent []
+                }
+            )
+        ]
 
 
 viewAppError : Http.Error -> Html msg
 viewAppError error =
-    PageLayout.view
-        (PageLayout.SidebarLayout
-            { header = AppHeader.appHeader (appTitle Nothing)
-            , sidebar = []
-            , sidebarToggled = False
-            , content =
-                PageLayout.PageContent
-                    [ div [ class "app-error" ]
-                        [ Icon.view Icon.warn
-                        , p [ title (Api.errorToString error) ]
-                            [ text "Unison Local could not be started." ]
+    div [ id "app" ]
+        [ AppHeader.view (AppHeader.appHeader (appTitle Nothing))
+        , PageLayout.view
+            (PageLayout.SidebarLayout
+                { sidebar = []
+                , sidebarToggled = False
+                , content =
+                    PageLayout.PageContent
+                        [ div [ class "app-error" ]
+                            [ Icon.view Icon.warn
+                            , p [ title (Api.errorToString error) ]
+                                [ text "Unison Local could not be started." ]
+                            ]
                         ]
-                    ]
-            }
-        )
+                }
+            )
+        ]
 
 
 view : Model -> Browser.Document Msg
@@ -800,12 +804,11 @@ view model =
 
         page =
             PageLayout.SidebarLayout
-                { header = viewAppHeader model
-                , sidebar = viewMainSidebar model
+                { sidebar = viewMainSidebar model
                 , sidebarToggled = model.sidebarToggled
                 , content = PageLayout.PageContent [ pageContent ]
                 }
     in
     { title = "Unison Local"
-    , body = [ div [ id "app" ] [ PageLayout.view page, viewModal model ] ]
+    , body = [ div [ id "app" ] [ AppHeader.view (viewAppHeader model), PageLayout.view page, viewModal model ] ]
     }

src/UnisonShare/App.elm

@@ -646,54 +646,51 @@ viewMainSidebar model =
 
 viewAppLoading : Html msg
 viewAppLoading =
-    PageLayout.view
-        (PageLayout.FullLayout
-            { header = AppHeader.appHeader (appTitle Nothing)
-            , content = PageLayout.PageContent []
-            }
-        )
+    div [ id "app" ]
+        [ AppHeader.view (AppHeader.appHeader (appTitle Nothing))
+        , PageLayout.view
+            (PageLayout.FullLayout
+                { content = PageLayout.PageContent [] }
+            )
+        ]
 
 
 viewAppError : Http.Error -> Html msg
 viewAppError error =
-    PageLayout.view
-        (PageLayout.FullLayout
-            { header = AppHeader.appHeader (appTitle Nothing)
-            , content =
-                PageLayout.PageContent
-                    [ div [ class "app-error" ]
-                        [ Icon.view Icon.warn
-                        , p [ title (Api.errorToString error) ]
-                            [ text "Unison Share could not be started." ]
+    div [ id "app" ]
+        [ AppHeader.view (AppHeader.appHeader (appTitle Nothing))
+        , PageLayout.view
+            (PageLayout.FullLayout
+                { content =
+                    PageLayout.PageContent
+                        [ div [ class "app-error" ]
+                            [ Icon.view Icon.warn
+                            , p [ title (Api.errorToString error) ]
+                                [ text "Unison Share could not be started." ]
+                            ]
                         ]
-                    ]
-            }
-        )
+                }
+            )
+        ]
 
 
 view : Model -> Browser.Document Msg
 view model =
     let
         appHeader =
-            viewAppHeader model
+            AppHeader.view (viewAppHeader model)
 
         withSidebar pageContent =
             PageLayout.SidebarLayout
-                { header = viewAppHeader model
-                , sidebar = viewMainSidebar model
+                { sidebar = viewMainSidebar model
                 , sidebarToggled = model.sidebarToggled
                 , content = PageLayout.PageContent [ pageContent ]
                 }
 
         page =
             case model.route of
                 Route.Catalog ->
-                    let
-                        ( m, _ ) =
-                            Catalog.init model.env
-                    in
-                    -- Html.map CatalogMsg (Catalog.view appHeader m)
-                    Catalog.view appHeader m
+                    Html.map CatalogMsg (Catalog.view model.catalog)
 
                 Route.Perspective _ ->
                     Html.map PerspectiveLandingMsg
@@ -712,7 +709,8 @@ view model =
     { title = "Unison Share"
     , body =
         [ div [ id "app" ]
-            [ page
+            [ appHeader
+            , page
             , Html.map AppModalMsg (AppModal.view model.env model.appModal)
             ]
         ]

src/UnisonShare/Page/Catalog.elm

@@ -6,12 +6,12 @@ import Env exposing (Env)
 import FullyQualifiedName as FQN
 import Html exposing (Html, a, div, h1, input, strong, text)
 import Html.Attributes exposing (class, href, placeholder)
+import Html.Events exposing (onInput)
 import Http
 import Project exposing (ProjectListing)
 import RemoteData exposing (RemoteData(..), WebData)
 import Set exposing (Set)
 import UI
-import UI.AppHeader exposing (AppHeader)
 import UI.Card as Card
 import UI.Icon as Icon
 import UI.PageLayout as PageLayout exposing (PageLayout)
@@ -133,8 +133,8 @@ viewCategory (Category category projects) =
         |> Card.view
 
 
-viewLoaded : AppHeader msg -> LoadedModel -> PageLayout msg
-viewLoaded appHeader _ =
+viewLoaded : LoadedModel -> PageLayout Msg
+viewLoaded model =
     let
         content =
             [ div [ class "categories" ]
@@ -165,8 +165,7 @@ viewLoaded appHeader _ =
             ]
     in
     PageLayout.HeroLayout
-        { header = appHeader
-        , hero =
+        { hero =
             PageLayout.PageHero
                 (div [ class "catalog-hero" ]
                     [ h1 []
@@ -180,37 +179,43 @@ viewLoaded appHeader _ =
                             ]
                         , div [] [ text "Projects, libraries, documention, terms, and types" ]
                         ]
-                    , div [ class "catalog-search" ] [ Icon.view Icon.search, input [ placeholder "Search for projects" ] [] ]
+                    , div [ class "catalog-search" ]
+                        [ Icon.view Icon.search
+                        , input
+                            [ placeholder "Search for projects"
+                            , onInput UpdateQuery
+                            ]
+                            []
+                        ]
                     ]
                 )
         , content = PageLayout.PageContent content
         }
 
 
-disabledPage : AppHeader msg -> Html msg -> PageLayout msg
-disabledPage appHeader content =
+disabledPage : Html Msg -> PageLayout Msg
+disabledPage content =
     PageLayout.HeroLayout
-        { header = appHeader
-        , hero = PageLayout.PageHero UI.nothing
+        { hero = PageLayout.PageHero UI.nothing
         , content = PageLayout.PageContent [ content ]
         }
 
 
-view : AppHeader msg -> Model -> Html msg
-view appHeader model =
+view : Model -> Html Msg
+view model =
     let
         page =
             case model of
                 NotAsked ->
-                    disabledPage appHeader (div [] [])
+                    disabledPage (div [] [])
 
                 Loading ->
-                    disabledPage appHeader (div [] [])
+                    disabledPage (div [] [])
 
                 Failure _ ->
-                    disabledPage appHeader (div [] [])
+                    disabledPage (div [] [])
 
                 Success m ->
-                    viewLoaded appHeader m
+                    viewLoaded m
     in
     PageLayout.view page