From 770ab6f01dc81a16f384f314982bd761540f8e65 Mon Sep 17 00:00:00 2001
From: Sebastian <sebasjm@gmail.com>
Date: Mon, 19 Dec 2022 12:11:50 -0300
Subject: build and test like other webapps

---
 .../merchant-backoffice-ui/src/Application.tsx     | 109 +++++++++++++++++++++
 .../src/components/menu/SideBar.tsx                |   5 +-
 packages/merchant-backoffice-ui/src/custom.d.ts    |   2 +
 packages/merchant-backoffice-ui/src/index.html     |  39 ++++++++
 packages/merchant-backoffice-ui/src/index.tsx      |  94 +-----------------
 .../merchant-backoffice-ui/src/scss/_mixins.scss   |   2 +-
 packages/merchant-backoffice-ui/src/template.html  |  52 ----------
 7 files changed, 159 insertions(+), 144 deletions(-)
 create mode 100644 packages/merchant-backoffice-ui/src/Application.tsx
 create mode 100644 packages/merchant-backoffice-ui/src/index.html
 delete mode 100644 packages/merchant-backoffice-ui/src/template.html

(limited to 'packages/merchant-backoffice-ui/src')

diff --git a/packages/merchant-backoffice-ui/src/Application.tsx b/packages/merchant-backoffice-ui/src/Application.tsx
new file mode 100644
index 000000000..4aa0f7891
--- /dev/null
+++ b/packages/merchant-backoffice-ui/src/Application.tsx
@@ -0,0 +1,109 @@
+/*
+ This file is part of GNU Taler
+ (C) 2021-2023 Taler Systems S.A.
+
+ GNU Taler is free software; you can redistribute it and/or modify it under the
+ terms of the GNU General Public License as published by the Free Software
+ Foundation; either version 3, or (at your option) any later version.
+
+ GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along with
+ GNU Taler; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+/**
+*
+* @author Sebastian Javier Marchano (sebasjm)
+*/
+
+import { h, VNode } from 'preact';
+import { route } from 'preact-router';
+import { useMemo } from "preact/hooks";
+import { ApplicationReadyRoutes } from "./ApplicationReadyRoutes.js";
+import { Loading } from "./components/exception/loading.js";
+import { NotificationCard, NotYetReadyAppMenu } from "./components/menu/index.js";
+import { BackendContextProvider, useBackendContext } from './context/backend.js';
+import { ConfigContextProvider } from './context/config.js';
+import { TranslationProvider } from './context/translation.js';
+import { useBackendConfig } from "./hooks/backend.js";
+import { useTranslator } from './i18n/index.js';
+import LoginPage from './paths/login/index.js';
+
+export function Application(): VNode {
+  return (
+    // <FetchContextProvider>
+      <BackendContextProvider>
+        <TranslationProvider>
+          <ApplicationStatusRoutes />
+        </TranslationProvider>
+      </BackendContextProvider>
+    // </FetchContextProvider>
+  );
+}
+
+function ApplicationStatusRoutes(): VNode {
+  const { updateLoginStatus, triedToLog } = useBackendContext()
+  const result = useBackendConfig();
+  const i18n = useTranslator()
+
+  const updateLoginInfoAndGoToRoot = (url: string, token?: string) => {
+    updateLoginStatus(url, token)
+    route('/')
+  }
+
+  const { currency, version } = result.ok ? result.data : { currency: 'unknown', version: 'unknown' }
+  const ctx = useMemo(() => ({ currency, version }), [currency, version])
+
+  if (!triedToLog) {
+    return <div id="app">
+      <NotYetReadyAppMenu title="Welcome!" />
+      <LoginPage onConfirm={updateLoginInfoAndGoToRoot} />
+    </div>
+  }
+
+  if (result.clientError && result.isUnauthorized) return <div id="app">
+    <NotYetReadyAppMenu title="Login" />
+    <LoginPage onConfirm={updateLoginInfoAndGoToRoot} />
+  </div>
+
+  if (result.clientError && result.isNotfound) return <div id="app">
+    <NotYetReadyAppMenu title="Error" />
+    <NotificationCard notification={{
+      message: i18n`Server not found`,
+      type: 'ERROR',
+      description: `Check your url`,
+    }} />
+    <LoginPage onConfirm={updateLoginInfoAndGoToRoot} />
+  </div>
+
+  if (result.serverError) return <div id="app">
+    <NotYetReadyAppMenu title="Error" />
+    <NotificationCard notification={{
+      message: i18n`Couldn't access the server`,
+      type: 'ERROR',
+      description: i18n`Got message ${result.message} from ${result.info?.url}`,
+    }} />
+    <LoginPage onConfirm={updateLoginInfoAndGoToRoot} />
+  </div>
+
+  if (result.loading) return <Loading />
+
+  if (!result.ok) return <div id="app">
+    <NotYetReadyAppMenu title="Error" />
+    <NotificationCard notification={{
+      message: i18n`Unexpected Error`,
+      type: 'ERROR',
+      description: i18n`Got message ${result.message} from ${result.info?.url}`,
+    }} />
+    <LoginPage onConfirm={updateLoginInfoAndGoToRoot} />
+  </div>
+
+  return <div id="app" class="has-navbar-fixed-top">
+    <ConfigContextProvider value={ctx}>
+      <ApplicationReadyRoutes />
+    </ConfigContextProvider>
+  </div>
+}
diff --git a/packages/merchant-backoffice-ui/src/components/menu/SideBar.tsx b/packages/merchant-backoffice-ui/src/components/menu/SideBar.tsx
index b96e431f8..1d15bb094 100644
--- a/packages/merchant-backoffice-ui/src/components/menu/SideBar.tsx
+++ b/packages/merchant-backoffice-ui/src/components/menu/SideBar.tsx
@@ -28,6 +28,9 @@ import { useInstanceKYCDetails } from "../../hooks/instance.js";
 import { Translate } from "../../i18n/index.js";
 import { LangSelector } from "./LangSelector.js";
 
