Merge pull request #315 from unisonweb/revert-314-revert-301-front-page-catalog

Revert "Revert "Enable the Catalog as the front page of Share""

Author: hojberg

src/UnisonLocal/App.elm

@@ -785,5 +785,11 @@ view model =
                 }
     in
     { title = "Unison Local"
-    , body = [ div [ id "app" ] [ AppHeader.view appHeader, PageLayout.view page, viewModal model ] ]
+    , body =
+        [ div [ id "app" ]
+            [ AppHeader.view appHeader
+            , PageLayout.view page
+            , viewModal model
+            ]
+        ]
     }

src/UnisonShare/Route.elm

@@ -38,11 +38,9 @@ import Url.Builder exposing (relative)
 
 {-
 
-   Routing
-   =======
+   URL Scheme for Projects
+   =======================
 
-   URL Scheme
-   ----------
 
    Directly on the codebase
    /[latest|:codebase-hash]/[namespaces|types|terms]/[:namespace-name|:definition-name|:definition-hash]
@@ -51,11 +49,14 @@ import Url.Builder exposing (relative)
    Within a namespace
    /[latest|:codebase-hash]/[namespaces]/[:namespace-name]/-/[types|terms]/[:definition-name|:definition-hash]
 
+   TODO:
+     /projects/[:project-name]/-/[namespaces|types|terms]/[:definition-name|:definition-hash]
+     /projects/[:project-name]/-/[namespaces]/[:namespace-name]/-/[types|terms]/[:definition-name|:definition-hash]
 
    Relative examples
    -----------------
 
-   Top level of a Codebase:                       /
+   Top level of a Codebase:                     /
    Top level of a Codebase:                     /latest
    With namespace context:                      /latest/namespaces/base/List
    Definitions:                                 /latest/[types|terms]/base/List/map
@@ -185,7 +186,7 @@ fromUrl basePath url =
                 "/" ++ path
 
         parse url_ =
-            Result.withDefault (Project (ByCodebase Relative) ProjectRoot) (Parser.run toRoute url_)
+            Result.withDefault Catalog (Parser.run toRoute url_)
     in
     url
         |> .path

tests/UnisonShare/RouteTests.elm

@@ -21,16 +21,13 @@ catalogRoute =
                         mkUrl "/catalog"
                 in
                 Expect.equal Catalog (Route.fromUrl "" url)
-
-        {- TODO enable when cutting over to catalog
-           , test "Matches root to Catalog" <|
-               \_ ->
-                   let
-                       url =
-                           mkUrl "/"
-                   in
-                   Expect.equal Catalog (Route.fromUrl "" url)
-        -}
+        , test "Matches root to Catalog" <|
+            \_ ->
+                let
+                    url =
+                        mkUrl "/"
+                in
+                Expect.equal Catalog (Route.fromUrl "" url)
         ]