Moving some files

15 files changed, 22 insertions, 31 deletions

diff --git a/src/client/elm/Model/Action.elm b/src/client/elm/Action.elm
index 7c99f39..33954dc 100644
--- a/src/client/elm/Model/Action.elm
+++ b/src/client/elm/Action.elm
@@ -1,4 +1,4 @@
-module Model.Action
+module Action
   ( Action(..)
   ) where
 
diff --git a/src/client/elm/LoggedIn/Account/View.elm b/src/client/elm/LoggedIn/Account/View.elm
index deee627..d074c41 100644
--- a/src/client/elm/LoggedIn/Account/View.elm
+++ b/src/client/elm/LoggedIn/Account/View.elm
@@ -20,7 +20,7 @@ import Model exposing (Model)
 import Model.User exposing (getUserName)
 import Model.Payer exposing (..)
 import Model.Translations exposing (getParamMessage, getMessage)
-import Model.Action exposing (..)
+import Action exposing (..)
 
 import View.Expand exposing (..)
 import View.Price exposing (price)
diff --git a/src/client/elm/LoggedIn/AddPayment/View.elm b/src/client/elm/LoggedIn/AddPayment/View.elm
index 50f7708..90f4f02 100644
--- a/src/client/elm/LoggedIn/AddPayment/View.elm
+++ b/src/client/elm/LoggedIn/AddPayment/View.elm
@@ -18,7 +18,7 @@ import LoggedIn.AddPayment.Model as AddPaymentModel
 import Model exposing (Model)
 import Model.Payment exposing (PaymentFrequency(..))
 import Model.Translations exposing (getMessage)
-import Model.Action as Action exposing (..)
+import Action as Action exposing (..)
 
 import View.Events exposing (onSubmitPrevDefault)
 import View.Icon exposing (..)
diff --git a/src/client/elm/LoggedIn/Model.elm b/src/client/elm/LoggedIn/Model.elm
index 8f0843e..a268afc 100644
--- a/src/client/elm/LoggedIn/Model.elm
+++ b/src/client/elm/LoggedIn/Model.elm
@@ -3,9 +3,8 @@ module LoggedIn.Model
   , init
   ) where
 
-import Model.View.LoggedIn.Edition exposing (..)
 import Model.User exposing (Users, UserId)
-import Model.Payment exposing (Payments, PaymentFrequency(..))
+import Model.Payment exposing (PaymentId, Payments, PaymentFrequency(..))
 import Model.Payer exposing (Payers)
 import Model.Init exposing (..)
 
@@ -20,7 +19,7 @@ type alias Model =
   , account : AccountModel.Model
   , payments : Payments
   , paymentsCount : Int
-  , paymentEdition : Maybe Edition
+  , paymentEdition : Maybe PaymentId
   , currentPage : Int
   }
 
diff --git a/src/client/elm/LoggedIn/Monthly/View.elm b/src/client/elm/LoggedIn/Monthly/View.elm
index f9ea3bf..6fc90b2 100644
--- a/src/client/elm/LoggedIn/Monthly/View.elm
+++ b/src/client/elm/LoggedIn/Monthly/View.elm
@@ -18,7 +18,7 @@ import LoggedIn.Monthly.Model as MonthlyModel
 import Model exposing (Model)
 import Model.Payment as Payment exposing (Payments, Payment)
 import Model.Translations exposing (getMessage, getParamMessage)
-import Model.Action exposing (..)
+import Action exposing (..)
 
 import View.Icon exposing (renderIcon)
 import View.Expand exposing (..)
diff --git a/src/client/elm/LoggedIn/View.elm b/src/client/elm/LoggedIn/View.elm
index 25624ce..c9980dc 100644
--- a/src/client/elm/LoggedIn/View.elm
+++ b/src/client/elm/LoggedIn/View.elm
@@ -14,10 +14,10 @@ import LoggedIn.Monthly.View as MonthlyView
 
 import Model exposing (Model)
 import Model.Payment exposing (Payments)
-import Model.Action exposing (Action)
+import Action exposing (Action)
 
-import View.LoggedIn.Table exposing (paymentsTable)
-import View.LoggedIn.Paging exposing (paymentsPaging)
+import LoggedIn.View.Table exposing (paymentsTable)
+import LoggedIn.View.Paging exposing (paymentsPaging)
 
 view : Address Action -> Model -> LoggedInModel.Model -> Html
 view address model loggedInModel =
diff --git a/src/client/elm/View/LoggedIn/Paging.elm b/src/client/elm/LoggedIn/View/Paging.elm
index 20396a6..0a149e9 100644
--- a/src/client/elm/View/LoggedIn/Paging.elm
+++ b/src/client/elm/LoggedIn/View/Paging.elm
@@ -1,4 +1,4 @@
-module View.LoggedIn.Paging
+module LoggedIn.View.Paging
   ( paymentsPaging
   ) where
 
