summaryrefslogtreecommitdiff
path: root/src/login
diff options
context:
space:
mode:
Diffstat (limited to 'src/login')
-rw-r--r--src/login/src/ElmModule/Init.elm10
-rw-r--r--src/login/src/ElmModule/Subscriptions.elm7
-rw-r--r--src/login/src/ElmModule/View.elm9
-rw-r--r--src/login/src/Main.elm8
-rw-r--r--src/login/src/Struct/Event.elm3
-rw-r--r--src/login/src/Struct/Model.elm10
-rw-r--r--src/login/src/Update/Disconnect.elm7
-rw-r--r--src/login/src/Update/HandleConnected.elm14
-rw-r--r--src/login/src/Update/HandleServerReply.elm10
9 files changed, 43 insertions, 35 deletions
diff --git a/src/login/src/ElmModule/Init.elm b/src/login/src/ElmModule/Init.elm
index 9574712..54897d7 100644
--- a/src/login/src/ElmModule/Init.elm
+++ b/src/login/src/ElmModule/Init.elm
@@ -2,9 +2,11 @@ module ElmModule.Init exposing (init)
-- Elm -------------------------------------------------------------------------
--- Map -------------------------------------------------------------------
+-- Shared ----------------------------------------------------------------------
+import Shared.Struct.Flags
+
+-- Local Module ----------------------------------------------------------
import Struct.Event
-import Struct.Flags
import Struct.Model
import Update.Disconnect
@@ -17,12 +19,12 @@ import Update.HandleConnected
--------------------------------------------------------------------------------
-- EXPORTED --------------------------------------------------------------------
--------------------------------------------------------------------------------
-init : Struct.Flags.Type -> (Struct.Model.Type, (Cmd Struct.Event.Type))
+init : Shared.Struct.Flags.Type -> (Struct.Model.Type, (Cmd Struct.Event.Type))
init flags =
let
new_model = (Struct.Model.new flags)
in
- case (Struct.Flags.maybe_get_parameter "action" flags) of
+ case (Shared.Struct.Flags.maybe_get_parameter "action" flags) of
(Just "disconnect") -> (Update.Disconnect.apply_to new_model)
_ ->
if (flags.user_id == "")
diff --git a/src/login/src/ElmModule/Subscriptions.elm b/src/login/src/ElmModule/Subscriptions.elm
index 9376f89..e777111 100644
--- a/src/login/src/ElmModule/Subscriptions.elm
+++ b/src/login/src/ElmModule/Subscriptions.elm
@@ -2,9 +2,10 @@ module ElmModule.Subscriptions exposing (..)
-- Elm -------------------------------------------------------------------------
--- Main Menu -------------------------------------------------------------------
-import Action.Ports
+-- Shared ----------------------------------------------------------------------
+import Shared.Action.Ports
+-- Main Menu -------------------------------------------------------------------
import Struct.Model
import Struct.Event
@@ -16,4 +17,4 @@ import Struct.Event
--------------------------------------------------------------------------------
subscriptions : Struct.Model.Type -> (Sub Struct.Event.Type)
subscriptions model =
- (Action.Ports.connected (always Struct.Event.Connected))
+ (Shared.Action.Ports.connected (always Struct.Event.Connected))
diff --git a/src/login/src/ElmModule/View.elm b/src/login/src/ElmModule/View.elm
index f6c5c93..21236a7 100644
--- a/src/login/src/ElmModule/View.elm
+++ b/src/login/src/ElmModule/View.elm
@@ -4,14 +4,15 @@ module ElmModule.View exposing (view)
import Html
import Html.Attributes
--- Map -------------------------------------------------------------------
+-- Shared ----------------------------------------------------------------
+import Shared.Util.Html
+
+-- Local Module ----------------------------------------------------------
import Struct.Error
import Struct.Event
import Struct.Model
import Struct.UI
-import Util.Html
-
import View.AccountRecovery
import View.Header
import View.MainMenu
@@ -51,7 +52,7 @@ view model =
),
(
case model.error of
- Nothing -> (Util.Html.nothing)
+ Nothing -> (Shared.Util.Html.nothing)
(Just err) ->
(Html.div
[
diff --git a/src/login/src/Main.elm b/src/login/src/Main.elm
index 384ecd8..bc838e0 100644
--- a/src/login/src/Main.elm
+++ b/src/login/src/Main.elm
@@ -3,17 +3,19 @@ module Main exposing (main)
-- Elm ------------------------------------------------------------------------
import Browser
--- Map -------------------------------------------------------------------
+-- Shared ----------------------------------------------------------------
+import Shared.Struct.Flags
+
+-- Local Module ----------------------------------------------------------
import Struct.Model
import Struct.Event
-import Struct.Flags
import ElmModule.Init
import ElmModule.Subscriptions
import ElmModule.View
import ElmModule.Update
-main : (Program Struct.Flags.Type Struct.Model.Type Struct.Event.Type)
+main : (Program Shared.Struct.Flags.Type Struct.Model.Type Struct.Event.Type)
main =
(Browser.element
{
diff --git a/src/login/src/Struct/Event.elm b/src/login/src/Struct/Event.elm
index faa4a2f..1c7085c 100644
--- a/src/login/src/Struct/Event.elm
+++ b/src/login/src/Struct/Event.elm
@@ -3,9 +3,6 @@ module Struct.Event exposing (Type(..), attempted)
-- Elm -------------------------------------------------------------------------
import Http
--- Shared ----------------------------------------------------------------------
-import Util.Http
-
-- Login -----------------------------------------------------------------------
import Struct.Error
import Struct.ServerReply
diff --git a/src/login/src/Struct/Model.elm b/src/login/src/Struct/Model.elm
index 3a721c1..4cb2288 100644
--- a/src/login/src/Struct/Model.elm
+++ b/src/login/src/Struct/Model.elm
@@ -10,9 +10,9 @@ module Struct.Model exposing
-- Elm -------------------------------------------------------------------------
-- Shared ----------------------------------------------------------------------
-import Struct.Flags
+import Shared.Struct.Flags
--- Login -----------------------------------------------------------------------
+-- Local Module ----------------------------------------------------------------
import Struct.Error
import Struct.HelpRequest
import Struct.UI
@@ -24,7 +24,7 @@ type alias Type =
{
help_request: Struct.HelpRequest.Type,
error: (Maybe Struct.Error.Type),
- flags: Struct.Flags.Type,
+ flags: Shared.Struct.Flags.Type,
username: String,
password1: String,
password2: String,
@@ -42,10 +42,10 @@ type alias Type =
--------------------------------------------------------------------------------
-- EXPORTED --------------------------------------------------------------------
--------------------------------------------------------------------------------
-new : Struct.Flags.Type -> Type
+new : Shared.Struct.Flags.Type -> Type
new flags =
let
- maybe_mode = (Struct.Flags.maybe_get_parameter "mode" flags)
+ maybe_mode = (Shared.Struct.Flags.maybe_get_parameter "mode" flags)
model =
{
help_request = Struct.HelpRequest.None,
diff --git a/src/login/src/Update/Disconnect.elm b/src/login/src/Update/Disconnect.elm
index 991b78a..0f59631 100644
--- a/src/login/src/Update/Disconnect.elm
+++ b/src/login/src/Update/Disconnect.elm
@@ -1,9 +1,10 @@
module Update.Disconnect exposing (apply_to)
-- Elm -------------------------------------------------------------------------
--- Login -----------------------------------------------------------------------
-import Action.Ports
+-- Shared ----------------------------------------------------------------------
+import Shared.Action.Ports
+-- Local Module ----------------------------------------------------------------
import Struct.Model
import Struct.Event
@@ -18,5 +19,5 @@ apply_to : Struct.Model.Type -> (Struct.Model.Type, (Cmd Struct.Event.Type))
apply_to model =
(
model,
- (Action.Ports.reset_session ())
+ (Shared.Action.Ports.reset_session ())
)
diff --git a/src/login/src/Update/HandleConnected.elm b/src/login/src/Update/HandleConnected.elm
index 15e3371..099036a 100644
--- a/src/login/src/Update/HandleConnected.elm
+++ b/src/login/src/Update/HandleConnected.elm
@@ -3,13 +3,15 @@ module Update.HandleConnected exposing (apply_to)
-- Elm -------------------------------------------------------------------------
import Url
--- Login -----------------------------------------------------------------------
-import Action.Ports
+-- Shared ----------------------------------------------------------------------
+import Shared.Action.Ports
+import Shared.Struct.Flags
+
+-- Local Module ----------------------------------------------------------------
import Constants.IO
import Struct.Event
-import Struct.Flags
import Struct.Model
--------------------------------------------------------------------------------
@@ -23,10 +25,12 @@ apply_to : Struct.Model.Type -> (Struct.Model.Type, (Cmd Struct.Event.Type))
apply_to model =
(
model,
- (Action.Ports.go_to
+ (Shared.Action.Ports.go_to
(Constants.IO.base_url ++
(
- case (Struct.Flags.maybe_get_parameter "goto" model.flags) of
+ case
+ (Shared.Struct.Flags.maybe_get_parameter "goto" model.flags)
+ of
Nothing -> "/main-menu/"
(Just string) ->
case (Url.percentDecode string) of
diff --git a/src/login/src/Update/HandleServerReply.elm b/src/login/src/Update/HandleServerReply.elm
index 1fcb240..6d770c6 100644
--- a/src/login/src/Update/HandleServerReply.elm
+++ b/src/login/src/Update/HandleServerReply.elm
@@ -4,11 +4,11 @@ module Update.HandleServerReply exposing (apply_to)
import Http
-- Shared ----------------------------------------------------------------------
-import Action.Ports
+import Shared.Action.Ports
-import Util.Http
+import Shared.Util.Http
--- Login -----------------------------------------------------------------------
+-- Local Module ----------------------------------------------------------------
import Struct.Error
import Struct.Event
import Struct.Model
@@ -35,7 +35,7 @@ set_session pid stk current_state =
session_token = stk
},
(
- (Action.Ports.store_new_session (pid, stk))
+ (Shared.Action.Ports.store_new_session (pid, stk))
:: cmds
)
)
@@ -67,7 +67,7 @@ apply_to model query_result =
(Struct.Model.invalidate
(Struct.Error.new
Struct.Error.Networking
- (Util.Http.error_to_string error)
+ (Shared.Util.Http.error_to_string error)
)
model
),