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/server.cabal | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 server/server.cabal (limited to 'server/server.cabal') diff --git a/server/server.cabal b/server/server.cabal new file mode 100644 index 0000000..2e1f7be --- /dev/null +++ b/server/server.cabal @@ -0,0 +1,47 @@ +name: server +version: 0.0.1 +license: GPL-3 +license-file: LICENSE +author: Joris Guyonvarch +maintainer: joris@guyonvarch.me +category: Web +build-type: Simple +cabal-version: >=1.10 + +executable server + main-is: Main.hs + ghc-options: -Wall -Werror + build-depends: aeson + , base >=4.9 && <4.11 + , base64-bytestring + , blaze-builder + , blaze-html + , bytestring + , clay + , clientsession + , common + , config-manager + , containers + , cookie + , email-validate + , filepath + , http-conduit + , http-types + , lens + , monad-logger + , mtl + , parsec + , process + , resourcet + , random + , scotty + , sqlite-simple + , text + , time + , transformers + , unordered-containers + , uuid + , wai + , wai-middleware-static + hs-source-dirs: src + default-language: Haskell2010 -- 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/server.cabal | 1 + 1 file changed, 1 insertion(+) (limited to 'server/server.cabal') diff --git a/server/server.cabal b/server/server.cabal index 2e1f7be..8bbe5f2 100644 --- a/server/server.cabal +++ b/server/server.cabal @@ -42,6 +42,7 @@ executable server , unordered-containers , uuid , wai + , wai-extra , wai-middleware-static hs-source-dirs: src default-language: Haskell2010 -- cgit v1.2.3 From 213cf7ede058b781fc957de2cd9f6a5988c08004 Mon Sep 17 00:00:00 2001 From: Joris Date: Sun, 12 Nov 2017 22:58:23 +0100 Subject: Add mocked pages --- server/server.cabal | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) (limited to 'server/server.cabal') diff --git a/server/server.cabal b/server/server.cabal index 8bbe5f2..41b2fd6 100644 --- a/server/server.cabal +++ b/server/server.cabal @@ -32,8 +32,8 @@ executable server , mtl , parsec , process - , resourcet , random + , resourcet , scotty , sqlite-simple , text @@ -46,3 +46,58 @@ executable server , wai-middleware-static hs-source-dirs: src default-language: Haskell2010 + other-modules: Conf + , Controller.Category + , Controller.Income + , Controller.Index + , Controller.Payment + , Controller.SignIn + , Cookie + , Design.Color + , Design.Constants + , Design.Dialog + , Design.Errors + , Design.Form + , Design.Global + , Design.Helper + , Design.Media + , Design.Tooltip + , Design.View.Header + , Design.View.Payment + , Design.View.Payment.Header + , Design.View.Payment.Pages + , Design.View.Payment.Table + , Design.View.SignIn + , Design.View.Stat + , Design.View.Table + , Design.Views + , Job.Daemon + , Job.Frequency + , Job.Kind + , Job.Model + , Job.MonthlyPayment + , Job.WeeklyReport + , Json + , LoginSession + , Main + , MimeMail + , Model.Category + , Model.Frequency + , Model.Income + , Model.Init + , Model.Mail + , Model.Payer + , Model.Payment + , Model.PaymentCategory + , Model.Query + , Model.SignIn + , Model.UUID + , Model.User + , Resource + , Secure + , SendMail + , Utils.Time + , Validation + , View.Mail.SignIn + , View.Mail.WeeklyReport + , View.Page -- 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/server.cabal | 211 +++++++++++++++++++++++++++------------------------- 1 file changed, 109 insertions(+), 102 deletions(-) (limited to 'server/server.cabal') diff --git a/server/server.cabal b/server/server.cabal index 41b2fd6..d30060b 100644 --- a/server/server.cabal +++ b/server/server.cabal @@ -1,103 +1,110 @@ -name: server -version: 0.0.1 -license: GPL-3 -license-file: LICENSE -author: Joris Guyonvarch -maintainer: joris@guyonvarch.me -category: Web -build-type: Simple -cabal-version: >=1.10 +Name: server +Version: 0.0.1 +License: GPL-3 +License-file: LICENSE +Author: Joris Guyonvarch +Maintainer: joris@guyonvarch.me +Category: Web +Build-type: Simple +Cabal-version: >=1.10 -executable server - main-is: Main.hs - ghc-options: -Wall -Werror - build-depends: aeson - , base >=4.9 && <4.11 - , base64-bytestring - , blaze-builder - , blaze-html - , bytestring - , clay - , clientsession - , common - , config-manager - , containers - , cookie - , email-validate - , filepath - , http-conduit - , http-types - , lens - , monad-logger - , mtl - , parsec - , process - , random - , resourcet - , scotty - , sqlite-simple - , text - , time - , transformers - , unordered-containers - , uuid - , wai - , wai-extra - , wai-middleware-static - hs-source-dirs: src - default-language: Haskell2010 - other-modules: Conf - , Controller.Category - , Controller.Income - , Controller.Index - , Controller.Payment - , Controller.SignIn - , Cookie - , Design.Color - , Design.Constants - , Design.Dialog - , Design.Errors - , Design.Form - , Design.Global - , Design.Helper - , Design.Media - , Design.Tooltip - , Design.View.Header - , Design.View.Payment - , Design.View.Payment.Header - , Design.View.Payment.Pages - , Design.View.Payment.Table - , Design.View.SignIn - , Design.View.Stat - , Design.View.Table - , Design.Views - , Job.Daemon - , Job.Frequency - , Job.Kind - , Job.Model - , Job.MonthlyPayment - , Job.WeeklyReport - , Json - , LoginSession - , Main - , MimeMail - , Model.Category - , Model.Frequency - , Model.Income - , Model.Init - , Model.Mail - , Model.Payer - , Model.Payment - , Model.PaymentCategory - , Model.Query - , Model.SignIn - , Model.UUID - , Model.User - , Resource - , Secure - , SendMail - , Utils.Time - , Validation - , View.Mail.SignIn - , View.Mail.WeeklyReport - , View.Page +Executable server + Main-is: Main.hs + Ghc-options: -Wall -Werror + Hs-source-dirs: src + Default-language: Haskell2010 + Extensions: + ExistentialQuantification + MultiParamTypeClasses + + Build-depends: + aeson + , base >=4.9 && <4.11 + , base64-bytestring + , blaze-builder + , blaze-html + , bytestring + , clay + , clientsession + , common + , config-manager + , containers + , cookie + , email-validate + , filepath + , http-conduit + , http-types + , lens + , monad-logger + , mtl + , parsec + , process + , random + , resourcet + , scotty + , sqlite-simple + , text + , time + , transformers + , unordered-containers + , uuid + , wai + , wai-extra + , wai-middleware-static + + other-modules: + Conf + Controller.Category + Controller.Income + Controller.Index + Controller.Payment + Controller.SignIn + Cookie + Design.Color + Design.Constants + Design.Dialog + Design.Errors + Design.Form + Design.Global + Design.Helper + Design.Media + Design.Tooltip + Design.View.Header + Design.View.Payment + Design.View.Payment.Header + Design.View.Payment.Pages + Design.View.Payment.Table + Design.View.SignIn + Design.View.Stat + Design.View.Table + Design.Views + Job.Daemon + Job.Frequency + Job.Kind + Job.Model + Job.MonthlyPayment + Job.WeeklyReport + Json + LoginSession + Main + MimeMail + Model.Category + Model.Frequency + Model.Income + Model.Init + Model.Mail + Model.Payer + Model.Payment + Model.PaymentCategory + Model.Query + Model.SignIn + Model.UUID + Model.User + Resource + Secure + SendMail + Utils.Time + Validation + View.Mail.SignIn + View.Mail.WeeklyReport + View.Page -- 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/server.cabal | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'server/server.cabal') diff --git a/server/server.cabal b/server/server.cabal index d30060b..e4a1730 100644 --- a/server/server.cabal +++ b/server/server.cabal @@ -13,9 +13,11 @@ Executable server Ghc-options: -Wall -Werror Hs-source-dirs: src Default-language: Haskell2010 - Extensions: + + Default-extensions: ExistentialQuantification MultiParamTypeClasses + OverloadedStrings Build-depends: aeson @@ -86,7 +88,6 @@ Executable server Job.WeeklyReport Json LoginSession - Main MimeMail Model.Category Model.Frequency @@ -103,7 +104,7 @@ Executable server Resource Secure SendMail - Utils.Time + Util.Time Validation View.Mail.SignIn View.Mail.WeeklyReport -- 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/server.cabal | 1 - 1 file changed, 1 deletion(-) (limited to 'server/server.cabal') diff --git a/server/server.cabal b/server/server.cabal index e4a1730..771a961 100644 --- a/server/server.cabal +++ b/server/server.cabal @@ -94,7 +94,6 @@ Executable server Model.Income Model.Init Model.Mail - Model.Payer Model.Payment Model.PaymentCategory Model.Query -- cgit v1.2.3 From 554880727d833befab00666c7a4f95611e8370b9 Mon Sep 17 00:00:00 2001 From: Joris Date: Sun, 19 Nov 2017 15:39:11 +0100 Subject: Remove local MimeMail --- server/server.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'server/server.cabal') diff --git a/server/server.cabal b/server/server.cabal index 771a961..3715105 100644 --- a/server/server.cabal +++ b/server/server.cabal @@ -37,6 +37,7 @@ Executable server , http-conduit , http-types , lens + , mime-mail , monad-logger , mtl , parsec @@ -88,7 +89,6 @@ Executable server Job.WeeklyReport Json LoginSession - MimeMail Model.Category Model.Frequency Model.Income -- 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/server.cabal | 2 -- 1 file changed, 2 deletions(-) (limited to 'server/server.cabal') diff --git a/server/server.cabal b/server/server.cabal index 3715105..d1dbd50 100644 --- a/server/server.cabal +++ b/server/server.cabal @@ -36,7 +36,6 @@ Executable server , filepath , http-conduit , http-types - , lens , mime-mail , monad-logger , mtl @@ -61,7 +60,6 @@ Executable server Controller.Income Controller.Index Controller.Payment - Controller.SignIn Cookie Design.Color Design.Constants -- cgit v1.2.3 From ab17b6339d16970c3845ec4f153bfeed89eae728 Mon Sep 17 00:00:00 2001 From: Joris Date: Fri, 5 Jan 2018 14:45:47 +0100 Subject: Add modal component --- server/server.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'server/server.cabal') diff --git a/server/server.cabal b/server/server.cabal index d1dbd50..ada7040 100644 --- a/server/server.cabal +++ b/server/server.cabal @@ -63,12 +63,12 @@ Executable server Cookie Design.Color Design.Constants - Design.Dialog Design.Errors Design.Form Design.Global Design.Helper Design.Media + Design.Modal Design.Tooltip Design.View.Header Design.View.Payment -- cgit v1.2.3 From 33b85b7f12798f5762d940ed5c30f775cdd7b751 Mon Sep 17 00:00:00 2001 From: Joris Date: Sun, 28 Jan 2018 12:13:09 +0100 Subject: WIP --- server/server.cabal | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'server/server.cabal') diff --git a/server/server.cabal b/server/server.cabal index ada7040..2bfd18d 100644 --- a/server/server.cabal +++ b/server/server.cabal @@ -72,6 +72,7 @@ Executable server Design.Tooltip Design.View.Header Design.View.Payment + Design.View.Payment.Add Design.View.Payment.Header Design.View.Payment.Pages Design.View.Payment.Table @@ -87,17 +88,17 @@ Executable server Job.WeeklyReport Json LoginSession - Model.Category - Model.Frequency - Model.Income - Model.Init Model.Mail - Model.Payment - Model.PaymentCategory Model.Query Model.SignIn Model.UUID - Model.User + Persistence.Category + Persistence.Frequency + Persistence.Income + Persistence.Init + Persistence.Payment + Persistence.PaymentCategory + Persistence.User Resource Secure SendMail -- 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/server.cabal | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'server/server.cabal') diff --git a/server/server.cabal b/server/server.cabal index 2bfd18d..2c6bef1 100644 --- a/server/server.cabal +++ b/server/server.cabal @@ -21,7 +21,7 @@ Executable server Build-depends: aeson - , base >=4.9 && <4.11 + , base >=4.9 && <5 , base64-bytestring , blaze-builder , blaze-html @@ -103,7 +103,8 @@ Executable server Secure SendMail Util.Time - Validation + Validation.Atomic + Validation.CreatePayment View.Mail.SignIn View.Mail.WeeklyReport View.Page -- cgit v1.2.3 From 8a28f608d8e08fba4bbe54b46804d261686c3c03 Mon Sep 17 00:00:00 2001 From: Joris Date: Tue, 30 Oct 2018 20:33:17 +0100 Subject: Upgrade reflex-platform --- server/server.cabal | 3 +++ 1 file changed, 3 insertions(+) (limited to 'server/server.cabal') diff --git a/server/server.cabal b/server/server.cabal index 2c6bef1..644f57a 100644 --- a/server/server.cabal +++ b/server/server.cabal @@ -73,6 +73,7 @@ Executable server Design.View.Header Design.View.Payment Design.View.Payment.Add + Design.View.Payment.Delete Design.View.Payment.Header Design.View.Payment.Pages Design.View.Payment.Table @@ -88,7 +89,9 @@ Executable server Job.WeeklyReport Json LoginSession + Model.IncomeResource Model.Mail + Model.PaymentResource Model.Query Model.SignIn Model.UUID -- cgit v1.2.3 From 2741f47ef7b87255203bc2f7f7b2b9140c70b8f0 Mon Sep 17 00:00:00 2001 From: Joris Date: Thu, 1 Nov 2018 13:14:25 +0100 Subject: Implementing client side validation --- server/server.cabal | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'server/server.cabal') diff --git a/server/server.cabal b/server/server.cabal index 644f57a..d6c4a9b 100644 --- a/server/server.cabal +++ b/server/server.cabal @@ -20,8 +20,8 @@ Executable server OverloadedStrings Build-depends: - aeson - , base >=4.9 && <5 + aeson + , base >= 4.11 && < 5 , base64-bytestring , blaze-builder , blaze-html @@ -32,7 +32,6 @@ Executable server , config-manager , containers , cookie - , email-validate , filepath , http-conduit , http-types -- cgit v1.2.3 From c542424b7b41c78a170763f6996c12f56b359860 Mon Sep 17 00:00:00 2001 From: Joris Date: Sat, 10 Aug 2019 21:31:27 +0200 Subject: Add smooth transitions to modal show and hide --- server/server.cabal | 1 + 1 file changed, 1 insertion(+) (limited to 'server/server.cabal') diff --git a/server/server.cabal b/server/server.cabal index d6c4a9b..3bc8e42 100644 --- a/server/server.cabal +++ b/server/server.cabal @@ -16,6 +16,7 @@ Executable server Default-extensions: ExistentialQuantification + LambdaCase MultiParamTypeClasses OverloadedStrings -- cgit v1.2.3 From 2d79ab0e0a11f55255fc21a5dfab1598d3beeba3 Mon Sep 17 00:00:00 2001 From: Joris Date: Sun, 11 Aug 2019 22:40:09 +0200 Subject: Add payment clone --- server/server.cabal | 1 + 1 file changed, 1 insertion(+) (limited to 'server/server.cabal') diff --git a/server/server.cabal b/server/server.cabal index 3bc8e42..3c1c770 100644 --- a/server/server.cabal +++ b/server/server.cabal @@ -74,6 +74,7 @@ Executable server Design.View.Payment Design.View.Payment.Add Design.View.Payment.Delete + Design.View.Payment.Form Design.View.Payment.Header Design.View.Payment.Pages Design.View.Payment.Table -- cgit v1.2.3 From 7529a18ff0ac443e7f9764b5e2d0f57a5d3a850b Mon Sep 17 00:00:00 2001 From: Joris Date: Wed, 9 Oct 2019 23:16:00 +0200 Subject: Use common payment validation in the backend Remove deprecated backend validation --- server/server.cabal | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'server/server.cabal') diff --git a/server/server.cabal b/server/server.cabal index 3c1c770..ea7ebed 100644 --- a/server/server.cabal +++ b/server/server.cabal @@ -50,6 +50,7 @@ Executable server , transformers , unordered-containers , uuid + , validation , wai , wai-extra , wai-middleware-static @@ -57,6 +58,7 @@ Executable server other-modules: Conf Controller.Category + Controller.Helper Controller.Income Controller.Index Controller.Payment @@ -90,6 +92,8 @@ Executable server Job.WeeklyReport Json LoginSession + Model.CreatePayment + Model.EditPayment Model.IncomeResource Model.Mail Model.PaymentResource @@ -107,8 +111,7 @@ Executable server Secure SendMail Util.Time - Validation.Atomic - Validation.CreatePayment + Validation.Payment View.Mail.SignIn View.Mail.WeeklyReport View.Page -- 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/server.cabal | 1 + 1 file changed, 1 insertion(+) (limited to 'server/server.cabal') diff --git a/server/server.cabal b/server/server.cabal index ea7ebed..75af442 100644 --- a/server/server.cabal +++ b/server/server.cabal @@ -73,6 +73,7 @@ Executable server Design.Modal Design.Tooltip Design.View.Header + Design.View.NotFound Design.View.Payment Design.View.Payment.Add Design.View.Payment.Delete -- cgit v1.2.3 From 0b40b6b5583b5c437f83e61bf8913f2b4c447b24 Mon Sep 17 00:00:00 2001 From: Joris Date: Sat, 19 Oct 2019 09:36:03 +0200 Subject: Include pages into table component --- server/server.cabal | 1 + 1 file changed, 1 insertion(+) (limited to 'server/server.cabal') diff --git a/server/server.cabal b/server/server.cabal index 75af442..426f521 100644 --- a/server/server.cabal +++ b/server/server.cabal @@ -74,6 +74,7 @@ Executable server Design.Tooltip Design.View.Header Design.View.NotFound + Design.View.Pages Design.View.Payment Design.View.Payment.Add Design.View.Payment.Delete -- cgit v1.2.3 From 7aadcc97f9df0e2daccbe8a8726d8bc6c63d67f4 Mon Sep 17 00:00:00 2001 From: Joris Date: Sun, 20 Oct 2019 12:02:21 +0200 Subject: Add income --- server/server.cabal | 3 +++ 1 file changed, 3 insertions(+) (limited to 'server/server.cabal') diff --git a/server/server.cabal b/server/server.cabal index 426f521..022d496 100644 --- a/server/server.cabal +++ b/server/server.cabal @@ -94,7 +94,9 @@ Executable server Job.WeeklyReport Json LoginSession + Model.CreateIncome Model.CreatePayment + Model.EditIncome Model.EditPayment Model.IncomeResource Model.Mail @@ -113,6 +115,7 @@ Executable server Secure SendMail Util.Time + Validation.Income Validation.Payment View.Mail.SignIn View.Mail.WeeklyReport -- 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/server.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'server/server.cabal') diff --git a/server/server.cabal b/server/server.cabal index 022d496..eeba14f 100644 --- a/server/server.cabal +++ b/server/server.cabal @@ -62,6 +62,7 @@ Executable server Controller.Income Controller.Index Controller.Payment + Controller.User Cookie Design.Color Design.Constants @@ -107,7 +108,6 @@ Executable server Persistence.Category Persistence.Frequency Persistence.Income - Persistence.Init Persistence.Payment Persistence.PaymentCategory Persistence.User -- cgit v1.2.3 From 80f09e8b3a5c856e60922a73c9161a8c5392e4d4 Mon Sep 17 00:00:00 2001 From: Joris Date: Tue, 22 Oct 2019 21:35:03 +0200 Subject: Create ModalForm component --- server/server.cabal | 1 + 1 file changed, 1 insertion(+) (limited to 'server/server.cabal') diff --git a/server/server.cabal b/server/server.cabal index eeba14f..f1105ff 100644 --- a/server/server.cabal +++ b/server/server.cabal @@ -19,6 +19,7 @@ Executable server LambdaCase MultiParamTypeClasses OverloadedStrings + ScopedTypeVariables Build-depends: aeson -- cgit v1.2.3 From f968c8ce63e1aec119b1e6f414cf27e2c0294bcb Mon Sep 17 00:00:00 2001 From: Joris Date: Wed, 23 Oct 2019 21:09:54 +0200 Subject: Delete income --- server/server.cabal | 1 + 1 file changed, 1 insertion(+) (limited to 'server/server.cabal') diff --git a/server/server.cabal b/server/server.cabal index f1105ff..c7b4f2b 100644 --- a/server/server.cabal +++ b/server/server.cabal @@ -74,6 +74,7 @@ Executable server Design.Media Design.Modal Design.Tooltip + Design.View.ConfirmDialog Design.View.Header Design.View.NotFound Design.View.Pages -- cgit v1.2.3 From a267f0bb4566389342c3244d3c082dc2453f4615 Mon Sep 17 00:00:00 2001 From: Joris Date: Sun, 3 Nov 2019 09:22:12 +0100 Subject: Show users in income table --- server/server.cabal | 1 + 1 file changed, 1 insertion(+) (limited to 'server/server.cabal') diff --git a/server/server.cabal b/server/server.cabal index c7b4f2b..b170a18 100644 --- a/server/server.cabal +++ b/server/server.cabal @@ -65,6 +65,7 @@ Executable server Controller.Payment Controller.User Cookie + Design.Appearing Design.Color Design.Constants Design.Errors -- 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/server.cabal | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'server/server.cabal') diff --git a/server/server.cabal b/server/server.cabal index b170a18..b4d9e08 100644 --- a/server/server.cabal +++ b/server/server.cabal @@ -80,12 +80,8 @@ Executable server Design.View.NotFound Design.View.Pages Design.View.Payment - Design.View.Payment.Add - Design.View.Payment.Delete Design.View.Payment.Form Design.View.Payment.Header - Design.View.Payment.Pages - Design.View.Payment.Table Design.View.SignIn Design.View.Stat Design.View.Table @@ -117,6 +113,7 @@ Executable server Resource Secure SendMail + Util.List Util.Time Validation.Income Validation.Payment -- 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/server.cabal | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'server/server.cabal') diff --git a/server/server.cabal b/server/server.cabal index b4d9e08..7056b3f 100644 --- a/server/server.cabal +++ b/server/server.cabal @@ -81,7 +81,8 @@ Executable server Design.View.Pages Design.View.Payment Design.View.Payment.Form - Design.View.Payment.Header + Design.View.Payment.HeaderForm + Design.View.Payment.HeaderInfos Design.View.SignIn Design.View.Stat Design.View.Table @@ -104,16 +105,15 @@ Executable server Model.Query Model.SignIn Model.UUID + Payer Persistence.Category Persistence.Frequency Persistence.Income Persistence.Payment - Persistence.PaymentCategory Persistence.User Resource Secure SendMail - Util.List Util.Time Validation.Income Validation.Payment -- cgit v1.2.3 From 54628c70cb33de5e4309c35b9f6b57bbe9f7a07b Mon Sep 17 00:00:00 2001 From: Joris Date: Sun, 24 Nov 2019 16:19:53 +0100 Subject: Compute cumulative income with a DB query --- server/server.cabal | 1 + 1 file changed, 1 insertion(+) (limited to 'server/server.cabal') diff --git a/server/server.cabal b/server/server.cabal index 7056b3f..c9ab2c7 100644 --- a/server/server.cabal +++ b/server/server.cabal @@ -72,6 +72,7 @@ Executable server Design.Form Design.Global Design.Helper + Design.Loadable Design.Media Design.Modal Design.Tooltip -- 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/server.cabal | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'server/server.cabal') diff --git a/server/server.cabal b/server/server.cabal index c9ab2c7..cc6172d 100644 --- a/server/server.cabal +++ b/server/server.cabal @@ -94,10 +94,11 @@ Executable server Job.Model Job.MonthlyPayment Job.WeeklyReport - Json LoginSession + Model.CreateCategory Model.CreateIncome Model.CreatePayment + Model.EditCategory Model.EditIncome Model.EditPayment Model.IncomeResource @@ -116,6 +117,7 @@ Executable server Secure SendMail Util.Time + Validation.Category Validation.Income Validation.Payment View.Mail.SignIn -- cgit v1.2.3 From 1dfb85d3fd56d163fc854a8b3cf659d0ac39f639 Mon Sep 17 00:00:00 2001 From: Joris Date: Sat, 4 Jan 2020 17:25:29 +0100 Subject: Search payments by cost too --- server/server.cabal | 1 + 1 file changed, 1 insertion(+) (limited to 'server/server.cabal') diff --git a/server/server.cabal b/server/server.cabal index cc6172d..d38949d 100644 --- a/server/server.cabal +++ b/server/server.cabal @@ -113,6 +113,7 @@ Executable server Persistence.Income Persistence.Payment Persistence.User + Persistence.Util Resource Secure SendMail -- 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/server.cabal | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'server/server.cabal') diff --git a/server/server.cabal b/server/server.cabal index d38949d..7ef5328 100644 --- a/server/server.cabal +++ b/server/server.cabal @@ -25,6 +25,7 @@ Executable server aeson , base >= 4.11 && < 5 , base64-bytestring + , bcrypt , blaze-builder , blaze-html , bytestring @@ -101,6 +102,7 @@ Executable server Model.EditCategory Model.EditIncome Model.EditPayment + Model.HashedPassword Model.IncomeResource Model.Mail Model.PaymentResource @@ -121,6 +123,6 @@ Executable server Validation.Category Validation.Income Validation.Payment - View.Mail.SignIn + Validation.SignIn View.Mail.WeeklyReport View.Page -- 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/server.cabal | 2 ++ 1 file changed, 2 insertions(+) (limited to 'server/server.cabal') diff --git a/server/server.cabal b/server/server.cabal index 7ef5328..4f513f4 100644 --- a/server/server.cabal +++ b/server/server.cabal @@ -38,6 +38,7 @@ Executable server , filepath , http-conduit , http-types + , jsaddle , mime-mail , monad-logger , mtl @@ -119,6 +120,7 @@ Executable server Resource Secure SendMail + Statistics Util.Time Validation.Category Validation.Income -- 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/server.cabal | 1 + 1 file changed, 1 insertion(+) (limited to 'server/server.cabal') diff --git a/server/server.cabal b/server/server.cabal index 4f513f4..5427385 100644 --- a/server/server.cabal +++ b/server/server.cabal @@ -65,6 +65,7 @@ Executable server Controller.Income Controller.Index Controller.Payment + Controller.Statistics Controller.User Cookie Design.Appearing -- cgit v1.2.3