From 86e1cb5b06c4b5e2080a18fce6dca2fb00b09f14 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 23 Jan 2023 11:25:53 -0300 Subject: fix deleted tip name and format name as merchant backend expected --- packages/merchant-backend-ui/README.md | 2 +- packages/merchant-backend-ui/package.json | 1 + packages/merchant-backend-ui/render-examples.ts | 8 +++- packages/merchant-backend-ui/rollup.config.js | 8 +++- packages/merchant-backend-ui/src/index.tsx | 44 +++++++++------------- .../src/pages/DeletedTip.stories.tsx | 30 +++++++-------- .../merchant-backend-ui/src/pages/DeletedTip.tsx | 6 +-- 7 files changed, 50 insertions(+), 49 deletions(-) (limited to 'packages') diff --git a/packages/merchant-backend-ui/README.md b/packages/merchant-backend-ui/README.md index 44a555ae0..34cf3210a 100644 --- a/packages/merchant-backend-ui/README.md +++ b/packages/merchant-backend-ui/README.md @@ -4,7 +4,7 @@ Merchant Backend pages This project generate 5 templates for the merchant backend: - * DepletedTip + * DeletedTip * OfferRefund * OfferTip * RequestPayment diff --git a/packages/merchant-backend-ui/package.json b/packages/merchant-backend-ui/package.json index b4a886f7b..4789b96e9 100644 --- a/packages/merchant-backend-ui/package.json +++ b/packages/merchant-backend-ui/package.json @@ -86,6 +86,7 @@ "rollup-plugin-css-only": "^3.1.0", "script-ext-html-webpack-plugin": "^2.1.5", "sirv-cli": "^1.0.11", + "tslib": "2.4.0", "typescript": "4.8.4" } } diff --git a/packages/merchant-backend-ui/render-examples.ts b/packages/merchant-backend-ui/render-examples.ts index 47300ab8f..86e18fa68 100644 --- a/packages/merchant-backend-ui/render-examples.ts +++ b/packages/merchant-backend-ui/render-examples.ts @@ -49,9 +49,13 @@ files.forEach(file => { const html = fs.readFileSync(`${sourceDirectory}/${file}`, 'utf8') const testName = file.replace('.html', '') - if (testName !== 'ShowOrderDetails') return; + const exampleFileName = `./src/pages/${testName}.examples` + if (!fs.existsSync(exampleFileName + ".ts")) { + console.log(`skipping ${testName}: no examples found`); + return; + } // eslint-disable-next-line @typescript-eslint/no-var-requires - const { exampleData } = require(`./src/pages/${testName}.examples`) + const { exampleData } = require(exampleFileName) Object.keys(exampleData).forEach(exampleName => { const example = exampleData[exampleName] diff --git a/packages/merchant-backend-ui/rollup.config.js b/packages/merchant-backend-ui/rollup.config.js index 8953a443a..5f22cc654 100644 --- a/packages/merchant-backend-ui/rollup.config.js +++ b/packages/merchant-backend-ui/rollup.config.js @@ -89,6 +89,12 @@ const makePlugins = (name) => [ 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`, @@ -98,7 +104,7 @@ const pageDefinition = (name) => ({ exports: 'named', name: 'page', }, - plugins: makePlugins(`${name}.html`), + plugins: makePlugins(formatHtmlName(name)), }); export default [ diff --git a/packages/merchant-backend-ui/src/index.tsx b/packages/merchant-backend-ui/src/index.tsx index 275f63371..4cfe8f7b4 100644 --- a/packages/merchant-backend-ui/src/index.tsx +++ b/packages/merchant-backend-ui/src/index.tsx @@ -15,22 +15,17 @@ */ /** -* -* @author Sebastian Javier Marchano (sebasjm) -*/ + * + * @author Sebastian Javier Marchano (sebasjm) + */ -import { h, VNode, Fragment } from 'preact'; -import { BackendContextProvider } from './context/backend'; -import { TranslationProvider } from './context/translation'; +import { Fragment, h, VNode } from "preact"; +import { BackendContextProvider } from "./context/backend"; +import { TranslationProvider } from "./context/translation"; // import { Page as RequestPayment } from './RequestPayment'; -import "./css/pure-min.css" -import { Route, Router } from 'preact-router'; -import { Footer } from './components/Footer'; -// import OfferTip from './pages/OfferTip'; -// import {OfferRefund} from './pages/OfferRefund'; -// import DepletedTip from './pages/DepletedTip'; -// import RequestPayment from './pages/RequestPayment'; -// import ShowOrderDetails from './pages/ShowOrderDetails'; +import { Route, Router } from "preact-router"; +import { Footer } from "./components/Footer"; +import "./css/pure-min.css"; export default function Application(): VNode { return ( @@ -45,17 +40,12 @@ export default function Application(): VNode { } function ApplicationStatusRoutes(): VNode { - return - - {/* - - - - */} -
- hello! -
} /> - -