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

---
 server/src/Main.hs | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 server/src/Main.hs

(limited to 'server/src/Main.hs')

diff --git a/server/src/Main.hs b/server/src/Main.hs
new file mode 100644
index 0000000..db73474
--- /dev/null
+++ b/server/src/Main.hs
@@ -0,0 +1,79 @@
+{-# LANGUAGE OverloadedStrings #-}
+
+import Control.Applicative (liftA3)
+import Control.Monad.IO.Class (liftIO)
+
+import Network.Wai.Middleware.Static
+import qualified Data.Text.Lazy as LT
+import Web.Scotty
+
+import qualified Conf
+import qualified Controller.Category as Category
+import qualified Controller.Income as Income
+import qualified Controller.Index as Index
+import qualified Controller.Payment as Payment
+import qualified Controller.SignIn as SignIn
+import Job.Daemon (runDaemons)
+import Model.Payer (getOrderedExceedingPayers)
+import qualified Data.Time as Time
+import qualified Model.User as UserM
+import qualified Model.Income as IncomeM
+import qualified Model.Payment as PaymentM
+import qualified Model.Query as Query
+
+main :: IO ()
+main = do
+  conf <- Conf.get "application.conf"
+  _ <- runDaemons conf
+  scotty (Conf.port conf) $ do
+    middleware . staticPolicy $ noDots >-> addBase "public"
+
+    get "/exceedingPayer" $ do
+      time <- liftIO Time.getCurrentTime
+      (users, incomes, payments) <- liftIO . Query.run $
+        liftA3 (,,) UserM.list IncomeM.list PaymentM.list
+      let exceedingPayers = getOrderedExceedingPayers time users incomes payments
+      text . LT.pack . show $ exceedingPayers
+
+    get "/" $ do
+      signInToken <- mbParam "signInToken"
+      Index.get conf signInToken
+
+    post "/signIn" $ do
+      jsonData >>= SignIn.signIn conf
+
+    post "/signOut" $
+      Index.signOut conf
+
+    post "/payment" $
+      jsonData >>= Payment.create
+
+    put "/payment" $
+      jsonData >>= Payment.editOwn
+
+    delete "/payment" $ do
+      paymentId <- param "id"
+      Payment.deleteOwn paymentId
+
+    post "/income" $
+      jsonData >>= Income.create
+
+    put "/income" $
+      jsonData >>= Income.editOwn
+
+    delete "/income" $ do
+      incomeId <- param "id"
+      Income.deleteOwn incomeId
+
+    post "/category" $
+      jsonData >>= Category.create
+
+    put "/category" $
+      jsonData >>= Category.edit
+
+    delete "/category" $ do
+      categoryId <- param "id"
+      Category.delete categoryId
+
+mbParam :: Parsable a => LT.Text -> ActionM (Maybe a)
+mbParam key = (Just <$> param key) `rescue` (const . return $ Nothing)
-- 
cgit v1.2.3


From 30f786e277b4ece6a09311de364082691f261ca3 Mon Sep 17 00:00:00 2001
From: Joris
Date: Fri, 10 Nov 2017 01:23:49 +0100
Subject: Minify javascript in dist mode, compress served files with gzip

---
 server/src/Main.hs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'server/src/Main.hs')

diff --git a/server/src/Main.hs b/server/src/Main.hs
index db73474..96c13ee 100644
--- a/server/src/Main.hs
+++ b/server/src/Main.hs
@@ -3,8 +3,10 @@
 import Control.Applicative (liftA3)
 import Control.Monad.IO.Class (liftIO)
 
-import Network.Wai.Middleware.Static
 import qualified Data.Text.Lazy as LT
+import Network.Wai.Middleware.Gzip (GzipFiles(GzipCompress))
+import qualified Network.Wai.Middleware.Gzip as W
+import Network.Wai.Middleware.Static
 import Web.Scotty
 
 import qualified Conf
@@ -26,6 +28,7 @@ main = do
   conf <- Conf.get "application.conf"
   _ <- runDaemons conf
   scotty (Conf.port conf) $ do
+    middleware $ W.gzip $ W.def { W.gzipFiles = GzipCompress }
     middleware . staticPolicy $ noDots >-> addBase "public"
 
     get "/exceedingPayer" $ do
