made it work again

src/Api.elm

@@ -12,6 +12,7 @@ module Api exposing
     , confirmAction
     , fetchClaimsOf
     , fetchLoot
+    , fetchSession
     , replaceShopItems
     )
 
@@ -421,6 +422,26 @@ replaceShopItems toMsg loot =
 
 
 
+-- This is where the error happened
+
+
+fetchSession toMsg =
+    let
+        gotResponse r =
+            case Debug.log "got session:" r of
+                Ok player ->
+                    toMsg (Just player)
+
+                Err _ ->
+                    toMsg Nothing
+    in
+    Http.get
+        { url = "http://localhost:8088/session"
+        , expect = Http.expectJson gotResponse Api.Player.playerDecoder
+        }
+
+
+
 -- UTILS
 
 

src/Api/Player.elm

@@ -1,4 +1,4 @@
-module Api.Player exposing (Player, Wealth, blankPlayer, get, list, wealthDecoder)
+module Api.Player exposing (Player, Wealth, blankPlayer, get, list, playerDecoder, wealthDecoder)
 
 import Http
 import Json.Decode as D exposing (Decoder, int, string)

src/Page.elm

@@ -5,6 +5,7 @@ import Html.Attributes exposing (..)
 import Html.Events exposing (..)
 import Page.Admin as Admin
 import Page.Chest as Chest
+import Page.Chest.Wealth as Wealth
 import Page.Shop as Shop
 import Session exposing (Session)
 import Utils exposing (renderIcon)
@@ -83,8 +84,8 @@ view page =
             case maybeSession of
                 Just session ->
                     case Session.user session of
-                        Session.Player id ->
+                        Session.Player player _ ->
-                            String.fromInt id
+                            player.name
 
                         Session.Admin ->
                             "Administration"
@@ -96,13 +97,13 @@ view page =
             case maybeSession of
                 Just session ->
                     case Session.user session of
-                        Session.Player id ->
+                        Session.Player player _ ->
                             let
                                 linkWithGem =
                                     navLink "fas fa-gem"
                             in
                             [ navLink "fas fa-store-alt" "Marchand" "/marchand"
-                            , if id == 0 then
+                            , if player.id == 0 then
                                 linkWithGem "Nouveau loot" "/nouveau-tresor"
 
                               else
@@ -117,25 +118,22 @@ view page =
     in
     ( title
     , { title = navbarTitle, links = navbarLinks }
-    , viewSessionBar maybeSession controls
+    , [ div [ class "container" ] <|
+            viewSessionBar maybeSession [ controls ]
                 :: content
+      ]
     )
 
 
 viewSessionBar maybeSession controls =
-    controls
+    let
+        user =
+            case Maybe.map Session.user maybeSession of
+                Nothing ->
+                    [ text "" ]
 
-
+                Just (Session.Player player wealth) ->
-
+                    Wealth.view player.wealth wealth
--- PLAYER BAR
-{-
-   viewPlayerBar : Player -> List (Html Msg) -> Wealth.Model -> Html Msg
-   viewPlayerBar player actionControls wealthModel =
-       section [ class "hero is-dark is-bold" ]
-           [ div [ class "hero-body" ]
-               [ div [ class "level container is-mobile" ]
-                   [ div [ class "level-left" ]
-                       (Wealth.view player.wealth wealthModel
                         ++ (if player.debt > 0 then
                                 [ div [ class "level-item" ]
                                     [ p [ class "heading is-size-4 has-text-danger" ]
@@ -146,14 +144,26 @@ viewSessionBar maybeSession controls =
                             else
                                 []
                            )
-                       )
+                        |> List.map (Html.map Wealth)
-                       |> Html.map WealthMsg
+
-                   , div [ class "level-right" ] actionControls
+                Just Session.Admin ->
-                   ]
+                    [ text "Admin" ]
-               ]
+    in
+    section [ class "hero is-dark is-bold" ]
+        [ div [ class "hero-body" ]
+            [ renderLevel user controls ]
         ]
 
--}
+
+renderLevel left right =
+    div [ class "level container is-mobile" ]
+        [ div [ class "level-left" ] left
+        , div [ class "level-right" ] right
+        ]
+
+
+
+-- PLAYER BAR
 
 
 navLink icon linkText url =
@@ -172,6 +182,7 @@ type PageMsg
     = GotChestMsg Chest.Msg
     | GotAdminMsg Admin.Msg
     | GotShopMsg Shop.Msg
+    | Wealth Wealth.Msg
 
 
 update msg page =
@@ -204,7 +215,7 @@ updatePage toPage toMsg ( subModel, subMsg ) =
 
 gotoHome session =
     case Session.user session of
-        Session.Player _ ->
+        Session.Player _ _ ->
             Chest.init session
                 |> updatePage Chest GotChestMsg
 

src/Page/Chest.elm

@@ -121,8 +121,8 @@ init session =
 
         playerId =
             case Session.user session of
-                Session.Player id ->
+                Session.Player player _ ->
-                    id
+                    player.id
 
                 Session.Admin ->
                     0
@@ -148,9 +148,7 @@ init session =
         Route.PlayerLoot
         Nothing
         ""
-        (Wealth.init
+        Wealth.init
-            blankPlayer.wealth
-        )
         []
     , Cmd.batch
         [ Api.Player.get GotPlayer playerId

src/Page/Chest/Wealth.elm

@@ -11,7 +11,7 @@ type Model
     | Edit String
 
 
-init wealth =
+init =
     View
 
 

src/Page/Shop.elm

@@ -47,7 +47,7 @@ view model =
                 Session.Admin ->
                     button [ class "button", onClick IntoRefresh ] [ text "Remplacer" ]
 
-                Session.Player _ ->
+                Session.Player _ _ ->
                     button [ class "button" ] [ text "Acheter" ]
             , [ Table.view Table.name loot ]
             )

src/Session.elm

@@ -1,12 +1,15 @@
 module Session exposing (Session, User(..), getSession, init, key, user)
 
+import Api
+import Api.Player as Player exposing (Player)
 import Browser.Navigation as Nav
 import Http
 import Json.Decode as D
+import Page.Chest.Wealth as Wealth
 
 
 type User
-    = Player Int
+    = Player Player Wealth.Model
     | Admin
 
 
@@ -17,29 +20,16 @@ type Session
 init : (Maybe Session -> msg) -> Nav.Key -> Cmd msg
 init toMsg navKey =
     let
-        toSession : Result Http.Error String -> msg
+        toSession : Maybe Player -> msg
         toSession response =
-            case Debug.log "got session:" response of
+            case response of
-                Ok value ->
+                Just player ->
-                    if value == "admin" then
+                    toMsg <| Just (Session navKey (Player player Wealth.init))
-                        toMsg <| Just (Session navKey Admin)
-
-                    else
-                        case String.toInt value of
-                            Just id ->
-                                toMsg <| Just (Session navKey (Player id))
 
                 Nothing ->
-                                toMsg
-                                    Nothing
-
-                Err _ ->
                     toMsg Nothing
     in
-    Http.get
+    Api.fetchSession toSession
-        { url = "http://localhost:8088/session"
-        , expect = Http.expectJson toSession D.string
-        }
 
 
 getSession : { r | session : Session } -> Session