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/Category.hs | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

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

diff --git a/src/server/Model/Category.hs b/src/server/Model/Category.hs
index 9597bd9..6b7a488 100644
--- a/src/server/Model/Category.hs
+++ b/src/server/Model/Category.hs
@@ -1,34 +1,23 @@
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE OverloadedStrings    #-}
+{-# OPTIONS_GHC -fno-warn-orphans #-}
 
 module Model.Category
-  ( CategoryId
-  , Category(..)
-  , list
+  ( list
   , create
   , edit
   , delete
   ) 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 Database.SQLite.Simple as SQLite
+import Prelude hiding (id)
 
-import Model.Query (Query(Query))
-
-type CategoryId = Int64
+import Common.Model (Category(..), CategoryId)
 
-data Category = Category
-  { id :: CategoryId
-  , name :: Text
-  , color :: Text
-  , createdAt :: UTCTime
-  , editedAt :: Maybe UTCTime
-  , deletedAt :: Maybe UTCTime
-  } deriving Show
+import Model.Query (Query(Query))
 
 instance FromRow Category where
   fromRow = Category <$>
-- 
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/Category.hs | 79 --------------------------------------------
 1 file changed, 79 deletions(-)
 delete mode 100644 src/server/Model/Category.hs

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

diff --git a/src/server/Model/Category.hs b/src/server/Model/Category.hs
deleted file mode 100644
index 6b7a488..0000000
--- a/src/server/Model/Category.hs
+++ /dev/null
@@ -1,79 +0,0 @@
-{-# LANGUAGE OverloadedStrings    #-}
-{-# OPTIONS_GHC -fno-warn-orphans #-}
-
-module Model.Category
-  ( list
-  , create
-  , edit
-  , delete
-  ) 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 Database.SQLite.Simple as SQLite
-import Prelude hiding (id)
-
-import Common.Model (Category(..), CategoryId)
-
-import Model.Query (Query(Query))
-
-instance FromRow Category where
-  fromRow = Category <$>
-    SQLite.field <*>
-    SQLite.field <*>
-    SQLite.field <*>
-    SQLite.field <*>
-    SQLite.field <*>
-    SQLite.field
-
-list :: Query [Category]
-list =
-  Query (\conn ->
-    SQLite.query_ conn "SELECT * FROM category WHERE deleted_at IS NULL"
-  )
-
-create :: Text -> Text -> Query CategoryId
-create categoryName categoryColor =
-  Query (\conn -> do
-    now <- getCurrentTime
-    SQLite.execute
-      conn
-      "INSERT INTO category (name, color, created_at) VALUES (?, ?, ?)"
-      (categoryName, categoryColor, now)
-    SQLite.lastInsertRowId conn
-  )
-
-edit :: CategoryId -> Text -> Text -> Query Bool
-edit categoryId categoryName categoryColor =
-  Query (\conn -> do
-    mbCategory <- listToMaybe <$>
-      (SQLite.query conn "SELECT * FROM category WHERE id = ?" (Only categoryId) :: IO [Category])
-    if isJust mbCategory
-      then do
-        now <- getCurrentTime
-        SQLite.execute
-          conn
-          "UPDATE category SET edited_at = ?, name = ?, color = ? WHERE id = ?"
-          (now, categoryName, categoryColor, categoryId)
-        return True
-      else
-        return False
-  )
-
-delete :: CategoryId -> Query Bool
-delete categoryId =
-  Query (\conn -> do
-    mbCategory <- listToMaybe <$>
-      (SQLite.query conn "SELECT * FROM category WHERE id = ?" (Only categoryId) :: IO [Category])
-    if isJust mbCategory
-      then do
-        now <- getCurrentTime
-        SQLite.execute
-          conn
-          "UPDATE category SET deleted_at = ? WHERE id = ?" (now, categoryId)
-        return True
-      else
-        return False
-  )
-- 
cgit v1.2.3