From 68588db76baaf8f2f17dd9b7f3649b09e102ea85 Mon Sep 17 00:00:00 2001
From: Jasper Van der Jeugt
Date: Thu, 30 Jul 2020 20:09:47 +0200
Subject: Pass black and white cards to the client

---
 server/lib/Cafp/Main/GenerateElmTypes.hs | 4 +++-
 server/lib/Cafp/Main/Server.hs           | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'server/lib/Cafp/Main')

diff --git a/server/lib/Cafp/Main/GenerateElmTypes.hs b/server/lib/Cafp/Main/GenerateElmTypes.hs
index 9c72027..51376a5 100644
--- a/server/lib/Cafp/Main/GenerateElmTypes.hs
+++ b/server/lib/Cafp/Main/GenerateElmTypes.hs
@@ -10,7 +10,9 @@ import           Elm.Module
 
 main :: IO ()
 main = putStrLn $ makeElmModule "Messages"
-    [ DefineElm (Proxy :: Proxy GameView)
+    [ DefineElm (Proxy :: Proxy BlackCard)
+    , DefineElm (Proxy :: Proxy WhiteCard)
+    , DefineElm (Proxy :: Proxy GameView)
     , DefineElm (Proxy :: Proxy ServerMessage)
     , DefineElm (Proxy :: Proxy ClientMessage)
     ]
diff --git a/server/lib/Cafp/Main/Server.hs b/server/lib/Cafp/Main/Server.hs
index eae887e..3edf039 100644
--- a/server/lib/Cafp/Main/Server.hs
+++ b/server/lib/Cafp/Main/Server.hs
@@ -46,8 +46,8 @@ data Server = Server
 
 readCards :: IO Cards
 readCards = Cards
-    <$> fmap T.lines (T.readFile "assets/black.txt")
-    <*> fmap T.lines (T.readFile "assets/white.txt")
+    <$> fmap (map BlackCard . T.lines) (T.readFile "assets/black.txt")
+    <*> fmap (map WhiteCard . T.lines) (T.readFile "assets/white.txt")
 
 newServer :: IO Server
 newServer = Server <$> readCards <*> atomically (STM.newTVar HMS.empty)
-- 
cgit v1.2.3