From 5a13317efdaa2a8594a138b07ddd45eab40a8322 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 19 Jan 2020 16:30:01 +0100
Subject: Return the css at /css/main.css instead of inlined

---
 server/src/Main.hs      | 5 +++++
 server/src/View/Page.hs | 4 +---
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'server/src')

diff --git a/server/src/Main.hs b/server/src/Main.hs
index 324557e..999f973 100644
--- a/server/src/Main.hs
+++ b/server/src/Main.hs
@@ -14,6 +14,7 @@ import qualified Controller.Income             as Income
 import qualified Controller.Index              as Index
 import qualified Controller.Payment            as Payment
 import qualified Controller.User               as User
+import qualified Design.Global                 as Design
 import           Job.Daemon                    (runDaemons)
 
 main :: IO ()
@@ -28,6 +29,10 @@ main = do
     S.middleware . staticPolicy $
       noDots >-> addBase "public"
 
+    S.get "/css/main.css" $ do
+      S.setHeader "Content-Type" "text/css"
+      S.text Design.globalDesign
+
     S.post "/api/signIn" $
       S.jsonData >>= Index.signIn conf
 
diff --git a/server/src/View/Page.hs b/server/src/View/Page.hs
index 4ada5f7..bac6b8a 100644
--- a/server/src/View/Page.hs
+++ b/server/src/View/Page.hs
@@ -18,8 +18,6 @@ import qualified Text.Blaze.Html5.Attributes   as A
 import           Common.Model                  (Init)
 import qualified Common.Msg                    as Msg
 
-import           Design.Global                 (globalDesign)
-
 page :: Maybe Init -> Text
 page init =
   renderHtml . docTypeHtml $ do
@@ -30,8 +28,8 @@ page init =
       script ! src "/javascript/main.js" $ ""
       jsonScript "init" init
       link ! rel "stylesheet" ! type_ "text/css" ! href "/css/reset.css"
+      link ! rel "stylesheet" ! type_ "text/css" ! href "/css/main.css"
       link ! rel "icon" ! type_ "image/png" ! href "/images/icon.png"
-      H.style $ toHtml globalDesign
     H.body $ do
       H.div ! A.class_ "spinner" $ ""
 
-- 
cgit v1.2.3