Undo head/CSS branching

benjamin-thomas · benjamin-thomas · commit fa42e844b462 · 2025-03-28T07:24:27.000+01:00
diff --git a/examples/Example/App.hs b/examples/Example/App.hs
@@ -62,7 +62,6 @@ import Foreign.Store (Store (..), lookupStore, readStore, storeAction, withStore
 import GHC.Generics (Generic)
 import GHC.Word (Word32)
 import Network.HTTP.Types (Header, Method, QueryItem, hCacheControl, methodPost, status200, status404)
-import Network.Wai (pathInfo)
 import Network.Wai qualified as Wai
 import Network.Wai.Handler.Warp qualified as Warp
 import Network.Wai.Middleware.Static as Static (CacheContainer, CachingStrategy (..), Options (..), addBase)
@@ -91,46 +90,13 @@ run = do
   cache <- clientCache
   Warp.run port $
     Static.staticPolicyWithOptions cache (addBase "client/dist") $
-      Static.staticPolicy (addBase "examples/static") $ \req -> do
-        let doc = case pathInfo req of
-              "todoscss" : _ -> toDocumentTodosCSS
-              _ -> toDocument
-        (app doc users count) req
-
--- Use the embedded version for real applications (see basicDocument).
--- The link to /hyperbole.js here is just to make local development easier
-toDocument :: BL.ByteString -> BL.ByteString
-toDocument cnt =
-  [i|<html>
-      <head>
-        <title>Hyperbole Examples</title>
-        <meta httpEquiv="Content-Type" content="text/html" charset="UTF-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <script type="text/javascript" src="/hyperbole.js"></script>
-        <script type="text/javascript" src="/custom.js"></script>
-        <style type="text/css">#{cssResetEmbed}</style>
-        <style type="text/css">body { background-color: \#d3dceb }</style>
-      </head>
-      <body>#{cnt}</body>
-    </html>|]
-
-toDocumentTodosCSS :: BL.ByteString -> BL.ByteString
-toDocumentTodosCSS cnt =
-  [i|<html>
-        <head>
-        <title>Todo MVC</title>
-        <script type="text/javascript">#{scriptEmbed}</script>
-
-        <link href="https://cdn.jsdelivr.net/npm/todomvc-app-css@2.4.3/index.min.css"
-              rel="stylesheet">
-      </head>
-        <body>#{cnt}</body>
-      </html>|]
+      Static.staticPolicy (addBase "examples/static") $
+        app users count
 
-app :: (BL.ByteString -> BL.ByteString) -> UserStore -> TVar Int -> Application
-app doc users count = do
+app :: UserStore -> TVar Int -> Application
+app users count = do
   liveApp
-    doc
+    toDocument
     (runApp . routeRequest $ router)
  where
   runApp :: (Hyperbole :> es, IOE :> es) => Eff (GenRandom : Concurrent : Debug : Users : Todos : es) a -> Eff es a
@@ -178,6 +144,23 @@ app doc users count = do
   hello Redirected = do
     pure $ exampleLayout RedirectNow $ el (pad 10) "You were redirected"
 
+  -- Use the embedded version for real applications (see basicDocument).
+  -- The link to /hyperbole.js here is just to make local development easier
+  toDocument :: BL.ByteString -> BL.ByteString
+  toDocument cnt =
+    [i|<html>
+      <head>
+        <title>Hyperbole Examples</title>
+        <meta httpEquiv="Content-Type" content="text/html" charset="UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <script type="text/javascript" src="/hyperbole.js"></script>
+        <script type="text/javascript" src="/custom.js"></script>
+        <style type="text/css">#{cssResetEmbed}</style>
+        <style type="text/css">body { background-color: \#d3dceb }</style>
+      </head>
+      <body>#{cnt}</body>
+    </html>|]
+
 {- | Made for local development
  -
  - ghcid --setup=Main.update --command="cabal repl exe:examples lib:hyperbole test" --run=Main.update --warnings
