wip

Author: functora

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

@@ -35,7 +35,7 @@ assetViewer st idx =
                 ]
             ]
         ]
-      <> FieldPairs.fieldPairsViewer args
+      <> FieldPairs.fieldPairsViewer FieldPairs.defOpts args
   ]
     <> ( Dialog.dialog
           ( Dialog.defOpts @Model @Action

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

@@ -10,6 +10,7 @@ import qualified Functora.Miso.Jsm as Jsm
 import Functora.Miso.Prelude
 import qualified Functora.Miso.Widgets.Dialog as Dialog
 import qualified Functora.Miso.Widgets.Field as Field
+import qualified Functora.Miso.Widgets.Icon as Icon
 
 fav :: Model -> [View Action]
 fav st =
@@ -34,7 +35,7 @@ fav st =
                   Field.optsTrailingWidget =
                     let w =
                           Field.ActionWidget
-                            "favorite"
+                            Icon.IconFav
                             mempty
                             . PushUpdate
                             $ Instant saveAction
@@ -43,7 +44,7 @@ fav st =
                   Field.optsLeadingWidget =
                     let w =
                           Field.ActionWidget
-                            "delete_forever"
+                            Icon.IconDelete
                             mempty
                             deleteAction
                      in Just

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

@@ -57,6 +57,7 @@ screenWidget st@Model {modelState = St {stScreen = QrCode sc}} =
       then mempty
       else
         Field.fieldViewer
+          Field.defOpts
           Field.Args
             { Field.argsModel = st,
               Field.argsOptic = #modelState . #stPreview,
@@ -65,6 +66,7 @@ screenWidget st@Model {modelState = St {stScreen = QrCode sc}} =
             }
   )
     <> FieldPairs.fieldPairsViewer
+      FieldPairs.defOpts
       FieldPairs.Args
         { FieldPairs.argsModel = st,
           FieldPairs.argsOptic = #modelUriViewer,
@@ -79,6 +81,7 @@ screenWidget st@Model {modelState = St {stScreen = QrCode sc}} =
        ]
 screenWidget st@Model {modelState = St {stScreen = Donate}} =
   FieldPairs.fieldPairsViewer
+    FieldPairs.defOpts
     FieldPairs.Args
       { FieldPairs.argsModel = st,
         FieldPairs.argsOptic = #modelDonateViewer,
@@ -135,6 +138,7 @@ totalViewer st =
       [ h1_ mempty [text "Total"]
       ]
         <> FieldPairs.fieldPairsViewer
+          FieldPairs.defOpts
           FieldPairs.Args
             { FieldPairs.argsModel = st,
               FieldPairs.argsOptic =

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

@@ -14,22 +14,17 @@ import qualified Functora.Miso.Widgets.BrowserLink as BrowserLink
 import qualified Functora.Miso.Widgets.Currency as Currency
 import qualified Functora.Miso.Widgets.Dialog as Dialog
 import qualified Functora.Miso.Widgets.Field as Field
+import qualified Functora.Miso.Widgets.Flex as Flex
 import qualified Functora.Miso.Widgets.Icon as Icon
 import qualified Functora.Miso.Widgets.Select as Select
 import qualified Functora.Money as Money
 import qualified Text.URI as URI
 
 menu :: Model -> [View Action]
 menu st =
-  [ menu_
-      [ class_ "no-print",
-        style_
-          [ ("display", "flex"),
-            ("flex-wrap", "wrap"),
-            ("flex-direction", "row"),
-            ("justify-content", "space-between")
-          ]
-      ]
+  ( Flex.flexLeftRight
+      menu_
+      id
       [ li_
           [ role_ "button",
             onClick
@@ -48,12 +43,9 @@ menu st =
               pure $ #modelState .~ doc
           ]
           [ text "Delivery Calculator"
-          ],
-        div_
-          [ style_ [("flex-grow", "1")]
           ]
-          mempty,
-        li_
+      ]
+      [ li_
           [ role_ "button",
             onClick
               . PushUpdate
@@ -104,7 +96,7 @@ menu st =
           [ icon Icon.IconShare
           ]
       ]
-  ]
+  )
     <> Fav.fav st
     <> Dialog.dialog
       ( Dialog.defOpts
@@ -267,7 +259,7 @@ qrButton st =
     [ icon
         $ if isQrCode sc
           then Icon.IconDelivery
-          else Icon.IconQr,
+          else Icon.IconQrCode,
       text
         $ if isQrCode sc
           then " Calculator"

ghcjs/miso-functora/src/Functora/Miso/Widgets/Dialog.hs

@@ -9,6 +9,7 @@ where
 import Functora.Miso.Prelude
 import Functora.Miso.Types
 import qualified Functora.Miso.Widgets.FixedOverlay as FixedOverlay
+import qualified Functora.Miso.Widgets.Flex as Flex
 import qualified Functora.Miso.Widgets.Icon as Icon
 
 data Args model action = Args
@@ -60,13 +61,13 @@ dialog opts args =
           ]
         . singleton
         . nodeHtml "dialog" [boolProp "open" True]
-        $ newFlex
+        $ Flex.flexLeftRight
           header_
           id
           (optsHeaderLeft opts defHeaderLeft)
           (optsHeaderRight opts defHeaderRight)
         <> argsContent args
-        <> newFlex
+        <> Flex.flexLeftRight
           footer_
           id
           (optsFooterLeft opts mempty)
@@ -111,37 +112,6 @@ dialog opts args =
           ]
       ]
 
-newFlex ::
-  ([Attribute action] -> [View action] -> View action) ->
-  ([Attribute action] -> [Attribute action]) ->
-  [View action] ->
-  [View action] ->
-  [View action]
-newFlex newTag newAttr lhs rhs =
-  if null lhs && null rhs
-    then mempty
-    else
-      singleton
-        . newTag
-          ( newAttr
-              [ style_
-                  [ ("display", "flex"),
-                    ("flex-wrap", "wrap"),
-                    ("flex-direction", "row"),
-                    ("justify-content", "space-between")
-                  ]
-              ]
-          )
-        $ lhs
-        <> [ div_
-              [ style_
-                  [ ("flex-grow", "1")
-                  ]
-              ]
-              mempty
-           ]
-        <> rhs
-
 closeDialogAction :: Opts model action -> Args model action -> action
 closeDialogAction opts args =
   argsAction args