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

---
 src/common/Model/Category.hs        | 26 --------------------------
 src/common/Model/CreateCategory.hs  | 16 ----------------
 src/common/Model/CreateIncome.hs    | 16 ----------------
 src/common/Model/CreatePayment.hs   | 23 -----------------------
 src/common/Model/Currency.hs        | 14 --------------
 src/common/Model/EditCategory.hs    | 19 -------------------
 src/common/Model/EditIncome.hs      | 19 -------------------
 src/common/Model/EditPayment.hs     | 25 -------------------------
 src/common/Model/Frequency.hs       | 16 ----------------
 src/common/Model/Income.hs          | 29 -----------------------------
 src/common/Model/Init.hs            | 28 ----------------------------
 src/common/Model/InitResult.hs      | 19 -------------------
 src/common/Model/Payment.hs         | 33 ---------------------------------
 src/common/Model/PaymentCategory.hs | 27 ---------------------------
 src/common/Model/SignIn.hs          | 16 ----------------
 src/common/Model/User.hs            | 29 -----------------------------
 16 files changed, 355 deletions(-)
 delete mode 100644 src/common/Model/Category.hs
 delete mode 100644 src/common/Model/CreateCategory.hs
 delete mode 100644 src/common/Model/CreateIncome.hs
 delete mode 100644 src/common/Model/CreatePayment.hs
 delete mode 100644 src/common/Model/Currency.hs
 delete mode 100644 src/common/Model/EditCategory.hs
 delete mode 100644 src/common/Model/EditIncome.hs
 delete mode 100644 src/common/Model/EditPayment.hs
 delete mode 100644 src/common/Model/Frequency.hs
 delete mode 100644 src/common/Model/Income.hs
 delete mode 100644 src/common/Model/Init.hs
 delete mode 100644 src/common/Model/InitResult.hs
 delete mode 100644 src/common/Model/Payment.hs
 delete mode 100644 src/common/Model/PaymentCategory.hs
 delete mode 100644 src/common/Model/SignIn.hs
 delete mode 100644 src/common/Model/User.hs

(limited to 'src/common/Model')

