taler/wallet-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

remove webui from login url, ad qr for template, fix navbar size,

Browse Source
This commit is contained in:
Sebastian 2023-03-10 01:25:22 -03:00
parent 2291d460e8
commit 8ddc551cc8
No known key found for this signature in database
GPG Key ID: 173909D1A5F66069
14 changed files with 343 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/merchant-backoffice-ui/dev.mjs
View File

@ -25,6 +25,7 @@ serve({
folder: './dist',
port: 8080,
source: './src',
insecure: true,
development: true,
onUpdate: async () => esbuild.build(buildConfig)
})

22
packages/merchant-backoffice-ui/src/Application.tsx
View File

@ -23,7 +23,7 @@ import {
TranslationProvider,
useTranslationContext,
} from "@gnu-taler/web-util/lib/index.browser";
import { h, VNode } from "preact";
import { Fragment, h, VNode } from "preact";
import { route } from "preact-router";
import { useMemo } from "preact/hooks";
import { ApplicationReadyRoutes } from "./ApplicationReadyRoutes.js";
@ -70,24 +70,24 @@ function ApplicationStatusRoutes(): VNode {
if (!triedToLog) {
return (
<div id="app">
<Fragment>
<NotYetReadyAppMenu title="Welcome!" />
<LoginPage onConfirm={updateLoginInfoAndGoToRoot} />
</div>
</Fragment>
);
}
if (result.clientError && result.isUnauthorized)
return (
<div id="app">
<Fragment>
<NotYetReadyAppMenu title="Login" />
<LoginPage onConfirm={updateLoginInfoAndGoToRoot} />
</div>
</Fragment>
);
if (result.clientError && result.isNotfound)
return (
<div id="app">
<Fragment>
<NotYetReadyAppMenu title="Error" />
<NotificationCard
notification={{
@ -97,12 +97,12 @@ function ApplicationStatusRoutes(): VNode {
}}
/>
<LoginPage onConfirm={updateLoginInfoAndGoToRoot} />
</div>
</Fragment>
);
if (result.serverError)
return (
<div id="app">
<Fragment>
<NotYetReadyAppMenu title="Error" />
<NotificationCard
notification={{
@ -112,14 +112,14 @@ function ApplicationStatusRoutes(): VNode {
}}
/>
<LoginPage onConfirm={updateLoginInfoAndGoToRoot} />
</div>
</Fragment>
);
if (result.loading) return <Loading />;
if (!result.ok)
return (
<div id="app">
<Fragment>
<NotYetReadyAppMenu title="Error" />
<NotificationCard
notification={{
@ -129,7 +129,7 @@ function ApplicationStatusRoutes(): VNode {
}}
/>
<LoginPage onConfirm={updateLoginInfoAndGoToRoot} />
</div>
</Fragment>
);
return (

15
packages/merchant-backoffice-ui/src/InstanceRoutes.tsx
View File

@ -52,6 +52,7 @@ import ReservesDetailsPage from "./paths/instance/reserves/details/index.js";
import ReservesListPage from "./paths/instance/reserves/list/index.js";
import TemplateCreatePage from "./paths/instance/templates/create/index.js";
import TemplateUsePage from "./paths/instance/templates/use/index.js";
import TemplateQrPage from "./paths/instance/templates/qr/index.js";
import TemplateListPage from "./paths/instance/templates/list/index.js";
import TemplateUpdatePage from "./paths/instance/templates/update/index.js";
import WebhookCreatePage from "./paths/instance/webhooks/create/index.js";
@ -94,6 +95,7 @@ export enum InstancePaths {
templates_update = "/templates/:tid/update",
templates_new = "/templates/new",
templates_use = "/templates/:tid/use",
templates_qr = "/templates/:tid/qr",
webhooks_list = "/webhooks",
webhooks_update = "/webhooks/:tid/update",
@ -465,6 +467,9 @@ export function InstanceRoutes({
onNewOrder={(id: string) => {
route(InstancePaths.templates_use.replace(":tid", id));
}}
onQR={(id: string) => {
route(InstancePaths.templates_qr.replace(":tid", id));
}}
onSelect={(id: string) => {
route(InstancePaths.templates_update.replace(":tid", id));
}}
@ -505,6 +510,16 @@ export function InstanceRoutes({
route(InstancePaths.templates_list);
}}
/>
<Route
path={InstancePaths.templates_qr}
component={TemplateQrPage}
onUnauthorized={LoginPageAccessDenied}
onLoadError={ServerErrorRedirectTo(InstancePaths.templates_list)}
onNotFound={IfAdminCreateDefaultOr(NotFoundPage)}
onBack={() => {
route(InstancePaths.templates_list);
}}
/>
{/**
* reserves pages

12
packages/merchant-backoffice-ui/src/components/exception/login.tsx
View File

@ -42,6 +42,14 @@ function normalizeToken(r: string | undefined): string | undefined {
return r ? `secret-token:${encodeURIComponent(r)}` : undefined;
}
function cleanUp(s: string): string {
let result = s;
if (result.indexOf("webui/") !== -1) {
result = result.substring(0, result.indexOf("webui/"));
}
return result;
}
export function LoginModal({ onConfirm, withMessage }: Props): VNode {
const { url: backendUrl, token: baseToken } = useBackendContext();
const { admin, token: instanceToken } = useInstanceContext();
@ -50,11 +58,11 @@ export function LoginModal({ onConfirm, withMessage }: Props): VNode {
);
const [token, setToken] = useState(currentToken);
const [url, setURL] = useState(backendUrl);
const [url, setURL] = useState(cleanUp(backendUrl));
const { i18n } = useTranslationContext();
return (
<div class="columns is-centered">
<div class="columns is-centered" style={{ margin: "auto" }}>
<div class="column is-two-thirds ">
<div class="modal-card" style={{ width: "100%", margin: 0 }}>
<header

2
packages/merchant-backoffice-ui/src/components/menu/NavigationBar.tsx
View File

@ -61,7 +61,7 @@ export function NavigationBar({ onMobileMenu, title }: Props): VNode {
class="navbar-start is-justify-content-center is-flex-grow-1"
href="https://taler.net"
>
<img src={logo} style={{ height: 50, margin: 10 }} />
<img src={logo} style={{ height: 35, margin: 10 }} />
</a>
<div class="navbar-end">
<div class="navbar-item" style={{ paddingTop: 4, paddingBottom: 4 }}>

2
packages/merchant-backoffice-ui/src/paths/admin/list/View.tsx
View File

@ -57,7 +57,6 @@ export function View({
: instances;
return (
<div id="app">
<section class="section is-main-section">
<div class="columns">
<div class="column is-two-thirds">
@ -107,6 +106,5 @@ export function View({
onCreate={onCreate}
/>
</section>
</div>
);
}

8
packages/merchant-backoffice-ui/src/paths/instance/templates/create/CreatePage.tsx
View File

@ -114,13 +114,13 @@ export function CreatePage({ onCreate, onBack }: Props): VNode {
<Input
name="template_contract.summary"
inputType="multiline"
label={i18n.str`Order summary`}
tooltip={i18n.str`Title of the order to be shown to the customer`}
label={i18n.str`Fixed summary`}
tooltip={i18n.str`If specified, this template will create order with the same summary`}
/>
<InputCurrency
name="template_contract.amount"
label={i18n.str`Order price`}
tooltip={i18n.str`Order price`}
label={i18n.str`Fixed price`}
tooltip={i18n.str`If specified, this template will create order with the same price`}
/>
<InputNumber
name="template_contract.minimum_age"

3
packages/merchant-backoffice-ui/src/paths/instance/templates/list/ListPage.tsx
View File

@ -32,6 +32,7 @@ export interface Props {
onDelete: (e: MerchantBackend.Template.TemplateEntry) => void;
onSelect: (e: MerchantBackend.Template.TemplateEntry) => void;
onNewOrder: (e: MerchantBackend.Template.TemplateEntry) => void;
onQR: (e: MerchantBackend.Template.TemplateEntry) => void;
}
export function ListPage({
@ -40,6 +41,7 @@ export function ListPage({
onDelete,
onSelect,
onNewOrder,
onQR,
onLoadMoreBefore,
onLoadMoreAfter,
}: Props): VNode {
@ -53,6 +55,7 @@ export function ListPage({
...o,
id: String(o.template_id),
}))}
onQR={onQR}
onCreate={onCreate}
onDelete={onDelete}
onSelect={onSelect}

12
packages/merchant-backoffice-ui/src/paths/instance/templates/list/Table.tsx
View File

@ -31,6 +31,7 @@ interface Props {
onDelete: (e: Entity) => void;
onSelect: (e: Entity) => void;
onNewOrder: (e: Entity) => void;
onQR: (e: Entity) => void;
onCreate: () => void;
onLoadMoreBefore?: () => void;
hasMoreBefore?: boolean;
@ -43,6 +44,7 @@ export function CardTable({
onCreate,
onDelete,
onSelect,
onQR,
onNewOrder,
onLoadMoreAfter,
onLoadMoreBefore,
@ -84,6 +86,7 @@ export function CardTable({
onDelete={onDelete}
onSelect={onSelect}
onNewOrder={onNewOrder}
onQR={onQR}
rowSelection={rowSelection}
rowSelectionHandler={rowSelectionHandler}
onLoadMoreAfter={onLoadMoreAfter}
@ -105,6 +108,7 @@ interface TableProps {
instances: Entity[];
onDelete: (e: Entity) => void;
onNewOrder: (e: Entity) => void;
onQR: (e: Entity) => void;
onSelect: (e: Entity) => void;
rowSelectionHandler: StateUpdater<string[]>;
onLoadMoreBefore?: () => void;
@ -123,6 +127,7 @@ function Table({
onLoadMoreAfter,
onDelete,
onNewOrder,
onQR,
onSelect,
onLoadMoreBefore,
hasMoreAfter,
@ -185,6 +190,13 @@ function Table({
>
New order
</button>
<button
class="button is-info is-small has-tooltip-left"
data-tooltip={i18n.str`create qr code for the template`}
onClick={() => onQR(i)}
>
QR
</button>
</div>
</td>
</tr>

5
packages/merchant-backoffice-ui/src/paths/instance/templates/list/index.tsx
View File

@ -42,12 +42,14 @@ interface Props {
onCreate: () => void;
onSelect: (id: string) => void;
onNewOrder: (id: string) => void;
onQR: (id: string) => void;
}
export default function ListTemplates({
onUnauthorized,
onLoadError,
onCreate,
onQR,
onSelect,
onNewOrder,
onNotFound,
@ -80,6 +82,9 @@ export default function ListTemplates({
onNewOrder={(e) => {
onNewOrder(e.template_id);
}}
onQR={(e) => {
onQR(e.template_id);
}}
onDelete={(e: MerchantBackend.Template.TemplateEntry) =>
deleteTemplate(e.template_id)
.then(() =>

27
packages/merchant-backoffice-ui/src/paths/instance/templates/qr/Qr.stories.tsx Normal file
View File

@ -0,0 +1,27 @@
/*
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 { QrPage as TestedComponent } from "./QrPage.js";
export default {
title: "Pages/Templates/QR",
component: TestedComponent,
};

133
packages/merchant-backoffice-ui/src/paths/instance/templates/qr/QrPage.tsx Normal file
View File

@ -0,0 +1,133 @@
/*
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 { buildPayto, classifyTalerUri } from "@gnu-taler/taler-util";
import { useTranslationContext } from "@gnu-taler/web-util/lib/index.browser";
import { h, VNode } from "preact";
import { useState } from "preact/hooks";
import { AsyncButton } from "../../../../components/exception/AsyncButton.js";
import { QR } from "../../../../components/exception/QR.js";
import {
FormErrors,
FormProvider,
} from "../../../../components/form/FormProvider.js";
import { Input } from "../../../../components/form/Input.js";
import { InputCurrency } from "../../../../components/form/InputCurrency.js";
import { useBackendContext } from "../../../../context/backend.js";
import { useConfigContext } from "../../../../context/config.js";
import { MerchantBackend } from "../../../../declaration.js";
type Entity = MerchantBackend.Template.UsingTemplateDetails;
interface Props {
template: MerchantBackend.Template.TemplateDetails;
id: string;
onBack?: () => void;
}
export function QrPage({ template, id: templateId, onBack }: Props): VNode {
const { i18n } = useTranslationContext();
const { url: backendUrl } = useBackendContext();
const config = useConfigContext();
const [state, setState] = useState<Partial<Entity>>({
amount: template.template_contract.amount,
summary: template.template_contract.summary,
});
const errors: FormErrors<Entity> = {};
const hasErrors = Object.keys(errors).some(
(k) => (errors as any)[k] !== undefined,
);
const fixedAmount = !!template.template_contract.amount;
const fixedSummary = !!template.template_contract.summary;
const params = new URLSearchParams();
if (!fixedAmount) {
if (state.amount) {
params.append("amount", state.amount);
} else {
params.append("amount", config.currency);
}
}
if (!fixedSummary) {
params.append("summary", state.summary ?? "");
}
const paramsStr = fixedAmount && fixedSummary ? "" : "?" + params.toString();
const merchantURL = new URL(backendUrl);
const talerProto =
merchantURL.protocol === "http:" ? "taler+http:" : "taler:";
const payTemplateUri = `${talerProto}//pay-template/${merchantURL.hostname}/${templateId}${paramsStr}`;
return (
<div>
<section class="section is-main-section">
<div class="columns">
<div class="column" />
<div class="column is-four-fifths">
<FormProvider
object={state}
valueHandler={setState}
errors={errors}
>
<InputCurrency<Entity>
name="amount"
label={i18n.str`Amount`}
readonly={fixedAmount}
tooltip={i18n.str`Amount of the order`}
/>
<Input<Entity>
name="summary"
inputType="multiline"
readonly={fixedSummary}
label={i18n.str`Order summary`}
tooltip={i18n.str`Title of the order to be shown to the customer`}
/>
</FormProvider>
<div class="buttons is-right mt-5">
{onBack && (
<button class="button" onClick={onBack}>
<i18n.Translate>Cancel</i18n.Translate>
</button>
)}
<button class="button is-info" onClick={onBack}>
<i18n.Translate>Print</i18n.Translate>
</button>
</div>
</div>
<div class="column" />
</div>
</section>
<section>
<pre>
<a href={payTemplateUri}>{payTemplateUri}</a>
</pre>
<QR text={payTemplateUri} />
</section>
</div>
);
}

70
packages/merchant-backoffice-ui/src/paths/instance/templates/qr/index.tsx Normal file
View File

@ -0,0 +1,70 @@
/*
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 {
HttpError,
useTranslationContext,
} from "@gnu-taler/web-util/lib/index.browser";
import { Fragment, h, VNode } from "preact";
import { useState } from "preact/hooks";
import { Loading } from "../../../../components/exception/loading.js";
import { NotificationCard } from "../../../../components/menu/index.js";
import { MerchantBackend } from "../../../../declaration.js";
import {
useTemplateAPI,
useTemplateDetails,
} from "../../../../hooks/templates.js";
import { Notification } from "../../../../utils/types.js";
import { QrPage } from "./QrPage.js";
export type Entity = MerchantBackend.Transfers.TransferInformation;
interface Props {
onBack?: () => void;
onUnauthorized: () => VNode;
onNotFound: () => VNode;
onLoadError: (e: HttpError<MerchantBackend.ErrorDetail>) => VNode;
tid: string;
}
export default function TemplateQrPage({
tid,
onBack,
onLoadError,
onNotFound,
onUnauthorized,
}: Props): VNode {
const { createOrderFromTemplate } = useTemplateAPI();
const result = useTemplateDetails(tid);
const [notif, setNotif] = useState<Notification | undefined>(undefined);
const { i18n } = useTranslationContext();
if (result.clientError && result.isUnauthorized) return onUnauthorized();
if (result.clientError && result.isNotfound) return onNotFound();
if (result.loading) return <Loading />;
if (!result.ok) return onLoadError(result);
return (
<>
<NotificationCard notification={notif} />
<QrPage template={result.data} id={tid} onBack={onBack} />
</>
);
}

8
packages/merchant-backoffice-ui/src/paths/instance/templates/update/UpdatePage.tsx
View File

@ -123,13 +123,13 @@ export function UpdatePage({ template, onUpdate, onBack }: Props): VNode {
<Input
name="template_contract.summary"
inputType="multiline"
label={i18n.str`Order summary`}
tooltip={i18n.str`Title of the order to be shown to the customer`}
label={i18n.str`Fixed summary`}
tooltip={i18n.str`If specified, this template will create order with the same summary`}
/>
<InputCurrency
name="template_contract.amount"
label={i18n.str`Order price`}
tooltip={i18n.str`total product price added up`}
label={i18n.str`Fixed price`}
tooltip={i18n.str`If specified, this template will create order with the same price`}
/>
<InputNumber
name="template_contract.minimum_age"