-- 
cgit v1.2.3


From 5a63f7be9375e3ab888e4232dd7ef72c2f1ffae1 Mon Sep 17 00:00:00 2001
From: Joris
Date: Mon, 13 Nov 2017 23:56:40 +0100
Subject: Setup stylish-haskell

---
 server/src/Main.hs | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'server/src/Main.hs')

diff --git a/server/src/Main.hs b/server/src/Main.hs
index 96c13ee..5ac68db 100644
--- a/server/src/Main.hs
+++ b/server/src/Main.hs
@@ -1,27 +1,27 @@
 {-# LANGUAGE OverloadedStrings #-}
 
-import Control.Applicative (liftA3)
-import Control.Monad.IO.Class (liftIO)
+import           Control.Applicative           (liftA3)
+import           Control.Monad.IO.Class        (liftIO)
 
-import qualified Data.Text.Lazy as LT
-import Network.Wai.Middleware.Gzip (GzipFiles(GzipCompress))
-import qualified Network.Wai.Middleware.Gzip as W
-import Network.Wai.Middleware.Static
-import Web.Scotty
+import qualified Data.Text.Lazy                as LT
+import           Network.Wai.Middleware.Gzip   (GzipFiles (GzipCompress))
+import qualified Network.Wai.Middleware.Gzip   as W
+import           Network.Wai.Middleware.Static
+import           Web.Scotty
 
 import qualified Conf
-import qualified Controller.Category as Category
-import qualified Controller.Income as Income
-import qualified Controller.Index as Index
-import qualified Controller.Payment as Payment
-import qualified Controller.SignIn as SignIn
-import Job.Daemon (runDaemons)
-import Model.Payer (getOrderedExceedingPayers)
-import qualified Data.Time as Time
-import qualified Model.User as UserM
-import qualified Model.Income as IncomeM
-import qualified Model.Payment as PaymentM
-import qualified Model.Query as Query
+import qualified Controller.Category           as Category
+import qualified Controller.Income             as Income
+import qualified Controller.Index              as Index
+import qualified Controller.Payment            as Payment
+import qualified Controller.SignIn             as SignIn
+import qualified Data.Time                     as Time
+import           Job.Daemon                    (runDaemons)
+import qualified Model.Income                  as IncomeM
+import           Model.Payer                   (getOrderedExceedingPayers)
+import qualified Model.Payment                 as PaymentM
+import qualified Model.Query                   as Query
+import qualified Model.User                    as UserM
 
 main :: IO ()
 main = do
-- 
cgit v1.2.3


From 7194cddb28656c721342c2ef604f9f9fb0692960 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 19 Nov 2017 00:20:25 +0100
Subject: Show payment count and partition

- Also fixes exceedingPayer in back by using only punctual payments
---
 server/src/Main.hs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'server/src/Main.hs')

diff --git a/server/src/Main.hs b/server/src/Main.hs
index 5ac68db..d7b9b93 100644
--- a/server/src/Main.hs
+++ b/server/src/Main.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedStrings #-}
-
 import           Control.Applicative           (liftA3)
 import           Control.Monad.IO.Class        (liftIO)
 
@@ -9,6 +7,8 @@ import qualified Network.Wai.Middleware.Gzip   as W
 import           Network.Wai.Middleware.Static
 import           Web.Scotty
 
+import           Common.Model                  (Frequency (..), Payment (..))
+
 import qualified Conf
 import qualified Controller.Category           as Category
 import qualified Controller.Income             as Income
@@ -35,7 +35,8 @@ main = do
       time <- liftIO Time.getCurrentTime
       (users, incomes, payments) <- liftIO . Query.run $
         liftA3 (,,) UserM.list IncomeM.list PaymentM.list
-      let exceedingPayers = getOrderedExceedingPayers time users incomes payments
+      let punctualPayments = filter ((==) Punctual . _payment_frequency) payments
+          exceedingPayers = getOrderedExceedingPayers time users incomes punctualPayments
       text . LT.pack . show $ exceedingPayers
 
     get "/" $ do
-- 
cgit v1.2.3


From bab2c30addf8aaed85675e2b7f7b15c97c426f74 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 19 Nov 2017 15:00:07 +0100
Subject: Add exceeding payer block

