From 2eb14687814a79577ca6dfd731df83b0cc29de18 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Tue, 24 Apr 2018 15:31:52 -0400 Subject: [PATCH] Eric's login changes --- src/web/ui/src/App.fs | 4 +++- src/web/ui/src/State.fs | 22 ++++++++++++++-------- src/web/ui/src/Types.fs | 14 ++++++++++---- 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/src/web/ui/src/App.fs b/src/web/ui/src/App.fs index e1ac5fd41..cabf8b891 100644 --- a/src/web/ui/src/App.fs +++ b/src/web/ui/src/App.fs @@ -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 diff --git a/src/web/ui/src/State.fs b/src/web/ui/src/State.fs index 8379d6b87..5c6c43387 100644 --- a/src/web/ui/src/State.fs +++ b/src/web/ui/src/State.fs @@ -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 diff --git a/src/web/ui/src/Types.fs b/src/web/ui/src/Types.fs index f9b820084..eb60ef5bc 100644 --- a/src/web/ui/src/Types.fs +++ b/src/web/ui/src/Types.fs @@ -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) -type Model = { - page: Page - } +type LoggedInModel = { + context : ServiceContext + page : Page +} + +type Model = + | PreLogin of Login.Model + | LoggedIn of LoggedInModel