Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add new route and render SVG with SVG package #23

Merged
merged 1 commit into from
Jun 7, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion elm-package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
71 changes: 44 additions & 27 deletions src/App.elm
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down Expand Up @@ -45,7 +47,8 @@ init location =
type Msg
= Username String
| Password String
| Submit
| LoginSubmit
| EmotionSubmit
| UrlChange Navigation.Location
| Mood String
| Energy String
Expand All @@ -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 )

Expand Down Expand Up @@ -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" ] [] ]
]