---
 server/src/Main.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'server/src/Main.hs')

diff --git a/server/src/Main.hs b/server/src/Main.hs
index d7b9b93..c8080dc 100644
--- a/server/src/Main.hs
+++ b/server/src/Main.hs
@@ -8,6 +8,7 @@ import           Network.Wai.Middleware.Static
 import           Web.Scotty
 
 import           Common.Model                  (Frequency (..), Payment (..))
+import qualified Common.Model                  as CM
 
 import qualified Conf
 import qualified Controller.Category           as Category
@@ -18,7 +19,6 @@ import qualified Controller.SignIn             as SignIn
 import qualified Data.Time                     as Time
 import           Job.Daemon                    (runDaemons)
 import qualified Model.Income                  as IncomeM
-import           Model.Payer                   (getOrderedExceedingPayers)
 import qualified Model.Payment                 as PaymentM
 import qualified Model.Query                   as Query
 import qualified Model.User                    as UserM
@@ -36,7 +36,7 @@ main = do
       (users, incomes, payments) <- liftIO . Query.run $
         liftA3 (,,) UserM.list IncomeM.list PaymentM.list
       let punctualPayments = filter ((==) Punctual . _payment_frequency) payments
-          exceedingPayers = getOrderedExceedingPayers time users incomes punctualPayments
+          exceedingPayers = CM.getExceedingPayers time users incomes punctualPayments
       text . LT.pack . show $ exceedingPayers
 
     get "/" $ do
-- 
cgit v1.2.3


From a4acc2e84158fa822f88a1d0bdddb470708b5809 Mon Sep 17 00:00:00 2001
From: Joris
Date: Wed, 3 Jan 2018 17:31:20 +0100
Subject: Modify weelky report and payment search interface

- Add payment balance in weekly report
- Show a message and hide pages when the search results in no results
- Go to page 1 when the search is updated / erased
---
 server/src/Main.hs | 81 ++++++++++++++++++++----------------------------------
 1 file changed, 30 insertions(+), 51 deletions(-)

(limited to 'server/src/Main.hs')

diff --git a/server/src/Main.hs b/server/src/Main.hs
index c8080dc..e298a06 100644
--- a/server/src/Main.hs
+++ b/server/src/Main.hs
@@ -1,83 +1,62 @@
-import           Control.Applicative           (liftA3)
-import           Control.Monad.IO.Class        (liftIO)
-
-import qualified Data.Text.Lazy                as LT
 import           Network.Wai.Middleware.Gzip   (GzipFiles (GzipCompress))
 import qualified Network.Wai.Middleware.Gzip   as W
 import           Network.Wai.Middleware.Static
-import           Web.Scotty
-
-import           Common.Model                  (Frequency (..), Payment (..))
-import qualified Common.Model                  as CM
+import qualified Web.Scotty                    as S
 
 import qualified Conf
 import qualified Controller.Category           as Category
 import qualified Controller.Income             as Income
 import qualified Controller.Index              as Index
 import qualified Controller.Payment            as Payment
-import qualified Controller.SignIn             as SignIn
-import qualified Data.Time                     as Time
 import           Job.Daemon                    (runDaemons)
-import qualified Model.Income                  as IncomeM
-import qualified Model.Payment                 as PaymentM
-import qualified Model.Query                   as Query
-import qualified Model.User                    as UserM
 
 main :: IO ()
 main = do
   conf <- Conf.get "application.conf"
   _ <- runDaemons conf
-  scotty (Conf.port conf) $ do
-    middleware $ W.gzip $ W.def { W.gzipFiles = GzipCompress }
-    middleware . staticPolicy $ noDots >-> addBase "public"
+  S.scotty (Conf.port conf) $ do
+    S.middleware $ W.gzip $ W.def { W.gzipFiles = GzipCompress }
+    S.middleware . staticPolicy $ noDots >-> addBase "public"
 
-    get "/exceedingPayer" $ do
-      time <- liftIO Time.getCurrentTime
-      (users, incomes, payments) <- liftIO . Query.run $
-        liftA3 (,,) UserM.list IncomeM.list PaymentM.list
-      let punctualPayments = filter ((==) Punctual . _payment_frequency) payments
-          exceedingPayers = CM.getExceedingPayers time users incomes punctualPayments
-      text . LT.pack . show $ exceedingPayers
+    S.get "/" $ do
+      Index.get conf
 
