Bootstrap with GHCJS and reflex:

- setup login and logout,
- first draft of payment view.

1 files changed, 14 insertions, 17 deletions

diff --git a/src/server/Model/Init.hs b/src/server/Model/Init.hs
index 7a9ccea..8c6a961 100644
--- a/src/server/Model/Init.hs
+++ b/src/server/Model/Init.hs
@@ -4,27 +4,24 @@ module Model.Init
   ( getInit
   ) where
 
-import Model.Json.Init (Init)
+import Common.Model (Init(Init), User(..))
+
+import Conf (Conf)
+import qualified Conf
 import Model.Query (Query)
-import Model.User (User)
 import qualified Model.Category as Category
 import qualified Model.Income as Income
-import qualified Model.Json.Category as Json
-import qualified Model.Json.Income as Json
-import qualified Model.Json.Init as Init
-import qualified Model.Json.Payment as Json
-import qualified Model.Json.PaymentCategory as Json
-import qualified Model.Json.User as Json
 import qualified Model.Payment as Payment
 import qualified Model.PaymentCategory as PaymentCategory
 import qualified Model.User as User
 
-getInit :: User -> Query Init
-getInit user =
-  Init.Init <$>
-    (map Json.fromUser <$> User.list) <*>
-    (return . User.id $ user) <*>
-    (map Json.fromPayment <$> Payment.list) <*>
-    (map Json.fromIncome <$> Income.list) <*>
-    (map Json.fromCategory <$> Category.list) <*>
-    (map Json.fromPaymentCategory <$> PaymentCategory.list)
+getInit :: User -> Conf -> Query Init
+getInit user conf =
+  Init <$>
+    User.list <*>
+    (return . _user_id $ user) <*>
+    Payment.list <*>
+    Income.list <*>
+    Category.list <*>
+    PaymentCategory.list <*>
+    (return . Conf.currency $ conf)