wip

Author: functora

ghcjs/delivery-calculator/delivery-calculator.cabal

@@ -93,7 +93,6 @@ common pkg
     , functora-ghcjs
     , microlens
     , miso
-    , miso-components
     , miso-functora
     , modern-uri
     , syb

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

@@ -13,21 +13,13 @@ import qualified Functora.Miso.Widgets.FieldPairs as FieldPairs
 import qualified Functora.Miso.Widgets.Grid as Grid
 import qualified Functora.Money as Money
 import Lens.Micro ((^..))
-import qualified Material.Button as Button
-import qualified Material.LayoutGrid as LayoutGrid
-import qualified Material.Theme as Theme
-import qualified Material.TopAppBar as TopAppBar
-import qualified Material.Typography as Typography
 import Miso hiding (at, view)
 
 mainWidget :: Model -> View Action
 mainWidget st =
-  LayoutGrid.layoutGrid
-    [ LayoutGrid.alignMiddle
-    ]
-    $ [ LayoutGrid.inner
-          [ class_ "container",
-            TopAppBar.shortFixedAdjust
+  Grid.grid mempty
+    $ [ div_
+          [ class_ "container"
           ]
           ( Menu.menu st
               <> screenWidget st
@@ -77,13 +69,12 @@ screenWidget st@Model {modelState = St {stScreen = QrCode sc}} =
               }
        ]
     <> [ Grid.bigCell
-          [ Button.raised
-              ( Button.config
-                  & Button.setIcon (Just "login")
-                  & Button.setAttributes [Css.fullWidth]
-                  & Button.setOnClick (setScreenAction $ unQrCode sc)
-              )
-              "Open"
+          [ button_
+              [ onClick . setScreenAction $ unQrCode sc,
+                Css.fullWidth
+              ]
+              [ text "Open"
+              ]
           ]
        ]
 screenWidget st@Model {modelState = St {stScreen = Donate}} =
@@ -95,13 +86,12 @@ screenWidget st@Model {modelState = St {stScreen = Donate}} =
         FieldPairs.argsEmitter = Misc.pushActionQueue st . Instant
       }
     <> [ Grid.bigCell
-          [ Button.raised
-              ( Button.config
-                  & Button.setIcon (Just "login")
-                  & Button.setAttributes [Css.fullWidth]
-                  & Button.setOnClick (setScreenAction Main)
-              )
-              "Open"
+          [ button_
+              [ onClick $ setScreenAction Main,
+                Css.fullWidth
+              ]
+              [ text "Open"
+              ]
           ]
        ]
 screenWidget st@Model {modelState = St {stScreen = Main}} =
@@ -118,31 +108,26 @@ screenWidget st@Model {modelState = St {stScreen = Main}} =
     buttons :: [View Action]
     buttons =
       [ Grid.mediumCell
-          [ Button.raised
-              ( Button.config
-                  & Button.setIcon (Just "add_box")
-                  & Button.setAttributes [Css.fullWidth]
-                  & Button.setOnClick
-                    ( PushUpdate . Instant . ImpureUpdate $ do
-                        asset <- newAsset
-                        pure $ #modelState . #stAssets %~ flip snoc asset
-                    )
-              )
-              "Add item"
+          [ button_
+              [ Css.fullWidth,
+                onClick . PushUpdate . Instant . ImpureUpdate $ do
+                  asset <- newAsset
+                  pure $ #modelState . #stAssets %~ flip snoc asset
+              ]
+              [ text "Add item"
+              ]
           ],
         Grid.mediumCell
-          [ Button.raised
-              ( Button.config
-                  & Button.setIcon (Just "send")
-                  & Button.setAttributes [Css.fullWidth]
-                  & Button.setOnClick
-                    ( PushUpdate
-                        . Instant
-                        . either impureThrow Jsm.openBrowserPage
-                        $ stTeleUri st
-                    )
-              )
-              "Order via Telegram"
+          [ button_
+              [ Css.fullWidth,
+                onClick
+                  . PushUpdate
+                  . Instant
+                  . either impureThrow Jsm.openBrowserPage
+                  $ stTeleUri st
+              ]
+              [ text "Order via Telegram"
+              ]
           ]
       ]
 
@@ -234,15 +219,7 @@ foldFieldPair acc =
 
 tosWidget :: View Action
 tosWidget =
-  LayoutGrid.cell
-    [ LayoutGrid.span12,
-      Typography.caption,
-      Theme.textDisabledOnBackground,
-      class_ "no-print",
-      style_
-        [ ("text-align", "center")
-        ]
-    ]
+  Grid.cell
     [ Miso.text "\169 2024 ",
       BrowserLink.browserLink
         BrowserLink.Args

ghcjs/miso-functora/miso-functora.cabal

@@ -73,6 +73,7 @@ common pkg
     , barbies
     , base
     , bytestring
+    , deepseq
     , functora-ghcjs
     , fuzzy
     , jsaddle

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

@@ -11,6 +11,24 @@ import Data.Monoid.Null
 import Data.Monoid.Textual
 import Data.Semigroup.Cancellative
 import Functora.Prelude
+import qualified Miso
+import Prelude hiding (String)
+
+deriving stock instance Generic (Miso.View action)
+
+deriving stock instance Generic (Miso.Attribute action)
+
+deriving stock instance Generic Miso.NS
+
+deriving stock instance Generic Miso.Key
+
+instance NFData (Miso.View action)
+
+instance NFData (Miso.Attribute action)
+
+instance NFData Miso.NS
+
+instance NFData Miso.Key
 
 instance MonoidNull JSString where
   null = JS.null