wip

functora · functora · commit d16728756b02 · 2024-10-14T17:36:31.000-03:00
diff --git a/ghcjs/delivery-calculator/flake.nix b/ghcjs/delivery-calculator/flake.nix
@@ -47,8 +47,7 @@
           ${app-release-wasm}/bin/app-release-wasm
           out="./dist/latest"
           rm -rf "$out"
-          mkdir -p "$out/static/css"
-          cp -R ./static/webfonts $out/static/webfonts
+          cp -R ${../miso-functora/dist}/* $out/
           cp ./static/*.png $out/static/
           cp ./static/*.woff2 $out/static/
           cp ./static/*.webmanifest $out/
@@ -84,13 +83,6 @@
             -o $out/index.html \
             ./static/wasm.html
 
-          ${pkgs.clean-css-cli}/bin/cleancss \
-            -O2 \
-            --source-map \
-            -o $out/static/css/all.css \
-            ./static/css/fontawesome.min.css \
-            ./static/css/app.css
-
           ${pkgs.nodejs}/bin/npm i --prefer-offline
           ${pkgs.nodejs}/bin/npm run build
         '';
diff --git a/ghcjs/delivery-calculator/src/Main.hs b/ghcjs/delivery-calculator/src/Main.hs
@@ -302,18 +302,24 @@ viewModel :: Model -> View Action
 #if defined(__GHCJS__) || defined(ghcjs_HOST_OS) || defined(wasi_HOST_OS)
 viewModel st =
   prependViews
-    ( ( if not (st ^. #modelState . #stEnableTheme)
+    (
+      [ keyed "css-pre-theme" $ link_
+          [ rel_ "stylesheet",
+            href_ $ "miso-functora/pre-theme.min.css"
+          ]
+      ] <>
+      ( if not (st ^. #modelState . #stEnableTheme)
           then mempty
           else
-            [ link_
+            [ keyed "css-theme" $ link_
                 [ rel_ "stylesheet",
                   href_ $ "themes/" <> themeCssFile (st ^. #modelState . #stTheme)
                 ]
             ]
       ) <>
-      [ link_
+      [ keyed "css-post-theme" $ link_
           [ rel_ "stylesheet",
-            href_ $ "miso-functora/miso-functora.min.css"
+            href_ $ "miso-functora/post-theme.min.css"
           ]
       ]
     )
@@ -325,21 +331,21 @@ viewModel st =
   --
   prependViews
     (
-      [ link_
+      [ keyed "css-pre-theme" $ link_
           [ rel_ "stylesheet",
             href_ $ "miso-functora/pre-theme.css"
           ]
       ] <>
       ( if not (st ^. #modelState . #stEnableTheme)
           then mempty
           else
-            [ link_
+            [ keyed "css-theme" $ link_
                 [ rel_ "stylesheet",
                   href_ $ "themes/" <> themeCssFile (st ^. #modelState . #stTheme)
                 ]
             ]
       ) <>
-      [ link_
+      [ keyed "css-post-theme" $ link_
           [ rel_ "stylesheet",
             href_ $ "miso-functora/post-theme.css"
           ]
diff --git a/ghcjs/delivery-calculator/static/wasm.html b/ghcjs/delivery-calculator/static/wasm.html
@@ -6,15 +6,6 @@
     <script language="javascript" src="miso_functora.js" defer="defer"></script>
     <script language="javascript" src="wasm.js" defer="defer"></script>
     <link rel="preconnect" href="https://cdn.jsdelivr.net" />
-    <link
-      rel="preload"
-      href="static/css/all.css"
-      as="style"
-      onload="this.onload=null;this.rel='stylesheet'"
-    />
-    <noscript>
-      <link rel="stylesheet" href="static/css/all.css" />
-    </noscript>
   </head>
   <body></body>
 </html>
diff --git a/ghcjs/miso-functora/src/Functora/Miso/Widgets/FixedOverlay.hs b/ghcjs/miso-functora/src/Functora/Miso/Widgets/FixedOverlay.hs
@@ -16,7 +16,7 @@ fixedOverlay attrs =
           ("left", "0"),
           ("width", "100%"),
           ("height", "100%"),
-          ("z-index", "9999"),
+          ("z-index", "9998"),
           ("backdrop-filter", "blur(2px)"),
           ("background-color", "rgba(0, 0, 0, 0.5)")
         ]

Original file line number	Diff line number	Diff line change
`@@ -302,18 +302,24 @@ viewModel :: Model -> View Action`
`302`	`302`	`#if defined(__GHCJS__) \|\| defined(ghcjs_HOST_OS) \|\| defined(wasi_HOST_OS)`
`303`	`303`	`viewModel st =`
`304`	`304`	`prependViews`
`305`		`- ( ( if not (st ^. #modelState . #stEnableTheme)`
	`305`	`+ (`
	`306`	`+ [ keyed "css-pre-theme" $ link_`
	`307`	`+ [ rel_ "stylesheet",`
	`308`	`+ href_ $ "miso-functora/pre-theme.min.css"`
	`309`	`+ ]`
	`310`	`+ ] <>`
	`311`	`+ ( if not (st ^. #modelState . #stEnableTheme)`
`306`	`312`	`then mempty`
`307`	`313`	`else`
`308`		`- [ link_`
	`314`	`+ [ keyed "css-theme" $ link_`
`309`	`315`	`[ rel_ "stylesheet",`
`310`	`316`	`href_ $ "themes/" <> themeCssFile (st ^. #modelState . #stTheme)`
`311`	`317`	`]`
`312`	`318`	`]`
`313`	`319`	`) <>`
`314`		`- [ link_`
	`320`	`+ [ keyed "css-post-theme" $ link_`
`315`	`321`	`[ rel_ "stylesheet",`
`316`		`- href_ $ "miso-functora/miso-functora.min.css"`
	`322`	`+ href_ $ "miso-functora/post-theme.min.css"`
`317`	`323`	`]`
`318`	`324`	`]`
`319`	`325`	`)`
`@@ -325,21 +331,21 @@ viewModel st =`
`325`	`331`	`--`
`326`	`332`	`prependViews`
`327`	`333`	`(`
`328`		`- [ link_`
	`334`	`+ [ keyed "css-pre-theme" $ link_`
`329`	`335`	`[ rel_ "stylesheet",`
`330`	`336`	`href_ $ "miso-functora/pre-theme.css"`
`331`	`337`	`]`
`332`	`338`	`] <>`
`333`	`339`	`( if not (st ^. #modelState . #stEnableTheme)`
`334`	`340`	`then mempty`
`335`	`341`	`else`
`336`		`- [ link_`
	`342`	`+ [ keyed "css-theme" $ link_`
`337`	`343`	`[ rel_ "stylesheet",`
`338`	`344`	`href_ $ "themes/" <> themeCssFile (st ^. #modelState . #stTheme)`
`339`	`345`	`]`
`340`	`346`	`]`
`341`	`347`	`) <>`
`342`		`- [ link_`
	`348`	`+ [ keyed "css-post-theme" $ link_`
`343`	`349`	`[ rel_ "stylesheet",`
`344`	`350`	`href_ $ "miso-functora/post-theme.css"`
`345`	`351`	`]`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ fixedOverlay attrs =`
`16`	`16`	`("left", "0"),`
`17`	`17`	`("width", "100%"),`
`18`	`18`	`("height", "100%"),`
`19`		`- ("z-index", "9999"),`
	`19`	`+ ("z-index", "9998"),`
`20`	`20`	`("backdrop-filter", "blur(2px)"),`
`21`	`21`	`("background-color", "rgba(0, 0, 0, 0.5)")`
`22`	`22`	`]`