Skip to content
This repository was archived by the owner on Oct 26, 2024. It is now read-only.

Commit 571d697

Browse files
committed
Make it possible to log in
1 parent 70560d2 commit 571d697

File tree

4 files changed

+34
-5
lines changed

4 files changed

+34
-5
lines changed

frontend/Main.elm

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,20 @@ import Thanks.Thanks as Thanks
1515
import Usetoken.View
1616
import Usetoken.Model
1717
import Usetoken.Update
18+
import Submissions.View
19+
import Submissions.Model
20+
import Submissions.Update
1821
import Nav.Requests exposing (getLoginCookie)
1922

2023

2124
initModel : Flags -> Page -> Model
2225
initModel flags page =
23-
Model flags (Login.initModel flags) (Thanks.initModel) (Usetoken.Model.initModel flags "") page
26+
Model flags
27+
(Login.initModel flags)
28+
(Thanks.initModel)
29+
(Usetoken.Model.initModel flags "")
30+
(Submissions.Model.initModel)
31+
page
2432

2533

2634
init : Flags -> Navigation.Location -> ( Model, Cmd Msg )
@@ -65,6 +73,16 @@ update msg model =
6573
in
6674
( { model | usetoken = newUsetoken }, mappedCmd )
6775

76+
SubmissionsMsg submissionsMsg ->
77+
let
78+
( newSubmissions, submissionsCmd ) =
79+
Submissions.Update.update submissionsMsg model.submissions
80+
81+
mappedCmd =
82+
Cmd.map SubmissionsMsg submissionsCmd
83+
in
84+
( { model | submissions = newSubmissions }, mappedCmd )
85+
6886

6987
updatePage : Page -> Model -> ( Model, Cmd Msg )
7088
updatePage page m =
@@ -89,7 +107,7 @@ view model =
89107

90108
pageView : Model -> Html Msg
91109
pageView model =
92-
case Debug.log "page" model.page of
110+
case model.page of
93111
Register ->
94112
map LoginMsg (Login.view model.login)
95113

@@ -100,7 +118,7 @@ pageView model =
100118
map UsetokenMsg (Usetoken.View.view model.usetoken)
101119

102120
Submissions ->
103-
map UsetokenMsg (Usetoken.View.view model.usetoken)
121+
map SubmissionsMsg (Submissions.View.view model.submissions)
104122

105123

106124
subscriptions : Model -> Sub Msg

frontend/src/Message.elm

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ module Message exposing (Msg(..))
33
import Login.Message
44
import Thanks.Thanks
55
import Usetoken.Messages
6+
import Submissions.Messages
67
import Nav.Model exposing (Page)
78

89

@@ -11,3 +12,4 @@ type Msg
1112
| LoginMsg Login.Message.Msg
1213
| ThanksMsg Thanks.Thanks.Msg
1314
| UsetokenMsg Usetoken.Messages.Msg
15+
| SubmissionsMsg Submissions.Messages.Msg

frontend/src/Model.elm

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import Login.Model as Login
44
import Nav.Model exposing (Page(..))
55
import Thanks.Thanks as Thanks
66
import Usetoken.Model
7+
import Submissions.Model
78
import Flags exposing (Flags)
89

910

@@ -12,5 +13,6 @@ type alias Model =
1213
, login : Login.Model
1314
, thanks : Thanks.Model
1415
, usetoken : Usetoken.Model.Model
16+
, submissions : Submissions.Model.Model
1517
, page : Page
1618
}

frontend/src/Nav/Requests.elm

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
module Nav.Requests exposing (getLoginCookie)
22

33
import Http
4-
import Json.Decode exposing (string)
54
import Usetoken.Messages
65

76

@@ -14,7 +13,15 @@ getLoginCookie baseUrl token =
1413
++ token
1514
in
1615
Http.send Usetoken.Messages.Get <|
17-
Http.post cookieUrl Http.emptyBody string
16+
Http.request
17+
{ method = "POST"
18+
, headers = []
19+
, url = cookieUrl
20+
, body = Http.emptyBody
21+
, expect = Http.expectString
22+
, timeout = Nothing
23+
, withCredentials = False
24+
}
1825

1926

2027
url : List String -> String

0 commit comments

Comments
 (0)