use elm-lang/navigation insted of a port

monty5811 · Jan 25, 2017 · 73dd945 · 73dd945
1 parent c99190d
commit 73dd945
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 15 deletions.
diff --git a/apostello/static/js/app.js b/apostello/static/js/app.js
diff --git a/assets/elm-package.json b/assets/elm-package.json
@@ -14,7 +14,8 @@
         "elm-community/list-extra": "4.0.0 <= v < 5.0.0",
         "elm-lang/core": "5.0.0 <= v < 6.0.0",
         "elm-lang/html": "2.0.0 <= v < 3.0.0",
-        "elm-lang/http": "1.0.0 <= v < 2.0.0"
+        "elm-lang/http": "1.0.0 <= v < 2.0.0",
+        "elm-lang/navigation": "2.1.0 <= v < 3.0.0"
     },
     "elm-version": "0.18.0 <= v < 0.19.0"
 }
diff --git a/assets/elm/Updates/Fab.elm b/assets/elm/Updates/Fab.elm
@@ -1,4 +1,4 @@
-port module Updates.Fab exposing (update)
+module Updates.Fab exposing (update)
 
 import Decoders exposing (decodeAlwaysTrue)
 import DjangoSend exposing (post)
@@ -7,6 +7,7 @@ import Http
 import Json.Encode as Encode
 import Messages exposing (..)
 import Models exposing (..)
+import Navigation
 
 
 update : FabMsg -> Model -> ( Model, Cmd Msg )
@@ -26,7 +27,7 @@ update msg model =
         ReceiveArchiveResp (Ok _) ->
             case model.fabModel.archiveButton of
                 Just ab ->
-                    ( model, redirectToUrl ab.redirectUrl )
+                    ( model, Navigation.load ab.redirectUrl )
 
                 Nothing ->
                     ( model, Cmd.none )
@@ -53,6 +54,3 @@ archiveItem csrftoken r =
     in
         post r.postUrl body csrftoken decodeAlwaysTrue
             |> Http.send (FabMsg << ReceiveArchiveResp)
-
-
-port redirectToUrl : String -> Cmd msg
diff --git a/assets/elm/elm-package.json b/assets/elm/elm-package.json
@@ -0,0 +1,16 @@
+{
+    "version": "1.0.0",
+    "summary": "helpful summary of your project, less than 80 characters",
+    "repository": "https://github.com/user/project.git",
+    "license": "BSD3",
+    "source-directories": [
+        "."
+    ],
+    "exposed-modules": [],
+    "dependencies": {
+        "elm-lang/core": "5.1.1 <= v < 6.0.0",
+        "elm-lang/html": "2.0.0 <= v < 3.0.0",
+        "elm-lang/navigation": "2.1.0 <= v < 3.0.0"
+    },
+    "elm-version": "0.18.0 <= v < 0.19.0"
+}
diff --git a/assets/js/utils/render_fab.js b/assets/js/utils/render_fab.js
@@ -23,7 +23,7 @@ function renderElm() {
 
   if (node !== null) {
     const Elm = require('../../elm/Main.elm');
-    const app = Elm.Main.embed(node,
+    Elm.Main.embed(node,
       { pageId: 'fab',
         dataUrl: '',
         csrftoken: Cookies.get('csrftoken'),
@@ -33,8 +33,6 @@ function renderElm() {
         },
       },
     );
-    // setup ports
-    app.ports.redirectToUrl.subscribe(url => redirect(url));
   }
 }