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/Controller/Category.hs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/server/Controller/Category.hs')

diff --git a/src/server/Controller/Category.hs b/src/server/Controller/Category.hs
index 3f800da..1a44083 100644
--- a/src/server/Controller/Category.hs
+++ b/src/server/Controller/Category.hs
@@ -11,12 +11,14 @@ import Network.HTTP.Types.Status (ok200, badRequest400)
 import qualified Data.Text.Lazy as TL
 import Web.Scotty hiding (delete)
 
+import Common.Model.Category (CategoryId)
+import qualified Common.Message as Message
+import qualified Common.Message.Key as Key
+import qualified Common.Model.CreateCategory as Json
+import qualified Common.Model.EditCategory as Json
+
 import Json (jsonId)
-import Model.Category (CategoryId)
 import qualified Model.Category as Category
-import qualified Model.Json.CreateCategory as Json
-import qualified Model.Json.EditCategory as Json
-import qualified Model.Message.Key as Key
 import qualified Model.PaymentCategory as PaymentCategory
 import qualified Model.Query as Query
 import qualified Secure
@@ -49,5 +51,5 @@ delete categoryId =
         status ok200
       else do
         status badRequest400
-        text . TL.pack . show $ Key.CategoryNotDeleted
+        text . TL.fromStrict $ Message.get Key.Category_NotDeleted
   )
-- 
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/Controller/Category.hs | 55 ---------------------------------------
 1 file changed, 55 deletions(-)
 delete mode 100644 src/server/Controller/Category.hs

(limited to 'src/server/Controller/Category.hs')

diff --git a/src/server/Controller/Category.hs b/src/server/Controller/Category.hs
deleted file mode 100644
index 1a44083..0000000
--- a/src/server/Controller/Category.hs
+++ /dev/null
@@ -1,55 +0,0 @@
-{-# LANGUAGE OverloadedStrings #-}
-
-module Controller.Category
-  ( create
-  , edit
-  , delete
-  ) where
-
-import Control.Monad.IO.Class (liftIO)
-import Network.HTTP.Types.Status (ok200, badRequest400)
-import qualified Data.Text.Lazy as TL
-import Web.Scotty hiding (delete)
-
-import Common.Model.Category (CategoryId)
-import qualified Common.Message as Message
-import qualified Common.Message.Key as Key
-import qualified Common.Model.CreateCategory as Json
-import qualified Common.Model.EditCategory as Json
-
-import Json (jsonId)
-import qualified Model.Category as Category
-import qualified Model.PaymentCategory as PaymentCategory
-import qualified Model.Query as Query
-import qualified Secure
-
-create :: Json.CreateCategory -> ActionM ()
-create (Json.CreateCategory name color) =
-  Secure.loggedAction (\_ ->
-    (liftIO . Query.run $ Category.create name color) >>= jsonId
-  )
-
-edit :: Json.EditCategory -> ActionM ()
-edit (Json.EditCategory categoryId name color) =
-  Secure.loggedAction (\_ -> do
-    updated <- liftIO . Query.run $ Category.edit categoryId name color
-    if updated
-      then status ok200
-      else status badRequest400
-  )
-
-delete :: CategoryId -> ActionM ()
-delete categoryId =
-  Secure.loggedAction (\_ -> do
-    deleted <- liftIO . Query.run $ do
-      paymentCategories <- PaymentCategory.listByCategory categoryId
-      if null paymentCategories
-        then Category.delete categoryId
-        else return False
-    if deleted
-      then
-        status ok200
-      else do
-        status badRequest400
-        text . TL.fromStrict $ Message.get Key.Category_NotDeleted
-  )
-- 
cgit v1.2.3