embedded css stylesheet in trident

poseidon-framework · Jan 7, 2025 · f72488c · f72488c
1 parent 8e20e8a
commit f72488c
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 8 deletions.
diff --git a/data/README.md b/data/README.md
@@ -0,0 +1,3 @@
+# Embedded data files
+
+- pico.classless.blue.min.css: CSS stylesheet from https://picocss.com
diff --git a/data/pico.classless.blue.min.css b/data/pico.classless.blue.min.css
diff --git a/poseidon-hs.cabal b/poseidon-hs.cabal
@@ -16,8 +16,8 @@ library
     exposed-modules:    Poseidon.Package, Poseidon.GenotypeData, Poseidon.BibFile, Poseidon.Janno,
                         Poseidon.ColumnTypes, Poseidon.ColumnTypesUtils, Poseidon.MathHelpers,
                         Poseidon.PoseidonVersion, Poseidon.SequencingSource, Poseidon.Chronicle,
-                        Poseidon.EntityTypes, Poseidon.ServerClient, Poseidon.ServerHTML
-                        Poseidon.Contributor, Poseidon.Version,
+                        Poseidon.EntityTypes, Poseidon.ServerClient, Poseidon.ServerHTML,
+                        Poseidon.ServerStylesheet, Poseidon.Contributor, Poseidon.Version,
                         Poseidon.CLI.List, Poseidon.CLI.Chronicle, Poseidon.CLI.Serve,
                         Poseidon.CLI.Summarise, Poseidon.CLI.Validate, Poseidon.Utils,
                         Poseidon.CLI.Survey, Poseidon.CLI.Forge, Poseidon.CLI.Init,
@@ -34,7 +34,7 @@ library
                         http-conduit, conduit, http-types, zip-archive,
                         unordered-containers, network-uri, optparse-applicative, co-log, regex-tdfa,
                         scientific, country, generics-sop, containers, process, deepseq, template-haskell,
-                        blaze-html, blaze-markup, neat-interpolation
+                        blaze-html, blaze-markup, neat-interpolation, file-embed
     default-language:   Haskell2010
 
 executable trident

diff --git a/src/Poseidon/CLI/Serve.hs b/src/Poseidon/CLI/Serve.hs
@@ -24,6 +24,7 @@ import           Poseidon.ServerClient        (AddJannoColSpec (..),
 import           Poseidon.ServerHTML
 import           Poseidon.Utils               (LogA, PoseidonIO, envLogAction,
                                                logDebug, logInfo, logWithEnv)
+import Poseidon.ServerStylesheet (stylesBS)
 
 import           Codec.Archive.Zip            (Archive, addEntryToArchive,
                                                emptyArchive, fromArchive,
@@ -55,7 +56,7 @@ import           Text.ParserCombinators.ReadP (readP_to_S)
 import           Web.Scotty                   (ActionM, ScottyM, file, get,
                                                json, middleware, notFound,
                                                param, raise, request, rescue,
-                                               scottyApp, text)
+                                               scottyApp, text, setHeader, raw)
 
 data ServeOptions = ServeOptions
     { cliArchiveBaseDirs :: [(String, FilePath)]
@@ -170,8 +171,12 @@ runServer (ServeOptions archBaseDirs maybeZipPath port ignoreChecksums certFiles
                         [(_, fn)] -> file fn
                         _ -> error "Should never happen" -- packageCollection should have been filtered to have only one version per package
 
-        -- http API
+        -- html API
 
+        -- css stylesheet
+        get "/styles.css" $ do
+            setHeader "Content-Type" "text/css; charset=utf-8"
+            raw stylesBS
         -- landing page
         get "/" $ do
             logRequest logA
@@ -357,9 +362,9 @@ makeZipArchive pac =
     addFN :: FilePath -> Archive -> IO Archive
     addFN fn a = do
         let fullFN = posPacBaseDir pac </> fn
-        raw <- B.readFile fullFN
+        rawFN <- B.readFile fullFN
         modTime <- round . utcTimeToPOSIXSeconds <$> getModificationTime fullFN
-        let zipEntry = toEntry fn modTime raw
+        let zipEntry = toEntry fn modTime rawFN
         return (addEntryToArchive zipEntry a)
 
 scottyHTTPS :: MVar () -> Int -> FilePath -> [FilePath] -> FilePath -> ScottyM () -> PoseidonIO ()

diff --git a/src/Poseidon/ServerHTML.hs b/src/Poseidon/ServerHTML.hs
@@ -29,7 +29,7 @@ jscript = [text|
 headerWithCSS :: H.Markup
 headerWithCSS = H.head $ do
     H.script ! A.type_ "text/javascript" $ H.text jscript
-    H.link ! A.rel "stylesheet" ! A.type_ "text/css" ! A.href "https://cdn.jsdelivr.net/npm/@picocss/pico@2/css/pico.classless.blue.min.css"
+    H.link ! A.rel "stylesheet" ! A.type_ "text/css" ! A.href "/styles.css"
 
 navBar :: H.Html
 navBar = H.nav $ do

diff --git a/src/Poseidon/ServerStylesheet.hs b/src/Poseidon/ServerStylesheet.hs
@@ -0,0 +1,9 @@
+{-# LANGUAGE TemplateHaskell #-}
+
+module Poseidon.ServerStylesheet (stylesBS) where
+
+import qualified Data.FileEmbed            as FE
+import Data.ByteString.Lazy as BL
+
+stylesBS :: BL.ByteString
+stylesBS = BL.fromStrict $(FE.embedFile "data/pico.classless.blue.min.css")
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# Embedded data files

		- pico.classless.blue.min.css: CSS stylesheet from https://picocss.com