From c414c2b9127921d77237d0ad018b87ad044915e8 Mon Sep 17 00:00:00 2001 From: nsensfel Date: Thu, 13 Sep 2018 18:30:08 +0200 Subject: ... --- src/ElmModule/Init.elm | 2 +- src/ElmModule/Update.elm | 1 - src/ElmModule/View.elm | 35 ++++++++--------------------------- 3 files changed, 9 insertions(+), 29 deletions(-) (limited to 'src/ElmModule') diff --git a/src/ElmModule/Init.elm b/src/ElmModule/Init.elm index 705cff7..ccb3595 100644 --- a/src/ElmModule/Init.elm +++ b/src/ElmModule/Init.elm @@ -15,4 +15,4 @@ import Struct.Model -- EXPORTED -------------------------------------------------------------------- -------------------------------------------------------------------------------- init : Struct.Flags.Type -> (Struct.Model.Type, (Cmd Struct.Event.Type)) -init flags = (Struct.Model.new flags) +init flags = ((Struct.Model.new flags), Cmd.none) diff --git a/src/ElmModule/Update.elm b/src/ElmModule/Update.elm index 18b2077..5baa84c 100644 --- a/src/ElmModule/Update.elm +++ b/src/ElmModule/Update.elm @@ -7,7 +7,6 @@ import Struct.Event import Struct.Model import Update.HandleServerReply -import Update.SelectTab -------------------------------------------------------------------------------- -- LOCAL ----------------------------------------------------------------------- diff --git a/src/ElmModule/View.elm b/src/ElmModule/View.elm index 0d6a321..3f0a16f 100644 --- a/src/ElmModule/View.elm +++ b/src/ElmModule/View.elm @@ -1,19 +1,19 @@ module ElmModule.View exposing (view) -- Elm ------------------------------------------------------------------------- +import Array + import Html import Html.Attributes --- Shared ---------------------------------------------------------------------- +-- Extension ------------------------------------------------------------------- import Util.Html --- Main Menu ------------------------------------------------------------------- import Struct.Error import Struct.Event import Struct.Model -import Struct.Player -import View.BattleListing +import View.Player -------------------------------------------------------------------------------- -- LOCAL ----------------------------------------------------------------------- -------------------------------------------------------------------------------- @@ -27,28 +27,7 @@ view model = [ (Html.Attributes.class "fullscreen-module") ] - [ - (Html.main_ - [ - ] - [ - (View.BattleListing.get_html - "Campaigns" - "main-menu-campaigns" - (Struct.Player.get_campaigns model.player) - ), - (View.BattleListing.get_html - "Invasions" - "main-menu-invasions" - (Struct.Player.get_invasions model.player) - ), - (View.BattleListing.get_html - "Events" - "main-menu-events" - (Struct.Player.get_events model.player) - ) - ] - ), + ( ( case model.error of Nothing -> (Util.Html.nothing) @@ -60,5 +39,7 @@ view model = ] ) ) - ] + :: + (List.map (View.Player.get_html) (Array.toList model.players)) + ) ) -- cgit v1.2.3-70-g09d2