+const GIT_HASH = typeof __GIT_HASH__ !== "undefined" ? __GIT_HASH__ : undefined;
+const VERSION = typeof __VERSION__ !== "undefined" ? __VERSION__ : undefined;
+
 interface Props {
   onLogout: () => void;
   mobile?: boolean;
@@ -76,7 +79,7 @@ export function Sidebar({
             class="is-size-7 has-text-right"
             style={{ lineHeight: 0, marginTop: -10 }}
           >
-            {process.env.__VERSION__} ({config.version})
+            {VERSION} ({config.version})
           </div>
         </div>
       </div>
diff --git a/packages/merchant-backoffice-ui/src/custom.d.ts b/packages/merchant-backoffice-ui/src/custom.d.ts
index b357d34ab..e60fa0c83 100644
--- a/packages/merchant-backoffice-ui/src/custom.d.ts
+++ b/packages/merchant-backoffice-ui/src/custom.d.ts
@@ -38,3 +38,5 @@ declare module '*.scss' {
   const content: Record<string, string>;
   export default content;
 }
+declare const __VERSION__: string;
+declare const __GIT_HASH__: string;
diff --git a/packages/merchant-backoffice-ui/src/index.html b/packages/merchant-backoffice-ui/src/index.html
new file mode 100644
index 000000000..5f7080df8
--- /dev/null
+++ b/packages/merchant-backoffice-ui/src/index.html
@@ -0,0 +1,39 @@
+<!--
+ This file is part of GNU Taler
+ (C) 2021-2023 Taler Systems S.A.
+
+ GNU Taler is free software; you can redistribute it and/or modify it under the
+ terms of the GNU General Public License as published by the Free Software
+ Foundation; either version 3, or (at your option) any later version.
+
+ GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along with
+ GNU Taler; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+
+ @author Sebastian Javier Marchano
+-->
+<!DOCTYPE html>
+<html lang="en" class="has-aside-left has-aside-mobile-transition has-navbar-fixed-top has-aside-expanded">
+  <head>
+    <meta charset="utf-8" />
+    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+    <meta name="viewport" content="width=device-width,initial-scale=1" />
+    <meta name="mobile-web-app-capable" content="yes" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+
+		<link rel="icon" href="data:;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAABILAAASCwAAAAAAAAAAAAD///////////////////////////////////////////////////////////////////////////////////////////////////7//v38//78/P/+/fz//vz7///+/v/+/f3//vz7///+/v/+/fz//v38///////////////////////+/v3///7+/////////////////////////////////////////////////////////v3//v79///////+/v3///////r28v/ct5//06SG/9Gffv/Xqo7/7N/V/9e2nf/bsJb/6uDW/9Sskf/euKH/+/j2///////+/v3//////+3azv+/eE3/2rWd/9Kkhv/Vr5T/48i2/8J+VP/Qn3//3ryn/795Tf/WrpP/2LCW/8B6T//w4Nb///////Pn4P+/d0v/9u3n/+7d0v/EhV7//v///+HDr//fxLD/zph2/+TJt//8/Pv/woBX//Lm3f/y5dz/v3hN//bu6f/JjGn/4sW0///////Df1j/8OLZ//v6+P+/elH/+vj1//jy7f+/elL//////+zYzP/Eg13//////967p//MlHT/wn5X///////v4Nb/yY1s///////jw7H/06KG////////////z5t9/+fNvf//////x4pn//Pp4v/8+vn/w39X/8WEX///////5s/A/9CbfP//////27Oc/9y2n////////////9itlf/gu6f//////86Vdf/r2Mz//////8SCXP/Df1j//////+7d0v/KkG7//////+HBrf/VpYr////////////RnoH/5sq6///////Ii2n/8ubf//39/P/Cf1j/xohk/+bNvv//////wn5W//Tq4//58/D/wHxV//7+/f/59fH/v3xU//39/P/w4Nf/xIFb///////hw7H/yo9t/+/f1f/AeU3/+/n2/+nSxP/FhmD//////9qzm//Upon/4MSx/96+qf//////xINc/+3bz//48e3/v3hN//Pn3///////6M+//752S//gw6//06aK/8J+VP/kzLr/zZd1/8OCWv/q18r/17KZ/9Ooi//fv6r/v3dK/+vWyP///////v39///////27un/1aeK/9Opjv/m1cf/1KCC/9a0nP/n08T/0Jx8/82YdP/QnHz/16yR//jx7P///////v39///////+/f3///7+///////+//7//v7+///////+/v7//v/+/////////////////////////v7//v79///////////////////+/v/+/Pv//v39///+/v/+/Pv///7+//7+/f/+/Pv//v39//79/P/+/Pv///7+////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==" />
+		<link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon" />
+    <title>Merchant Backoffice</title>
+    <!-- Optional customization script.  -->
+    <script src="merchant-backoffice-ui-settings.js"></script>
+    <!-- Entry point for the demobank SPA. -->
+    <script type="module" src="index.js"></script>
+    <link rel="stylesheet" href="index.css" />
+  </head>
+  <body>
+    <div id="app"></div>
+  </body>
+</html>
diff --git a/packages/merchant-backoffice-ui/src/index.tsx b/packages/merchant-backoffice-ui/src/index.tsx
index 3802a2149..c60471099 100644
--- a/packages/merchant-backoffice-ui/src/index.tsx
+++ b/packages/merchant-backoffice-ui/src/index.tsx
@@ -14,97 +14,11 @@
  GNU Taler; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
  */
 
-/**
-*
-* @author Sebastian Javier Marchano (sebasjm)
-*/
+import {Application} from "./Application.js";
 
-import { h, VNode } from 'preact';
-import { route } from 'preact-router';
-import { useMemo } from "preact/hooks";
-import { ApplicationReadyRoutes } from "./ApplicationReadyRoutes.js";
-import { Loading } from "./components/exception/loading.js";
-import { NotificationCard, NotYetReadyAppMenu } from "./components/menu/index.js";
-import { BackendContextProvider, useBackendContext } from './context/backend.js';
-import { ConfigContextProvider } from './context/config.js';
-import { TranslationProvider } from './context/translation.js';
-import { useBackendConfig } from "./hooks/backend.js";
-import { useTranslator } from './i18n/index.js';
-import LoginPage from './paths/login/index.js';
+import { h, render } from "preact";
 import "./scss/main.scss";
 
-export default function Application(): VNode {
-  return (
-    // <FetchContextProvider>
-      <BackendContextProvider>
-        <TranslationProvider>
-          <ApplicationStatusRoutes />
-        </TranslationProvider>
-      </BackendContextProvider>
-    // </FetchContextProvider>
-  );
-}
+const app = document.getElementById("app");
 
-function ApplicationStatusRoutes(): VNode {
-  const { updateLoginStatus, triedToLog } = useBackendContext()
-  const result = useBackendConfig();
-  const i18n = useTranslator()
-
-  const updateLoginInfoAndGoToRoot = (url: string, token?: string) => {
-    updateLoginStatus(url, token)
-    route('/')
-  }
-
-  const { currency, version } = result.ok ? result.data : { currency: 'unknown', version: 'unknown' }
-  const ctx = useMemo(() => ({ currency, version }), [currency, version])
-
-  if (!triedToLog) {
-    return <div id="app">
-      <NotYetReadyAppMenu title="Welcome!" />
-      <LoginPage onConfirm={updateLoginInfoAndGoToRoot} />
-    </div>
-  }
-
-  if (result.clientError && result.isUnauthorized) return <div id="app">
-    <NotYetReadyAppMenu title="Login" />
-    <LoginPage onConfirm={updateLoginInfoAndGoToRoot} />
-  </div>
-
-  if (result.clientError && result.isNotfound) return <div id="app">
-    <NotYetReadyAppMenu title="Error" />
-    <NotificationCard notification={{
-      message: i18n`Server not found`,
-      type: 'ERROR',
-      description: `Check your url`,
-    }} />
-    <LoginPage onConfirm={updateLoginInfoAndGoToRoot} />
-  </div>
-
-  if (result.serverError) return <div id="app">
-    <NotYetReadyAppMenu title="Error" />
-    <NotificationCard notification={{
-      message: i18n`Couldn't access the server`,
-      type: 'ERROR',
-      description: i18n`Got message ${result.message} from ${result.info?.url}`,
-    }} />
-    <LoginPage onConfirm={updateLoginInfoAndGoToRoot} />
-  </div>
-
-  if (result.loading) return <Loading />
-
-  if (!result.ok) return <div id="app">
-    <NotYetReadyAppMenu title="Error" />
-    <NotificationCard notification={{
-      message: i18n`Unexpected Error`,
-      type: 'ERROR',
-      description: i18n`Got message ${result.message} from ${result.info?.url}`,
-    }} />
-    <LoginPage onConfirm={updateLoginInfoAndGoToRoot} />
-  </div>
-
-  return <div id="app" class="has-navbar-fixed-top">
-    <ConfigContextProvider value={ctx}>
-      <ApplicationReadyRoutes />
-    </ConfigContextProvider>
-  </div>
-}
+render(<Application />, app as any);
diff --git a/packages/merchant-backoffice-ui/src/scss/_mixins.scss b/packages/merchant-backoffice-ui/src/scss/_mixins.scss
index 8df866de4..7d5f6b144 100644
--- a/packages/merchant-backoffice-ui/src/scss/_mixins.scss
+++ b/packages/merchant-backoffice-ui/src/scss/_mixins.scss
@@ -28,7 +28,7 @@
     width: $icon-base-width;
 
     &.has-update-mark:after {
-      right: ($icon-base-width / 2) - .85;
+      right: calc($icon-base-width / 2) - .85;
     }
   }
 }
diff --git a/packages/merchant-backoffice-ui/src/template.html b/packages/merchant-backoffice-ui/src/template.html
deleted file mode 100644
index 306b90f11..000000000
--- a/packages/merchant-backoffice-ui/src/template.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!--
-	 This file is part of GNU Taler
- (C) 2021-2023 Taler Systems S.A.
-
- GNU Taler is free software; you can redistribute it and/or modify it under the
- terms of the GNU General Public License as published by the Free Software
- Foundation; either version 3, or (at your option) any later version.
-
- GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY
- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along with
- GNU Taler; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
-
- @author Sebastian Javier Marchano
--->
-<!DOCTYPE html>
-<html lang="en" class="has-aside-left has-aside-mobile-transition has-navbar-fixed-top has-aside-expanded">
-	<head>
-		<meta charset="utf-8">
-		<title><%= htmlWebpackPlugin.options.title %></title>
-		<meta name="viewport" content="width=device-width,initial-scale=1">
-		<meta name="mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-
-		<link rel="icon" href="data:;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAABILAAASCwAAAAAAAAAAAAD///////////////////////////////////////////////////////////////////////////////////////////////////7//v38//78/P/+/fz//vz7///+/v/+/f3//vz7///+/v/+/fz//v38///////////////////////+/v3///7+/////////////////////////////////////////////////////////v3//v79///////+/v3///////r28v/ct5//06SG/9Gffv/Xqo7/7N/V/9e2nf/bsJb/6uDW/9Sskf/euKH/+/j2///////+/v3//////+3azv+/eE3/2rWd/9Kkhv/Vr5T/48i2/8J+VP/Qn3//3ryn/795Tf/WrpP/2LCW/8B6T//w4Nb///////Pn4P+/d0v/9u3n/+7d0v/EhV7//v///+HDr//fxLD/zph2/+TJt//8/Pv/woBX//Lm3f/y5dz/v3hN//bu6f/JjGn/4sW0///////Df1j/8OLZ//v6+P+/elH/+vj1//jy7f+/elL//////+zYzP/Eg13//////967p//MlHT/wn5X///////v4Nb/yY1s///////jw7H/06KG////////////z5t9/+fNvf//////x4pn//Pp4v/8+vn/w39X/8WEX///////5s/A/9CbfP//////27Oc/9y2n////////////9itlf/gu6f//////86Vdf/r2Mz//////8SCXP/Df1j//////+7d0v/KkG7//////+HBrf/VpYr////////////RnoH/5sq6///////Ii2n/8ubf//39/P/Cf1j/xohk/+bNvv//////wn5W//Tq4//58/D/wHxV//7+/f/59fH/v3xU//39/P/w4Nf/xIFb///////hw7H/yo9t/+/f1f/AeU3/+/n2/+nSxP/FhmD//////9qzm//Upon/4MSx/96+qf//////xINc/+3bz//48e3/v3hN//Pn3///////6M+//752S//gw6//06aK/8J+VP/kzLr/zZd1/8OCWv/q18r/17KZ/9Ooi//fv6r/v3dK/+vWyP///////v39///////27un/1aeK/9Opjv/m1cf/1KCC/9a0nP/n08T/0Jx8/82YdP/QnHz/16yR//jx7P///////v39///////+/f3///7+///////+//7//v7+///////+/v7//v/+/////////////////////////v7//v79///////////////////+/v/+/Pv//v39///+/v/+/Pv///7+//7+/f/+/Pv//v39//79/P/+/Pv///7+////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==" />
-		<link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon" />
-
-		<% if (htmlWebpackPlugin.options.manifest.theme_color) { %>
-			<meta name="theme-color" content="<%= htmlWebpackPlugin.options.manifest.theme_color %>">
-		<% } %>
-
-		<% for (const index in htmlWebpackPlugin.files.css) { %>
-			<% const file = htmlWebpackPlugin.files.css[index] %>
-			<style data-href='<%= file %>' >
-				<%= compilation.assets[file.substr(htmlWebpackPlugin.files.publicPath.length)].source() %>
-			</style>
-		<% } %>
-		
-	</head>
-	<body>
-
-		<script>
-			<%= compilation.assets[htmlWebpackPlugin.files.chunks["polyfills"].entry.substr(htmlWebpackPlugin.files.publicPath.length)].source() %>
-		</script>
-		<script>
-			<%= compilation.assets[htmlWebpackPlugin.files.chunks["bundle"].entry.substr(htmlWebpackPlugin.files.publicPath.length)].source() %>
-		</script>
-
-	</body>
-</html>
-- 
cgit v1.2.3