-    get "/" $ do
-      signInToken <- mbParam "signInToken"
-      Index.get conf signInToken
+    S.post "/askSignIn" $ do
+      S.jsonData >>= Index.askSignIn conf
 
-    post "/signIn" $ do
-      jsonData >>= SignIn.signIn conf
+    S.get "/signIn/:signInToken" $ do
+      signInToken <- S.param "signInToken"
+      Index.trySignIn conf signInToken
 
-    post "/signOut" $
+    S.post "/signOut" $
       Index.signOut conf
 
-    post "/payment" $
-      jsonData >>= Payment.create
+    S.post "/payment" $
+      S.jsonData >>= Payment.create
 
-    put "/payment" $
-      jsonData >>= Payment.editOwn
+    S.put "/payment" $
+      S.jsonData >>= Payment.editOwn
 
-    delete "/payment" $ do
-      paymentId <- param "id"
+    S.delete "/payment" $ do
+      paymentId <- S.param "id"
       Payment.deleteOwn paymentId
 
-    post "/income" $
-      jsonData >>= Income.create
+    S.post "/income" $
+      S.jsonData >>= Income.create
 
-    put "/income" $
-      jsonData >>= Income.editOwn
+    S.put "/income" $
+      S.jsonData >>= Income.editOwn
 
-    delete "/income" $ do
-      incomeId <- param "id"
+    S.delete "/income" $ do
+      incomeId <- S.param "id"
       Income.deleteOwn incomeId
 
-    post "/category" $
-      jsonData >>= Category.create
+    S.post "/category" $
+      S.jsonData >>= Category.create
 
-    put "/category" $
-      jsonData >>= Category.edit
+    S.put "/category" $
+      S.jsonData >>= Category.edit
 
-    delete "/category" $ do
-      categoryId <- param "id"
+    S.delete "/category" $ do
+      categoryId <- S.param "id"
       Category.delete categoryId
-
-mbParam :: Parsable a => LT.Text -> ActionM (Maybe a)
-mbParam key = (Just <$> param key) `rescue` (const . return $ Nothing)
-- 
cgit v1.2.3


From 40b4994797a797b1fa86cafda789a5c488730c6d Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 28 Oct 2018 17:57:58 +0100
Subject: Delete payment

---
 server/src/Main.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'server/src/Main.hs')

diff --git a/server/src/Main.hs b/server/src/Main.hs
index e298a06..745071c 100644
--- a/server/src/Main.hs
+++ b/server/src/Main.hs
@@ -37,7 +37,7 @@ main = do
     S.put "/payment" $
       S.jsonData >>= Payment.editOwn
 
-    S.delete "/payment" $ do
+    S.delete "/payment/:id" $ do
       paymentId <- S.param "id"
       Payment.deleteOwn paymentId
 
@@ -47,7 +47,7 @@ main = do
     S.put "/income" $
       S.jsonData >>= Income.editOwn
 
-    S.delete "/income" $ do
+    S.delete "/income/:id" $ do
       incomeId <- S.param "id"
       Income.deleteOwn incomeId
 
@@ -57,6 +57,6 @@ main = do
     S.put "/category" $
       S.jsonData >>= Category.edit
 
-    S.delete "/category" $ do
+    S.delete "/category/:id" $ do
       categoryId <- S.param "id"
       Category.delete categoryId
-- 
cgit v1.2.3


From fb8f0fe577e28dae69903413b761da50586e0099 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sat, 10 Aug 2019 14:53:41 +0200
Subject: Remove payment category if unused after a payment is deleted

---
 server/src/Main.hs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'server/src/Main.hs')

diff --git a/server/src/Main.hs b/server/src/Main.hs
index 745071c..0ccf5e2 100644
--- a/server/src/Main.hs
+++ b/server/src/Main.hs
@@ -35,21 +35,21 @@ main = do
       S.jsonData >>= Payment.create
 
     S.put "/payment" $
-      S.jsonData >>= Payment.editOwn
+      S.jsonData >>= Payment.edit
 
     S.delete "/payment/:id" $ do
       paymentId <- S.param "id"
