Final fixies for 0.19 on routing and add official elm-return

rogeriochaves · Sep 3, 2018 · 39ea475 · 39ea475
1 parent 1540abb
commit 39ea475
Show file tree

Hide file tree

Showing 12 changed files with 51 additions and 351 deletions.
diff --git a/boilerplate/elm.json b/boilerplate/elm.json
@@ -6,6 +6,7 @@
     "elm-version": "0.19.0",
     "dependencies": {
         "direct": {
+            "Fresheyeball/elm-return": "7.0.0",
             "elm/browser": "1.0.0",
             "elm/core": "1.0.0",
             "elm/html": "1.0.0",
@@ -18,6 +19,7 @@
         "indirect": {
             "Skinney/murmur3": "2.0.7",
             "elm/regex": "1.0.0",
+            "elm/time": "1.0.0",
             "elm/virtual-dom": "1.0.0"
         }
     },

diff --git a/boilerplate/src/Cats/Update.elm b/boilerplate/src/Cats/Update.elm
@@ -1,9 +1,9 @@
-module Cats.Update exposing (..)
+module Cats.Update exposing (init, update)
 
 import Cats.Data exposing (..)
 import Cats.Types exposing (..)
-import Helpers.Return exposing (Return, return)
 import RemoteData exposing (..)
+import Return exposing (Return, return)
 import Types
 
 

diff --git a/boilerplate/src/Counter/Update.elm b/boilerplate/src/Counter/Update.elm
@@ -1,8 +1,8 @@
-module Counter.Update exposing (..)
+module Counter.Update exposing (init, update)
 
 import Counter.Types exposing (..)
-import Helpers.Return exposing (Return, return)
 import RemoteData exposing (..)
+import Return exposing (Return, return)
 import Types
 
 

diff --git a/boilerplate/src/Helpers/Respond.elm b/boilerplate/src/Helpers/Respond.elm
diff --git a/boilerplate/src/Helpers/Return.elm b/boilerplate/src/Helpers/Return.elm
diff --git a/boilerplate/src/Main.elm b/boilerplate/src/Main.elm
@@ -11,10 +11,11 @@ import View exposing (view)
 
 main : Program () Model Msg
 main =
-    Browser.fullscreen
+    Browser.application
         { init = init
-        , update = update
         , view = view
-        , onNavigation = Just (MsgForRouter << Router.Types.OnNavigation)
+        , update = update
         , subscriptions = always Sub.none
+        , onUrlChange = MsgForRouter << Router.Types.OnUrlChange
+        , onUrlRequest = MsgForRouter << Router.Types.OnUrlRequest
         }
diff --git a/boilerplate/src/Router/Types.elm b/boilerplate/src/Router/Types.elm
@@ -1,13 +1,18 @@
-module Router.Types exposing (..)
+module Router.Types exposing (Model, Msg(..))
 
+import Browser exposing (UrlRequest)
+import Browser.Navigation exposing (Key)
 import Router.Routes exposing (..)
 import Url exposing (Url)
 
 
 type alias Model =
-    Page
+    { page : Page
+    , key : Key
+    }
 
 
 type Msg
-    = OnNavigation Url
+    = OnUrlChange Url
+    | OnUrlRequest UrlRequest
     | Go Page