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/Model/PaymentCategory.hs | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

(limited to 'src/server/Model/PaymentCategory.hs')

diff --git a/src/server/Model/PaymentCategory.hs b/src/server/Model/PaymentCategory.hs
index 7c504dc..6e1d304 100644
--- a/src/server/Model/PaymentCategory.hs
+++ b/src/server/Model/PaymentCategory.hs
@@ -1,35 +1,23 @@
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE OverloadedStrings    #-}
+{-# OPTIONS_GHC -fno-warn-orphans #-}
 
 module Model.PaymentCategory
-  ( PaymentCategoryId
-  , PaymentCategory(..)
-  , list
+  ( list
   , listByCategory
   , save
   ) where
 
-import Data.Int (Int64)
 import Data.Maybe (isJust, listToMaybe)
 import Data.Text (Text)
-import Data.Time (UTCTime)
 import Data.Time.Clock (getCurrentTime)
 import Database.SQLite.Simple (Only(Only), FromRow(fromRow))
 import qualified Data.Text as T
 import qualified Database.SQLite.Simple as SQLite
 
-import Model.Category (CategoryId)
-import Model.Query (Query(Query))
-import qualified Utils.Text as T
-
-type PaymentCategoryId = Int64
+import Common.Model (CategoryId, PaymentCategory(..))
+import qualified Common.Util.Text as T
 
-data PaymentCategory = PaymentCategory
-  { id :: PaymentCategoryId
-  , name :: Text
-  , category :: CategoryId
-  , createdAt :: UTCTime
-  , editedAt :: Maybe UTCTime
-  } deriving Show
+import Model.Query (Query(Query))
 
 instance FromRow PaymentCategory where
   fromRow = PaymentCategory <$>
-- 
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/Model/PaymentCategory.hs | 62 -------------------------------------
 1 file changed, 62 deletions(-)
 delete mode 100644 src/server/Model/PaymentCategory.hs

(limited to 'src/server/Model/PaymentCategory.hs')

diff --git a/src/server/Model/PaymentCategory.hs b/src/server/Model/PaymentCategory.hs
deleted file mode 100644
index 6e1d304..0000000
--- a/src/server/Model/PaymentCategory.hs
+++ /dev/null
@@ -1,62 +0,0 @@
-{-# LANGUAGE OverloadedStrings    #-}
-{-# OPTIONS_GHC -fno-warn-orphans #-}
-
-module Model.PaymentCategory
-  ( list
-  , listByCategory
-  , save
-  ) where
-
-import Data.Maybe (isJust, listToMaybe)
-import Data.Text (Text)
-import Data.Time.Clock (getCurrentTime)
-import Database.SQLite.Simple (Only(Only), FromRow(fromRow))
-import qualified Data.Text as T
-import qualified Database.SQLite.Simple as SQLite
-
-import Common.Model (CategoryId, PaymentCategory(..))
-import qualified Common.Util.Text as T
-
-import Model.Query (Query(Query))
-
-instance FromRow PaymentCategory where
-  fromRow = PaymentCategory <$>
-    SQLite.field <*>
-    SQLite.field <*>
-    SQLite.field <*>
-    SQLite.field <*>
-    SQLite.field
-
-list :: Query [PaymentCategory]
-list = Query (\conn -> SQLite.query_ conn "SELECT * from payment_category")
-
-listByCategory :: CategoryId -> Query [PaymentCategory]
-listByCategory cat =
-  Query (\conn ->
-    SQLite.query conn "SELECT * FROM payment_category WHERE category = ?" (Only cat)
-  )
-
-save :: Text -> CategoryId -> Query ()
-save newName categoryId =
-  Query (\conn -> do
-    now <- getCurrentTime
-    mbPaymentCategory <- listToMaybe <$>
-      (SQLite.query
-        conn
-        "SELECT * FROM payment_category WHERE name = ?"
-        (Only (formatPaymentName newName)) :: IO [PaymentCategory])
-    if isJust mbPaymentCategory
-      then
-        SQLite.execute
-          conn
-          "UPDATE payment_category SET category = ?, edited_at = ? WHERE name = ?"
-          (categoryId, now, formatPaymentName newName)
-      else do
-        SQLite.execute
-          conn
-          "INSERT INTO payment_category (name, category, created_at) VALUES (?, ?, ?)"
-          (formatPaymentName newName, categoryId, now)
-  )
-  where
-    formatPaymentName :: Text -> Text
-    formatPaymentName = T.unaccent . T.toLower
-- 
cgit v1.2.3