From c50cb37900fe29f2ed242beeaf7322539c17cec3 Mon Sep 17 00:00:00 2001 From: Artus Date: Wed, 27 Nov 2019 22:02:47 +0100 Subject: [PATCH] made it work again --- src/Api.elm | 25 ++++++++++--------------- src/Session.elm | 2 +- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/src/Api.elm b/src/Api.elm index ed96237..b116c30 100644 --- a/src/Api.elm +++ b/src/Api.elm @@ -12,6 +12,7 @@ module Api exposing , confirmAction , fetchClaimsOf , fetchLoot + , fetchSession , replaceShopItems ) @@ -420,29 +421,23 @@ replaceShopItems toMsg loot = } + +-- This is where the error happened + + fetchSession toMsg = let - toSession : Result Http.Error String -> msg - toSession response = - case Debug.log "got session:" response of - Ok value -> - if value == "admin" then - toMsg Nothing - - else - case value of - Ok player -> - toMsg <| Just player - - Err _ -> - toMsg Nothing + 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 toSession (valueDecoder Api.Player.playerDecoder) + , expect = Http.expectJson gotResponse Api.Player.playerDecoder } diff --git a/src/Session.elm b/src/Session.elm index 87bed6f..edda7bb 100644 --- a/src/Session.elm +++ b/src/Session.elm @@ -1,6 +1,6 @@ module Session exposing (Session, User(..), getSession, init, key, user) -import Api exposing (valueDecoder) +import Api import Api.Player as Player exposing (Player) import Browser.Navigation as Nav import Http