aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/client/View/Payments/Table.elm12
-rw-r--r--src/server/Controller/Payment.hs2
-rw-r--r--src/server/Design/Global.hs12
3 files changed, 16 insertions, 10 deletions
diff --git a/src/client/View/Payments/Table.elm b/src/client/View/Payments/Table.elm
index b92735a..847c620 100644
--- a/src/client/View/Payments/Table.elm
+++ b/src/client/View/Payments/Table.elm
@@ -20,10 +20,10 @@ paymentsTable payments =
[]
([ tr
[]
- [ th [] [ renderIcon "user" ]
- , th [] [ renderIcon "shopping-cart" ]
- , th [] [ renderIcon "euro" ]
- , th [] [ renderIcon "calendar" ]
+ [ th [ class "category" ] [ renderIcon "shopping-cart" ]
+ , th [ class "cost" ] [ renderIcon "euro" ]
+ , th [ class "user" ] [ renderIcon "user" ]
+ , th [ class "date" ] [ renderIcon "calendar" ]
]
] ++ (paymentLines payments))
@@ -38,9 +38,9 @@ paymentLine : Payment -> Html
paymentLine payment =
tr
[]
- [ td [] [ text payment.id ]
- , td [] [ text payment.name ]
+ [ td [] [ text payment.name ]
, td [] [ text ((toString payment.cost) ++ " €") ]
+ , td [] [ text payment.userName ]
, td [] [ text (renderDate payment.creation) ]
]
diff --git a/src/server/Controller/Payment.hs b/src/server/Controller/Payment.hs
index 219206a..141aed0 100644
--- a/src/server/Controller/Payment.hs
+++ b/src/server/Controller/Payment.hs
@@ -11,8 +11,6 @@ import Control.Monad.IO.Class (liftIO)
import Data.Text (Text)
-import Database.Persist.Sqlite (unSqlBackendKey)
-
import qualified Secure
import Model.Database
diff --git a/src/server/Design/Global.hs b/src/server/Design/Global.hs
index 54533c2..bdf4cdb 100644
--- a/src/server/Design/Global.hs
+++ b/src/server/Design/Global.hs
@@ -73,7 +73,10 @@ global = do
fontSize (px 22)
verticalAlign middle
cursor cursorText
- input ? defaultInput inputHeight
+ borderRadius (px 0) (px 3) (px 3) (px 0)
+ input ? do
+ defaultInput inputHeight
+ borderRadius (px 3) (px 0) (px 0) (px 3)
"input:focus + label" ? backgroundColor C.grey
".name" ? do
@@ -111,6 +114,11 @@ global = do
fontSize (px iconFontSize)
lineHeight (px 70)
+ ".category" & width (pct 40)
+ ".cost" & width (pct 20)
+ ".user" & width (pct 20)
+ ".date" & width (pct 20)
+
tr ? do
fontSize (px 20)
lineHeight (px 60)
@@ -162,7 +170,7 @@ defaultInput :: Integer -> Css
defaultInput inputHeight = do
height (px inputHeight)
padding (px 10) (px 10) (px 10) (px 10)
- borderRadius (px 0) (px 0) (px 0) (px 0)
+ borderRadius (px 3) (px 3) (px 3) (px 3)
border solid (px 1) C.darkgrey
focus & borderColor C.grey
verticalAlign middle