diff options
| author | Joris | 2017-03-24 09:21:06 +0000 |
|---|---|---|
| committer | Joris | 2017-03-24 09:21:06 +0000 |
| commit | c0ac16a713c4e53cf6af8e72a6d5f6b8ac5d6456 (patch) | |
| tree | 8a438430cee7411259fc395d8f3898488e85d750 /src/server/Model/Json/Init.hs | |
| parent | 293eb8295162bf0a038f488237db9c9d1316c04d (diff) | |
| parent | cfca18262c1ff48dcb683ddab7d03cf8e55573ff (diff) | |
| download | budget-c0ac16a713c4e53cf6af8e72a6d5f6b8ac5d6456.tar.gz budget-c0ac16a713c4e53cf6af8e72a6d5f6b8ac5d6456.tar.bz2 budget-c0ac16a713c4e53cf6af8e72a6d5f6b8ac5d6456.zip | |
Merge branch 'features/categories' into 'master'
Features/categories
See merge request !1
Diffstat (limited to 'src/server/Model/Json/Init.hs')
| -rw-r--r-- | src/server/Model/Json/Init.hs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/server/Model/Json/Init.hs b/src/server/Model/Json/Init.hs index 5e6d2a2..b9f7f40 100644 --- a/src/server/Model/Json/Init.hs +++ b/src/server/Model/Json/Init.hs @@ -13,6 +13,8 @@ import Model.Database (UserId) import Model.Json.User (User) import Model.Json.Payment (Payment) import Model.Json.Income (Income) +import Model.Json.Category (Category) +import Model.Json.PaymentCategory (PaymentCategory) import Model.Message.Key (Key) data Init = Init @@ -20,6 +22,8 @@ data Init = Init , me :: UserId , payments :: [Payment] , incomes :: [Income] + , categories :: [Category] + , paymentCategories :: [PaymentCategory] } deriving (Show, Generic) instance ToJSON Init |