-      Payment.deleteOwn paymentId
+      Payment.delete paymentId
 
     S.post "/income" $
       S.jsonData >>= Income.create
 
     S.put "/income" $
-      S.jsonData >>= Income.editOwn
+      S.jsonData >>= Income.edit
 
     S.delete "/income/:id" $ do
       incomeId <- S.param "id"
-      Income.deleteOwn incomeId
+      Income.delete incomeId
 
     S.post "/category" $
       S.jsonData >>= Category.create
-- 
cgit v1.2.3


From 52331eeadce8d250564851c25fc965172640bc55 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sat, 12 Oct 2019 11:23:10 +0200
Subject: Implement client routing

---
 server/src/Main.hs | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

(limited to 'server/src/Main.hs')

diff --git a/server/src/Main.hs b/server/src/Main.hs
index 0ccf5e2..e3dad9e 100644
--- a/server/src/Main.hs
+++ b/server/src/Main.hs
@@ -15,48 +15,52 @@ main = do
   conf <- Conf.get "application.conf"
   _ <- runDaemons conf
   S.scotty (Conf.port conf) $ do
-    S.middleware $ W.gzip $ W.def { W.gzipFiles = GzipCompress }
-    S.middleware . staticPolicy $ noDots >-> addBase "public"
 
-    S.get "/" $ do
-      Index.get conf
+    S.middleware $
+      W.gzip $ W.def { W.gzipFiles = GzipCompress }
+
+    S.middleware . staticPolicy $
+      noDots >-> addBase "public"
 
-    S.post "/askSignIn" $ do
+    S.post "/api/askSignIn" $
       S.jsonData >>= Index.askSignIn conf
 
-    S.get "/signIn/:signInToken" $ do
+    S.get "/api/signIn/:signInToken" $ do
       signInToken <- S.param "signInToken"
       Index.trySignIn conf signInToken
 
-    S.post "/signOut" $
+    S.post "/api/signOut" $
       Index.signOut conf
 
-    S.post "/payment" $
+    S.post "/api/payment" $
       S.jsonData >>= Payment.create
 
-    S.put "/payment" $
+    S.put "/api/payment" $
       S.jsonData >>= Payment.edit
 
-    S.delete "/payment/:id" $ do
+    S.delete "/api/payment/:id" $ do
       paymentId <- S.param "id"
       Payment.delete paymentId
 
-    S.post "/income" $
+    S.post "/api/income" $
       S.jsonData >>= Income.create
 
-    S.put "/income" $
+    S.put "/api/income" $
       S.jsonData >>= Income.edit
 
-    S.delete "/income/:id" $ do
+    S.delete "/api/income/:id" $ do
       incomeId <- S.param "id"
       Income.delete incomeId
 
-    S.post "/category" $
+    S.post "/api/category" $
       S.jsonData >>= Category.create
 
-    S.put "/category" $
+    S.put "/api/category" $
       S.jsonData >>= Category.edit
 
-    S.delete "/category/:id" $ do
+    S.delete "/api/category/:id" $ do
       categoryId <- S.param "id"
       Category.delete categoryId
+
+    S.notFound $
+      Index.get conf
-- 
cgit v1.2.3


From 602c52acfcfa494b07fec05c20b317b60ea8a6f3 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 20 Oct 2019 21:31:57 +0200
Subject: Load init data per page with AJAX

---
 server/src/Main.hs | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

(limited to 'server/src/Main.hs')

diff --git a/server/src/Main.hs b/server/src/Main.hs
index e3dad9e..9882092 100644
--- a/server/src/Main.hs
+++ b/server/src/Main.hs
@@ -1,3 +1,8 @@
+module Main
+  ( main
+  ) where
+
+import qualified Network.HTTP.Types.Status     as Status
 import           Network.Wai.Middleware.Gzip   (GzipFiles (GzipCompress))
 import qualified Network.Wai.Middleware.Gzip   as W
 import           Network.Wai.Middleware.Static
@@ -8,6 +13,7 @@ import qualified Controller.Category           as Category
 import qualified Controller.Income             as Income
 import qualified Controller.Index              as Index
 import qualified Controller.Payment            as Payment
