moves headerbar out of chest page
This commit is contained in:
@@ -27,8 +27,7 @@ import Utils exposing (..)
|
||||
|
||||
|
||||
type alias State =
|
||||
{ menuOpen : Bool
|
||||
, mode : ActionMode
|
||||
{ mode : ActionMode
|
||||
, error : Maybe String
|
||||
, notification : Maybe String
|
||||
|
||||
@@ -73,7 +72,6 @@ init (Player navKey playerId) =
|
||||
( Model
|
||||
navKey
|
||||
(State
|
||||
False
|
||||
View
|
||||
Nothing
|
||||
Nothing
|
||||
@@ -130,103 +128,6 @@ viewNotification model =
|
||||
|
||||
|
||||
|
||||
-- DEBUG SECTION
|
||||
|
||||
|
||||
viewDebugSection : Model -> Html Msg
|
||||
viewDebugSection model =
|
||||
div [ class "panel is-danger" ]
|
||||
[ p [ class "panel-heading" ] [ text "Debug" ]
|
||||
, p [ class "panel-block has-text-danger" ] [ text <| Maybe.withDefault "" model.state.error ]
|
||||
, p [ class "panel-block" ] [ text ("Shown content : " ++ Debug.toString model.shown) ]
|
||||
, p [ class "panel-block" ] [ text ("Active Mode : " ++ Debug.toString model.state.mode) ]
|
||||
, p [ class "panel-block" ] [ text ("Selection : " ++ Debug.toString model.selection) ]
|
||||
, p [ class "panel-block" ] [ text ("Claims : " ++ Debug.toString model.claims) ]
|
||||
, p [] debugSandbox
|
||||
]
|
||||
|
||||
|
||||
stackedIcon name =
|
||||
span [ class "icon is-medium" ]
|
||||
[ span [ class "fa-stack" ]
|
||||
[ i [ class "fas fa-circle fa-stack-2x" ] []
|
||||
, i [ class (name ++ " fa-inverse fa-stack-1x") ] []
|
||||
, text ""
|
||||
]
|
||||
]
|
||||
|
||||
|
||||
debugSandbox =
|
||||
[ stackedIcon "fas fa-coins"
|
||||
, stackedIcon "fab fa-d-and-d"
|
||||
, stackedIcon "fas fa-praying-hands"
|
||||
, stackedIcon "fas fa-gem"
|
||||
, stackedIcon "fas fa-pen"
|
||||
, stackedIcon "fas fa-percentage"
|
||||
, stackedIcon "fas fa-store-alt"
|
||||
, stackedIcon "fas fa-cart-plus"
|
||||
, stackedIcon "fas fa-angry"
|
||||
, stackedIcon "fas fa-plus"
|
||||
, stackedIcon "fas fa-tools"
|
||||
, stackedIcon "fas fa-search"
|
||||
]
|
||||
|
||||
|
||||
|
||||
-- HEADER SECTION
|
||||
|
||||
|
||||
viewHeaderBar : String -> Model -> Html Msg
|
||||
viewHeaderBar title model =
|
||||
nav [ class "navbar", class "is-transparent" ]
|
||||
[ div [ class "navbar-brand" ]
|
||||
[ a [ class "navbar-item", href "/" ]
|
||||
[ renderIcon { icon = "fab fa-d-and-d", size = "medium", ratio = "2x" }
|
||||
, span [ class "title is-4", style "padding-left" "0.4em" ] [ text title ]
|
||||
]
|
||||
, a
|
||||
[ class "navbar-burger"
|
||||
, classList [ ( "is-active", model.state.menuOpen ) ]
|
||||
, onClick SwitchMenuOpen
|
||||
]
|
||||
[ span [ attribute "aria-hidden" "true" ] []
|
||||
, span [ attribute "aria-hidden" "true" ] []
|
||||
, span [ attribute "aria-hidden" "true" ] []
|
||||
]
|
||||
]
|
||||
, div [ class "navbar-menu", classList [ ( "is-active", model.state.menuOpen ) ] ]
|
||||
[ div [ class "navbar-end" ]
|
||||
[ a [ class "navbar-item", href "/marchand" ]
|
||||
[ renderIcon { icon = "fas fa-store-alt", ratio = "1x", size = "medium" }
|
||||
, span [] [ text "Marchand" ]
|
||||
]
|
||||
, a
|
||||
[ class "navbar-item"
|
||||
, href
|
||||
(if model.state.player.id == 0 then
|
||||
"/nouveau-tresor"
|
||||
|
||||
else
|
||||
"/coffre"
|
||||
)
|
||||
]
|
||||
[ renderIcon { icon = "fas fa-gem", ratio = "1x", size = "medium" }
|
||||
, span []
|
||||
[ text
|
||||
(if model.state.player.id == 0 then
|
||||
"Nouveau loot"
|
||||
|
||||
else
|
||||
"Coffre de groupe"
|
||||
)
|
||||
]
|
||||
]
|
||||
]
|
||||
]
|
||||
]
|
||||
|
||||
|
||||
|
||||
-- PLAYER BAR
|
||||
|
||||
|
||||
@@ -236,14 +137,11 @@ viewPlayerBar player actionControls ( editing, amount ) =
|
||||
[ div [ class "hero-body" ]
|
||||
[ div [ class "level container is-mobile" ]
|
||||
[ div [ class "level-left" ]
|
||||
([ div [ class "level-item" ]
|
||||
[ p [ class "title is-3" ] [ text player.name ] ]
|
||||
, div [ class "level-item" ]
|
||||
(div [ class "level-item" ]
|
||||
[ span [ class "icon is-large" ] [ i [ class "fas fa-2x fa-piggy-bank" ] [] ]
|
||||
, span [ class "icon", onClick EditWealth ] [ i [ class "fas fa-tools" ] [] ]
|
||||
]
|
||||
]
|
||||
++ (if editing then
|
||||
:: (if editing then
|
||||
viewUpdateWealth amount
|
||||
|
||||
else
|
||||
@@ -438,8 +336,7 @@ view model =
|
||||
|> List.filter
|
||||
(\i -> String.toLower i.name |> String.contains (String.toLower model.searchText))
|
||||
in
|
||||
[ viewHeaderBar "Mon coffre" model
|
||||
, viewPlayerBar model.state.player renderControls ( model.state.editWealth, model.state.wealthAmount )
|
||||
[ viewPlayerBar model.state.player renderControls ( model.state.editWealth, model.state.wealthAmount )
|
||||
, main_
|
||||
[ class "container" ]
|
||||
[ viewNotification model
|
||||
@@ -864,7 +761,6 @@ type Msg
|
||||
| GotPlayer (HttpResult Api.Player)
|
||||
-- Chest UI
|
||||
| ClearNotification
|
||||
| SwitchMenuOpen
|
||||
| SetContent ChestContent
|
||||
| SearchTextChanged String
|
||||
-- Selection
|
||||
@@ -896,7 +792,7 @@ switchEditWealth state =
|
||||
|
||||
setWealthAmount state amount =
|
||||
{ state
|
||||
| wealthAmount = amount
|
||||
| wealthAmount = String.replace "," "." amount
|
||||
}
|
||||
|
||||
|
||||
@@ -950,15 +846,6 @@ update msg model =
|
||||
, Cmd.none
|
||||
)
|
||||
|
||||
SwitchMenuOpen ->
|
||||
let
|
||||
state =
|
||||
model.state
|
||||
in
|
||||
( { model | state = { state | menuOpen = not model.state.menuOpen } }
|
||||
, Cmd.none
|
||||
)
|
||||
|
||||
AddMsg addMsg ->
|
||||
case addMsg of
|
||||
NewItemsFromList newLoot maybeErrors ->
|
||||
|
||||
Reference in New Issue
Block a user