wip

Author: functora

ghcjs/cryptogram/cryptogram.cabal

@@ -14,15 +14,16 @@ common pkg
   autogen-modules:    Paths_cryptogram
   default-language:   Haskell2010
   hs-source-dirs:     src
-  js-sources:         static/app.js
+  js-sources:
+    static/app.js
+    static/telegram-web-app-58.js
+
   other-modules:
-    App.I18n
-    App.Jsm
+    App.Init
     App.Types
     App.Widgets.Donate
     App.Widgets.Main
     App.Widgets.Menu
-    App.Widgets.Templates
 
   ghc-options:
     -Werror -Weverything -Wno-all-missed-specialisations

ghcjs/cryptogram/default.nix

@@ -107,6 +107,7 @@ in rec {
         --compilation_level ADVANCED_OPTIMIZATIONS \
         --externs ${app}/bin/${label}.jsexe/all.js.externs \
         --externs ${./static/app.js} \
+        --externs ${./static/telegram-web-app-58.js} \
         --externs ${
         pkgs.haskell.packages.ghc865.bitcoin-hash.src
       }/js/index.compiled.js \

ghcjs/cryptogram/src/App/I18n.hs

@@ -1,11 +1,10 @@
-module App.Widgets.Templates
+module App.Init
   ( newModel,
   )
 where
 
 import App.Types
 import Functora.Miso.Prelude
-import qualified Functora.Rates as Rates
 import qualified Functora.Web as Web
 
 newModel ::
@@ -20,25 +19,16 @@ newModel ::
 newModel webOpts sink mMod mApp = do
   defSt <- maybe (liftIO newSt) pure $ mMod ^? _Just . #modelState
   donate <- newDonateViewer
-  market <- maybe Rates.newMarket pure $ mMod ^? _Just . #modelMarket
-  ct <- getCurrentTime
   pure
     Model
       { modelSink = sink,
         modelMenu = Closed,
         modelDonate = Closed,
-        modelAppLinks = Closed,
-        modelShareApp = Closed,
-        modelPlaceOrder = Closed,
-        modelRemoveOrder = Closed,
-        modelMarketLinks = Closed,
         modelLoading = True,
         modelState = fromMaybe defSt mApp,
         modelUriViewer = mempty,
         modelDonateViewer = donate,
-        modelWebOpts = webOpts,
-        modelMarket = market,
-        modelTime = ct
+        modelWebOpts = webOpts
       }
 
 newDonateViewer :: (MonadIO m) => m [FieldPair DynamicField Unique]

ghcjs/cryptogram/src/App/Widgets/Templates.hs renamed to ghcjs/cryptogram/src/App/Init.hs

@@ -37,7 +37,6 @@ import qualified Functora.Miso.Types as FM
 import qualified Functora.Miso.Widgets.Field as Field
 import qualified Functora.Miso.Widgets.Icon as Icon
 import qualified Functora.Prelude as Prelude
-import qualified Functora.Rates as Rates
 import qualified Functora.Web as Web
 import qualified Paths_cryptogram as Paths
 import qualified Text.URI as URI
@@ -46,18 +45,11 @@ data Model = Model
   { modelSink :: MVar (Action -> IO ()),
     modelMenu :: OpenedOrClosed,
     modelDonate :: OpenedOrClosed,
-    modelAppLinks :: OpenedOrClosed,
-    modelShareApp :: OpenedOrClosed,
-    modelPlaceOrder :: OpenedOrClosed,
-    modelRemoveOrder :: OpenedOrClosed,
-    modelMarketLinks :: OpenedOrClosed,
     modelLoading :: Bool,
     modelState :: St Unique,
     modelUriViewer :: [FieldPair DynamicField Unique],
     modelDonateViewer :: [FieldPair DynamicField Unique],
-    modelWebOpts :: Web.Opts,
-    modelMarket :: MVar Rates.Market,
-    modelTime :: UTCTime
+    modelWebOpts :: Web.Opts
   }
   deriving stock (Eq, Generic)
 

ghcjs/cryptogram/src/App/Jsm.hs

@@ -15,9 +15,9 @@ import qualified Data.ByteString.Lazy as BL
 import qualified Language.Javascript.JSaddle.Wasm as JSaddle.Wasm
 #endif
 
+import App.Init
 import App.Types
 import App.Widgets.Main
-import App.Widgets.Templates
 import qualified Data.Generics as Syb
 import qualified Data.Map as Map
 import qualified Functora.Miso.Jsm as Jsm
@@ -74,6 +74,7 @@ runApp :: JSM () -> IO ()
 runApp app = do
   js0 <- BL.readFile "../miso-functora/js/main.min.js"
   js1 <- BL.readFile "static/app.js"
+  js2 <- BL.readFile "static/telegram-web-app-58.js"
   Warp.runSettings
     ( Warp.setPort
         8080
@@ -82,7 +83,7 @@ runApp app = do
     =<< JS.jsaddleOr
       Ws.defaultConnectionOptions
       (app >> syncPoint)
-      (router $ js0 <> js1)
+      (router $ js0 <> js1 <> js2)
   where
     router js req =
       case Wai.pathInfo req of