summaryrefslogtreecommitdiff
path: root/src/main-menu
diff options
context:
space:
mode:
Diffstat (limited to 'src/main-menu')
-rw-r--r--src/main-menu/src/ElmModule/Init.elm6
-rw-r--r--src/main-menu/src/ElmModule/View.elm4
-rw-r--r--src/main-menu/src/Main.elm6
-rw-r--r--src/main-menu/src/Struct/Model.elm6
-rw-r--r--src/main-menu/src/Update/HandleServerReply.elm13
5 files changed, 20 insertions, 15 deletions
diff --git a/src/main-menu/src/ElmModule/Init.elm b/src/main-menu/src/ElmModule/Init.elm
index 367af39..4e2725a 100644
--- a/src/main-menu/src/ElmModule/Init.elm
+++ b/src/main-menu/src/ElmModule/Init.elm
@@ -2,11 +2,13 @@ module ElmModule.Init exposing (init)
-- Elm -------------------------------------------------------------------------
+-- Shared ----------------------------------------------------------------------
+import Shared.Struct.Flags
+
-- Main Menu -------------------------------------------------------------------
import Comm.LoadPlayer
import Struct.Event
-import Struct.Flags
import Struct.Model
--------------------------------------------------------------------------------
@@ -16,7 +18,7 @@ import Struct.Model
--------------------------------------------------------------------------------
-- 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
model = (Struct.Model.new flags)
diff --git a/src/main-menu/src/ElmModule/View.elm b/src/main-menu/src/ElmModule/View.elm
index 561f924..1563a73 100644
--- a/src/main-menu/src/ElmModule/View.elm
+++ b/src/main-menu/src/ElmModule/View.elm
@@ -5,7 +5,7 @@ import Html
import Html.Attributes
-- Shared ----------------------------------------------------------------------
-import Util.Html
+import Shared.Util.Html
-- Main Menu -------------------------------------------------------------------
import Struct.Error
@@ -33,7 +33,7 @@ view model =
(View.CurrentTab.get_html model),
(
case model.error of
- Nothing -> (Util.Html.nothing)
+ Nothing -> (Shared.Util.Html.nothing)
(Just err) ->
(Html.div
[]
diff --git a/src/main-menu/src/Main.elm b/src/main-menu/src/Main.elm
index 4922621..433a4e0 100644
--- a/src/main-menu/src/Main.elm
+++ b/src/main-menu/src/Main.elm
@@ -3,17 +3,19 @@ module Main exposing (main)
-- Elm ------------------------------------------------------------------------
import Browser
+-- Shared ----------------------------------------------------------------------
+import Shared.Struct.Flags
+
-- Main Menu -------------------------------------------------------------------
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/main-menu/src/Struct/Model.elm b/src/main-menu/src/Struct/Model.elm
index 747a39e..f7798a5 100644
--- a/src/main-menu/src/Struct/Model.elm
+++ b/src/main-menu/src/Struct/Model.elm
@@ -10,7 +10,7 @@ module Struct.Model exposing
-- Elm -------------------------------------------------------------------------
-- Shared ----------------------------------------------------------------------
-import Struct.Flags
+import Shared.Struct.Flags
-- Main Menu -------------------------------------------------------------------
import Struct.Error
@@ -22,7 +22,7 @@ import Struct.UI
--------------------------------------------------------------------------------
type alias Type =
{
- flags: Struct.Flags.Type,
+ flags: Shared.Struct.Flags.Type,
error: (Maybe Struct.Error.Type),
player_id: String,
session_token: String,
@@ -37,7 +37,7 @@ type alias Type =
--------------------------------------------------------------------------------
-- EXPORTED --------------------------------------------------------------------
--------------------------------------------------------------------------------
-new : Struct.Flags.Type -> Type
+new : Shared.Struct.Flags.Type -> Type
new flags =
{
flags = flags,
diff --git a/src/main-menu/src/Update/HandleServerReply.elm b/src/main-menu/src/Update/HandleServerReply.elm
index 62f8005..52e8309 100644
--- a/src/main-menu/src/Update/HandleServerReply.elm
+++ b/src/main-menu/src/Update/HandleServerReply.elm
@@ -5,11 +5,11 @@ import Http
import Url
-- Shared ----------------------------------------------------------------------
-import Action.Ports
+import Shared.Action.Ports
-import Struct.Flags
+import Shared.Struct.Flags
-import Util.Http
+import Shared.Util.Http
-- Main Menu -------------------------------------------------------------------
import Constants.IO
@@ -36,7 +36,7 @@ disconnected current_state =
(
model,
[
- (Action.Ports.go_to
+ (Shared.Action.Ports.go_to
(
Constants.IO.base_url
++ "/login/?action=disconnect&goto="
@@ -44,7 +44,8 @@ disconnected current_state =
(Url.percentEncode
(
"/main-menu/?"
- ++ (Struct.Flags.get_parameters_as_url model.flags)
+ ++
+ (Shared.Struct.Flags.get_parameters_as_url model.flags)
)
)
)
@@ -86,7 +87,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
),