From 302a2e798f10e61c129753a2bd11634420c1f1a1 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sat, 2 Jan 2016 20:31:25 +0100
Subject: Set a spinner for sign in

---
 src/server/Controller/SignIn.hs          |  2 +-
 src/server/Design/SignIn.hs              |  5 ++---
 src/server/Model/Message/Key.hs          | 10 +++++++---
 src/server/Model/Message/Translations.hs | 19 +++++++++++++------
 src/server/View/Page.hs                  |  2 +-
 5 files changed, 24 insertions(+), 14 deletions(-)

(limited to 'src/server')

diff --git a/src/server/Controller/SignIn.hs b/src/server/Controller/SignIn.hs
index 8eceb56..ddd8852 100644
--- a/src/server/Controller/SignIn.hs
+++ b/src/server/Controller/SignIn.hs
@@ -41,4 +41,4 @@ signIn config assertion = do
           LoginSession.put token
           status ok200
         else
-          jsonError (getMessage Unauthorized)
+          jsonError (getMessage UnauthorizedSignIn)
diff --git a/src/server/Design/SignIn.hs b/src/server/Design/SignIn.hs
index 92e485b..a90832e 100644
--- a/src/server/Design/SignIn.hs
+++ b/src/server/Design/SignIn.hs
@@ -21,7 +21,6 @@ signInDesign =
       fontSize (em 1.5)
       position relative
 
-    ".result" ? do
+    ".error" ? do
       textAlign (alignSide sideCenter)
-      ".success" ? color C.greenSuccess
-      ".error" ? color C.redError
+      color C.redError
diff --git a/src/server/Model/Message/Key.hs b/src/server/Model/Message/Key.hs
index 1a1e944..34c9d71 100644
--- a/src/server/Model/Message/Key.hs
+++ b/src/server/Model/Message/Key.hs
@@ -4,16 +4,20 @@ module Model.Message.Key
 
 data Key =
 
+  -- Title
+
+  SharedCost
+
   -- Mail
 
-  NoReplyMail
+  | NoReplyMail
 
   -- Sign
 
-  | SharedCost
   | SignIn
   | InvalidEmail
-  | Unauthorized
+  | UnauthorizedSignIn
+  | ErrorSignIn
 
   -- Dates
 
diff --git a/src/server/Model/Message/Translations.hs b/src/server/Model/Message/Translations.hs
index 05187aa..2212e1a 100644
--- a/src/server/Model/Message/Translations.hs
+++ b/src/server/Model/Message/Translations.hs
@@ -15,6 +15,13 @@ getNonFormattedMessage = m
 
 m :: Lang -> Key -> Text
 
+-- Title
+
+m l SharedCost =
+  case l of
+    English -> "Shared Cost"
+    French  -> "Partage des frais"
+
 -- Mail
 
 m l NoReplyMail =
@@ -24,11 +31,6 @@ m l NoReplyMail =
 
 -- Sign in
 
-m l SharedCost =
-  case l of
-    English -> "Shared Cost"
-    French  -> "Partage des frais"
-
 m l SignIn =
   case l of
     English -> "Sign in"
@@ -39,11 +41,16 @@ m l InvalidEmail =
     English -> "Your email is not valid."
     French  -> "Votre courriel n'est pas valide."
 
-m l Unauthorized =
+m l UnauthorizedSignIn =
   case l of
     English -> "You are not authorized to sign in."
     French  -> "Tu n'es pas autorisé à te connecter."
 
+m l ErrorSignIn =
+  case l of
+    English -> "An error occured, please retry later."
+    French  -> "Une erreur est survenue, veuillez réessayer ultérieurement."
+
 -- Date
 
 m l January =
diff --git a/src/server/View/Page.hs b/src/server/View/Page.hs
index 7310fbb..e85ed33 100644
--- a/src/server/View/Page.hs
+++ b/src/server/View/Page.hs
@@ -33,7 +33,7 @@ page config =
       script ! A.id "messages" ! type_ "application/json" $ toHtml . decodeUtf8 . encode $ getTranslations
       script ! A.id "config" ! type_ "application/json" $ toHtml . decodeUtf8 . encode $ config
       link ! rel "stylesheet" ! type_ "text/css" ! href "css/reset.css"
-      link ! rel "stylesheet" ! href "css/font-awesome/css/font-awesome.min.css"
+      link ! rel "stylesheet" ! href "css/font-awesome-4.5.0/css/font-awesome.min.css"
       link ! rel "icon" ! type_ "image/png" ! href "images/icon.png"
       H.style $ toHtml globalDesign
     body $ do
-- 
cgit v1.2.3