Merge pull request #316 from AttilaMihaly/contributor-enablement

Fix routing. #311
finos · Jan 28, 2021 · 2385a10 · 2385a10
2 parents 39dbe2d + aa76769
commit 2385a10
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/cli/src/Morphir/Web/DevelopApp.elm b/cli/src/Morphir/Web/DevelopApp.elm
@@ -16,7 +16,7 @@ import Morphir.Visual.ViewValue as ViewValue
 import Morphir.Web.Theme exposing (Theme)
 import Morphir.Web.Theme.Light as Light
 import Url exposing (Url)
-import Url.Parser as UrlParser
+import Url.Parser as UrlParser exposing ((</>))
 
 
 
@@ -131,7 +131,8 @@ routeParser : UrlParser.Parser (Route -> a) a
 routeParser =
     UrlParser.oneOf
         [ UrlParser.map Home UrlParser.top
-        , UrlParser.map Module (UrlParser.string |> UrlParser.map (String.split "."))
+        , UrlParser.map Module (UrlParser.s "module" </> (UrlParser.string |> UrlParser.map (String.split ".")))
+        , UrlParser.map (always Home) UrlParser.string
         ]
 
 
@@ -200,7 +201,7 @@ viewHeader model =
                 [ image
                     [ height (px 50)
                     ]
-                    { src = "assets/2020_Morphir_Logo_Icon_WHT.svg"
+                    { src = "/assets/2020_Morphir_Logo_Icon_WHT.svg"
                     , description = "Morphir Logo"
                     }
                 , el [ paddingXY 10 0 ]
@@ -235,7 +236,7 @@ viewBody model =
                                 (\( moduleName, accessControlledModuleDef ) ->
                                     link [ Font.size 18 ]
                                         { url =
-                                            "/" ++ (moduleName |> List.map Name.toTitleCase |> String.join ".")
+                                            "/module/" ++ (moduleName |> List.map Name.toTitleCase |> String.join ".")
                                         , label =
                                             moduleName
                                                 |> List.map (Name.toHumanWords >> String.join " ")