From 1c7d6ea6e3bcd3c672cb5eb3cf22ffc88cabb257 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 20 Mar 2016 22:38:44 +0100
Subject: use config-manager instead of ConfigFile

---
 src/server/Model/Json/Conf.hs   | 17 +++++++++++++++++
 src/server/Model/Json/Config.hs | 17 -----------------
 src/server/Model/Message.hs     |  7 +++++--
 src/server/Model/Payment.hs     |  1 -
 src/server/Model/SignIn.hs      |  6 +++---
 5 files changed, 25 insertions(+), 23 deletions(-)
 create mode 100644 src/server/Model/Json/Conf.hs
 delete mode 100644 src/server/Model/Json/Config.hs

(limited to 'src/server/Model')

diff --git a/src/server/Model/Json/Conf.hs b/src/server/Model/Json/Conf.hs
new file mode 100644
index 0000000..a66fb55
--- /dev/null
+++ b/src/server/Model/Json/Conf.hs
@@ -0,0 +1,17 @@
+{-# LANGUAGE DeriveGeneric #-}
+
+module Model.Json.Conf
+  ( Conf(..)
+  ) where
+
+import GHC.Generics
+
+import Data.Aeson
+import Data.Text
+
+data Conf = Conf
+  { currency :: Text
+  } deriving (Show, Generic)
+
+instance FromJSON Conf
+instance ToJSON Conf
diff --git a/src/server/Model/Json/Config.hs b/src/server/Model/Json/Config.hs
deleted file mode 100644
index 422ecee..0000000
--- a/src/server/Model/Json/Config.hs
+++ /dev/null
@@ -1,17 +0,0 @@
-{-# LANGUAGE DeriveGeneric #-}
-
-module Model.Json.Config
-  ( Config(..)
-  ) where
-
-import GHC.Generics
-
-import Data.Aeson
-import Data.Text
-
-data Config = Config
-  { currency :: Text
-  } deriving (Show, Generic)
-
-instance FromJSON Config
-instance ToJSON Config
diff --git a/src/server/Model/Message.hs b/src/server/Model/Message.hs
index a65e01c..0e83e5b 100644
--- a/src/server/Model/Message.hs
+++ b/src/server/Model/Message.hs
@@ -18,10 +18,13 @@ getMessage :: Key -> Text
 getMessage = getParamMessage []
 
 getParamMessage :: [Text] -> Key -> Text
-getParamMessage values key = replaceParts values (getNonFormattedMessage lang key)
+getParamMessage values paramKey = replaceParts values (getNonFormattedMessage lang paramKey)
 
 getTranslations :: [Translation]
 getTranslations = (map getTranslation [minBound..])
 
 getTranslation :: Key -> Translation
-getTranslation key = Translation (T.pack . show $ key) (getParts $ getNonFormattedMessage lang key)
+getTranslation translationKey =
+  Translation
+    (T.pack . show $ translationKey)
+    (getParts $ getNonFormattedMessage lang translationKey)
diff --git a/src/server/Model/Payment.hs b/src/server/Model/Payment.hs
index 404b143..9b32fea 100644
--- a/src/server/Model/Payment.hs
+++ b/src/server/Model/Payment.hs
@@ -10,7 +10,6 @@ module Model.Payment
   ) where
 
 import Data.Text (Text)
-import qualified Data.Text as T
 import Data.Time.Clock (getCurrentTime)
 import Data.Either (lefts)
 
diff --git a/src/server/Model/SignIn.hs b/src/server/Model/SignIn.hs
index 117b8b5..06aba5a 100644
--- a/src/server/Model/SignIn.hs
+++ b/src/server/Model/SignIn.hs
@@ -1,6 +1,6 @@
 module Model.SignIn
   ( createSignInToken
-  , getSignInToken
+  , getSignIn
   , signInTokenToUsed
   , isLastValidToken
   ) where
@@ -22,8 +22,8 @@ createSignInToken email = do
   _ <- insert $ SignIn token now email False
   return token
 
-getSignInToken :: Text -> Persist (Maybe (Entity SignIn))
-getSignInToken token =
+getSignIn :: Text -> Persist (Maybe (Entity SignIn))
+getSignIn token =
   selectFirst [SignInToken ==. token] []
 
 signInTokenToUsed :: SignInId -> Persist ()
-- 
cgit v1.2.3