Eric's login changes

This commit is contained in:
Michael Harding committed 2018-04-24 15:31:52 -04:00
1 parent 720695b613
commit 2eb1468781
3 files changed
+27 -13

No files matched your search

+3 -1
View File
@@ -71,8 +71,10 @@ let topLevel currentPage dispatch content =
[ content ] ] ] ] ]
let root model dispatch =
match model with
| PreLogin m -> Login.root m (LoginMsg >> dispatch)
| LoggedIn model ->
match model.page with
| LoginModel m -> Login.root m (LoginMsg >> dispatch)
| HomeModel m -> Home.View.root m (HomeMsg>>dispatch) |> topLevel model.page dispatch
| CounterModel c -> Counter.View.root c (CounterMsg>>dispatch) |> topLevel model.page dispatch
| None -> Info.View.root |> topLevel None dispatch
+14 -8
View File
@@ -9,10 +9,10 @@ open Types
let init () =
let model,cmd = Login.init()
{ page = LoginModel model }, Cmd.map LoginMsg cmd
PreLogin model, Cmd.map LoginMsg cmd
let update msg model =
let updateLoggedIn msg model =
match msg, model.page with
| CounterMsg msg, CounterModel m ->
let (counter, counterCmd) = Counter.State.update msg m
@@ -20,13 +20,19 @@ let update msg model =
| HomeMsg msg, HomeModel m ->
let (home, homeCmd) = Home.State.update msg m
{ model with page = HomeModel home }, Cmd.map HomeMsg homeCmd
| LoginMsg (Login.LoginSuccess _), _ ->
let (home, homeCmd) = Home.State.init()
{ model with page = HomeModel home }, Cmd.map HomeMsg homeCmd
| LoginMsg msg, LoginModel l ->
let (lmodel, lcmd) = Login.update msg l
{ model with page = LoginModel lmodel }, Cmd.map LoginMsg lcmd
| Navigate (getmodel), _->
let (pmodel,pcmd) = getmodel()
{ model with page = pmodel }, pcmd
| _ -> failwith "Invalid state"
let update msg model =
match model with
| PreLogin p ->
match msg with
| LoginMsg m' ->
let (lmodel, lmsg) = Login.update m' p
PreLogin lmodel, Cmd.map LoginMsg lmsg
| _ -> failwith "Invalid state"
| LoggedIn m ->
let lmodel, lmsg = updateLoggedIn msg m
LoggedIn lmodel, lmsg
+10 -4
View File
@@ -1,9 +1,10 @@
module App.Types
open Global
open ServiceContext
open Imports
type Page =
| LoginModel of Login.Model
| CounterModel of Counter.Types.Model
| HomeModel of Home.Types.Model
| None
@@ -15,6 +16,11 @@ type Msg =
| Navigate of (unit->Page*Elmish.Cmd<Msg>)
type Model = {
page: Page
}
type LoggedInModel = {
context : ServiceContext
page : Page
}
type Model =
| PreLogin of Login.Model
| LoggedIn of LoggedInModel