diff options
Diffstat (limited to '')
| -rw-r--r-- | server/lib/Cafp/Main/GenerateElmTypes.hs | 4 | ||||
| -rw-r--r-- | server/lib/Cafp/Main/Server.hs | 4 |
2 files changed, 5 insertions, 3 deletions
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) |