aboutsummaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorJoris Guyonvarch2015-07-18 18:29:46 +0200
committerJoris Guyonvarch2015-07-18 18:29:46 +0200
commit3486644b442a0800f645ec9ae7f3ce8fe2b3c9cd (patch)
tree07cf31c37b09a2cb8bcb04380b91a640727888df /src/client
parentb27a7914993f5a5a87160dc33431a6fa1f4ad323 (diff)
Showing either the payment table or a forbidden message in the UI
Diffstat (limited to 'src/client')
-rw-r--r--src/client/Main.elm12
-rw-r--r--src/client/Model.elm6
-rw-r--r--src/client/Update.elm5
-rw-r--r--src/client/View/Page.elm62
4 files changed, 62 insertions, 23 deletions
diff --git a/src/client/Main.elm b/src/client/Main.elm
index e112144..bff5f23 100644
--- a/src/client/Main.elm
+++ b/src/client/Main.elm
@@ -27,10 +27,16 @@ model : Signal Model
model = Signal.foldp updateModel initialModel actions.signal
port fetchPayments : Task Http.Error ()
-port fetchPayments = getPayments `Task.andThen` report
+port fetchPayments =
+ getPayments
+ |> flip Task.andThen reportSuccess
+ |> flip Task.onError reportError
-report : Payments -> Task x ()
-report payments = Signal.send actions.address (UpdatePayments payments)
+reportSuccess : Payments -> Task x ()
+reportSuccess payments = Signal.send actions.address (UpdatePayments payments)
+
+reportError : Http.Error -> Task x ()
+reportError error = Signal.send actions.address Forbidden
getPayments : Task Http.Error Payments
getPayments = Http.get paymentsDecoder "/payments"
diff --git a/src/client/Model.elm b/src/client/Model.elm
index 50d0c06..6888676 100644
--- a/src/client/Model.elm
+++ b/src/client/Model.elm
@@ -8,10 +8,12 @@ import List
import Model.Payment exposing (Payments)
type alias Model =
- { payments : Payments
+ { payments : Maybe Payments
+ , forbiddenAccess : Bool
}
initialModel : Model
initialModel =
- { payments = []
+ { payments = Nothing
+ , forbiddenAccess = False
}
diff --git a/src/client/Update.elm b/src/client/Update.elm
index 6eedb7f..b96d899 100644
--- a/src/client/Update.elm
+++ b/src/client/Update.elm
@@ -9,6 +9,7 @@ import Model.Payment exposing (Payments)
type Action =
NoOp
+ | Forbidden
| UpdatePayments Payments
actions : Signal.Mailbox Action
@@ -19,5 +20,7 @@ updateModel action model =
case action of
NoOp ->
model
+ Forbidden ->
+ { model | forbiddenAccess <- True }
UpdatePayments payments ->
- { model | payments <- payments }
+ { model | payments <- Just payments }
diff --git a/src/client/View/Page.elm b/src/client/View/Page.elm
index 73afed9..777655c 100644
--- a/src/client/View/Page.elm
+++ b/src/client/View/Page.elm
@@ -18,31 +18,59 @@ import Model.Payment exposing (Payments, Payment)
renderPage : Model -> Html
renderPage model =
+ div
+ []
+ [ renderHeader
+ , renderMain model
+ ]
+
+renderHeader : Html
+renderHeader =
header
[]
[ h1
[]
[ text "Payments" ]
- , table
- []
- ([ tr
- []
- [ th [] [ text "Utilisateur" ]
- , th [] [ text "Nom" ]
- , th [] [ text "Prix" ]
- , th [] [ text "Date" ]
- ]
- ] ++ (List.map renderPayment model.payments))
]
-renderPayments : Payments -> List Html
-renderPayments =
- List.map renderPayment
- << List.reverse
- << List.sortBy (Date.toTime << .creation)
+renderMain : Model -> Html
+renderMain model =
+ if model.forbiddenAccess
+ then
+ forbiddenAccess
+ else
+ model.payments
+ |> Maybe.map paymentTable
+ |> Maybe.withDefault loadingTable
+
+forbiddenAccess : Html
+forbiddenAccess = text "Forbidden access"
+
+loadingTable : Html
+loadingTable = text ""
+
+paymentTable : Payments -> Html
+paymentTable payments =
+ table
+ []
+ ([ tr
+ []
+ [ th [] [ text "Utilisateur" ]
+ , th [] [ text "Nom" ]
+ , th [] [ text "Prix" ]
+ , th [] [ text "Date" ]
+ ]
+ ] ++ (paymentLines payments))
+
+paymentLines : Payments -> List Html
+paymentLines payments =
+ payments
+ |> List.sortBy (Date.toTime << .creation)
+ |> List.reverse
+ |> List.map paymentLine
-renderPayment : Payment -> Html
-renderPayment payment =
+paymentLine : Payment -> Html
+paymentLine payment =
tr
[]
[ td [] [ text payment.name ]