From d5dfefd06147c4d13594e2c458e767933e82dd52 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Fri, 9 Feb 2024 15:46:09 -0300 Subject: fix #8203 --- packages/merchant-backend-ui/README.md | 2 - packages/merchant-backend-ui/build.mjs | 2 +- packages/merchant-backend-ui/rollup.config.js | 116 ----------------- .../src/pages/DepletedTip.stories.tsx | 40 ------ .../merchant-backend-ui/src/pages/DepletedTip.tsx | 60 --------- .../src/pages/OfferTip.stories.tsx | 45 ------- .../merchant-backend-ui/src/pages/OfferTip.tsx | 142 --------------------- .../src/pages/RequestPayment.tsx | 4 + 8 files changed, 5 insertions(+), 406 deletions(-) delete mode 100644 packages/merchant-backend-ui/rollup.config.js delete mode 100644 packages/merchant-backend-ui/src/pages/DepletedTip.stories.tsx delete mode 100644 packages/merchant-backend-ui/src/pages/DepletedTip.tsx delete mode 100644 packages/merchant-backend-ui/src/pages/OfferTip.stories.tsx delete mode 100644 packages/merchant-backend-ui/src/pages/OfferTip.tsx diff --git a/packages/merchant-backend-ui/README.md b/packages/merchant-backend-ui/README.md index bbf826e0e..7f9bcf5dc 100644 --- a/packages/merchant-backend-ui/README.md +++ b/packages/merchant-backend-ui/README.md @@ -4,9 +4,7 @@ Merchant Backend pages This project generate 5 templates for the merchant backend: -- DepletedTip - OfferRefund -- OfferTip - RequestPayment - ShowOrderDetails diff --git a/packages/merchant-backend-ui/build.mjs b/packages/merchant-backend-ui/build.mjs index e53c96737..bb1dd3ebf 100755 --- a/packages/merchant-backend-ui/build.mjs +++ b/packages/merchant-backend-ui/build.mjs @@ -44,7 +44,7 @@ const preactCompatPlugin = { }, }; -const pages = ["OfferTip", "OfferRefund", "DepletedTip", "RequestPayment", "ShowOrderDetails"] +const pages = ["OfferRefund", "RequestPayment", "ShowOrderDetails"] const entryPoints = pages.map(p => `src/pages/${p}.tsx`); let GIT_ROOT = BASE; diff --git a/packages/merchant-backend-ui/rollup.config.js b/packages/merchant-backend-ui/rollup.config.js deleted file mode 100644 index 18d72e56b..000000000 --- a/packages/merchant-backend-ui/rollup.config.js +++ /dev/null @@ -1,116 +0,0 @@ -/* - This file is part of GNU Taler - (C) 2021 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 - */ - -// rollup.config.js -import linaria from '@linaria/rollup'; -import nodeResolve from "@rollup/plugin-node-resolve"; -import alias from "@rollup/plugin-alias"; -import image from '@rollup/plugin-image'; -import json from "@rollup/plugin-json"; -import ts from "@rollup/plugin-typescript"; -import replace from "@rollup/plugin-replace"; -import css from 'rollup-plugin-css-only'; -import html from '@rollup/plugin-html'; -import commonjs from "@rollup/plugin-commonjs"; - -const template = async ({ - files, -}) => { - const scripts = (files.js || []).map(({ code }) => ``).join('\n'); - const css = (files.css || []).map(({ source }) => ``).join('\n'); - const ssr = (files.js || []).map(({ code }) => code).join('\n'); - const page = new Function(`${ssr}; return page.buildTimeRendering();`)() - return ` - - - - ${page.head} - ${css} - - - - ${page.body} - ${scripts} - - -`; -}; - -const makePlugins = (name) => [ - alias({ - entries: [ - { find: 'react', replacement: 'preact/compat' }, - { find: 'react-dom', replacement: 'preact/compat' } - ] - }), - - replace({ - "process.env.NODE_ENV": JSON.stringify("production"), - preventAssignment: true, - }), - - commonjs({ - include: [/node_modules/, /dist/], - extensions: [".js"], - ignoreGlobal: true, - sourceMap: true, - }), - - nodeResolve({ - browser: true, - preferBuiltins: true, - }), - - json(), - image(), - - linaria({ - sourceMap: process.env.NODE_ENV !== 'production', - }), - css(), - ts({ - sourceMap: false, - outputToFilesystem: false, - }), - html({ template, fileName: name }), -]; - -function formatHtmlName(name) { - return name - .replace(/^[A-Z]/, letter => `${letter.toLowerCase()}`) //first letter lowercase - .replace(/[A-Z]/g, letter => `_${letter.toLowerCase()}`) //snake case - .concat(".en.html"); //extension -} - -const pageDefinition = (name) => ({ - input: `src/pages/${name}.tsx`, - output: { - file: `dist/pages/${name}.js`, - format: "iife", - exports: 'named', - name: 'page', - }, - plugins: makePlugins(formatHtmlName(name)), -}); - -export default [ - pageDefinition("OfferTip"), - pageDefinition("OfferRefund"), - pageDefinition("DepletedTip"), - pageDefinition("RequestPayment"), - pageDefinition("ShowOrderDetails"), -] diff --git a/packages/merchant-backend-ui/src/pages/DepletedTip.stories.tsx b/packages/merchant-backend-ui/src/pages/DepletedTip.stories.tsx deleted file mode 100644 index 41c3e26a5..000000000 --- a/packages/merchant-backend-ui/src/pages/DepletedTip.stories.tsx +++ /dev/null @@ -1,40 +0,0 @@ -/* - This file is part of GNU Taler - (C) 2021 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 - */ - -/** - * - * @author Sebastian Javier Marchano (sebasjm) - */ - -import { h, VNode, FunctionalComponent } from "preact"; -import { DepletedTip as TestedComponent } from "./DepletedTip"; - -export default { - title: "DepletedTip", - component: TestedComponent, - argTypes: {}, -}; - -function createExample( - Component: FunctionalComponent, - props: Partial, -) { - const r = (args: any) => ; - r.args = props; - return r; -} - -export const Example = createExample(TestedComponent, {}); diff --git a/packages/merchant-backend-ui/src/pages/DepletedTip.tsx b/packages/merchant-backend-ui/src/pages/DepletedTip.tsx deleted file mode 100644 index 61fc52cdf..000000000 --- a/packages/merchant-backend-ui/src/pages/DepletedTip.tsx +++ /dev/null @@ -1,60 +0,0 @@ -/* - This file is part of GNU Taler - (C) 2021 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 - */ - -/** - * - * @author Sebastian Javier Marchano (sebasjm) - */ -import { Fragment, h, render, VNode } from "preact"; -import { render as renderToString } from "preact-render-to-string"; -import { Footer } from "../components/Footer"; -import "../css/pure-min.css"; -import "../css/style.css"; -import { Page } from "../styled"; - -function Head(): VNode { - return Status of your tip; -} - -export function DepletedTip(): VNode { - return ( - -
-

Tip already collected

-
You have already collected this tip.
-
-