+import qualified Controller.User               as User
 import           Job.Daemon                    (runDaemons)
 
 main :: IO ()
@@ -32,6 +38,12 @@ main = do
     S.post "/api/signOut" $
       Index.signOut conf
 
+    S.get "/api/users"$
+      User.list
+
+    S.get "/api/payments" $
+      Payment.list
+
     S.post "/api/payment" $
       S.jsonData >>= Payment.create
 
@@ -42,6 +54,9 @@ main = do
       paymentId <- S.param "id"
       Payment.delete paymentId
 
+    S.get "/api/incomes" $
+      Income.list
+
     S.post "/api/income" $
       S.jsonData >>= Income.create
 
@@ -52,6 +67,12 @@ main = do
       incomeId <- S.param "id"
       Income.delete incomeId
 
+    S.get "/api/paymentCategories" $
+      Payment.listPaymentCategories
+
+    S.get "/api/categories" $
+      Category.list
+
     S.post "/api/category" $
       S.jsonData >>= Category.create
 
@@ -62,5 +83,6 @@ main = do
       categoryId <- S.param "id"
       Category.delete categoryId
 
-    S.notFound $
+    S.notFound $ do
+      S.status Status.ok200
       Index.get conf
-- 
cgit v1.2.3


From b97ad942495352c3fc1e0c820cfba82a9693ac7a Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 27 Oct 2019 20:26:29 +0100
Subject: WIP Set up server side paging for incomes

---
 server/src/Main.hs | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'server/src/Main.hs')

diff --git a/server/src/Main.hs b/server/src/Main.hs
index 9882092..00e8d1c 100644
--- a/server/src/Main.hs
+++ b/server/src/Main.hs
@@ -54,6 +54,11 @@ main = do
       paymentId <- S.param "id"
       Payment.delete paymentId
 
+    S.get "/api/v2/incomes" $ do
+      page <- S.param "page"
+      perPage <- S.param "perPage"
+      Income.listv2 page perPage
+
     S.get "/api/incomes" $
       Income.list
 
-- 
cgit v1.2.3


From 9dbb4e6f7c2f0edc1126626e2ff498144c6b9947 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 3 Nov 2019 11:28:42 +0100
Subject: Show income header

---
 server/src/Main.hs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'server/src/Main.hs')

diff --git a/server/src/Main.hs b/server/src/Main.hs
index 00e8d1c..40b53b6 100644
--- a/server/src/Main.hs
+++ b/server/src/Main.hs
@@ -54,13 +54,10 @@ main = do
       paymentId <- S.param "id"
       Payment.delete paymentId
 
-    S.get "/api/v2/incomes" $ do
+    S.get "/api/incomes" $ do
       page <- S.param "page"
       perPage <- S.param "perPage"
-      Income.listv2 page perPage
-
-    S.get "/api/incomes" $
-      Income.list
+      Income.list page perPage
 
     S.post "/api/income" $
       S.jsonData >>= Income.create
-- 
cgit v1.2.3


From 182f3d3fea9985c0e403087fe253981c68e57102 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 3 Nov 2019 11:33:20 +0100
Subject: Fix payment page

---
 server/src/Main.hs | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'server/src/Main.hs')

diff --git a/server/src/Main.hs b/server/src/Main.hs
index 40b53b6..b2672e4 100644
--- a/server/src/Main.hs
+++ b/server/src/Main.hs
@@ -59,6 +59,9 @@ main = do
       perPage <- S.param "perPage"
       Income.list page perPage
 
+    S.get "/api/deprecated/incomes" $ do
+      Income.deprecatedList
+
     S.post "/api/income" $
       S.jsonData >>= Income.create
 
-- 
cgit v1.2.3


From f4f24158a46d8c0975f1b8813bbdbbeebad8c108 Mon Sep 17 00:00:00 2001
From: Joris
Date: Wed, 6 Nov 2019 19:44:15 +0100
Subject: Show the payment table with server side paging

---
 server/src/Main.hs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'server/src/Main.hs')

diff --git a/server/src/Main.hs b/server/src/Main.hs
index b2672e4..a4d8635 100644
--- a/server/src/Main.hs
+++ b/server/src/Main.hs
@@ -41,8 +41,13 @@ main = do
     S.get "/api/users"$
       User.list
 