diff --git a/src/common/Model/Category.hs b/src/common/Model/Category.hs
deleted file mode 100644
index 53a6bdb..0000000
--- a/src/common/Model/Category.hs
+++ /dev/null
@@ -1,26 +0,0 @@
-{-# LANGUAGE DeriveGeneric #-}
-
-module Common.Model.Category
-  ( CategoryId
-  , Category(..)
-  ) where
-
-import Data.Aeson (FromJSON, ToJSON)
-import Data.Int (Int64)
-import Data.Text (Text)
-import Data.Time (UTCTime)
-import GHC.Generics (Generic)
-
-type CategoryId = Int64
-
-data Category = Category
-  { _category_id :: CategoryId
-  , _category_name :: Text
-  , _category_color :: Text
-  , _category_createdAt :: UTCTime
-  , _category_editedAt :: Maybe UTCTime
-  , _category_deletedAt :: Maybe UTCTime
-  } deriving (Show, Generic)
-
-instance FromJSON Category
-instance ToJSON Category
diff --git a/src/common/Model/CreateCategory.hs b/src/common/Model/CreateCategory.hs
deleted file mode 100644
index bfe24c5..0000000
--- a/src/common/Model/CreateCategory.hs
+++ /dev/null
@@ -1,16 +0,0 @@
-{-# LANGUAGE DeriveGeneric #-}
-
-module Common.Model.CreateCategory
-  ( CreateCategory(..)
-  ) where
-
-import Data.Aeson (FromJSON)
-import Data.Text (Text)
-import GHC.Generics (Generic)
-
-data CreateCategory = CreateCategory
-  { _createCategory_name :: Text
-  , _createCategory_color :: Text
-  } deriving (Show, Generic)
-
-instance FromJSON CreateCategory
diff --git a/src/common/Model/CreateIncome.hs b/src/common/Model/CreateIncome.hs
deleted file mode 100644
index 4ee3a50..0000000
--- a/src/common/Model/CreateIncome.hs
+++ /dev/null
@@ -1,16 +0,0 @@
-{-# LANGUAGE DeriveGeneric #-}
-
-module Common.Model.CreateIncome
-  ( CreateIncome(..)
-  ) where
-
-import Data.Aeson (FromJSON)
-import Data.Time.Calendar (Day)
-import GHC.Generics (Generic)
-
-data CreateIncome = CreateIncome
-  { _createIncome_date :: Day
-  , _createIncome_amount :: Int
-  } deriving (Show, Generic)
-
-instance FromJSON CreateIncome
diff --git a/src/common/Model/CreatePayment.hs b/src/common/Model/CreatePayment.hs
deleted file mode 100644
index b5b6256..0000000
--- a/src/common/Model/CreatePayment.hs
+++ /dev/null
@@ -1,23 +0,0 @@
-{-# LANGUAGE DeriveGeneric #-}
-
-module Common.Model.CreatePayment
-  ( CreatePayment(..)
-  ) where
-
-import Data.Aeson (FromJSON)
-import Data.Text (Text)
-import Data.Time.Calendar (Day)
-import GHC.Generics (Generic)
-
-import Common.Model.Category (CategoryId)
-import Common.Model.Frequency (Frequency)
-
-data CreatePayment = CreatePayment
-  { _createPayment_name :: Text
-  , _createPayment_cost :: Int
-  , _createPayment_date :: Day
-  , _createPayment_category :: CategoryId
-  , _createPayment_frequency :: Frequency
-  } deriving (Show, Generic)
-
-instance FromJSON CreatePayment
diff --git a/src/common/Model/Currency.hs b/src/common/Model/Currency.hs
deleted file mode 100644
index 7c12545..0000000
--- a/src/common/Model/Currency.hs
+++ /dev/null
@@ -1,14 +0,0 @@
-{-# LANGUAGE DeriveGeneric #-}
-
-module Common.Model.Currency
-  ( Currency(..)
-  ) where
-
-import Data.Aeson (FromJSON, ToJSON)
-import Data.Text (Text)
-import GHC.Generics (Generic)
-
-newtype Currency = Currency Text deriving (Show, Generic)
-
-instance FromJSON Currency
-instance ToJSON Currency
diff --git a/src/common/Model/EditCategory.hs b/src/common/Model/EditCategory.hs
deleted file mode 100644
index 2a3a697..0000000
--- a/src/common/Model/EditCategory.hs
+++ /dev/null
@@ -1,19 +0,0 @@
-{-# LANGUAGE DeriveGeneric #-}
-
-module Common.Model.EditCategory
-  ( EditCategory(..)
-  ) where
-
-import Data.Aeson (FromJSON)
-import Data.Text (Text)
-import GHC.Generics (Generic)
-
-import Common.Model.Category (CategoryId)
-
-data EditCategory = EditCategory
-  { _editCategory_id :: CategoryId
-  , _editCategory_name :: Text
-  , _editCategory_color :: Text
-  } deriving (Show, Generic)
-
-instance FromJSON EditCategory
diff --git a/src/common/Model/EditIncome.hs b/src/common/Model/EditIncome.hs
deleted file mode 100644
index a55c39e..0000000
--- a/src/common/Model/EditIncome.hs
+++ /dev/null
@@ -1,19 +0,0 @@
-{-# LANGUAGE DeriveGeneric #-}
-
-module Common.Model.EditIncome
-  ( EditIncome(..)
-  ) where
-
-import Data.Aeson (FromJSON)
-import Data.Time.Calendar (Day)
-import GHC.Generics (Generic)
-
-import Common.Model.Income (IncomeId)
-
-data EditIncome = EditIncome
-  { _editIncome_id :: IncomeId
-  , _editIncome_date :: Day
-  , _editIncome_amount :: Int
-  } deriving (Show, Generic)
-
-instance FromJSON EditIncome
diff --git a/src/common/Model/EditPayment.hs b/src/common/Model/EditPayment.hs
deleted file mode 100644
index 172c0c1..0000000
--- a/src/common/Model/EditPayment.hs
+++ /dev/null
@@ -1,25 +0,0 @@
-{-# LANGUAGE DeriveGeneric #-}
-
-module Common.Model.EditPayment
-  ( EditPayment(..)
-  ) where
-
-import Data.Aeson (FromJSON)
-import Data.Text (Text)
-import Data.Time.Calendar (Day)
-import GHC.Generics (Generic)
-
-import Common.Model.Category (CategoryId)
-import Common.Model.Frequency (Frequency)
-import Common.Model.Payment (PaymentId)
-
-data EditPayment = EditPayment
-  { _editPayment_id :: PaymentId
-  , _editPayment_name :: Text
-  , _editPayment_cost :: Int
-  , _editPayment_date :: Day
-  , _editPayment_category :: CategoryId
-  , _editPayment_frequency :: Frequency
-  } deriving (Show, Generic)
-
-instance FromJSON EditPayment
diff --git a/src/common/Model/Frequency.hs b/src/common/Model/Frequency.hs
deleted file mode 100644
index 7c46605..0000000
--- a/src/common/Model/Frequency.hs
+++ /dev/null
@@ -1,16 +0,0 @@
-{-# LANGUAGE DeriveGeneric #-}
-
-module Common.Model.Frequency
-  ( Frequency(..)
-  ) where
-
-import Data.Aeson (FromJSON, ToJSON)
-import GHC.Generics (Generic)
-
-data Frequency =
-  Punctual
-  | Monthly
-  deriving (Eq, Read, Show, Generic)
-
-instance FromJSON Frequency
-instance ToJSON Frequency
diff --git a/src/common/Model/Income.hs b/src/common/Model/Income.hs
deleted file mode 100644
index 280812f..0000000
--- a/src/common/Model/Income.hs
+++ /dev/null
@@ -1,29 +0,0 @@
-{-# LANGUAGE DeriveGeneric #-}
-
-module Common.Model.Income
-  ( IncomeId
-  , Income(..)
-  ) where
-
-import Data.Aeson (FromJSON, ToJSON)
-import Data.Int (Int64)
-import Data.Time (UTCTime)
-import Data.Time.Calendar (Day)
-import GHC.Generics (Generic)
-
-import Common.Model.User (UserId)
-
-type IncomeId = Int64
-
-data Income = Income
-  { _income_id :: IncomeId
-  , _income_userId :: UserId
-  , _income_date :: Day
-  , _income_amount :: Int
-  , _income_createdAt :: UTCTime
-  , _income_editedAt :: Maybe UTCTime
-  , _income_deletedAt :: Maybe UTCTime
-  } deriving (Show, Generic)
-
-instance FromJSON Income
-instance ToJSON Income
diff --git a/src/common/Model/Init.hs b/src/common/Model/Init.hs
deleted file mode 100644
index 68fcfb8..0000000
--- a/src/common/Model/Init.hs
+++ /dev/null
@@ -1,28 +0,0 @@
-{-# LANGUAGE DeriveGeneric #-}
-
-module Common.Model.Init
-  ( Init(..)
-  ) where
-
-import Data.Aeson (FromJSON, ToJSON)
-import GHC.Generics (Generic)
-
-import Common.Model.Category (Category)
-import Common.Model.Currency (Currency)
-import Common.Model.Income (Income)
-import Common.Model.Payment (Payment)
-import Common.Model.PaymentCategory (PaymentCategory)
-import Common.Model.User (UserId, User)
-
-data Init = Init
-  { _init_users :: [User]
-  , _init_currentUser :: UserId
-  , _init_payments :: [Payment]
-  , _init_incomes :: [Income]
-  , _init_categories :: [Category]
-  , _init_paymentCategories :: [PaymentCategory]
-  , _init_currency :: Currency
-  } deriving (Show, Generic)
-
-instance FromJSON Init
-instance ToJSON Init
diff --git a/src/common/Model/InitResult.hs b/src/common/Model/InitResult.hs
deleted file mode 100644
index 43c16f9..0000000
--- a/src/common/Model/InitResult.hs
+++ /dev/null
@@ -1,19 +0,0 @@
-{-# LANGUAGE DeriveGeneric #-}
-
-module Common.Model.InitResult
-  ( InitResult(..)
-  ) where
-
-import Data.Aeson (FromJSON, ToJSON)
-import Data.Text (Text)
-import GHC.Generics (Generic)
-
-import Common.Model.Init (Init)
-
-data InitResult =
-  InitSuccess Init
-  | InitEmpty (Either Text (Maybe Text))
-  deriving (Show, Generic)
-
-instance FromJSON InitResult
-instance ToJSON InitResult
diff --git a/src/common/Model/Payment.hs b/src/common/Model/Payment.hs
deleted file mode 100644
index 804b501..0000000
--- a/src/common/Model/Payment.hs
+++ /dev/null
@@ -1,33 +0,0 @@
-{-# LANGUAGE DeriveGeneric #-}
-
-module Common.Model.Payment
-  ( PaymentId
-  , Payment(..)
-  ) where
-
-import Data.Aeson (FromJSON, ToJSON)
-import Data.Int (Int64)
-import Data.Text (Text)
-import Data.Time (UTCTime)
-import Data.Time.Calendar (Day)
-import GHC.Generics (Generic)
-
-import Common.Model.Frequency
-import Common.Model.User (UserId)
-
-type PaymentId = Int64
-
-data Payment = Payment
-  { _payment_id :: PaymentId
-  , _payment_user :: UserId
-  , _payment_name :: Text
-  , _payment_cost :: Int
-  , _payment_date :: Day
-  , _payment_frequency :: Frequency
-  , _payment_createdAt :: UTCTime
-  , _payment_editedAt :: Maybe UTCTime
-  , _payment_deletedAt :: Maybe UTCTime
-  } deriving (Show, Generic)
-
-instance FromJSON Payment
-instance ToJSON Payment
diff --git a/src/common/Model/PaymentCategory.hs b/src/common/Model/PaymentCategory.hs
deleted file mode 100644
index a0e94f9..0000000
--- a/src/common/Model/PaymentCategory.hs
+++ /dev/null
@@ -1,27 +0,0 @@
-{-# LANGUAGE DeriveGeneric #-}
-
-module Common.Model.PaymentCategory
-  ( PaymentCategoryId
-  , PaymentCategory(..)
-  ) where
-
-import Data.Aeson (FromJSON, ToJSON)
-import Data.Int (Int64)
-import Data.Text (Text)
-import Data.Time (UTCTime)
-import GHC.Generics (Generic)
-
-import Common.Model.Category (CategoryId)
-
-type PaymentCategoryId = Int64
-
-data PaymentCategory = PaymentCategory
-  { _paymentCategory_id :: PaymentCategoryId
-  , _paymentCategory_name :: Text
-  , _paymentCategory_category :: CategoryId
-  , _paymentCategory_createdAt :: UTCTime
-  , _paymentCategory_editedAt :: Maybe UTCTime
-  } deriving (Show, Generic)
-
-instance FromJSON PaymentCategory
-instance ToJSON PaymentCategory
diff --git a/src/common/Model/SignIn.hs b/src/common/Model/SignIn.hs
deleted file mode 100644
index f4da97f..0000000
--- a/src/common/Model/SignIn.hs
+++ /dev/null
@@ -1,16 +0,0 @@
-{-# LANGUAGE DeriveGeneric #-}
-
-module Common.Model.SignIn
-  ( SignIn(..)
-  ) where
-
-import Data.Aeson (FromJSON, ToJSON)
-import Data.Text (Text)
-import GHC.Generics (Generic)
-
-data SignIn = SignIn
-  { _signIn_email :: Text
-  } deriving (Show, Generic)
-
-instance FromJSON SignIn
-instance ToJSON SignIn
diff --git a/src/common/Model/User.hs b/src/common/Model/User.hs
deleted file mode 100644
index 8c64bc2..0000000
--- a/src/common/Model/User.hs
+++ /dev/null
@@ -1,29 +0,0 @@
-{-# LANGUAGE DeriveGeneric #-}
-
-module Common.Model.User
-  ( UserId
-  , User(..)
-  , find
-  ) where
-
-import Data.Aeson (FromJSON, ToJSON)
-import qualified Data.List as L
-import Data.Int (Int64)
-import Data.Text (Text)
-import Data.Time (UTCTime)
-import GHC.Generics (Generic)
-
-type UserId = Int64
-
-data User = User
-  { _user_id :: UserId
-  , _user_creation :: UTCTime
-  , _user_email :: Text
-  , _user_name :: Text
-  } deriving (Show, Generic)
-
-instance FromJSON User
-instance ToJSON User
-
-find :: UserId -> [User] -> Maybe User
-find userId users = L.find ((== userId) . _user_id) users
-- 
cgit v1.2.3