From 898e7ed11ab0958fcdaf65b99b33f7b04787630a Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 24 Sep 2017 22:14:48 +0200
Subject: Bootstrap with GHCJS and reflex:

- setup login and logout,
- first draft of payment view.
---
 src/server/Conf.hs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/server/Conf.hs')

diff --git a/src/server/Conf.hs b/src/server/Conf.hs
index a05349d..92df4e9 100644
--- a/src/server/Conf.hs
+++ b/src/server/Conf.hs
@@ -10,11 +10,13 @@ import qualified Data.Text as T
 import qualified Data.ConfigManager as Conf
 import Data.Time.Clock (NominalDiffTime)
 
+import Common.Model.Currency (Currency(..))
+
 data Conf = Conf
   { hostname :: Text
   , port :: Int
   , signInExpiration :: NominalDiffTime
-  , currency :: Text
+  , currency :: Currency
   , noReplyMail :: Text
   , https :: Bool
   } deriving Show
@@ -28,7 +30,7 @@ get path = do
         Conf.lookup "hostname" conf <*>
         Conf.lookup "port" conf <*>
         Conf.lookup "signInExpiration" conf <*>
-        Conf.lookup "currency" conf <*>
+        fmap Currency (Conf.lookup "currency" conf) <*>
         Conf.lookup "noReplyMail" conf <*>
         Conf.lookup "https" conf
     )
-- 
cgit v1.2.3


From 27e11b20b06f2f2dbfb56c0998a63169b4b8abc4 Mon Sep 17 00:00:00 2001
From: Joris
Date: Wed, 8 Nov 2017 23:47:26 +0100
Subject: Use a better project structure

---
 src/server/Conf.hs | 39 ---------------------------------------
 1 file changed, 39 deletions(-)
 delete mode 100644 src/server/Conf.hs

(limited to 'src/server/Conf.hs')

diff --git a/src/server/Conf.hs b/src/server/Conf.hs
deleted file mode 100644
index 92df4e9..0000000
--- a/src/server/Conf.hs
+++ /dev/null
@@ -1,39 +0,0 @@
-{-# LANGUAGE OverloadedStrings #-}
-
-module Conf
-  ( get
-  , Conf(..)
-  ) where
-
-import Data.Text (Text)
-import qualified Data.Text as T
-import qualified Data.ConfigManager as Conf
-import Data.Time.Clock (NominalDiffTime)
-
-import Common.Model.Currency (Currency(..))
-
-data Conf = Conf
-  { hostname :: Text
-  , port :: Int
-  , signInExpiration :: NominalDiffTime
-  , currency :: Currency
-  , noReplyMail :: Text
-  , https :: Bool
-  } deriving Show
-
-get :: FilePath -> IO Conf
-get path = do
-  conf <-
-    (flip fmap) (Conf.readConfig path) (\configOrError -> do
-      conf <- configOrError
-      Conf <$>
-        Conf.lookup "hostname" conf <*>
-        Conf.lookup "port" conf <*>
-        Conf.lookup "signInExpiration" conf <*>
-        fmap Currency (Conf.lookup "currency" conf) <*>
-        Conf.lookup "noReplyMail" conf <*>
-        Conf.lookup "https" conf
-    )
-  case conf of
-    Left msg -> error (T.unpack msg)
-    Right c -> return c
-- 
cgit v1.2.3