wip

Author: functora

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

@@ -8,6 +8,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.FieldPairs as FieldPairs
+import qualified Functora.Miso.Widgets.Icon as Icon
 
 assetsViewer :: Model -> [View Action]
 assetsViewer st = do
@@ -32,9 +33,30 @@ assetViewer st idx =
       ]
   ]
     <> ( Dialog.dialog
-          ( Dialog.defOpts
+          ( Dialog.defOpts @Model @Action
               & #optsTitle
               .~ Just title
+              & #optsFooterRight
+              .~ const
+                [ button_
+                    [ onClick
+                        . PushUpdate
+                        . Instant
+                        $ Jsm.removeAt
+                          ( #modelState . #stAssets
+                          )
+                          idx
+                    ]
+                    [ icon Icon.IconDelete,
+                      text " Remove"
+                    ],
+                  button_
+                    [ onClick closeAction
+                    ]
+                    [ icon Icon.IconSave,
+                      text " Save"
+                    ]
+                ]
           )
           Dialog.Args
             { Dialog.argsModel = st,
@@ -43,25 +65,9 @@ assetViewer st idx =
               Dialog.argsContent =
                 FieldPairs.fieldPairsEditor
                   args
-                  ( FieldPairs.defOpts & #optsAdvanced .~ False
-                  )
-                  <> [ button_
-                        [ onClick
-                            . PushUpdate
-                            . Instant
-                            $ Jsm.removeAt
-                              ( #modelState . #stAssets
-                              )
-                              idx
-                        ]
-                        [ text "Remove"
-                        ],
-                       button_
-                        [ onClick closeAction
-                        ]
-                        [ text "Save"
-                        ]
-                     ]
+                  $ FieldPairs.defOpts
+                  & #optsAdvanced
+                  .~ False
             }
        )
     <> FieldPairs.fieldPairsViewer args

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

@@ -8,6 +8,7 @@ import Functora.Miso.Prelude
 import qualified Functora.Miso.Widgets.BrowserLink as BrowserLink
 import qualified Functora.Miso.Widgets.Field as Field
 import qualified Functora.Miso.Widgets.FieldPairs as FieldPairs
+import qualified Functora.Miso.Widgets.Icon as Icon
 import qualified Functora.Miso.Widgets.Spinner as Spinner
 import qualified Functora.Money as Money
 import Lens.Micro ((^..))
@@ -29,12 +30,20 @@ mainWidget st =
     $ [ header_ mempty $ Menu.menu st
       ]
     <> [ main_
-          [style_ [("max-width", "550px")]]
+          [ style_
+              [ ("max-width", "550px"),
+                ("align-self", "center"),
+                ("display", "flex"),
+                ("align-items", "center"),
+                ("flex-direction", "column")
+              ]
+          ]
           $ screenWidget st
        ]
     <> [ footer_
           [style_ [("text-align", "center")]]
           $ tosWidget
+          : br_ mempty
           : Menu.qrButton st
           : Menu.linksWidget st
        ]
@@ -104,7 +113,8 @@ screenWidget st@Model {modelState = St {stScreen = Main}} =
                 . #stAssets
                 %~ flip snoc asset
           ]
-          [ text "Add item"
+          [ icon Icon.IconAdd,
+            text " Add item"
           ],
         button_
           [ onClick
@@ -113,7 +123,8 @@ screenWidget st@Model {modelState = St {stScreen = Main}} =
               . either impureThrow Jsm.openBrowserPage
               $ stTeleUri st
           ]
-          [ text "Order via Telegram"
+          [ icon Icon.IconTelegram,
+            text " Order via Telegram"
           ]
       ]
 

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

@@ -125,14 +125,15 @@ fieldPairEditor
           Field.argsEmitter = emitter
         }
       ( Field.defOpts
-          & #optsPlaceholder
-          .~ ( fromMaybe ("#" <> inspect (idx + 1))
+          & #optsLabel
+          .~ Just
+            ( fromMaybe ("#" <> inspect (idx + 1))
                 $ st
                 ^? cloneTraversal optic
                 . ix idx
                 . #fieldPairKey
                 . #fieldOutput
-             )
+            )
       )
 fieldPairEditor
   Args

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

@@ -24,6 +24,11 @@ data Icon
   | IconGit
   | IconBitcoin
   | IconUser
+  | IconCopy
+  | IconAdd
+  | IconTelegram
+  | IconDelete
+  | IconSave
   deriving stock (Eq, Ord, Show, Read, Data, Generic, Enum, Bounded)
 
 class (From Icon a) => IsIcon a where
@@ -45,6 +50,11 @@ data Fa
   | FaGitAlt
   | FaBitcoin
   | FaUser
+  | FaCopy
+  | FaSquarePlus
+  | FaTelegram
+  | FaTrash
+  | FaFloppyDisk
   deriving stock (Eq, Ord, Show, Read, Data, Generic, Enum, Bounded)
 
 instance From Icon Fa where
@@ -64,6 +74,11 @@ instance From Icon Fa where
     IconGit -> FaGitAlt
     IconBitcoin -> FaBitcoin
     IconUser -> FaUser
+    IconCopy -> FaCopy
+    IconAdd -> FaSquarePlus
+    IconTelegram -> FaTelegram
+    IconDelete -> FaTrash
+    IconSave -> FaFloppyDisk
 
 instance IsIcon Fa where
   icon x =
@@ -74,6 +89,7 @@ instance IsIcon Fa where
             FaAndroid -> brand
             FaGitAlt -> brand
             FaBitcoin -> brand
+            FaTelegram -> brand
             _ -> solid,
         class_
           . from @String @Unicode