aboutsummaryrefslogtreecommitdiff
path: root/src/client/elm/Model
diff options
context:
space:
mode:
Diffstat (limited to 'src/client/elm/Model')
-rw-r--r--src/client/elm/Model/Action.elm4
-rw-r--r--src/client/elm/Model/Action/LoggedInAction.elm21
-rw-r--r--src/client/elm/Model/View.elm4
-rw-r--r--src/client/elm/Model/View/LoggedInView.elm36
4 files changed, 4 insertions, 61 deletions
diff --git a/src/client/elm/Model/Action.elm b/src/client/elm/Model/Action.elm
index 3d06521..7c99f39 100644
--- a/src/client/elm/Model/Action.elm
+++ b/src/client/elm/Model/Action.elm
@@ -5,10 +5,10 @@ module Model.Action
import Time exposing (Time)
import Signal exposing (Address)
-import Model.Action.LoggedInAction exposing (LoggedInAction)
import Model.Init exposing (Init)
import SignIn.Action as SignInAction
+import LoggedIn.Action as LoggedInAction
type Action =
NoOp
@@ -16,6 +16,6 @@ type Action =
| UpdateTime Time
| GoLoggedInView Init
| UpdateSignIn SignInAction.Action
- | UpdateLoggedIn LoggedInAction
+ | UpdateLoggedIn LoggedInAction.Action
| GoSignInView
| SignOut
diff --git a/src/client/elm/Model/Action/LoggedInAction.elm b/src/client/elm/Model/Action/LoggedInAction.elm
deleted file mode 100644
index 4538ec7..0000000
--- a/src/client/elm/Model/Action/LoggedInAction.elm
+++ /dev/null
@@ -1,21 +0,0 @@
-module Model.Action.LoggedInAction
- ( LoggedInAction(..)
- ) where
-
-import Model.Payment exposing (Payments, Payment, PaymentId, PaymentFrequency)
-import Model.Action.MonthlyAction exposing (MonthlyAction)
-import Model.Action.AccountAction exposing (AccountAction)
-import Model.Action.AddPaymentAction exposing (AddPaymentAction)
-
-type LoggedInAction =
- NoOp
- | UpdateAdd AddPaymentAction
- | UpdatePayments Payments
- | AddPayment String String PaymentFrequency
- | ValidateAddPayment PaymentId String Int PaymentFrequency
- | DeletePayment Payment PaymentFrequency
- | ValidateDeletePayment Payment PaymentFrequency
- | ToggleEdit PaymentId
- | UpdatePage Int
- | UpdateMonthly MonthlyAction
- | UpdateAccount AccountAction
diff --git a/src/client/elm/Model/View.elm b/src/client/elm/Model/View.elm
index 7fc42af..9d64c73 100644
--- a/src/client/elm/Model/View.elm
+++ b/src/client/elm/Model/View.elm
@@ -3,11 +3,11 @@ module Model.View
) where
import Model.Payment exposing (Payments)
-import Model.View.LoggedInView exposing (..)
import SignIn.Model as SignInModel
+import LoggedIn.Model as LoggedInModel
type View =
LoadingView
| SignInView SignInModel.Model
- | LoggedInView LoggedInView
+ | LoggedInView LoggedInModel.Model
diff --git a/src/client/elm/Model/View/LoggedInView.elm b/src/client/elm/Model/View/LoggedInView.elm
deleted file mode 100644
index e33c58b..0000000
--- a/src/client/elm/Model/View/LoggedInView.elm
+++ /dev/null
@@ -1,36 +0,0 @@
-module Model.View.LoggedInView
- ( LoggedInView
- , initLoggedInView
- ) where
-
-import Model.User exposing (Users, UserId)
-import Model.Payment exposing (Payments, PaymentFrequency(..))
-import Model.Payer exposing (Payers)
-import Model.Init exposing (..)
-import Model.View.LoggedIn.AddPayment exposing (..)
-import Model.View.LoggedIn.Edition exposing (..)
-import Model.View.LoggedIn.Monthly exposing (..)
-import Model.View.LoggedIn.Account exposing (..)
-
-type alias LoggedInView =
- { users : Users
- , add : AddPayment
- , monthly : Monthly
- , account : Account
- , payments : Payments
- , paymentsCount : Int
- , paymentEdition : Maybe Edition
- , currentPage : Int
- }
-
-initLoggedInView : Init -> LoggedInView
-initLoggedInView init =
- { users = init.users
- , add = initAddPayment Punctual
- , monthly = initMonthly init.monthlyPayments
- , account = initAccount init.me init.incomes
- , payments = init.payments
- , paymentsCount = init.paymentsCount
- , paymentEdition = Nothing
- , currentPage = 1
- }