-    S.get "/api/payments" $
-      Payment.list
+    S.get "/api/deprecated/payments" $
+      Payment.deprecatedList
+
+    S.get "/api/payments" $ do
+      page <- S.param "page"
+      perPage <- S.param "perPage"
+      Payment.list page perPage
 
     S.post "/api/payment" $
       S.jsonData >>= Payment.create
-- 
cgit v1.2.3


From 4dc84dbda7ba3ea60d13e6f81eeec556974b7c72 Mon Sep 17 00:00:00 2001
From: Joris
Date: Thu, 7 Nov 2019 07:59:41 +0100
Subject: Show payment header infos

---
 server/src/Main.hs | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'server/src/Main.hs')

diff --git a/server/src/Main.hs b/server/src/Main.hs
index a4d8635..5068d10 100644
--- a/server/src/Main.hs
+++ b/server/src/Main.hs
@@ -41,9 +41,6 @@ main = do
     S.get "/api/users"$
       User.list
 
-    S.get "/api/deprecated/payments" $
-      Payment.deprecatedList
-
     S.get "/api/payments" $ do
       page <- S.param "page"
       perPage <- S.param "perPage"
-- 
cgit v1.2.3


From c0ea63f8c1a8c7123b78798cec99726b113fb1f3 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 17 Nov 2019 18:08:28 +0100
Subject: Optimize and refactor payments

---
 server/src/Main.hs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'server/src/Main.hs')

diff --git a/server/src/Main.hs b/server/src/Main.hs
index 5068d10..f4d75a0 100644
--- a/server/src/Main.hs
+++ b/server/src/Main.hs
@@ -42,9 +42,15 @@ main = do
       User.list
 
     S.get "/api/payments" $ do
+      frequency <- S.param "frequency"
       page <- S.param "page"
       perPage <- S.param "perPage"
-      Payment.list page perPage
+      search <- S.param "search"
+      Payment.list (read frequency) page perPage search
+
+    S.get "/api/payment/category" $ do
+      name <- S.param "name"
+      Payment.searchCategory name
 
     S.post "/api/payment" $
       S.jsonData >>= Payment.create
@@ -61,9 +67,6 @@ main = do
       perPage <- S.param "perPage"
       Income.list page perPage
 
-    S.get "/api/deprecated/incomes" $ do
-      Income.deprecatedList
-
     S.post "/api/income" $
       S.jsonData >>= Income.create
 
@@ -74,9 +77,6 @@ main = do
       incomeId <- S.param "id"
       Income.delete incomeId
 
-    S.get "/api/paymentCategories" $
-      Payment.listPaymentCategories
-
     S.get "/api/categories" $
       Category.list
 
-- 
cgit v1.2.3


From 316bda10c6bec8b5ccc9e23f1f677c076205f046 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 8 Dec 2019 11:39:37 +0100
Subject: Add category page

---
 server/src/Main.hs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'server/src/Main.hs')

diff --git a/server/src/Main.hs b/server/src/Main.hs
index f4d75a0..0b80de0 100644
--- a/server/src/Main.hs
+++ b/server/src/Main.hs
@@ -77,8 +77,13 @@ main = do
       incomeId <- S.param "id"
       Income.delete incomeId
 
-    S.get "/api/categories" $
-      Category.list
+    S.get "/api/allCategories" $ do
+      Category.listAll
+
+    S.get "/api/categories" $ do
+      page <- S.param "page"
+      perPage <- S.param "perPage"
+      Category.list page perPage
 
     S.post "/api/category" $
       S.jsonData >>= Category.create
-- 
cgit v1.2.3


From af8353c6164aaaaa836bfed181f883ac86bb76a5 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 19 Jan 2020 14:03:31 +0100
Subject: Sign in with email and password

---
 server/src/Main.hs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'server/src/Main.hs')

diff --git a/server/src/Main.hs b/server/src/Main.hs
index 0b80de0..324557e 100644
--- a/server/src/Main.hs
+++ b/server/src/Main.hs
@@ -28,12 +28,8 @@ main = do
     S.middleware . staticPolicy $
       noDots >-> addBase "public"
 
