wip

Author: functora

ghcjs/delivery-calculator/src/App/Widgets/Main.hs

@@ -17,22 +17,15 @@ import Miso hiding (at, view)
 
 mainWidget :: Model -> View Action
 mainWidget st =
-  Grid.grid mempty
-    $ [ div_
-          [ class_ "container"
-          ]
-          ( Menu.menu st
-              <> screenWidget st
-              <> [ -- LayoutGrid.cell [LayoutGrid.span12]
-                   --  . (: mempty)
-                   --  $ div_
-                   --    mempty
-                   --    [ text . inspect $ st ^. #modelFavMap
-                   --    ],
-                   tosWidget
-                 ]
-          )
+  section_
+    [ class_ "main-widget"
+    ]
+    $ [ header_ mempty $ Menu.menu st
       ]
+    <> [ main_ [class_ "main-widget-middle"] $ screenWidget st
+       ]
+    <> [ footer_ mempty tosWidget
+       ]
     <> ( if st ^. #modelLoading
           then
             [ div_
@@ -217,20 +210,19 @@ foldFieldPair :: Rational -> FieldPair DynamicField f -> Rational
 foldFieldPair acc =
   foldField acc . fieldPairValue
 
-tosWidget :: View Action
+tosWidget :: [View Action]
 tosWidget =
-  Grid.cell
-    [ Miso.text "\169 2024 ",
-      BrowserLink.browserLink
-        BrowserLink.Args
-          { BrowserLink.argsLink = functoraLink,
-            BrowserLink.argsLabel = "Functora",
-            BrowserLink.argsAction = PushUpdate . Instant
-          },
-      Miso.text ". All rights reserved. ",
-      Miso.text "By continuing to use this software, you agree to the ",
-      a_ [href_ "license.html"] [Miso.text "Terms of Service"],
-      Miso.text " and ",
-      a_ [href_ "privacy.html"] [Miso.text "Privacy Policy"],
-      Miso.text $ ". Version " <> vsn <> "."
-    ]
+  [ Miso.text "\169 2024 ",
+    BrowserLink.browserLink
+      BrowserLink.Args
+        { BrowserLink.argsLink = functoraLink,
+          BrowserLink.argsLabel = "Functora",
+          BrowserLink.argsAction = PushUpdate . Instant
+        },
+    Miso.text ". All rights reserved. ",
+    Miso.text "By continuing to use this software, you agree to the ",
+    a_ [href_ "license.html"] [Miso.text "Terms of Service"],
+    Miso.text " and ",
+    a_ [href_ "privacy.html"] [Miso.text "Privacy Policy"],
+    Miso.text $ ". Version " <> vsn <> "."
+  ]

ghcjs/delivery-calculator/src/App/Widgets/Menu.hs

@@ -21,22 +21,18 @@ import qualified Text.URI as URI
 
 menu :: Model -> [View Action]
 menu st =
-  [ div_
-      [class_ "no-print"]
-      [ button_
-          [ onClick opened
-          ]
-          [ text "menu"
-          ],
-        a_
-          [ style_ [("cursor", "pointer")],
-            onClick . PushUpdate . Instant . ImpureUpdate $ do
+  [ menu_
+      [ class_ "no-print"
+      ]
+      [ li_ [onClick opened] [text "menu"],
+        li_
+          [ onClick . PushUpdate . Instant . ImpureUpdate $ do
               doc <- liftIO newSt
               pure $ #modelState .~ doc
           ]
           [ text "Delivery Calculator"
           ],
-        button_
+        li_
           [ onClick
               . PushUpdate
               . Instant
@@ -46,7 +42,7 @@ menu st =
           ]
           [ text "favorite"
           ],
-        button_
+        li_
           [ onClick
               . PushUpdate
               . Instant
@@ -57,7 +53,7 @@ menu st =
           ]
           [ text "print"
           ],
-        button_
+        li_
           [ onClick
               . PushUpdate
               . Instant
@@ -71,7 +67,7 @@ menu st =
           ]
           [ text "download"
           ],
-        button_
+        li_
           [ onClick
               . PushUpdate
               . Instant

ghcjs/delivery-calculator/src/Main.hs

@@ -239,19 +239,17 @@ viewModel st =
   mainWidget st
 #else
 viewModel st =
-  div_
-    mempty
+  prependViews
     [ link_
         [ rel_ "stylesheet",
           href_ "node_modules/@lowlighter/matcha/dist/matcha.css"
         ],
       link_
-        [ rel_
-            "stylesheet",
+        [ rel_ "stylesheet",
           href_ "static/app.css"
-        ],
-      mainWidget st
+        ]
     ]
+    $ mainWidget st
 #endif
 
 extendedEvents :: Map Unicode Bool

ghcjs/delivery-calculator/static/app.css

@@ -1,16 +1,30 @@
 html {
+  width: 100vw;
+  min-height: 100vh;
+}
+
+html, main {
+  margin: 0;
+  padding: 0;
+}
+
+footer {
+  padding-bottom: 18px;
+}
+
+.main-widget {
   margin: 0;
   padding: 0;
   width: 100vw;
   min-height: 100vh;
-  display: flex;
   overflow-x: hidden;
-  align-items: center;
-  justify-content: center;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
 }
 
-a {
-  color: inherit;
+.main-widget-middle {
+  max-width: 550px;
 }
 
 textarea {
@@ -19,24 +33,6 @@ textarea {
   min-height: 72px;
 }
 
-.container {
-  max-width: 550px;
-}
-
-.app-success > span {
-  color: white;
-  background-color: #018786 !important;
-  display: flex;
-  justify-content: center;
-}
-
-.app-failure > span {
-  color: white;
-  background-color: #b00020 !important;
-  display: flex;
-  justify-content: center;
-}
-
 @media print {
   body {
     color-adjust: exact !important;

ghcjs/miso-functora/src/Functora/Miso/Types.hs

@@ -43,6 +43,7 @@ module Functora.Miso.Types
     uniqueToIdentity,
     identityToUnique,
     keyed,
+    prependViews,
     TopOrBottom (..),
     OnlineOrOffline (..),
     StaticOrDynamic (..),
@@ -498,6 +499,11 @@ keyed uid = \case
   x ->
     x
 
+prependViews :: [View action] -> View action -> View action
+prependViews xs = \case
+  Node a b c d e -> Node a b c d $ xs <> e
+  x -> x
+
 data TopOrBottom
   = Top
   | Bottom

pub/vi/nix/default.nix

@@ -90,6 +90,7 @@ in
               gleam-vim
               neoformat
               vim-terraform
+              vim-commentary
               #
               # Productivity
               #

pub/vi/vimrc.vim

@@ -717,6 +717,11 @@ map <M-g> zg
 " Suggest
 map <M-s> z=
 
+"
+" => Comments
+"
+map <leader>\ gc
+
 "
 " => LanguageTool
 "