From 6034f1617392d09e3a5f9af19b064cc369f546e0 Mon Sep 17 00:00:00 2001 From: Jasper Van der Jeugt Date: Tue, 4 Aug 2020 20:20:12 +0200 Subject: Make it look decent --- client/src/Messages.elm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'client/src/Messages.elm') diff --git a/client/src/Messages.elm b/client/src/Messages.elm index 434efb0..fb244f9 100644 --- a/client/src/Messages.elm +++ b/client/src/Messages.elm @@ -156,28 +156,25 @@ jsonEncGameView val = type ServerMessage = - Welcome Int + Welcome String | SyncCards Cards | SyncGameView GameView - | Bye jsonDecServerMessage : Json.Decode.Decoder ( ServerMessage ) jsonDecServerMessage = let jsonDecDictServerMessage = Dict.fromList - [ ("Welcome", Json.Decode.lazy (\_ -> Json.Decode.map Welcome (Json.Decode.int))) + [ ("Welcome", Json.Decode.lazy (\_ -> Json.Decode.map Welcome (Json.Decode.string))) , ("SyncCards", Json.Decode.lazy (\_ -> Json.Decode.map SyncCards (jsonDecCards))) , ("SyncGameView", Json.Decode.lazy (\_ -> Json.Decode.map SyncGameView (jsonDecGameView))) - , ("Bye", Json.Decode.lazy (\_ -> Json.Decode.succeed Bye)) ] in decodeSumObjectWithSingleField "ServerMessage" jsonDecDictServerMessage jsonEncServerMessage : ServerMessage -> Value jsonEncServerMessage val = let keyval v = case v of - Welcome v1 -> ("Welcome", encodeValue (Json.Encode.int v1)) + Welcome v1 -> ("Welcome", encodeValue (Json.Encode.string v1)) SyncCards v1 -> ("SyncCards", encodeValue (jsonEncCards v1)) SyncGameView v1 -> ("SyncGameView", encodeValue (jsonEncGameView v1)) - Bye -> ("Bye", encodeValue (Json.Encode.list identity [])) in encodeSumObjectWithSingleField keyval val -- cgit v1.2.3