Add Catalog Route and render Catalog page

hojberg · hojberg · commit 00fdbbdd20cc · 2021-12-13T12:48:35.000-05:00
Add a new Catalog Route to render the Catalog page on /catalog (this is
intended to eventually be the front page of Unison Share)
diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
   "scripts": {
     "build": "webpack --mode production --config webpack.prod.js",
     "clean": "rm -rf dist",
-    "start": "webpack serve --mode development --port 1234 --config webpack.dev.js",
+    "start": "echo 'Please use either `npm run start:unisonLocal` or `npm run start:unisonShare`'",
     "start:unisonLocal": "webpack serve --mode development --port 1234 --config webpack.unisonLocal.dev.js",
     "start:unisonShare": "webpack serve --mode development --port 1234 --config webpack.unisonShare.dev.js",
     "test": "elm-test",
diff --git a/src/Project.elm b/src/Project.elm
@@ -14,7 +14,7 @@ type alias Project a =
 
 
 type alias ProjectListing =
-    Project ()
+    Project {}
 
 
 decodeList : Decode.Decoder (List ProjectListing)
diff --git a/src/UnisonShare/App.elm b/src/UnisonShare/App.elm
@@ -28,6 +28,7 @@ import UI.Page as Page
 import UI.Sidebar as Sidebar
 import UI.Tooltip as Tooltip
 import UnisonShare.AppModal as AppModal
+import UnisonShare.Page.Catalog as Catalog
 import UnisonShare.Route as Route exposing (Route)
 import Url exposing (Url)
 import Workspace
@@ -44,6 +45,7 @@ type alias Model =
     , codebaseTree : CodebaseTree.Model
     , workspace : Workspace.Model
     , perspectiveLanding : PerspectiveLanding.Model
+    , catalog : Catalog.Model
     , appModal : AppModal.Model
     , keyboardShortcut : KeyboardShortcut.Model
     , env : Env
@@ -74,6 +76,9 @@ init env route navKey =
                 |> Maybe.map (Api.perform env.apiBasePath)
                 |> Maybe.withDefault Cmd.none
 
+        ( catalog, _ ) =
+            Catalog.init env
+
         model =
             { navKey = navKey
             , route = route
@@ -84,6 +89,7 @@ init env route navKey =
             , keyboardShortcut = KeyboardShortcut.init env.operatingSystem
             , env = env
             , sidebarToggled = False
+            , catalog = catalog
             }
     in
     ( model
@@ -110,6 +116,7 @@ type Msg
     | ToggleSidebar
       -- sub msgs
     | AppModalMsg AppModal.Msg
+    | CatalogMsg Catalog.Msg
     | WorkspaceMsg Workspace.Msg
     | PerspectiveLandingMsg PerspectiveLanding.Msg
     | CodebaseTreeMsg CodebaseTree.Msg
@@ -134,6 +141,13 @@ update msg ({ env } as model) =
                     { env | perspective = Perspective.nextFromParams env.perspective params }
             in
             case route of
+                Route.Catalog ->
+                    let
+                        ( catalog, cmd ) =
+                            Catalog.init model.env
+                    in
+                    ( { model | catalog = catalog }, Cmd.map CatalogMsg cmd )
+
                 Route.Definition params ref ->
                     let
                         ( workspace, cmd ) =
@@ -204,6 +218,13 @@ update msg ({ env } as model) =
             in
             ( newModel, Cmd.batch [ Cmd.map AppModalMsg amCmd, cmd ] )
 
+        CatalogMsg cMsg ->
+            let
+                ( catalog, cmd ) =
+                    Catalog.update cMsg model.catalog
+            in
+            ( { model | catalog = catalog }, Cmd.map CatalogMsg cmd )
+
         WorkspaceMsg wMsg ->
             let
                 ( workspace, wCmd, outMsg ) =
@@ -646,30 +667,45 @@ viewAppError error =
 view : Model -> Browser.Document Msg
 view model =
     let
-        pageContent =
+        appHeader =
+            viewAppHeader model
+
+        withSidebar pageContent =
+            Page.SidebarLayout
+                { header = viewAppHeader model
+                , sidebar = viewMainSidebar model
+                , sidebarToggled = model.sidebarToggled
+                , content = Page.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
+
                 Route.Perspective _ ->
                     Html.map PerspectiveLandingMsg
                         (PerspectiveLanding.view
                             model.env
                             model.perspectiveLanding
                         )
+                        |> withSidebar
+                        |> Page.view
 
                 Route.Definition _ _ ->
                     Html.map WorkspaceMsg (Workspace.view model.workspace)
-
-        page =
-            Page.SidebarLayout
-                { header = viewAppHeader model
-                , sidebar = viewMainSidebar model
-                , sidebarToggled = model.sidebarToggled
-                , content = Page.PageContent [ pageContent ]
-                }
+                        |> withSidebar
+                        |> Page.view
     in
     { title = "Unison Share"
     , body =
         [ div [ id "app" ]
-            [ Page.view page
+            [ page
             , Html.map AppModalMsg (AppModal.view model.env model.appModal)
             ]
         ]
diff --git a/src/UnisonShare/Page/Catalog.elm b/src/UnisonShare/Page/Catalog.elm
@@ -9,6 +9,8 @@ import Http
 import Project exposing (ProjectListing)
 import RemoteData exposing (RemoteData(..), WebData)
 import UI
+import UI.AppHeader exposing (AppHeader)
+import UI.Page as Page exposing (Page)
 
 
 
@@ -88,22 +90,13 @@ projectsToCatalog _ =
 -- VIEW
 
 
-viewLoaded : LoadedModel -> Html Msg
-viewLoaded _ =
-    div [] [ text "Catalog" ]
-
-
-view : Model -> Html Msg
-view model =
-    case model of
-        NotAsked ->
-            UI.nothing
-
-        Loading ->
-            UI.nothing
-
-        Failure _ ->
-            div [ class "" ] [ text "Error..." ]
-
-        Success m ->
-            viewLoaded m
+view : AppHeader msg -> Model -> Html msg
+view appHeader _ =
+    let
+        page =
+            Page.FullLayout
+                { header = appHeader
+                , content = Page.PageContent [ div [] [ text "Catalog" ] ]
+                }
+    in
+    Page.view page
diff --git a/src/UnisonShare/PreApp.elm b/src/UnisonShare/PreApp.elm
@@ -32,11 +32,16 @@ init flags url navKey =
         route =
             Route.fromUrl flags.basePath url
 
+        perspectiveParams =
+            route
+                |> Route.perspectiveParams
+                |> Maybe.withDefault (Perspective.ByCodebase Perspective.Relative)
+
         preEnv =
             { flags = flags
             , route = route
             , navKey = navKey
-            , perspectiveParams = Route.perspectiveParams route
+            , perspectiveParams = perspectiveParams
             }
 
         perspectiveToAppInit perspective =
diff --git a/src/UnisonShare/Route.elm b/src/UnisonShare/Route.elm
@@ -22,7 +22,7 @@ import HashQualified exposing (HashQualified(..))
 import List.Nonempty as NEL
 import Parser exposing ((|.), (|=), Parser, end, oneOf, succeed)
 import Perspective exposing (CodebasePerspectiveParam(..), PerspectiveParams(..))
-import Route.Parsers as RP exposing (b, reference, slash)
+import Route.Parsers as RP exposing (b, reference, s, slash)
 import Url exposing (Url)
 import Url.Builder exposing (relative)
 
@@ -72,13 +72,17 @@ import Url.Builder exposing (relative)
 
 
 type Route
-    = Perspective PerspectiveParams
+    = Catalog
+    | Perspective PerspectiveParams
     | Definition PerspectiveParams Reference
 
 
 updatePerspectiveParams : Route -> PerspectiveParams -> Route
 updatePerspectiveParams route params =
     case route of
+        Catalog ->
+            Catalog
+
         Perspective _ ->
             Perspective params
 
@@ -90,6 +94,11 @@ updatePerspectiveParams route params =
 -- PARSER ---------------------------------------------------------------------
 
 
+catalog : Parser Route
+catalog =
+    succeed Catalog |. slash |. s "catalog"
+
+
 perspective : Parser Route
 perspective =
     succeed Perspective |. slash |= RP.perspectiveParams |. end
@@ -102,7 +111,7 @@ definition =
 
 toRoute : Parser Route
 toRoute =
-    oneOf [ b perspective, b definition ]
+    oneOf [ b catalog, b perspective, b definition ]
 
 
 {-| In environments like Unison Local, the UI is served with a base path
@@ -151,14 +160,17 @@ fromUrl basePath url =
 -- HELPERS --------------------------------------------------------------------
 
 
-perspectiveParams : Route -> PerspectiveParams
+perspectiveParams : Route -> Maybe PerspectiveParams
 perspectiveParams route =
     case route of
+        Catalog ->
+            Nothing
+
         Perspective nsRef ->
-            nsRef
+            Just nsRef
 
         Definition nsRef _ ->
-            nsRef
+            Just nsRef
 
 
 
@@ -167,7 +179,13 @@ perspectiveParams route =
 
 toDefinition : Route -> Reference -> Route
 toDefinition oldRoute ref =
-    Definition (perspectiveParams oldRoute) ref
+    let
+        params =
+            oldRoute
+                |> perspectiveParams
+                |> Maybe.withDefault (ByCodebase Relative)
+    in
+    Definition params ref
 
 
 toUrlString : Route -> String
@@ -217,6 +235,9 @@ toUrlString route =
 
         path =
             case route of
+                Catalog ->
+                    [ "catalog" ]
+
                 Perspective pp ->
                     perspectiveParamsToPath pp False
 
@@ -255,7 +276,13 @@ navigateToPerspective navKey perspectiveParams_ =
 
 navigateToCurrentPerspective : Nav.Key -> Route -> Cmd msg
 navigateToCurrentPerspective navKey oldRoute =
-    navigateToPerspective navKey (perspectiveParams oldRoute)
+    let
+        params =
+            oldRoute
+                |> perspectiveParams
+                |> Maybe.withDefault (ByCodebase Relative)
+    in
+    navigateToPerspective navKey params
 
 
 navigateToLatestCodebase : Nav.Key -> Cmd msg
@@ -273,6 +300,9 @@ replacePerspective navKey perspectiveParams_ oldRoute =
     let
         newRoute =
             case oldRoute of
+                Catalog ->
+                    Catalog
+
                 Perspective _ ->
                     Perspective perspectiveParams_
 
