| summaryrefslogtreecommitdiff | 
diff options
| author | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2018-09-04 21:47:28 +0200 | 
|---|---|---|
| committer | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2018-09-04 21:47:28 +0200 | 
| commit | 39c267a7a2f0c66c951b6ef24fbc3738f8cfa7e1 (patch) | |
| tree | 2f6a2eb6e09c29cef495c401c2cd9347e056e98e /src/login | |
| parent | e22e904a181a3158787d5e5e7552a0405f20d210 (diff) | |
Redirects to main-menu upon login in.
Diffstat (limited to 'src/login')
| -rw-r--r-- | src/login/src/Action/Session.elm | 4 | ||||
| -rw-r--r-- | src/login/src/ElmModule/Subscriptions.elm | 8 | ||||
| -rw-r--r-- | src/login/src/ElmModule/Update.elm | 3 | ||||
| -rw-r--r-- | src/login/src/Struct/Event.elm | 1 | ||||
| -rw-r--r-- | src/login/src/Struct/Model.elm | 3 | ||||
| -rw-r--r-- | src/login/src/Update/HandleConnected.elm | 25 | ||||
| -rw-r--r-- | src/login/www/index.html | 2 | 
7 files changed, 41 insertions, 5 deletions
| diff --git a/src/login/src/Action/Session.elm b/src/login/src/Action/Session.elm index eab1658..1074cd7 100644 --- a/src/login/src/Action/Session.elm +++ b/src/login/src/Action/Session.elm @@ -1,4 +1,8 @@  port module Action.Session exposing (..) +import Struct.Event +  port store_new_session : (String, String) -> (Cmd msg)  port reset_session : () -> (Cmd msg) +port connected: (() -> msg) -> (Sub msg) +port go_to : (String) -> (Cmd msg) diff --git a/src/login/src/ElmModule/Subscriptions.elm b/src/login/src/ElmModule/Subscriptions.elm index fe276f4..08ba697 100644 --- a/src/login/src/ElmModule/Subscriptions.elm +++ b/src/login/src/ElmModule/Subscriptions.elm @@ -2,16 +2,18 @@ module ElmModule.Subscriptions exposing (..)  -- Elm ------------------------------------------------------------------------- --- Map ------------------------------------------------------------------- +-- Main Menu ------------------------------------------------------------------- +import Action.Session +  import Struct.Model  import Struct.Event  --------------------------------------------------------------------------------  -- LOCAL -----------------------------------------------------------------------  -------------------------------------------------------------------------------- -  --------------------------------------------------------------------------------  -- EXPORTED --------------------------------------------------------------------  --------------------------------------------------------------------------------  subscriptions : Struct.Model.Type -> (Sub Struct.Event.Type) -subscriptions model = Sub.none +subscriptions model = +   (Action.Session.connected (always Struct.Event.Connected)) diff --git a/src/login/src/ElmModule/Update.elm b/src/login/src/ElmModule/Update.elm index babb5b5..66708d8 100644 --- a/src/login/src/ElmModule/Update.elm +++ b/src/login/src/ElmModule/Update.elm @@ -6,6 +6,7 @@ module ElmModule.Update exposing (update)  import Struct.Event  import Struct.Model +import Update.HandleConnected  import Update.HandleServerReply  import Update.SendSignIn  import Update.SendSignUp @@ -19,7 +20,6 @@ import Update.SelectTab  --------------------------------------------------------------------------------  -- EXPORTED --------------------------------------------------------------------  -------------------------------------------------------------------------------- -  update : (        Struct.Event.Type ->        Struct.Model.Type -> @@ -87,3 +87,4 @@ update event model =              Cmd.none           ) +      Struct.Event.Connected -> (Update.HandleConnected.apply_to model) diff --git a/src/login/src/Struct/Event.elm b/src/login/src/Struct/Event.elm index 662b768..39af983 100644 --- a/src/login/src/Struct/Event.elm +++ b/src/login/src/Struct/Event.elm @@ -26,6 +26,7 @@ type Type =     | SetEmail2 String     | ServerReplied (Result Http.Error (List Struct.ServerReply.Type))     | TabSelected Struct.UI.Tab +   | Connected  attempted : (Result.Result err val) -> Type  attempted act = diff --git a/src/login/src/Struct/Model.elm b/src/login/src/Struct/Model.elm index cb7bf35..88a509e 100644 --- a/src/login/src/Struct/Model.elm +++ b/src/login/src/Struct/Model.elm @@ -9,8 +9,9 @@ module Struct.Model exposing  -- Elm ------------------------------------------------------------------------- --- Map ------------------------------------------------------------------- +-- Login -----------------------------------------------------------------------  import Struct.Error +import Struct.Event  import Struct.Flags  import Struct.HelpRequest  import Struct.UI diff --git a/src/login/src/Update/HandleConnected.elm b/src/login/src/Update/HandleConnected.elm new file mode 100644 index 0000000..5d1284d --- /dev/null +++ b/src/login/src/Update/HandleConnected.elm @@ -0,0 +1,25 @@ +module Update.HandleConnected exposing (apply_to) +-- Elm ------------------------------------------------------------------------- + +-- Login ----------------------------------------------------------------------- +import Action.Session + +import Constants.IO + +import Struct.Model +import Struct.Event +import Struct.UI + +-------------------------------------------------------------------------------- +-- LOCAL ----------------------------------------------------------------------- +-------------------------------------------------------------------------------- + +-------------------------------------------------------------------------------- +-- EXPORTED -------------------------------------------------------------------- +-------------------------------------------------------------------------------- +apply_to : Struct.Model.Type -> (Struct.Model.Type, (Cmd Struct.Event.Type)) +apply_to model = +   ( +      model, +      (Action.Session.go_to (Constants.IO.base_url ++"/main-menu/")) +   ) diff --git a/src/login/www/index.html b/src/login/www/index.html index 459c550..f3b9b21 100644 --- a/src/login/www/index.html +++ b/src/login/www/index.html @@ -9,6 +9,7 @@        <script src="script/main.js"></script>        <script src="../global/script/session.js"></script>        <script src="../global/script/urlparams.js"></script> +      <script src="../global/script/navigation.js"></script>        <script>           tacticians_online.session.load(); @@ -23,6 +24,7 @@              );           tacticians_online.session.attach_to(tacticians_online.app); +         tacticians_online.navigation.attach_to(tacticians_online.app);        </script>     </body>  </html> | 


