Merge branch 'features/categories' into 'master'

Features/categories

See merge request !1

1 files changed, 15 insertions, 6 deletions

diff --git a/src/client/elm/LoggedIn/Model.elm b/src/client/elm/LoggedIn/Model.elm
index 11386d5..6bcb0b2 100644
--- a/src/client/elm/LoggedIn/Model.elm
+++ b/src/client/elm/LoggedIn/Model.elm
@@ -9,25 +9,34 @@ import Model.Init exposing (..)
 import Model.Payment exposing (Payments)
 import Model.User exposing (Users, UserId)
 import Model.Income exposing (Incomes)
+import Model.Category exposing (Categories)
+import Model.PaymentCategory exposing (PaymentCategories)
 
-import LoggedIn.Home.Model as HomeModel
-import LoggedIn.Income.Model as IncomeModel
+import LoggedIn.Home.Model as Home
+import LoggedIn.Income.Model as Income
+import LoggedIn.Category.Model as Categories
 
 type alias Model =
-  { home : HomeModel.Model
-  , income : IncomeModel.Model
+  { home : Home.Model
+  , income : Income.Model
+  , category : Categories.Model
   , users : Users
   , me : UserId
   , payments : Payments
   , incomes : Incomes
+  , categories : Categories
+  , paymentCategories : PaymentCategories
   }
 
 init : Init -> Model
 init initData =
-  { home = HomeModel.init
-  , income = IncomeModel.init
+  { home = Home.init
+  , income = Income.init
+  , category = Categories.init
   , users = initData.users
   , me = initData.me
   , payments = initData.payments
   , incomes = initData.incomes
+  , categories = initData.categories
+  , paymentCategories = initData.paymentCategories
   }