From 7a0e9725e691bd84cda8f6b169414581e5e1d4f1 Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Thu, 29 Aug 2019 06:26:52 -0700 Subject: implement Network.RemoteData --- lore/Biz/Ibb/Core.hs | 9 +-------- lore/Biz/Ibb/Move.hs | 7 ++++--- 2 files changed, 5 insertions(+), 11 deletions(-) (limited to 'lore/Biz/Ibb') diff --git a/lore/Biz/Ibb/Core.hs b/lore/Biz/Ibb/Core.hs index 4ec87e3..39f506c 100644 --- a/lore/Biz/Ibb/Core.hs +++ b/lore/Biz/Ibb/Core.hs @@ -6,9 +6,9 @@ module Biz.Ibb.Core where import Alpha import Biz.Ibb.Influencers -import Data.Proxy import Miso import Miso.String +import Network.RemoteData import Servant.API import Servant.Links @@ -21,13 +21,6 @@ data Model = Model , people :: WebData [Person] } deriving (Show, Eq) -data RemoteData e a - = NotAsked - | Loading - | Failure e - | Success a - deriving (Show, Eq) - type WebData a = RemoteData MisoString a init :: URI -> Model diff --git a/lore/Biz/Ibb/Move.hs b/lore/Biz/Ibb/Move.hs index 291e015..ea3904d 100644 --- a/lore/Biz/Ibb/Move.hs +++ b/lore/Biz/Ibb/Move.hs @@ -16,6 +16,7 @@ import Biz.Ibb.Core as Core import JavaScript.Web.XMLHttpRequest (Request(..), Method(GET), RequestData(NoData), contents, xhrByteString) import Miso import Miso.String +import Network.RemoteData move :: Action -> Model -> Effect Action Model move Nop m = noEff m @@ -29,9 +30,9 @@ fetchPeople = do mjson <- contents /@ xhrByteString req case mjson of Nothing -> pure $ Failure "could not read from server" - Just json -> pure - $ either (Failure . ms) Core.Success - $ eitherDecodeStrict json + Just a -> pure + $ either (Failure . ms) Network.RemoteData.Success + $ eitherDecodeStrict a where req = Request { reqMethod = GET , reqURI = "/api/people" -- FIXME: can replace this hardcoding with a function? -- cgit v1.2.3