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

---
 server/src/Conf.hs | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 server/src/Conf.hs

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

diff --git a/server/src/Conf.hs b/server/src/Conf.hs
new file mode 100644
index 0000000..26c5c28
--- /dev/null
+++ b/server/src/Conf.hs
@@ -0,0 +1,39 @@
+{-# 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(..))
+
+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


From 5a63f7be9375e3ab888e4232dd7ef72c2f1ffae1 Mon Sep 17 00:00:00 2001
From: Joris
Date: Mon, 13 Nov 2017 23:56:40 +0100
Subject: Setup stylish-haskell

---
 server/src/Conf.hs | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

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

diff --git a/server/src/Conf.hs b/server/src/Conf.hs
index 26c5c28..299f071 100644
--- a/server/src/Conf.hs
+++ b/server/src/Conf.hs
@@ -5,20 +5,20 @@ module Conf
   , Conf(..)
   ) where
 
-import Data.Text (Text)
-import qualified Data.Text as T
 import qualified Data.ConfigManager as Conf
-import Data.Time.Clock (NominalDiffTime)
+import           Data.Text          (Text)
+import qualified Data.Text          as T
+import           Data.Time.Clock    (NominalDiffTime)
 
-import Common.Model (Currency(..))
+import           Common.Model       (Currency (..))
 
 data Conf = Conf
-  { hostname :: Text
-  , port :: Int
+  { hostname         :: Text
+  , port             :: Int
   , signInExpiration :: NominalDiffTime
-  , currency :: Currency
-  , noReplyMail :: Text
-  , https :: Bool
+  , currency         :: Currency
+  , noReplyMail      :: Text
+  , https            :: Bool
   } deriving Show
 
 get :: FilePath -> IO Conf
@@ -36,4 +36,4 @@ get path = do
     )
   case conf of
     Left msg -> error (T.unpack msg)
-    Right c -> return c
+    Right c  -> return c
-- 
cgit v1.2.3


From 7194cddb28656c721342c2ef604f9f9fb0692960 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 19 Nov 2017 00:20:25 +0100
Subject: Show payment count and partition

- Also fixes exceedingPayer in back by using only punctual payments
---
 server/src/Conf.hs | 2 --
 1 file changed, 2 deletions(-)

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

diff --git a/server/src/Conf.hs b/server/src/Conf.hs
index 299f071..2422a93 100644
--- a/server/src/Conf.hs
+++ b/server/src/Conf.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedStrings #-}
-
 module Conf
   ( get
   , Conf(..)
-- 
cgit v1.2.3


From a4acc2e84158fa822f88a1d0bdddb470708b5809 Mon Sep 17 00:00:00 2001
From: Joris
Date: Wed, 3 Jan 2018 17:31:20 +0100
Subject: Modify weelky report and payment search interface

- Add payment balance in weekly report
- Show a message and hide pages when the search results in no results
- Go to page 1 when the search is updated / erased
---
 server/src/Conf.hs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/server/src/Conf.hs b/server/src/Conf.hs
index 2422a93..ca19c8d 100644
--- a/server/src/Conf.hs
+++ b/server/src/Conf.hs
@@ -17,6 +17,7 @@ data Conf = Conf
   , currency         :: Currency
   , noReplyMail      :: Text
   , https            :: Bool
+  , devMode          :: Bool
   } deriving Show
 
 get :: FilePath -> IO Conf
@@ -30,7 +31,8 @@ get path = do
         Conf.lookup "signInExpiration" conf <*>
         fmap Currency (Conf.lookup "currency" conf) <*>
         Conf.lookup "noReplyMail" conf <*>
-        Conf.lookup "https" conf
+        Conf.lookup "https" conf <*>
+        Conf.lookup "devMode" conf
     )
   case conf of
     Left msg -> error (T.unpack msg)
-- 
cgit v1.2.3