-    S.post "/api/askSignIn" $
-      S.jsonData >>= Index.askSignIn conf
-
-    S.get "/api/signIn/:signInToken" $ do
-      signInToken <- S.param "signInToken"
-      Index.trySignIn conf signInToken
+    S.post "/api/signIn" $
+      S.jsonData >>= Index.signIn conf
 
     S.post "/api/signOut" $
       Index.signOut conf
-- 
cgit v1.2.3


From 5a13317efdaa2a8594a138b07ddd45eab40a8322 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 19 Jan 2020 16:30:01 +0100
Subject: Return the css at /css/main.css instead of inlined

---
 server/src/Main.hs | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'server/src/Main.hs')

diff --git a/server/src/Main.hs b/server/src/Main.hs
index 324557e..999f973 100644
--- a/server/src/Main.hs
+++ b/server/src/Main.hs
@@ -14,6 +14,7 @@ import qualified Controller.Income             as Income
 import qualified Controller.Index              as Index
 import qualified Controller.Payment            as Payment
 import qualified Controller.User               as User
+import qualified Design.Global                 as Design
 import           Job.Daemon                    (runDaemons)
 
 main :: IO ()
@@ -28,6 +29,10 @@ main = do
     S.middleware . staticPolicy $
       noDots >-> addBase "public"
 
+    S.get "/css/main.css" $ do
+      S.setHeader "Content-Type" "text/css"
+      S.text Design.globalDesign
+
     S.post "/api/signIn" $
       S.jsonData >>= Index.signIn conf
 
-- 
cgit v1.2.3


From d20d7ceec2a14f79ebb06555a71d424aeaa90e54 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 19 Jan 2020 16:31:55 +0100
Subject: Show conf at server startup

---
 server/src/Main.hs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'server/src/Main.hs')

diff --git a/server/src/Main.hs b/server/src/Main.hs
index 999f973..25fffb3 100644
--- a/server/src/Main.hs
+++ b/server/src/Main.hs
@@ -20,6 +20,7 @@ import           Job.Daemon                    (runDaemons)
 main :: IO ()
 main = do
   conf <- Conf.get "application.conf"
+  putStrLn . show $ conf
   _ <- runDaemons conf
   S.scotty (Conf.port conf) $ do
 
-- 
cgit v1.2.3


From 47c2a4d6b68c54eed5f7b45671b1ccaf8c0db200 Mon Sep 17 00:00:00 2001
From: Joris
Date: Mon, 20 Jan 2020 19:47:23 +0100
Subject: Show payment stats

---
 server/src/Main.hs | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'server/src/Main.hs')

diff --git a/server/src/Main.hs b/server/src/Main.hs
index 25fffb3..64de511 100644
--- a/server/src/Main.hs
+++ b/server/src/Main.hs
@@ -97,6 +97,9 @@ main = do
       categoryId <- S.param "id"
       Category.delete categoryId
 
+    S.get "/api/statistics" $ do
+      Payment.statistics
+
     S.notFound $ do
       S.status Status.ok200
       Index.get conf
-- 
cgit v1.2.3


From 79e1d8b0099d61b580a499311f1714b1b7eb07b5 Mon Sep 17 00:00:00 2001
From: Joris
Date: Mon, 27 Jan 2020 22:07:18 +0100
Subject: Show total incom by month in statistics

---
 server/src/Main.hs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'server/src/Main.hs')

diff --git a/server/src/Main.hs b/server/src/Main.hs
index 64de511..659a0fa 100644
--- a/server/src/Main.hs
+++ b/server/src/Main.hs
@@ -13,6 +13,7 @@ import qualified Controller.Category           as Category
 import qualified Controller.Income             as Income
 import qualified Controller.Index              as Index
 import qualified Controller.Payment            as Payment
+import qualified Controller.Statistics         as Statistics
 import qualified Controller.User               as User
 import qualified Design.Global                 as Design
 import           Job.Daemon                    (runDaemons)
@@ -98,7 +99,7 @@ main = do
       Category.delete categoryId
 
     S.get "/api/statistics" $ do
-      Payment.statistics
+      Statistics.paymentsAndIncomes
 
     S.notFound $ do
       S.status Status.ok200
-- 
cgit v1.2.3