summaryrefslogtreecommitdiff |
diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/battle/src/View/Controlled/CharacterCard.elm | 1 | ||||
-rw-r--r-- | src/css/src/main-menu.scss | 14 | ||||
-rw-r--r-- | src/login/src/ElmModule/Init.elm | 14 | ||||
-rw-r--r-- | src/login/src/ElmModule/View.elm | 1 | ||||
-rw-r--r-- | src/login/src/Struct/Model.elm | 3 | ||||
-rw-r--r-- | src/login/src/Update/Disconnect.elm | 22 | ||||
-rw-r--r-- | src/login/src/Update/HandleConnected.elm | 1 | ||||
-rw-r--r-- | src/login/src/Update/HandleServerReply.elm | 5 | ||||
-rw-r--r-- | src/login/src/View/AccountRecovery.elm | 1 | ||||
-rw-r--r-- | src/login/src/View/Header.elm.m4 | 2 | ||||
-rw-r--r-- | src/login/src/View/SignIn.elm | 1 | ||||
-rw-r--r-- | src/login/src/View/SignUp.elm | 1 | ||||
-rw-r--r-- | src/main-menu/src/ElmModule/View.elm | 5 | ||||
-rw-r--r-- | src/main-menu/src/Struct/Model.elm | 2 | ||||
-rw-r--r-- | src/map-editor/src/Struct/HelpRequest.elm | 3 | ||||
-rw-r--r-- | src/map-editor/src/Struct/Model.elm | 4 |
16 files changed, 50 insertions, 30 deletions
diff --git a/src/battle/src/View/Controlled/CharacterCard.elm b/src/battle/src/View/Controlled/CharacterCard.elm index cc11e0e..ac56cbb 100644 --- a/src/battle/src/View/Controlled/CharacterCard.elm +++ b/src/battle/src/View/Controlled/CharacterCard.elm @@ -14,7 +14,6 @@ import Html.Events -- Battle ---------------------------------------------------------------------- import Struct.Armor -import Struct.Attributes import Struct.Character import Struct.CharacterTurn import Struct.Event diff --git a/src/css/src/main-menu.scss b/src/css/src/main-menu.scss index c081952..1b35427 100644 --- a/src/css/src/main-menu.scss +++ b/src/css/src/main-menu.scss @@ -98,3 +98,17 @@ main > * { background-color: $GREEN-2; } + +@keyframes reverse-brown-alarm-bg { + 0% {background-color: $BROWN-0;} + 50% {background-color: $BROWN-2;} + 100% {background-color: $BROWN-0;} +} + +.main-menu-battle-summary-is-active +{ + border: 1px solid $BROWN-0; + animation-name: reverse-brown-alarm-bg; + animation-duration: 2s; + animation-iteration-count: infinite; +} diff --git a/src/login/src/ElmModule/Init.elm b/src/login/src/ElmModule/Init.elm index 4cfbcb2..e3ca64d 100644 --- a/src/login/src/ElmModule/Init.elm +++ b/src/login/src/ElmModule/Init.elm @@ -7,6 +7,9 @@ import Struct.Event import Struct.Flags import Struct.Model +import Update.Disconnect +import Update.HandleConnected + -------------------------------------------------------------------------------- -- LOCAL ----------------------------------------------------------------------- -------------------------------------------------------------------------------- @@ -15,4 +18,13 @@ import Struct.Model -- EXPORTED -------------------------------------------------------------------- -------------------------------------------------------------------------------- init : Struct.Flags.Type -> (Struct.Model.Type, (Cmd Struct.Event.Type)) -init flags = ((Struct.Model.new flags), Cmd.none) +init flags = + let + new_model = (Struct.Model.new flags) + in + case (Struct.Flags.maybe_get_param "action" flags) of + (Just "disconnect") -> (Update.Disconnect.apply_to new_model) + _ -> + if (flags.user_id == "") + then (new_model, Cmd.none) + else (Update.HandleConnected.apply_to new_model) diff --git a/src/login/src/ElmModule/View.elm b/src/login/src/ElmModule/View.elm index 657e063..f8c0d8c 100644 --- a/src/login/src/ElmModule/View.elm +++ b/src/login/src/ElmModule/View.elm @@ -2,7 +2,6 @@ module ElmModule.View exposing (view) -- Elm ------------------------------------------------------------------------- import Html -import Html.Lazy import Html.Attributes -- Map ------------------------------------------------------------------- diff --git a/src/login/src/Struct/Model.elm b/src/login/src/Struct/Model.elm index 88a509e..859c054 100644 --- a/src/login/src/Struct/Model.elm +++ b/src/login/src/Struct/Model.elm @@ -11,13 +11,10 @@ module Struct.Model exposing -- Login ----------------------------------------------------------------------- import Struct.Error -import Struct.Event import Struct.Flags import Struct.HelpRequest import Struct.UI -import Util.Array - -------------------------------------------------------------------------------- -- TYPES ----------------------------------------------------------------------- -------------------------------------------------------------------------------- diff --git a/src/login/src/Update/Disconnect.elm b/src/login/src/Update/Disconnect.elm new file mode 100644 index 0000000..991b78a --- /dev/null +++ b/src/login/src/Update/Disconnect.elm @@ -0,0 +1,22 @@ +module Update.Disconnect exposing (apply_to) +-- Elm ------------------------------------------------------------------------- + +-- Login ----------------------------------------------------------------------- +import Action.Ports + +import Struct.Model +import Struct.Event + +-------------------------------------------------------------------------------- +-- LOCAL ----------------------------------------------------------------------- +-------------------------------------------------------------------------------- + +-------------------------------------------------------------------------------- +-- EXPORTED -------------------------------------------------------------------- +-------------------------------------------------------------------------------- +apply_to : Struct.Model.Type -> (Struct.Model.Type, (Cmd Struct.Event.Type)) +apply_to model = + ( + model, + (Action.Ports.reset_session ()) + ) diff --git a/src/login/src/Update/HandleConnected.elm b/src/login/src/Update/HandleConnected.elm index 62fd243..2888153 100644 --- a/src/login/src/Update/HandleConnected.elm +++ b/src/login/src/Update/HandleConnected.elm @@ -8,7 +8,6 @@ import Constants.IO import Struct.Model import Struct.Event -import Struct.UI -------------------------------------------------------------------------------- -- LOCAL ----------------------------------------------------------------------- diff --git a/src/login/src/Update/HandleServerReply.elm b/src/login/src/Update/HandleServerReply.elm index f079b33..b0f4e6b 100644 --- a/src/login/src/Update/HandleServerReply.elm +++ b/src/login/src/Update/HandleServerReply.elm @@ -1,10 +1,6 @@ module Update.HandleServerReply exposing (apply_to) -- Elm ------------------------------------------------------------------------- -import Array - -import Dict - import Http -- Map ------------------------------------------------------------------- @@ -14,7 +10,6 @@ import Struct.Error import Struct.Event import Struct.Model import Struct.ServerReply -import Struct.UI -------------------------------------------------------------------------------- -- TYPES ----------------------------------------------------------------------- diff --git a/src/login/src/View/AccountRecovery.elm b/src/login/src/View/AccountRecovery.elm index 5010bb1..730d7a9 100644 --- a/src/login/src/View/AccountRecovery.elm +++ b/src/login/src/View/AccountRecovery.elm @@ -8,7 +8,6 @@ import Html.Events -- Map ------------------------------------------------------------------- import Struct.Event import Struct.Model -import Struct.UI -------------------------------------------------------------------------------- -- LOCAL ----------------------------------------------------------------------- diff --git a/src/login/src/View/Header.elm.m4 b/src/login/src/View/Header.elm.m4 index df080ed..8d744f0 100644 --- a/src/login/src/View/Header.elm.m4 +++ b/src/login/src/View/Header.elm.m4 @@ -3,11 +3,9 @@ module View.Header exposing (get_html) -- Elm ------------------------------------------------------------------------- import Html import Html.Attributes -import Html.Events -- Map ------------------------------------------------------------------- import Struct.Event -import Struct.UI -------------------------------------------------------------------------------- -- LOCAL ----------------------------------------------------------------------- diff --git a/src/login/src/View/SignIn.elm b/src/login/src/View/SignIn.elm index 6d75cb4..1333aaa 100644 --- a/src/login/src/View/SignIn.elm +++ b/src/login/src/View/SignIn.elm @@ -8,7 +8,6 @@ import Html.Events -- Map ------------------------------------------------------------------- import Struct.Event import Struct.Model -import Struct.UI -------------------------------------------------------------------------------- -- LOCAL ----------------------------------------------------------------------- diff --git a/src/login/src/View/SignUp.elm b/src/login/src/View/SignUp.elm index fe7a8a3..55f3fb8 100644 --- a/src/login/src/View/SignUp.elm +++ b/src/login/src/View/SignUp.elm @@ -8,7 +8,6 @@ import Html.Events -- Map ------------------------------------------------------------------- import Struct.Event import Struct.Model -import Struct.UI -------------------------------------------------------------------------------- -- LOCAL ----------------------------------------------------------------------- diff --git a/src/main-menu/src/ElmModule/View.elm b/src/main-menu/src/ElmModule/View.elm index 7adf573..3ccb5aa 100644 --- a/src/main-menu/src/ElmModule/View.elm +++ b/src/main-menu/src/ElmModule/View.elm @@ -2,17 +2,12 @@ module ElmModule.View exposing (view) -- Elm ------------------------------------------------------------------------- import Html -import Html.Lazy import Html.Attributes -- Main Menu ------------------------------------------------------------------- -import Struct.Error import Struct.Event import Struct.Model import Struct.Player -import Struct.UI - -import Util.Html import View.BattleListing import View.MapListing diff --git a/src/main-menu/src/Struct/Model.elm b/src/main-menu/src/Struct/Model.elm index 69a7529..d748cfa 100644 --- a/src/main-menu/src/Struct/Model.elm +++ b/src/main-menu/src/Struct/Model.elm @@ -15,8 +15,6 @@ import Struct.Flags import Struct.Player import Struct.UI -import Util.Array - -------------------------------------------------------------------------------- -- TYPES ----------------------------------------------------------------------- -------------------------------------------------------------------------------- diff --git a/src/map-editor/src/Struct/HelpRequest.elm b/src/map-editor/src/Struct/HelpRequest.elm index 774ecdc..61bf3aa 100644 --- a/src/map-editor/src/Struct/HelpRequest.elm +++ b/src/map-editor/src/Struct/HelpRequest.elm @@ -2,8 +2,7 @@ module Struct.HelpRequest exposing (Type(..)) -- Elm ------------------------------------------------------------------------- --- Battlemap ------------------------------------------------------------------- -import Struct.Toolbox +-- Map Editor ------------------------------------------------------------------ -------------------------------------------------------------------------------- -- TYPES ----------------------------------------------------------------------- diff --git a/src/map-editor/src/Struct/Model.elm b/src/map-editor/src/Struct/Model.elm index e8135f1..70b840f 100644 --- a/src/map-editor/src/Struct/Model.elm +++ b/src/map-editor/src/Struct/Model.elm @@ -10,8 +10,6 @@ module Struct.Model exposing ) -- Elm ------------------------------------------------------------------------- -import Array - import Dict -- Map ------------------------------------------------------------------- @@ -24,8 +22,6 @@ import Struct.TilePattern import Struct.Toolbox import Struct.UI -import Util.Array - -------------------------------------------------------------------------------- -- TYPES ----------------------------------------------------------------------- -------------------------------------------------------------------------------- |