@@ -11,7 +11,7 @@ import Html.Events exposing (..)
 import LoggedIn.Action as LoggedInAction
 import LoggedIn.Model as LoggedInModel
 
-import Model.Action as Action exposing (..)
+import Action exposing (..)
 import Model.Payment exposing (perPage)
 
 import View.Icon exposing (renderIcon)
diff --git a/src/client/elm/View/LoggedIn/Table.elm b/src/client/elm/LoggedIn/View/Table.elm
index ababcbd..7a156af 100644
--- a/src/client/elm/View/LoggedIn/Table.elm
+++ b/src/client/elm/LoggedIn/View/Table.elm
@@ -1,4 +1,4 @@
-module View.LoggedIn.Table
+module LoggedIn.View.Table
   ( paymentsTable
   ) where
 
@@ -18,7 +18,7 @@ import Model exposing (Model)
 import Model.User exposing (getUserName)
 import Model.Payment exposing (..)
 import Model.Translations exposing (getMessage)
-import Model.Action exposing (..)
+import Action exposing (..)
 
 import View.Icon exposing (renderIcon)
 import View.Date exposing (..)
diff --git a/src/client/elm/Main.elm b/src/client/elm/Main.elm
index c3d5192..0ba25b7 100644
--- a/src/client/elm/Main.elm
+++ b/src/client/elm/Main.elm
@@ -12,15 +12,13 @@ import Json.Decode as Json
 import Task exposing (..)
 import Time exposing (..)
 
-import Model exposing (Model, initialModel)
-import Model.Action exposing (..)
+import Server
 
+import Action exposing (..)
+import Model exposing (Model, initialModel)
 import Update exposing (update)
-
 import View exposing (view)
 
-import Server
-
 import Utils.Maybe exposing (isJust)
 
 main : Signal Html
diff --git a/src/client/elm/Model/View/LoggedIn/Edition.elm b/src/client/elm/Model/View/LoggedIn/Edition.elm
deleted file mode 100644
index da6d7b0..0000000
--- a/src/client/elm/Model/View/LoggedIn/Edition.elm
+++ /dev/null
@@ -1,7 +0,0 @@
-module Model.View.LoggedIn.Edition
-  ( Edition
-  ) where
-
-import Model.Payment exposing (PaymentId)
-
-type alias Edition = PaymentId
diff --git a/src/client/elm/SignIn/View.elm b/src/client/elm/SignIn/View.elm
index 2f63651..52fcde1 100644
--- a/src/client/elm/SignIn/View.elm
+++ b/src/client/elm/SignIn/View.elm
@@ -14,7 +14,7 @@ import SignIn.Model as SignInModel
 import Update exposing (..)
 
 import Model exposing (Model)
-import Model.Action exposing (..)
+import Action exposing (..)
 import Model.Translations exposing (getMessage)
 
 import View.Events exposing (onSubmitPrevDefault)
diff --git a/src/client/elm/Update.elm b/src/client/elm/Update.elm
index d25b852..5cac028 100644
--- a/src/client/elm/Update.elm
+++ b/src/client/elm/Update.elm
@@ -8,9 +8,10 @@ import Effects exposing (Effects)
 
 import Server
 
+import Action exposing (..)
+
 import Model exposing (Model)
 import Model.Translations exposing (getMessage)
-import Model.Action exposing (..)
 import Model.View as V
 
 import LoggedIn.Model as LoggedInModel
diff --git a/src/client/elm/View.elm b/src/client/elm/View.elm
index 081166d..818daf4 100644
--- a/src/client/elm/View.elm
+++ b/src/client/elm/View.elm
@@ -6,7 +6,7 @@ import Html exposing (..)
 import Signal exposing (Address)
 
 import Model exposing (Model)
-import Model.Action exposing (Action)
+import Action exposing (Action)
 import Model.View exposing (..)
 
 import View.Header exposing (renderHeader)
diff --git a/src/client/elm/View/Header.elm b/src/client/elm/View/Header.elm
index b49cf74..f1b0e76 100644
--- a/src/client/elm/View/Header.elm
+++ b/src/client/elm/View/Header.elm
@@ -11,7 +11,7 @@ import Html.Events exposing (..)
 
 import Model exposing (Model)
 import Model.Translations exposing (getMessage)
-import Model.Action exposing (..)
+import Action exposing (..)
 import Model.View exposing (..)
 
 import View.Icon exposing (renderIcon)
diff --git a/src/client/elm/View/Loading.elm b/src/client/elm/View/Loading.elm
index cfd5d0f..5270099 100644
--- a/src/client/elm/View/Loading.elm
+++ b/src/client/elm/View/Loading.elm
@@ -6,7 +6,7 @@ import Signal exposing (Address)
 
 import Html exposing (..)
 
-import Model.Action exposing (Action)
+import Action exposing (Action)
 
 renderLoading : Address Action -> Html
 renderLoading address = text ""