Merge branch 'features/categories' into 'master'

Features/categories

See merge request !1

1 files changed, 14 insertions, 6 deletions

diff --git a/src/client/elm/Msg.elm b/src/client/elm/Msg.elm
index 49d13ca..cf592aa 100644
--- a/src/client/elm/Msg.elm
+++ b/src/client/elm/Msg.elm
@@ -10,6 +10,7 @@ import Page exposing (Page)
 import Model.Init exposing (Init)
 import Model.Payment exposing (PaymentId, Frequency)
 import Model.Income exposing (IncomeId)
+import Model.Category exposing (CategoryId)
 
 import Dialog
 import Dialog.Model as DialogModel
@@ -22,19 +23,26 @@ import LoggedIn.Msg as LoggedInMsg
 
 type Msg =
   NoOp
+  | UpdatePage Page
   | SignIn String
   | UpdateTime Time
   | GoLoggedInView Init
   | UpdateSignIn SignInMsg.Msg
   | UpdateLoggedIn LoggedInMsg.Msg
-  | CreatePayment String Int Date Frequency
-  | EditPayment PaymentId String Int Date Frequency
-  | DeletePayment PaymentId
-  | CreateIncome Int Date
-  | EditIncome IncomeId Int Date
-  | DeleteIncome IncomeId
   | GoSignInView
   | SignOut
   | Error String
   | Dialog (Dialog.Msg DialogModel.Model DialogMsg.Msg Msg)
   | Tooltip Tooltip.Msg
+
+  | CreatePayment String Int Date CategoryId Frequency
+  | EditPayment PaymentId String Int Date CategoryId Frequency
+  | DeletePayment PaymentId
+
+  | CreateIncome Int Date
+  | EditIncome IncomeId Int Date
+  | DeleteIncome IncomeId
+
+  | CreateCategory String String
+  | EditCategory CategoryId String String
+  | DeleteCategory CategoryId