Merge pull request #23 from ZooeyMiller/add-results-route

Add new route and render SVG with SVG package
ZooeyMiller · Jun 7, 2017 · 98beeda · 98beeda
2 parents 6765d23 + 7f13bc8
commit 98beeda
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 28 deletions.
diff --git a/elm-package.json b/elm-package.json
@@ -10,7 +10,8 @@
     "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-lang/navigation": "2.1.0 <= v < 3.0.0",
+        "elm-lang/svg": "2.0.0 <= v < 3.0.0"
     },
     "elm-version": "0.18.0 <= v < 0.19.0"
 }
diff --git a/src/App.elm b/src/App.elm
@@ -4,6 +4,8 @@ import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (..)
 import Navigation
+import Svg exposing (..)
+import Svg.Attributes exposing (..)
 
 
 main =
@@ -45,7 +47,8 @@ init location =
 type Msg
     = Username String
     | Password String
-    | Submit
+    | LoginSubmit
+    | EmotionSubmit
     | UrlChange Navigation.Location
     | Mood String
     | Energy String
@@ -60,9 +63,12 @@ update msg model =
         Password newPassword ->
             ( { model | password = newPassword }, Cmd.none )
 
-        Submit ->
+        LoginSubmit ->
             ( model, Navigation.newUrl "#/mood" )
 
+        EmotionSubmit ->
+            ( model, Navigation.newUrl "#/graph" )
+
         Mood newMood ->
             ( { model | current = setMood newMood model.current }, Cmd.none )
 
@@ -91,49 +97,60 @@ view : Model -> Html Msg
 view model =
     div []
         [ chooseView model
-        , div [] [ text model.location.pathname ]
+        , div [] [ Html.text model.location.pathname ]
         ]
 
 
+chooseView model =
+    case model.location.hash of
+        "" ->
+            loginForm model
+
+        "#/mood" ->
+            recordMood model
+
+        "#/graph" ->
+            graphView model
+
+        _ ->
+            div [] [ Html.text "you're not supposed to be here" ]
+
+
 loginForm : Model -> Html Msg
 loginForm model =
-    Html.form [ onSubmit Submit ]
+    Html.form [ onSubmit LoginSubmit ]
         [ label [ for "username" ]
-            [ text "Username" ]
-        , input [ id "username", placeholder "Username", type_ "text", value model.username, onInput Username ]
+            [ Html.text "Username" ]
+        , input [ Html.Attributes.id "username", placeholder "Username", Html.Attributes.type_ "text", value model.username, onInput Username ]
             []
         , label [ for "password" ]
-            [ text "Password" ]
-        , input [ placeholder "password", type_ "password", value model.password, onInput Password ]
+            [ Html.text "Password" ]
+        , input [ placeholder "password", Html.Attributes.type_ "password", value model.password, onInput Password ]
             []
-        , button [ type_ "submit" ]
-            [ text "Log in" ]
+        , button [ Html.Attributes.type_ "submit" ]
+            [ Html.text "Log in" ]
         ]
 
 
 recordMood : Model -> Html Msg
 recordMood model =
-    Html.form []
+    Html.form [ onSubmit EmotionSubmit ]
         [ label [ for "mood" ]
-            [ text "Mood" ]
-        , input [ id "mood", onInput Mood, Html.Attributes.max "10", Html.Attributes.min "0", value model.current.mood, type_ "range" ]
+            [ Html.text "Mood" ]
+        , input [ Html.Attributes.id "mood", onInput Mood, Html.Attributes.max "10", Html.Attributes.min "0", value model.current.mood, Html.Attributes.type_ "range" ]
             []
         , label [ for "energy" ]
-            [ text "Energy" ]
-        , input [ id "energy", onInput Energy, Html.Attributes.max "10", Html.Attributes.min "0", value model.current.energy, type_ "range" ]
+            [ Html.text "Energy" ]
+        , input [ Html.Attributes.id "energy", onInput Energy, Html.Attributes.max "10", Html.Attributes.min "0", value model.current.energy, Html.Attributes.type_ "range" ]
             []
-        , button [ type_ "submit" ]
-            [ text "Submit" ]
+        , button [ Html.Attributes.type_ "submit" ]
+            [ Html.text "Submit" ]
         ]
 
 
-chooseView model =
-    case model.location.hash of
-        "" ->
-            loginForm model
-
-        "#/mood" ->
-            recordMood model
-
-        _ ->
-            div [] [ text "you're not supposed to be here" ]
+graphView : Model -> Html Msg
+graphView model =
+    Html.div []
+        [ svg [ Svg.Attributes.width "200", Svg.Attributes.height "200", viewBox "0 0 100 100" ]
+            [ circle [ cx "50", cy "50", r "50" ] [] ]
+        ]