From 6a4de830c13c90baf98f1efbca5bbdc4ab6470b3 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 22 Oct 2023 09:22:23 +0200 Subject: [PATCH 01/27] wip: Work on fix for #5230 --- sites/org/pages/account/apikeys/[id].mjs | 89 --------------------- sites/org/pages/account/apikeys/index.mjs | 37 ++++++++- sites/shared/components/account/apikeys.mjs | 12 +-- sites/shared/hooks/use-id.mjs | 7 ++ 4 files changed, 50 insertions(+), 95 deletions(-) delete mode 100644 sites/org/pages/account/apikeys/[id].mjs create mode 100644 sites/shared/hooks/use-id.mjs diff --git a/sites/org/pages/account/apikeys/[id].mjs b/sites/org/pages/account/apikeys/[id].mjs deleted file mode 100644 index a5223f37d86..00000000000 --- a/sites/org/pages/account/apikeys/[id].mjs +++ /dev/null @@ -1,89 +0,0 @@ -// Dependencies -import dynamic from 'next/dynamic' -import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -//import { ssrI18n } from 'shared/ssr-i18n.mjs' -import { nsMerge } from 'shared/utils.mjs' -// Context -import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' -// Hooks -import { useTranslation } from 'next-i18next' -import { useState, useEffect, useContext } from 'react' -import { useBackend } from 'shared/hooks/use-backend.mjs' -// Components -import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' -import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs' -import { ns as apikeysNs } from 'shared/components/account/apikeys.mjs' - -// Translation namespaces used on this page -const ns = nsMerge(apikeysNs, authNs, pageNs) -const key = 'apikey' -let i18n - -/* - * Some things should never generated as SSR - * So for these, we run a dynamic import and disable SSR rendering - */ -const DynamicAuthWrapper = dynamic( - () => import('shared/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper), - { ssr: false } -) - -const DynamicApikey = dynamic( - () => import('shared/components/account/apikeys.mjs').then((mod) => mod.Apikey), - { ssr: false } -) - -/* - * Each page MUST be wrapped in the PageWrapper component. - * You also MUST spread props.page into this wrapper component - * when path and locale come from static props (as here) - * or set them manually. - */ -const ApikeyPage = ({ page, id }) => { - const { t } = useTranslation(ns) - const backend = useBackend() - const { setLoadingStatus } = useContext(LoadingStatusContext) - - const [apikey, setApikey] = useState() - - useEffect(() => { - const getApikey = async () => { - const result = await backend.getApikey(id) - if (result.success) setApikey(result.data.apikey) - else setLoadingStatus([false]) - } - getApikey() - }, [id]) - - return ( - - - - - - ) -} - -export default ApikeyPage - -export async function getStaticProps({ locale, params }) { - if (!i18n) i18n = await serverSideTranslations(locale, ns) - - return { - props: { - ...i18n, - id: params.id, - page: { - locale, - path: ['account', 'apikeys', params.id], - }, - }, - } -} - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - * To learn more, see: https://nextjs.org/docs/basic-features/data-fetching - */ -export const getStaticPaths = async () => ({ paths: ['/account/apikeys/1'], fallback: true }) diff --git a/sites/org/pages/account/apikeys/index.mjs b/sites/org/pages/account/apikeys/index.mjs index f1c346f8e10..dd890c20b1e 100644 --- a/sites/org/pages/account/apikeys/index.mjs +++ b/sites/org/pages/account/apikeys/index.mjs @@ -2,8 +2,13 @@ import dynamic from 'next/dynamic' import { serverSideTranslations } from 'next-i18next/serverSideTranslations' import { nsMerge } from 'shared/utils.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' // Hooks import { useTranslation } from 'next-i18next' +import { useId } from 'shared/hooks/use-id.mjs' +import { useState, useEffect, useContext } from 'react' +import { useBackend } from 'shared/hooks/use-backend.mjs' // Components import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs' @@ -26,6 +31,11 @@ const DynamicApikeys = dynamic( { ssr: false } ) +const DynamicApikey = dynamic( + () => import('shared/components/account/apikeys.mjs').then((mod) => mod.Apikey), + { ssr: false } +) + /* * Each page MUST be wrapped in the PageWrapper component. * You also MUST spread props.page into this wrapper component @@ -34,11 +44,36 @@ const DynamicApikeys = dynamic( */ const AccountApikeysPage = ({ page }) => { const { t } = useTranslation(ns) + const backend = useBackend() + const { setLoadingStatus } = useContext(LoadingStatusContext) + + const [id, setId] = useId() + const [apikey, setApikey] = useState() + + useEffect(() => { + const getApikey = async () => { + setLoadingStatus([true, 'contactingBackend']) + setApikey({ name: '', id }) + const result = await backend.getApikey(id) + if (result.success) { + setApikey(result.data.apikey) + setLoadingStatus([true, 'status:dataLoaded', true, true]) + } else setLoadingStatus([false]) + } + if (id) getApikey() + }, [id, backend, setLoadingStatus]) return ( - + {id && apikey ? ( + <> +

{id}

+ + + ) : ( + + )} ) diff --git a/sites/shared/components/account/apikeys.mjs b/sites/shared/components/account/apikeys.mjs index c2042d81b64..475f5c21f69 100644 --- a/sites/shared/components/account/apikeys.mjs +++ b/sites/shared/components/account/apikeys.mjs @@ -14,7 +14,7 @@ import { useRouter } from 'next/router' import { BackToAccountButton, DisplayRow, NumberBullet } from './shared.mjs' import { Popout } from 'shared/components/popout/index.mjs' import { LeftIcon, PlusIcon, CopyIcon, RightIcon, TrashIcon } from 'shared/components/icons.mjs' -import { PageLink, Link } from 'shared/components/link.mjs' +import { PageLink, Link, linkClasses } from 'shared/components/link.mjs' import { StringInput, ListInput, FormControl } from 'shared/components/inputs.mjs' import { DynamicMdx } from 'shared/components/mdx/dynamic.mjs' @@ -83,7 +83,7 @@ const CopyInput = ({ text }) => { ) } -export const Apikey = ({ apikey }) => { +export const Apikey = ({ apikey, setId }) => { const { t } = useTranslation(ns) const router = useRouter() const { locale } = router @@ -97,7 +97,7 @@ export const Apikey = ({ apikey }) => {
{apikey.level} diff --git a/sites/shared/hooks/use-id.mjs b/sites/shared/hooks/use-id.mjs new file mode 100644 index 00000000000..5f5eecd3904 --- /dev/null +++ b/sites/shared/hooks/use-id.mjs @@ -0,0 +1,7 @@ +// __SDEFILE__ - This file is a dependency for the stand-alone environment +import { useAtom } from 'jotai' +import { atomWithHash } from 'jotai-location' + +const idAtom = atomWithHash('id', null) + +export const useId = () => useAtom(idAtom) From 1e0741c72b871cbd4707efc037d491abb8f89a3c Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 22 Oct 2023 09:32:46 +0200 Subject: [PATCH 02/27] chore(shared): Remove lint --- sites/shared/components/account/apikeys.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sites/shared/components/account/apikeys.mjs b/sites/shared/components/account/apikeys.mjs index 475f5c21f69..670be07ae68 100644 --- a/sites/shared/components/account/apikeys.mjs +++ b/sites/shared/components/account/apikeys.mjs @@ -14,7 +14,7 @@ import { useRouter } from 'next/router' import { BackToAccountButton, DisplayRow, NumberBullet } from './shared.mjs' import { Popout } from 'shared/components/popout/index.mjs' import { LeftIcon, PlusIcon, CopyIcon, RightIcon, TrashIcon } from 'shared/components/icons.mjs' -import { PageLink, Link, linkClasses } from 'shared/components/link.mjs' +import { Link, linkClasses } from 'shared/components/link.mjs' import { StringInput, ListInput, FormControl } from 'shared/components/inputs.mjs' import { DynamicMdx } from 'shared/components/mdx/dynamic.mjs' From 00e1e601ae41cc3e9aef703b6afae03edbf795d0 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 22 Oct 2023 10:06:27 +0200 Subject: [PATCH 03/27] chore: Add node about buildall to new software script --- scripts/add-software.mjs | 10 +++++++++- sites/shared/ssr-i18n.mjs | 17 ----------------- 2 files changed, 9 insertions(+), 18 deletions(-) delete mode 100644 sites/shared/ssr-i18n.mjs diff --git a/scripts/add-software.mjs b/scripts/add-software.mjs index 9cc73c920cc..f95b82f2f52 100644 --- a/scripts/add-software.mjs +++ b/scripts/add-software.mjs @@ -100,10 +100,18 @@ async function addDesign() { If you change any of these, run ${chalk.blue('yarn reconfigure')} to update the package(s). + ${chalk.bold.yellow('⚒️ Build packages at least once')} + ${chalk.gray('≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡')} + + ⚠️ You need to run ${chalk.blue('yarn buildall')} at least once before you run the steps below. + ${chalk.gray(`If you have never built the packages (for example, you have just cloned this repo), + do this now. You only need to re-run this step when you make changes to core plugins`)} + + ${chalk.bold.yellow('👷 Get to work')} ${chalk.gray('≡≡≡≡≡≡≡≡≡≡≡≡≡≡')} - 🛠️ You can now start the development environment with ${chalk.blue('yarn lab')} + 🚀 You can now start the development environment with ${chalk.blue('yarn lab')} 📖 Documentation is available at ${chalk.green('https://freesewing.dev/')} 🤓 Happy hacking diff --git a/sites/shared/ssr-i18n.mjs b/sites/shared/ssr-i18n.mjs deleted file mode 100644 index 10c27bbe169..00000000000 --- a/sites/shared/ssr-i18n.mjs +++ /dev/null @@ -1,17 +0,0 @@ -import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { siteConfig } from 'site/site.config.mjs' - -/* - * We're being lazy and loading all namespaces here - * See https://github.com/freesewing/freesewing/issues/5230 - */ -const ssrI18n = async () => { - const i18n = {} - for (const locale of siteConfig.languages) { - i18n[locale] = await serverSideTranslations(locale) - } - - return i18n -} - -export const i18n = await ssrI18n() From c7025403e5598517ae14217123bc4db9ef2c5238 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 22 Oct 2023 10:07:55 +0200 Subject: [PATCH 04/27] chore: Remove fallback from platforms page. See #5230 --- sites/org/pages/account/[platform].mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sites/org/pages/account/[platform].mjs b/sites/org/pages/account/[platform].mjs index 7322375432c..c81e73e8f25 100644 --- a/sites/org/pages/account/[platform].mjs +++ b/sites/org/pages/account/[platform].mjs @@ -80,5 +80,5 @@ export const getStaticPaths = async () => { } } - return { paths, fallback: 'blocking' } + return { paths } } From b4e96449eafffbf7c2448b6710bd1622720098f0 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 22 Oct 2023 11:23:30 +0200 Subject: [PATCH 05/27] chore: Add yarn buildall to kickstart --- package.json | 2 +- scripts/add-software.mjs | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/package.json b/package.json index 74e32fb3baf..bbedc1491d1 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "strapi:translate": "node scripts/strapi-en-to-other.mjs", "fixdocs": "remark markdown --quiet --frail --output", "wbuildall": "lerna run wbuildall", - "prepare": "husky install" + "prepare": "husky install && yarn buildall" }, "repository": { "type": "git", diff --git a/scripts/add-software.mjs b/scripts/add-software.mjs index f95b82f2f52..18ca1e8b035 100644 --- a/scripts/add-software.mjs +++ b/scripts/add-software.mjs @@ -100,14 +100,6 @@ async function addDesign() { If you change any of these, run ${chalk.blue('yarn reconfigure')} to update the package(s). - ${chalk.bold.yellow('⚒️ Build packages at least once')} - ${chalk.gray('≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡')} - - ⚠️ You need to run ${chalk.blue('yarn buildall')} at least once before you run the steps below. - ${chalk.gray(`If you have never built the packages (for example, you have just cloned this repo), - do this now. You only need to re-run this step when you make changes to core plugins`)} - - ${chalk.bold.yellow('👷 Get to work')} ${chalk.gray('≡≡≡≡≡≡≡≡≡≡≡≡≡≡')} From 679ba9dc1075fade45cd70271fbf48897d4671f2 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 22 Oct 2023 11:50:39 +0200 Subject: [PATCH 06/27] wip: Fix platform pages to add fallback (and remove twitter) --- sites/lab/pages/account/[platform].mjs | 2 +- sites/lab/pages/account/apikeys/index.mjs | 37 ++++++++++++++++++++++- sites/org/pages/account/[platform].mjs | 2 +- sites/shared/components/account/links.mjs | 2 +- sites/shared/config/freesewing.config.mjs | 1 - 5 files changed, 39 insertions(+), 5 deletions(-) diff --git a/sites/lab/pages/account/[platform].mjs b/sites/lab/pages/account/[platform].mjs index a47580ec167..b811f3977da 100644 --- a/sites/lab/pages/account/[platform].mjs +++ b/sites/lab/pages/account/[platform].mjs @@ -80,5 +80,5 @@ export const getStaticPaths = async () => { } } - return { paths, fallback: true } + return { paths, fallback: false } } diff --git a/sites/lab/pages/account/apikeys/index.mjs b/sites/lab/pages/account/apikeys/index.mjs index f1c346f8e10..dd890c20b1e 100644 --- a/sites/lab/pages/account/apikeys/index.mjs +++ b/sites/lab/pages/account/apikeys/index.mjs @@ -2,8 +2,13 @@ import dynamic from 'next/dynamic' import { serverSideTranslations } from 'next-i18next/serverSideTranslations' import { nsMerge } from 'shared/utils.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' // Hooks import { useTranslation } from 'next-i18next' +import { useId } from 'shared/hooks/use-id.mjs' +import { useState, useEffect, useContext } from 'react' +import { useBackend } from 'shared/hooks/use-backend.mjs' // Components import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs' @@ -26,6 +31,11 @@ const DynamicApikeys = dynamic( { ssr: false } ) +const DynamicApikey = dynamic( + () => import('shared/components/account/apikeys.mjs').then((mod) => mod.Apikey), + { ssr: false } +) + /* * Each page MUST be wrapped in the PageWrapper component. * You also MUST spread props.page into this wrapper component @@ -34,11 +44,36 @@ const DynamicApikeys = dynamic( */ const AccountApikeysPage = ({ page }) => { const { t } = useTranslation(ns) + const backend = useBackend() + const { setLoadingStatus } = useContext(LoadingStatusContext) + + const [id, setId] = useId() + const [apikey, setApikey] = useState() + + useEffect(() => { + const getApikey = async () => { + setLoadingStatus([true, 'contactingBackend']) + setApikey({ name: '', id }) + const result = await backend.getApikey(id) + if (result.success) { + setApikey(result.data.apikey) + setLoadingStatus([true, 'status:dataLoaded', true, true]) + } else setLoadingStatus([false]) + } + if (id) getApikey() + }, [id, backend, setLoadingStatus]) return ( - + {id && apikey ? ( + <> +

{id}

+ + + ) : ( + + )} ) diff --git a/sites/org/pages/account/[platform].mjs b/sites/org/pages/account/[platform].mjs index c81e73e8f25..b811f3977da 100644 --- a/sites/org/pages/account/[platform].mjs +++ b/sites/org/pages/account/[platform].mjs @@ -80,5 +80,5 @@ export const getStaticPaths = async () => { } } - return { paths } + return { paths, fallback: false } } diff --git a/sites/shared/components/account/links.mjs b/sites/shared/components/account/links.mjs index c4b01e7a505..1cbf43ead69 100644 --- a/sites/shared/components/account/links.mjs +++ b/sites/shared/components/account/links.mjs @@ -215,7 +215,7 @@ export const AccountLinks = () => {
{itemIcons[item]} - {t(item)} + {capitalize(t(item))}
{itemPreviews[item]}
 diff --git a/sites/shared/config/freesewing.config.mjs b/sites/shared/config/freesewing.config.mjs index a893a9cbee0..a9f22e97402 100644 --- a/sites/shared/config/freesewing.config.mjs +++ b/sites/shared/config/freesewing.config.mjs @@ -43,7 +43,6 @@ export const freeSewingConfig = { instagram: 3, mastodon: 3, reddit: 3, - twitter: 3, twitch: 3, tiktok: 3, website: 3, From ca67ecd2c4975b98d67eedd382ac669ff9582fe0 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 22 Oct 2023 12:07:02 +0200 Subject: [PATCH 07/27] chore: Remove twitter, add Mastodon --- config/social.mjs | 2 +- sites/shared/components/icons.mjs | 6 ++ sites/shared/components/social/icons.mjs | 70 ++++++++++++------------ sites/shared/config/social.mjs | 2 +- 4 files changed, 43 insertions(+), 37 deletions(-) diff --git a/config/social.mjs b/config/social.mjs index 2bc58277fba..9b7219178f7 100644 --- a/config/social.mjs +++ b/config/social.mjs @@ -5,5 +5,5 @@ export const social = { Facebook: 'https://www.facebook.com/groups/627769821272714/', GitHub: 'https://github.com/freesewing', Reddit: 'https://www.reddit.com/r/freesewing/', - Twitter: 'https://twitter.com/freesewing_org', + Mastodon: 'https://freesewing.social/@freesewing', } diff --git a/sites/shared/components/icons.mjs b/sites/shared/components/icons.mjs index 70f8dc1dc87..edc3de4da93 100644 --- a/sites/shared/components/icons.mjs +++ b/sites/shared/components/icons.mjs @@ -195,6 +195,12 @@ export const CsetIcon = (props) => ( ) export const CuratedMeasurementsSetIcon = CsetIcon +export const CloudIcon = (props) => ( + + + +) + export const CutIcon = (props) => ( diff --git a/sites/shared/components/social/icons.mjs b/sites/shared/components/social/icons.mjs index c0f181a429e..1e5f8a24f1d 100644 --- a/sites/shared/components/social/icons.mjs +++ b/sites/shared/components/social/icons.mjs @@ -3,14 +3,14 @@ import Link from 'next/link' import { useTheme } from 'shared/hooks/use-theme.mjs' import { MsfIcon, - HelpIcon, + HeartIcon, DiscordIcon, FacebookIcon, GitHubIcon, InstagramIcon, RedditIcon, - TwitterIcon, - OpenSourceIcon, + MastodonIcon, + CloudIcon, YouTubeIcon, } from 'shared/components/icons.mjs' import { social } from 'config/social.mjs' @@ -19,7 +19,7 @@ import { siteConfig } from 'site/site.config.mjs' const iconClasses = (color) => ({ className: `w-8 lg:w-12 h-8 lg:h-12 text-${color} hover:text-neutral-content`, }) - +console.log(social) export const socialList = (spectrum) => ({ MSF: { icon: , @@ -30,49 +30,49 @@ export const socialList = (spectrum) => ({ name: 'Doctors Without Borders / Médecins Sans Frontières', community: false, }, - Discord: { - icon: , - href: social.Discord, - community: true, - }, - Instagram: { - icon: , - href: social.Instagram, - community: true, - }, - Facebook: { - icon: , - href: social.Facebook, - community: true, - }, GitHub: { - icon: , + icon: , href: social.GitHub, community: true, }, - Reddit: { - icon: , - href: social.Reddit, + Mastodon: { + icon: , + href: social.Mastodon, community: true, }, - Twitter: { - icon: , - href: social.Twitter, + Instagram: { + icon: , + href: social.Instagram, community: true, }, - YouTube: { - icon: , + Bluesky: { + icon: , href: social.YouTube, community: true, }, - 'Open Souce License: MIT': { - icon: , - href: 'https://github.com/freesewing/freesewing/blob/develop/LICENSE', - community: false, + Discord: { + icon: , + href: social.Discord, + community: true, }, - 'Contact Information': { - icon: , - href: '/contact', + Facebook: { + icon: , + href: social.Facebook, + community: true, + }, + Reddit: { + icon: , + href: social.Reddit, + community: true, + }, + YouTube: { + icon: , + href: social.YouTube, + community: true, + }, + Support: { + icon: , + href: '/support', community: false, }, }) diff --git a/sites/shared/config/social.mjs b/sites/shared/config/social.mjs index f08b73bfd47..585eb9918b5 100644 --- a/sites/shared/config/social.mjs +++ b/sites/shared/config/social.mjs @@ -6,5 +6,5 @@ export const social = { Facebook: 'https://www.facebook.com/groups/627769821272714/', GitHub: 'https://github.com/freesewing', Reddit: 'https://www.reddit.com/r/freesewing/', - Twitter: 'https://twitter.com/freesewing_org', + Mastodon: 'https://freesewing.social/@freesewing', } From cc0cd9a5b5dafb1341c1e0272e8a3c2112fd6260 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 22 Oct 2023 12:48:06 +0200 Subject: [PATCH 08/27] wip: Work on #5230 --- sites/org/page-templates/edit-pattern.mjs | 21 +- .../{bookmarks/[id].mjs => bookmark.mjs} | 26 ++- .../{bookmarks/index.mjs => bookmarks.mjs} | 0 .../{patterns/[id]/index.mjs => pattern.mjs} | 20 +- .../patterns/aaron/{[id] => }/edit.mjs | 21 +- .../patterns/albert/{[id] => }/edit.mjs | 21 +- .../account/patterns/bee/{[id] => }/edit.mjs | 21 +- .../patterns/bella/{[id] => }/edit.mjs | 21 +- .../patterns/benjamin/{[id] => }/edit.mjs | 21 +- .../account/patterns/bent/{[id] => }/edit.mjs | 21 +- .../account/patterns/bob/{[id] => }/edit.mjs | 21 +- .../patterns/breanna/{[id] => }/edit.mjs | 21 +- .../patterns/brian/{[id] => }/edit.mjs | 21 +- .../patterns/bruce/{[id] => }/edit.mjs | 21 +- .../patterns/carlita/{[id] => }/edit.mjs | 21 +- .../patterns/carlton/{[id] => }/edit.mjs | 21 +- .../patterns/cathrin/{[id] => }/edit.mjs | 21 +- .../patterns/charlie/{[id] => }/edit.mjs | 21 +- .../patterns/cornelius/{[id] => }/edit.mjs | 21 +- .../patterns/diana/{[id] => }/edit.mjs | 21 +- .../patterns/florence/{[id] => }/edit.mjs | 21 +- .../patterns/florent/{[id] => }/edit.mjs | 21 +- .../patterns/gozer/{[id] => }/edit.mjs | 21 +- .../account/patterns/hi/{[id] => }/edit.mjs | 21 +- .../patterns/holmes/{[id] => }/edit.mjs | 21 +- .../patterns/hortensia/{[id] => }/edit.mjs | 21 +- .../account/patterns/huey/{[id] => }/edit.mjs | 21 +- .../account/patterns/hugo/{[id] => }/edit.mjs | 21 +- .../patterns/jaeger/{[id] => }/edit.mjs | 21 +- .../account/patterns/lucy/{[id] => }/edit.mjs | 21 +- .../patterns/lunetius/{[id] => }/edit.mjs | 21 +- .../patterns/noble/{[id] => }/edit.mjs | 21 +- .../patterns/octoplushy/{[id] => }/edit.mjs | 21 +- .../account/patterns/otis/{[id] => }/edit.mjs | 21 +- .../account/patterns/paco/{[id] => }/edit.mjs | 21 +- .../patterns/penelope/{[id] => }/edit.mjs | 21 +- .../patterns/sandy/{[id] => }/edit.mjs | 21 +- .../patterns/shelly/{[id] => }/edit.mjs | 21 +- .../account/patterns/shin/{[id] => }/edit.mjs | 21 +- .../patterns/simon/{[id] => }/edit.mjs | 21 +- .../patterns/simone/{[id] => }/edit.mjs | 21 +- .../patterns/skully/{[id] => }/edit.mjs | 21 +- .../account/patterns/sven/{[id] => }/edit.mjs | 21 +- .../patterns/tamiko/{[id] => }/edit.mjs | 21 +- .../patterns/teagan/{[id] => }/edit.mjs | 21 +- .../patterns/tiberius/{[id] => }/edit.mjs | 21 +- .../patterns/titan/{[id] => }/edit.mjs | 21 +- .../patterns/trayvon/{[id] => }/edit.mjs | 21 +- .../account/patterns/uma/{[id] => }/edit.mjs | 21 +- .../patterns/wahid/{[id] => }/edit.mjs | 21 +- .../patterns/walburga/{[id] => }/edit.mjs | 21 +- .../patterns/waralee/{[id] => }/edit.mjs | 21 +- .../account/patterns/yuri/{[id] => }/edit.mjs | 21 +- .../{patterns/[id]/index.mjs => pattern.mjs} | 25 ++- sites/org/pages/patterns/index.mjs | 53 ----- sites/org/vercel.json | 200 ++++++++++++++++++ sites/shared/components/account/bookmarks.mjs | 5 +- sites/shared/components/account/patterns.mjs | 21 +- sites/shared/components/social/icons.mjs | 2 +- sites/shared/prebuild/org.mjs | 17 +- sites/shared/utils.mjs | 3 + 61 files changed, 517 insertions(+), 905 deletions(-) rename sites/org/pages/account/{bookmarks/[id].mjs => bookmark.mjs} (79%) rename sites/org/pages/account/{bookmarks/index.mjs => bookmarks.mjs} (100%) rename sites/org/pages/account/{patterns/[id]/index.mjs => pattern.mjs} (72%) rename sites/org/pages/account/patterns/aaron/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/albert/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/bee/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/bella/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/benjamin/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/bent/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/bob/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/breanna/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/brian/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/bruce/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/carlita/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/carlton/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/cathrin/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/charlie/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/cornelius/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/diana/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/florence/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/florent/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/gozer/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/hi/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/holmes/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/hortensia/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/huey/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/hugo/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/jaeger/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/lucy/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/lunetius/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/noble/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/octoplushy/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/otis/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/paco/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/penelope/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/sandy/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/shelly/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/shin/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/simon/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/simone/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/skully/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/sven/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/tamiko/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/teagan/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/tiberius/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/titan/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/trayvon/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/uma/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/wahid/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/walburga/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/waralee/{[id] => }/edit.mjs (85%) rename sites/org/pages/account/patterns/yuri/{[id] => }/edit.mjs (85%) rename sites/org/pages/{patterns/[id]/index.mjs => pattern.mjs} (69%) delete mode 100644 sites/org/pages/patterns/index.mjs create mode 100644 sites/org/vercel.json diff --git a/sites/org/page-templates/edit-pattern.mjs b/sites/org/page-templates/edit-pattern.mjs index 68770acbc4d..ec3fc063ea3 100644 --- a/sites/org/page-templates/edit-pattern.mjs +++ b/sites/org/page-templates/edit-pattern.mjs @@ -4,7 +4,7 @@ import { $$Design$$ } from 'designs/$$design$$/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const Edit$$Design$$Page = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const Edit$$Design$$Page = ({ page, docs, id }) => { export default Edit$$Design$$Page -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', '$$design$$', params.id, 'edit'], + path: ['account', 'patterns', '$$design$$'], title: '$$Design$$', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/bookmarks/[id].mjs b/sites/org/pages/account/bookmark.mjs similarity index 79% rename from sites/org/pages/account/bookmarks/[id].mjs rename to sites/org/pages/account/bookmark.mjs index 1b36edc05af..6efbcf1df35 100644 --- a/sites/org/pages/account/bookmarks/[id].mjs +++ b/sites/org/pages/account/bookmark.mjs @@ -1,7 +1,7 @@ // Dependencies import dynamic from 'next/dynamic' import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Context import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' // Hooks @@ -36,20 +36,26 @@ const DynamicBookmark = dynamic( * when path and locale come from static props (as here) * or set them manually. */ -const BookmarkPage = ({ page, id }) => { +const BookmarkPage = ({ page }) => { const { t } = useTranslation(ns) const backend = useBackend() const { setLoadingStatus } = useContext(LoadingStatusContext) + const [id, setId] = useState() const [bookmark, setBookmark] = useState() useEffect(() => { - const getBookmark = async () => { + const getBookmark = async (id) => { const result = await backend.getBookmark(id) if (result.success) setBookmark(result.data.bookmark) else setLoadingStatus([false]) } - getBookmark() + const newId = getSearchParam('id') + console.log({ newId }) + if (newId !== id) { + setId(newId) + getBookmark(newId) + } }, [id]) return ( @@ -63,22 +69,14 @@ const BookmarkPage = ({ page, id }) => { export default BookmarkPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'bookmarks', params.id], + path: ['account', 'bookmark'], }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - * To learn more, see: https://nextjs.org/docs/basic-features/data-fetching - */ -export const getStaticPaths = async () => ({ paths: [], fallback: true }) diff --git a/sites/org/pages/account/bookmarks/index.mjs b/sites/org/pages/account/bookmarks.mjs similarity index 100% rename from sites/org/pages/account/bookmarks/index.mjs rename to sites/org/pages/account/bookmarks.mjs diff --git a/sites/org/pages/account/patterns/[id]/index.mjs b/sites/org/pages/account/pattern.mjs similarity index 72% rename from sites/org/pages/account/patterns/[id]/index.mjs rename to sites/org/pages/account/pattern.mjs index c518cea8800..d6d88d24a49 100644 --- a/sites/org/pages/account/patterns/[id]/index.mjs +++ b/sites/org/pages/account/pattern.mjs @@ -1,9 +1,10 @@ // Dependencies import dynamic from 'next/dynamic' import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useTranslation } from 'next-i18next' +import { useState, useEffect } from 'react' // Components import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs' @@ -32,11 +33,12 @@ const DynamicPattern = dynamic( * when path and locale come from static props (as here) * or set them manually. */ -const PatternPage = ({ page, id }) => { +const PatternPage = ({ page }) => { const { t } = useTranslation(ns) + const id = getSearchParam('id') return ( - + @@ -46,22 +48,14 @@ const PatternPage = ({ page, id }) => { export default PatternPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', params.id], + path: ['account', 'patterns'], }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - * To learn more, see: https://nextjs.org/docs/basic-features/data-fetching - */ -export const getStaticPaths = async () => ({ paths: [], fallback: true }) diff --git a/sites/org/pages/account/patterns/aaron/[id]/edit.mjs b/sites/org/pages/account/patterns/aaron/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/aaron/[id]/edit.mjs rename to sites/org/pages/account/patterns/aaron/edit.mjs index 33cbdca13f5..ed6d533ca5a 100644 --- a/sites/org/pages/account/patterns/aaron/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/aaron/edit.mjs @@ -4,7 +4,7 @@ import { Aaron } from 'designs/aaron/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditAaronPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditAaronPage = ({ page, docs, id }) => { export default EditAaronPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'aaron', params.id, 'edit'], + path: ['account', 'patterns', 'aaron'], title: 'Aaron', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/albert/[id]/edit.mjs b/sites/org/pages/account/patterns/albert/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/albert/[id]/edit.mjs rename to sites/org/pages/account/patterns/albert/edit.mjs index 706386be5e6..fa21c811628 100644 --- a/sites/org/pages/account/patterns/albert/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/albert/edit.mjs @@ -4,7 +4,7 @@ import { Albert } from 'designs/albert/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditAlbertPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditAlbertPage = ({ page, docs, id }) => { export default EditAlbertPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'albert', params.id, 'edit'], + path: ['account', 'patterns', 'albert'], title: 'Albert', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/bee/[id]/edit.mjs b/sites/org/pages/account/patterns/bee/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/bee/[id]/edit.mjs rename to sites/org/pages/account/patterns/bee/edit.mjs index ba62bd1a9d9..ace3c75287c 100644 --- a/sites/org/pages/account/patterns/bee/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/bee/edit.mjs @@ -4,7 +4,7 @@ import { Bee } from 'designs/bee/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditBeePage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditBeePage = ({ page, docs, id }) => { export default EditBeePage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'bee', params.id, 'edit'], + path: ['account', 'patterns', 'bee'], title: 'Bee', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/bella/[id]/edit.mjs b/sites/org/pages/account/patterns/bella/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/bella/[id]/edit.mjs rename to sites/org/pages/account/patterns/bella/edit.mjs index c8f27c2c036..415d1a7e052 100644 --- a/sites/org/pages/account/patterns/bella/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/bella/edit.mjs @@ -4,7 +4,7 @@ import { Bella } from 'designs/bella/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditBellaPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditBellaPage = ({ page, docs, id }) => { export default EditBellaPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'bella', params.id, 'edit'], + path: ['account', 'patterns', 'bella'], title: 'Bella', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/benjamin/[id]/edit.mjs b/sites/org/pages/account/patterns/benjamin/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/benjamin/[id]/edit.mjs rename to sites/org/pages/account/patterns/benjamin/edit.mjs index 2747a4a8575..31901cc3b46 100644 --- a/sites/org/pages/account/patterns/benjamin/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/benjamin/edit.mjs @@ -4,7 +4,7 @@ import { Benjamin } from 'designs/benjamin/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditBenjaminPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditBenjaminPage = ({ page, docs, id }) => { export default EditBenjaminPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'benjamin', params.id, 'edit'], + path: ['account', 'patterns', 'benjamin'], title: 'Benjamin', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/bent/[id]/edit.mjs b/sites/org/pages/account/patterns/bent/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/bent/[id]/edit.mjs rename to sites/org/pages/account/patterns/bent/edit.mjs index 4294c85e039..88bd5862a6a 100644 --- a/sites/org/pages/account/patterns/bent/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/bent/edit.mjs @@ -4,7 +4,7 @@ import { Bent } from 'designs/bent/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditBentPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditBentPage = ({ page, docs, id }) => { export default EditBentPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'bent', params.id, 'edit'], + path: ['account', 'patterns', 'bent'], title: 'Bent', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/bob/[id]/edit.mjs b/sites/org/pages/account/patterns/bob/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/bob/[id]/edit.mjs rename to sites/org/pages/account/patterns/bob/edit.mjs index 0be1cdc5ff2..df6796bedfd 100644 --- a/sites/org/pages/account/patterns/bob/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/bob/edit.mjs @@ -4,7 +4,7 @@ import { Bob } from 'designs/bob/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditBobPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditBobPage = ({ page, docs, id }) => { export default EditBobPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'bob', params.id, 'edit'], + path: ['account', 'patterns', 'bob'], title: 'Bob', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/breanna/[id]/edit.mjs b/sites/org/pages/account/patterns/breanna/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/breanna/[id]/edit.mjs rename to sites/org/pages/account/patterns/breanna/edit.mjs index 29924c441e0..98d061239da 100644 --- a/sites/org/pages/account/patterns/breanna/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/breanna/edit.mjs @@ -4,7 +4,7 @@ import { Breanna } from 'designs/breanna/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditBreannaPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditBreannaPage = ({ page, docs, id }) => { export default EditBreannaPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'breanna', params.id, 'edit'], + path: ['account', 'patterns', 'breanna'], title: 'Breanna', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/brian/[id]/edit.mjs b/sites/org/pages/account/patterns/brian/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/brian/[id]/edit.mjs rename to sites/org/pages/account/patterns/brian/edit.mjs index ea7daccc6bd..4b293230675 100644 --- a/sites/org/pages/account/patterns/brian/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/brian/edit.mjs @@ -4,7 +4,7 @@ import { Brian } from 'designs/brian/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditBrianPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditBrianPage = ({ page, docs, id }) => { export default EditBrianPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'brian', params.id, 'edit'], + path: ['account', 'patterns', 'brian'], title: 'Brian', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/bruce/[id]/edit.mjs b/sites/org/pages/account/patterns/bruce/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/bruce/[id]/edit.mjs rename to sites/org/pages/account/patterns/bruce/edit.mjs index e2930b76852..c68d8bba9d3 100644 --- a/sites/org/pages/account/patterns/bruce/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/bruce/edit.mjs @@ -4,7 +4,7 @@ import { Bruce } from 'designs/bruce/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditBrucePage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditBrucePage = ({ page, docs, id }) => { export default EditBrucePage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'bruce', params.id, 'edit'], + path: ['account', 'patterns', 'bruce'], title: 'Bruce', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/carlita/[id]/edit.mjs b/sites/org/pages/account/patterns/carlita/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/carlita/[id]/edit.mjs rename to sites/org/pages/account/patterns/carlita/edit.mjs index 38bf7d5df80..301a591b2b7 100644 --- a/sites/org/pages/account/patterns/carlita/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/carlita/edit.mjs @@ -4,7 +4,7 @@ import { Carlita } from 'designs/carlita/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditCarlitaPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditCarlitaPage = ({ page, docs, id }) => { export default EditCarlitaPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'carlita', params.id, 'edit'], + path: ['account', 'patterns', 'carlita'], title: 'Carlita', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/carlton/[id]/edit.mjs b/sites/org/pages/account/patterns/carlton/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/carlton/[id]/edit.mjs rename to sites/org/pages/account/patterns/carlton/edit.mjs index 69c2e9670ac..9f46f274680 100644 --- a/sites/org/pages/account/patterns/carlton/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/carlton/edit.mjs @@ -4,7 +4,7 @@ import { Carlton } from 'designs/carlton/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditCarltonPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditCarltonPage = ({ page, docs, id }) => { export default EditCarltonPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'carlton', params.id, 'edit'], + path: ['account', 'patterns', 'carlton'], title: 'Carlton', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/cathrin/[id]/edit.mjs b/sites/org/pages/account/patterns/cathrin/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/cathrin/[id]/edit.mjs rename to sites/org/pages/account/patterns/cathrin/edit.mjs index 6ccf9d3de09..c7189f9a9c9 100644 --- a/sites/org/pages/account/patterns/cathrin/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/cathrin/edit.mjs @@ -4,7 +4,7 @@ import { Cathrin } from 'designs/cathrin/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditCathrinPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditCathrinPage = ({ page, docs, id }) => { export default EditCathrinPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'cathrin', params.id, 'edit'], + path: ['account', 'patterns', 'cathrin'], title: 'Cathrin', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/charlie/[id]/edit.mjs b/sites/org/pages/account/patterns/charlie/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/charlie/[id]/edit.mjs rename to sites/org/pages/account/patterns/charlie/edit.mjs index d6d41f13a51..6d60235acb8 100644 --- a/sites/org/pages/account/patterns/charlie/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/charlie/edit.mjs @@ -4,7 +4,7 @@ import { Charlie } from 'designs/charlie/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditCharliePage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditCharliePage = ({ page, docs, id }) => { export default EditCharliePage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'charlie', params.id, 'edit'], + path: ['account', 'patterns', 'charlie'], title: 'Charlie', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/cornelius/[id]/edit.mjs b/sites/org/pages/account/patterns/cornelius/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/cornelius/[id]/edit.mjs rename to sites/org/pages/account/patterns/cornelius/edit.mjs index 38b5ae25deb..572dd385570 100644 --- a/sites/org/pages/account/patterns/cornelius/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/cornelius/edit.mjs @@ -4,7 +4,7 @@ import { Cornelius } from 'designs/cornelius/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditCorneliusPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditCorneliusPage = ({ page, docs, id }) => { export default EditCorneliusPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'cornelius', params.id, 'edit'], + path: ['account', 'patterns', 'cornelius'], title: 'Cornelius', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/diana/[id]/edit.mjs b/sites/org/pages/account/patterns/diana/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/diana/[id]/edit.mjs rename to sites/org/pages/account/patterns/diana/edit.mjs index 74af63df65f..eaa636656dc 100644 --- a/sites/org/pages/account/patterns/diana/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/diana/edit.mjs @@ -4,7 +4,7 @@ import { Diana } from 'designs/diana/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditDianaPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditDianaPage = ({ page, docs, id }) => { export default EditDianaPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'diana', params.id, 'edit'], + path: ['account', 'patterns', 'diana'], title: 'Diana', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/florence/[id]/edit.mjs b/sites/org/pages/account/patterns/florence/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/florence/[id]/edit.mjs rename to sites/org/pages/account/patterns/florence/edit.mjs index 852aae7a98e..f5e1c41fd2c 100644 --- a/sites/org/pages/account/patterns/florence/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/florence/edit.mjs @@ -4,7 +4,7 @@ import { Florence } from 'designs/florence/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditFlorencePage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditFlorencePage = ({ page, docs, id }) => { export default EditFlorencePage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'florence', params.id, 'edit'], + path: ['account', 'patterns', 'florence'], title: 'Florence', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/florent/[id]/edit.mjs b/sites/org/pages/account/patterns/florent/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/florent/[id]/edit.mjs rename to sites/org/pages/account/patterns/florent/edit.mjs index 065842d8ecf..e266522159e 100644 --- a/sites/org/pages/account/patterns/florent/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/florent/edit.mjs @@ -4,7 +4,7 @@ import { Florent } from 'designs/florent/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditFlorentPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditFlorentPage = ({ page, docs, id }) => { export default EditFlorentPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'florent', params.id, 'edit'], + path: ['account', 'patterns', 'florent'], title: 'Florent', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/gozer/[id]/edit.mjs b/sites/org/pages/account/patterns/gozer/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/gozer/[id]/edit.mjs rename to sites/org/pages/account/patterns/gozer/edit.mjs index dd37081ced8..808b4044d78 100644 --- a/sites/org/pages/account/patterns/gozer/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/gozer/edit.mjs @@ -4,7 +4,7 @@ import { Gozer } from 'designs/gozer/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditGozerPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditGozerPage = ({ page, docs, id }) => { export default EditGozerPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'gozer', params.id, 'edit'], + path: ['account', 'patterns', 'gozer'], title: 'Gozer', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/hi/[id]/edit.mjs b/sites/org/pages/account/patterns/hi/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/hi/[id]/edit.mjs rename to sites/org/pages/account/patterns/hi/edit.mjs index 1e458459c9b..8b1e5f82b73 100644 --- a/sites/org/pages/account/patterns/hi/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/hi/edit.mjs @@ -4,7 +4,7 @@ import { Hi } from 'designs/hi/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditHiPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditHiPage = ({ page, docs, id }) => { export default EditHiPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'hi', params.id, 'edit'], + path: ['account', 'patterns', 'hi'], title: 'Hi', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/holmes/[id]/edit.mjs b/sites/org/pages/account/patterns/holmes/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/holmes/[id]/edit.mjs rename to sites/org/pages/account/patterns/holmes/edit.mjs index 945fa9d713b..f8483b84571 100644 --- a/sites/org/pages/account/patterns/holmes/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/holmes/edit.mjs @@ -4,7 +4,7 @@ import { Holmes } from 'designs/holmes/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditHolmesPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditHolmesPage = ({ page, docs, id }) => { export default EditHolmesPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'holmes', params.id, 'edit'], + path: ['account', 'patterns', 'holmes'], title: 'Holmes', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/hortensia/[id]/edit.mjs b/sites/org/pages/account/patterns/hortensia/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/hortensia/[id]/edit.mjs rename to sites/org/pages/account/patterns/hortensia/edit.mjs index 25376425318..e736e19f1df 100644 --- a/sites/org/pages/account/patterns/hortensia/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/hortensia/edit.mjs @@ -4,7 +4,7 @@ import { Hortensia } from 'designs/hortensia/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditHortensiaPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditHortensiaPage = ({ page, docs, id }) => { export default EditHortensiaPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'hortensia', params.id, 'edit'], + path: ['account', 'patterns', 'hortensia'], title: 'Hortensia', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/huey/[id]/edit.mjs b/sites/org/pages/account/patterns/huey/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/huey/[id]/edit.mjs rename to sites/org/pages/account/patterns/huey/edit.mjs index cba82a35b0b..5174a5ff0df 100644 --- a/sites/org/pages/account/patterns/huey/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/huey/edit.mjs @@ -4,7 +4,7 @@ import { Huey } from 'designs/huey/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditHueyPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditHueyPage = ({ page, docs, id }) => { export default EditHueyPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'huey', params.id, 'edit'], + path: ['account', 'patterns', 'huey'], title: 'Huey', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/hugo/[id]/edit.mjs b/sites/org/pages/account/patterns/hugo/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/hugo/[id]/edit.mjs rename to sites/org/pages/account/patterns/hugo/edit.mjs index 67ed095b2b6..43a6e65e1da 100644 --- a/sites/org/pages/account/patterns/hugo/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/hugo/edit.mjs @@ -4,7 +4,7 @@ import { Hugo } from 'designs/hugo/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditHugoPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditHugoPage = ({ page, docs, id }) => { export default EditHugoPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'hugo', params.id, 'edit'], + path: ['account', 'patterns', 'hugo'], title: 'Hugo', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/jaeger/[id]/edit.mjs b/sites/org/pages/account/patterns/jaeger/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/jaeger/[id]/edit.mjs rename to sites/org/pages/account/patterns/jaeger/edit.mjs index bf4c95d1d19..df962a305b6 100644 --- a/sites/org/pages/account/patterns/jaeger/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/jaeger/edit.mjs @@ -4,7 +4,7 @@ import { Jaeger } from 'designs/jaeger/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditJaegerPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditJaegerPage = ({ page, docs, id }) => { export default EditJaegerPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'jaeger', params.id, 'edit'], + path: ['account', 'patterns', 'jaeger'], title: 'Jaeger', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/lucy/[id]/edit.mjs b/sites/org/pages/account/patterns/lucy/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/lucy/[id]/edit.mjs rename to sites/org/pages/account/patterns/lucy/edit.mjs index 34423dfbcca..9f79b5373a0 100644 --- a/sites/org/pages/account/patterns/lucy/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/lucy/edit.mjs @@ -4,7 +4,7 @@ import { Lucy } from 'designs/lucy/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditLucyPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditLucyPage = ({ page, docs, id }) => { export default EditLucyPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'lucy', params.id, 'edit'], + path: ['account', 'patterns', 'lucy'], title: 'Lucy', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/lunetius/[id]/edit.mjs b/sites/org/pages/account/patterns/lunetius/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/lunetius/[id]/edit.mjs rename to sites/org/pages/account/patterns/lunetius/edit.mjs index 177a47deab3..238f2da940a 100644 --- a/sites/org/pages/account/patterns/lunetius/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/lunetius/edit.mjs @@ -4,7 +4,7 @@ import { Lunetius } from 'designs/lunetius/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditLunetiusPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditLunetiusPage = ({ page, docs, id }) => { export default EditLunetiusPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'lunetius', params.id, 'edit'], + path: ['account', 'patterns', 'lunetius'], title: 'Lunetius', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/noble/[id]/edit.mjs b/sites/org/pages/account/patterns/noble/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/noble/[id]/edit.mjs rename to sites/org/pages/account/patterns/noble/edit.mjs index b580578e597..e245db76ad5 100644 --- a/sites/org/pages/account/patterns/noble/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/noble/edit.mjs @@ -4,7 +4,7 @@ import { Noble } from 'designs/noble/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditNoblePage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditNoblePage = ({ page, docs, id }) => { export default EditNoblePage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'noble', params.id, 'edit'], + path: ['account', 'patterns', 'noble'], title: 'Noble', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/octoplushy/[id]/edit.mjs b/sites/org/pages/account/patterns/octoplushy/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/octoplushy/[id]/edit.mjs rename to sites/org/pages/account/patterns/octoplushy/edit.mjs index 78db564271a..68cbbfc4501 100644 --- a/sites/org/pages/account/patterns/octoplushy/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/octoplushy/edit.mjs @@ -4,7 +4,7 @@ import { Octoplushy } from 'designs/octoplushy/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditOctoplushyPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditOctoplushyPage = ({ page, docs, id }) => { export default EditOctoplushyPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'octoplushy', params.id, 'edit'], + path: ['account', 'patterns', 'octoplushy'], title: 'Octoplushy', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/otis/[id]/edit.mjs b/sites/org/pages/account/patterns/otis/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/otis/[id]/edit.mjs rename to sites/org/pages/account/patterns/otis/edit.mjs index 00586bf0f01..a5d0b8e326a 100644 --- a/sites/org/pages/account/patterns/otis/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/otis/edit.mjs @@ -4,7 +4,7 @@ import { Otis } from 'designs/otis/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditOtisPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditOtisPage = ({ page, docs, id }) => { export default EditOtisPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'otis', params.id, 'edit'], + path: ['account', 'patterns', 'otis'], title: 'Otis', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/paco/[id]/edit.mjs b/sites/org/pages/account/patterns/paco/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/paco/[id]/edit.mjs rename to sites/org/pages/account/patterns/paco/edit.mjs index d5ca9d962d1..84e01db34dc 100644 --- a/sites/org/pages/account/patterns/paco/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/paco/edit.mjs @@ -4,7 +4,7 @@ import { Paco } from 'designs/paco/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditPacoPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditPacoPage = ({ page, docs, id }) => { export default EditPacoPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'paco', params.id, 'edit'], + path: ['account', 'patterns', 'paco'], title: 'Paco', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/penelope/[id]/edit.mjs b/sites/org/pages/account/patterns/penelope/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/penelope/[id]/edit.mjs rename to sites/org/pages/account/patterns/penelope/edit.mjs index b26cce2d41e..bbdd55363ca 100644 --- a/sites/org/pages/account/patterns/penelope/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/penelope/edit.mjs @@ -4,7 +4,7 @@ import { Penelope } from 'designs/penelope/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditPenelopePage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditPenelopePage = ({ page, docs, id }) => { export default EditPenelopePage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'penelope', params.id, 'edit'], + path: ['account', 'patterns', 'penelope'], title: 'Penelope', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/sandy/[id]/edit.mjs b/sites/org/pages/account/patterns/sandy/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/sandy/[id]/edit.mjs rename to sites/org/pages/account/patterns/sandy/edit.mjs index 41aa85fc535..7ed2273c2e4 100644 --- a/sites/org/pages/account/patterns/sandy/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/sandy/edit.mjs @@ -4,7 +4,7 @@ import { Sandy } from 'designs/sandy/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditSandyPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditSandyPage = ({ page, docs, id }) => { export default EditSandyPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'sandy', params.id, 'edit'], + path: ['account', 'patterns', 'sandy'], title: 'Sandy', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/shelly/[id]/edit.mjs b/sites/org/pages/account/patterns/shelly/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/shelly/[id]/edit.mjs rename to sites/org/pages/account/patterns/shelly/edit.mjs index ced75f3aa2f..854e3a9f562 100644 --- a/sites/org/pages/account/patterns/shelly/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/shelly/edit.mjs @@ -4,7 +4,7 @@ import { Shelly } from 'designs/shelly/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditShellyPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditShellyPage = ({ page, docs, id }) => { export default EditShellyPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'shelly', params.id, 'edit'], + path: ['account', 'patterns', 'shelly'], title: 'Shelly', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/shin/[id]/edit.mjs b/sites/org/pages/account/patterns/shin/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/shin/[id]/edit.mjs rename to sites/org/pages/account/patterns/shin/edit.mjs index 9b257170cae..f91bba7ef2d 100644 --- a/sites/org/pages/account/patterns/shin/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/shin/edit.mjs @@ -4,7 +4,7 @@ import { Shin } from 'designs/shin/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditShinPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditShinPage = ({ page, docs, id }) => { export default EditShinPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'shin', params.id, 'edit'], + path: ['account', 'patterns', 'shin'], title: 'Shin', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/simon/[id]/edit.mjs b/sites/org/pages/account/patterns/simon/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/simon/[id]/edit.mjs rename to sites/org/pages/account/patterns/simon/edit.mjs index 192b8a92405..98f4c3ba81a 100644 --- a/sites/org/pages/account/patterns/simon/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/simon/edit.mjs @@ -4,7 +4,7 @@ import { Simon } from 'designs/simon/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditSimonPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditSimonPage = ({ page, docs, id }) => { export default EditSimonPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'simon', params.id, 'edit'], + path: ['account', 'patterns', 'simon'], title: 'Simon', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/simone/[id]/edit.mjs b/sites/org/pages/account/patterns/simone/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/simone/[id]/edit.mjs rename to sites/org/pages/account/patterns/simone/edit.mjs index ad1fb9f7450..fb674bda276 100644 --- a/sites/org/pages/account/patterns/simone/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/simone/edit.mjs @@ -4,7 +4,7 @@ import { Simone } from 'designs/simone/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditSimonePage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditSimonePage = ({ page, docs, id }) => { export default EditSimonePage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'simone', params.id, 'edit'], + path: ['account', 'patterns', 'simone'], title: 'Simone', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/skully/[id]/edit.mjs b/sites/org/pages/account/patterns/skully/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/skully/[id]/edit.mjs rename to sites/org/pages/account/patterns/skully/edit.mjs index c2e21bc495d..12fcc539219 100644 --- a/sites/org/pages/account/patterns/skully/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/skully/edit.mjs @@ -4,7 +4,7 @@ import { Skully } from 'designs/skully/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditSkullyPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditSkullyPage = ({ page, docs, id }) => { export default EditSkullyPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'skully', params.id, 'edit'], + path: ['account', 'patterns', 'skully'], title: 'Skully', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/sven/[id]/edit.mjs b/sites/org/pages/account/patterns/sven/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/sven/[id]/edit.mjs rename to sites/org/pages/account/patterns/sven/edit.mjs index 871609dc516..fef5c6ec877 100644 --- a/sites/org/pages/account/patterns/sven/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/sven/edit.mjs @@ -4,7 +4,7 @@ import { Sven } from 'designs/sven/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditSvenPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditSvenPage = ({ page, docs, id }) => { export default EditSvenPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'sven', params.id, 'edit'], + path: ['account', 'patterns', 'sven'], title: 'Sven', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/tamiko/[id]/edit.mjs b/sites/org/pages/account/patterns/tamiko/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/tamiko/[id]/edit.mjs rename to sites/org/pages/account/patterns/tamiko/edit.mjs index 6593db5e9cb..46ec913701f 100644 --- a/sites/org/pages/account/patterns/tamiko/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/tamiko/edit.mjs @@ -4,7 +4,7 @@ import { Tamiko } from 'designs/tamiko/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditTamikoPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditTamikoPage = ({ page, docs, id }) => { export default EditTamikoPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'tamiko', params.id, 'edit'], + path: ['account', 'patterns', 'tamiko'], title: 'Tamiko', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/teagan/[id]/edit.mjs b/sites/org/pages/account/patterns/teagan/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/teagan/[id]/edit.mjs rename to sites/org/pages/account/patterns/teagan/edit.mjs index e5881ef576f..b8dfae8da0e 100644 --- a/sites/org/pages/account/patterns/teagan/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/teagan/edit.mjs @@ -4,7 +4,7 @@ import { Teagan } from 'designs/teagan/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditTeaganPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditTeaganPage = ({ page, docs, id }) => { export default EditTeaganPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'teagan', params.id, 'edit'], + path: ['account', 'patterns', 'teagan'], title: 'Teagan', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/tiberius/[id]/edit.mjs b/sites/org/pages/account/patterns/tiberius/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/tiberius/[id]/edit.mjs rename to sites/org/pages/account/patterns/tiberius/edit.mjs index 97e3b6020c7..3dca1a2032c 100644 --- a/sites/org/pages/account/patterns/tiberius/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/tiberius/edit.mjs @@ -4,7 +4,7 @@ import { Tiberius } from 'designs/tiberius/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditTiberiusPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditTiberiusPage = ({ page, docs, id }) => { export default EditTiberiusPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'tiberius', params.id, 'edit'], + path: ['account', 'patterns', 'tiberius'], title: 'Tiberius', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/titan/[id]/edit.mjs b/sites/org/pages/account/patterns/titan/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/titan/[id]/edit.mjs rename to sites/org/pages/account/patterns/titan/edit.mjs index b8de9d35d4d..529d7fc136a 100644 --- a/sites/org/pages/account/patterns/titan/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/titan/edit.mjs @@ -4,7 +4,7 @@ import { Titan } from 'designs/titan/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditTitanPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditTitanPage = ({ page, docs, id }) => { export default EditTitanPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'titan', params.id, 'edit'], + path: ['account', 'patterns', 'titan'], title: 'Titan', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/trayvon/[id]/edit.mjs b/sites/org/pages/account/patterns/trayvon/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/trayvon/[id]/edit.mjs rename to sites/org/pages/account/patterns/trayvon/edit.mjs index 77227539626..92abe3031e6 100644 --- a/sites/org/pages/account/patterns/trayvon/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/trayvon/edit.mjs @@ -4,7 +4,7 @@ import { Trayvon } from 'designs/trayvon/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditTrayvonPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditTrayvonPage = ({ page, docs, id }) => { export default EditTrayvonPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'trayvon', params.id, 'edit'], + path: ['account', 'patterns', 'trayvon'], title: 'Trayvon', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/uma/[id]/edit.mjs b/sites/org/pages/account/patterns/uma/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/uma/[id]/edit.mjs rename to sites/org/pages/account/patterns/uma/edit.mjs index 2a8e4b7d9f6..70f692c843d 100644 --- a/sites/org/pages/account/patterns/uma/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/uma/edit.mjs @@ -4,7 +4,7 @@ import { Uma } from 'designs/uma/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditUmaPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditUmaPage = ({ page, docs, id }) => { export default EditUmaPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'uma', params.id, 'edit'], + path: ['account', 'patterns', 'uma'], title: 'Uma', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/wahid/[id]/edit.mjs b/sites/org/pages/account/patterns/wahid/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/wahid/[id]/edit.mjs rename to sites/org/pages/account/patterns/wahid/edit.mjs index e2f361672d7..18b95021e2a 100644 --- a/sites/org/pages/account/patterns/wahid/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/wahid/edit.mjs @@ -4,7 +4,7 @@ import { Wahid } from 'designs/wahid/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditWahidPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditWahidPage = ({ page, docs, id }) => { export default EditWahidPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'wahid', params.id, 'edit'], + path: ['account', 'patterns', 'wahid'], title: 'Wahid', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/walburga/[id]/edit.mjs b/sites/org/pages/account/patterns/walburga/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/walburga/[id]/edit.mjs rename to sites/org/pages/account/patterns/walburga/edit.mjs index 49be13cbd63..069a68c430b 100644 --- a/sites/org/pages/account/patterns/walburga/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/walburga/edit.mjs @@ -4,7 +4,7 @@ import { Walburga } from 'designs/walburga/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditWalburgaPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditWalburgaPage = ({ page, docs, id }) => { export default EditWalburgaPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'walburga', params.id, 'edit'], + path: ['account', 'patterns', 'walburga'], title: 'Walburga', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/waralee/[id]/edit.mjs b/sites/org/pages/account/patterns/waralee/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/waralee/[id]/edit.mjs rename to sites/org/pages/account/patterns/waralee/edit.mjs index b2064feac16..3961920f06c 100644 --- a/sites/org/pages/account/patterns/waralee/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/waralee/edit.mjs @@ -4,7 +4,7 @@ import { Waralee } from 'designs/waralee/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditWaraleePage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditWaraleePage = ({ page, docs, id }) => { export default EditWaraleePage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'waralee', params.id, 'edit'], + path: ['account', 'patterns', 'waralee'], title: 'Waralee', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/account/patterns/yuri/[id]/edit.mjs b/sites/org/pages/account/patterns/yuri/edit.mjs similarity index 85% rename from sites/org/pages/account/patterns/yuri/[id]/edit.mjs rename to sites/org/pages/account/patterns/yuri/edit.mjs index d99aaa19b3b..f7b325b973d 100644 --- a/sites/org/pages/account/patterns/yuri/[id]/edit.mjs +++ b/sites/org/pages/account/patterns/yuri/edit.mjs @@ -4,7 +4,7 @@ import { Yuri } from 'designs/yuri/src/index.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -46,8 +46,9 @@ const EditYuriPage = ({ page, docs, id }) => { setLoadingStatus([true, 'backendError', true, false]) } } + const id = getSearchParam('id') if (id) getPattern() - }, [id]) + }, []) return ( // prettier-ignore @@ -72,27 +73,15 @@ const EditYuriPage = ({ page, docs, id }) => { export default EditYuriPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', 'yuri', params.id, 'edit'], + path: ['account', 'patterns', 'yuri'], title: 'Yuri', }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/patterns/[id]/index.mjs b/sites/org/pages/pattern.mjs similarity index 69% rename from sites/org/pages/patterns/[id]/index.mjs rename to sites/org/pages/pattern.mjs index 4c2b08b98d8..d9d547f4e54 100644 --- a/sites/org/pages/patterns/[id]/index.mjs +++ b/sites/org/pages/pattern.mjs @@ -1,9 +1,10 @@ // Dependencies import dynamic from 'next/dynamic' import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useTranslation } from 'next-i18next' +import { useState, useEffect } from 'react' // Components import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs' @@ -27,11 +28,17 @@ const DynamicPattern = dynamic( * when path and locale come from static props (as here) * or set them manually. */ -const PatternPage = ({ page, id }) => { +const PatternPage = ({ page }) => { const { t } = useTranslation(ns) + const [id, setId] = useState() + + useEffect(() => { + const newId = getSearchParam('id') + if (newId !== id) setId(newId) + }, [id]) return ( - + ) @@ -39,22 +46,14 @@ const PatternPage = ({ page, id }) => { export default PatternPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'patterns', params.id], + path: ['account', 'patterns'], }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - * To learn more, see: https://nextjs.org/docs/basic-features/data-fetching - */ -export const getStaticPaths = async () => ({ paths: [], fallback: true }) diff --git a/sites/org/pages/patterns/index.mjs b/sites/org/pages/patterns/index.mjs deleted file mode 100644 index b74a5880e31..00000000000 --- a/sites/org/pages/patterns/index.mjs +++ /dev/null @@ -1,53 +0,0 @@ -// Dependencies -import dynamic from 'next/dynamic' -import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -// Components -import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' - -import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs' -import { ns as setsNs } from 'shared/components/account/sets.mjs' - -// Translation namespaces used on this page -const namespaces = [...new Set([...setsNs, ...authNs, ...pageNs])] - -/* - * Some things should never generated as SSR - * So for these, we run a dynamic import and disable SSR rendering - */ -const DynamicAuthWrapper = dynamic( - () => import('shared/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper), - { ssr: false } -) - -const DynamicPatterns = dynamic( - () => import('shared/components/account/patterns.mjs').then((mod) => mod.Patterns), - { ssr: false } -) - -/* - * Each page MUST be wrapped in the PageWrapper component. - * You also MUST spread props.page into this wrapper component - * when path and locale come from static props (as here) - * or set them manually. - */ -const PatternsIndexPage = ({ page }) => ( - - - - - -) - -export default PatternsIndexPage - -export async function getStaticProps({ locale }) { - return { - props: { - ...(await serverSideTranslations(locale, namespaces)), - page: { - locale, - path: ['patterns'], - }, - }, - } -} diff --git a/sites/org/vercel.json b/sites/org/vercel.json new file mode 100644 index 00000000000..d5ba7258dda --- /dev/null +++ b/sites/org/vercel.json @@ -0,0 +1,200 @@ +{ + "rewrites": [ + { + "source": "/account/patterns/aaron/:id/edit", + "destination": "/account/patterns/aaron/edit?id=:id" + }, + { + "source": "/account/patterns/albert/:id/edit", + "destination": "/account/patterns/albert/edit?id=:id" + }, + { + "source": "/account/patterns/bee/:id/edit", + "destination": "/account/patterns/bee/edit?id=:id" + }, + { + "source": "/account/patterns/bella/:id/edit", + "destination": "/account/patterns/bella/edit?id=:id" + }, + { + "source": "/account/patterns/benjamin/:id/edit", + "destination": "/account/patterns/benjamin/edit?id=:id" + }, + { + "source": "/account/patterns/bent/:id/edit", + "destination": "/account/patterns/bent/edit?id=:id" + }, + { + "source": "/account/patterns/bob/:id/edit", + "destination": "/account/patterns/bob/edit?id=:id" + }, + { + "source": "/account/patterns/breanna/:id/edit", + "destination": "/account/patterns/breanna/edit?id=:id" + }, + { + "source": "/account/patterns/brian/:id/edit", + "destination": "/account/patterns/brian/edit?id=:id" + }, + { + "source": "/account/patterns/bruce/:id/edit", + "destination": "/account/patterns/bruce/edit?id=:id" + }, + { + "source": "/account/patterns/carlita/:id/edit", + "destination": "/account/patterns/carlita/edit?id=:id" + }, + { + "source": "/account/patterns/carlton/:id/edit", + "destination": "/account/patterns/carlton/edit?id=:id" + }, + { + "source": "/account/patterns/cathrin/:id/edit", + "destination": "/account/patterns/cathrin/edit?id=:id" + }, + { + "source": "/account/patterns/charlie/:id/edit", + "destination": "/account/patterns/charlie/edit?id=:id" + }, + { + "source": "/account/patterns/cornelius/:id/edit", + "destination": "/account/patterns/cornelius/edit?id=:id" + }, + { + "source": "/account/patterns/diana/:id/edit", + "destination": "/account/patterns/diana/edit?id=:id" + }, + { + "source": "/account/patterns/florence/:id/edit", + "destination": "/account/patterns/florence/edit?id=:id" + }, + { + "source": "/account/patterns/florent/:id/edit", + "destination": "/account/patterns/florent/edit?id=:id" + }, + { + "source": "/account/patterns/gozer/:id/edit", + "destination": "/account/patterns/gozer/edit?id=:id" + }, + { + "source": "/account/patterns/hi/:id/edit", + "destination": "/account/patterns/hi/edit?id=:id" + }, + { + "source": "/account/patterns/holmes/:id/edit", + "destination": "/account/patterns/holmes/edit?id=:id" + }, + { + "source": "/account/patterns/hortensia/:id/edit", + "destination": "/account/patterns/hortensia/edit?id=:id" + }, + { + "source": "/account/patterns/huey/:id/edit", + "destination": "/account/patterns/huey/edit?id=:id" + }, + { + "source": "/account/patterns/hugo/:id/edit", + "destination": "/account/patterns/hugo/edit?id=:id" + }, + { + "source": "/account/patterns/jaeger/:id/edit", + "destination": "/account/patterns/jaeger/edit?id=:id" + }, + { + "source": "/account/patterns/lucy/:id/edit", + "destination": "/account/patterns/lucy/edit?id=:id" + }, + { + "source": "/account/patterns/lunetius/:id/edit", + "destination": "/account/patterns/lunetius/edit?id=:id" + }, + { + "source": "/account/patterns/noble/:id/edit", + "destination": "/account/patterns/noble/edit?id=:id" + }, + { + "source": "/account/patterns/octoplushy/:id/edit", + "destination": "/account/patterns/octoplushy/edit?id=:id" + }, + { + "source": "/account/patterns/paco/:id/edit", + "destination": "/account/patterns/paco/edit?id=:id" + }, + { + "source": "/account/patterns/penelope/:id/edit", + "destination": "/account/patterns/penelope/edit?id=:id" + }, + { + "source": "/account/patterns/sandy/:id/edit", + "destination": "/account/patterns/sandy/edit?id=:id" + }, + { + "source": "/account/patterns/shelly/:id/edit", + "destination": "/account/patterns/shelly/edit?id=:id" + }, + { + "source": "/account/patterns/shin/:id/edit", + "destination": "/account/patterns/shin/edit?id=:id" + }, + { + "source": "/account/patterns/simon/:id/edit", + "destination": "/account/patterns/simon/edit?id=:id" + }, + { + "source": "/account/patterns/simone/:id/edit", + "destination": "/account/patterns/simone/edit?id=:id" + }, + { + "source": "/account/patterns/skully/:id/edit", + "destination": "/account/patterns/skully/edit?id=:id" + }, + { + "source": "/account/patterns/sven/:id/edit", + "destination": "/account/patterns/sven/edit?id=:id" + }, + { + "source": "/account/patterns/tamiko/:id/edit", + "destination": "/account/patterns/tamiko/edit?id=:id" + }, + { + "source": "/account/patterns/teagan/:id/edit", + "destination": "/account/patterns/teagan/edit?id=:id" + }, + { + "source": "/account/patterns/tiberius/:id/edit", + "destination": "/account/patterns/tiberius/edit?id=:id" + }, + { + "source": "/account/patterns/titan/:id/edit", + "destination": "/account/patterns/titan/edit?id=:id" + }, + { + "source": "/account/patterns/trayvon/:id/edit", + "destination": "/account/patterns/trayvon/edit?id=:id" + }, + { + "source": "/account/patterns/uma/:id/edit", + "destination": "/account/patterns/uma/edit?id=:id" + }, + { + "source": "/account/patterns/wahid/:id/edit", + "destination": "/account/patterns/wahid/edit?id=:id" + }, + { + "source": "/account/patterns/walburga/:id/edit", + "destination": "/account/patterns/walburga/edit?id=:id" + }, + { + "source": "/account/patterns/waralee/:id/edit", + "destination": "/account/patterns/waralee/edit?id=:id" + }, + { + "source": "/account/patterns/yuri/:id/edit", + "destination": "/account/patterns/yuri/edit?id=:id" + }, + { + "source": "/account/patterns/otis/:id/edit", + "destination": "/account/patterns/otis/edit?id=:id" + } + ] +} \ No newline at end of file diff --git a/sites/shared/components/account/bookmarks.mjs b/sites/shared/components/account/bookmarks.mjs index 9e68dbaa5a6..65621b5b5ee 100644 --- a/sites/shared/components/account/bookmarks.mjs +++ b/sites/shared/components/account/bookmarks.mjs @@ -214,7 +214,10 @@ export const Bookmarks = () => { /> - + { {pattern.name} {pattern.id} - + @@ -142,7 +142,7 @@ export const ShowPattern = ({ id }) => {

{t('account:ownPublicPattern')}

{t('account:privateView')} @@ -270,7 +270,7 @@ export const Pattern = ({ id }) => { ) : ( <> {t('updatePattern')} @@ -314,7 +314,7 @@ export const Pattern = ({ id }) => { {pattern.public && ( - + )} @@ -338,7 +338,10 @@ export const Pattern = ({ id }) => { )}

{t('account:ownPrivatePattern')}

- + {t('account:publicView')} @@ -617,13 +620,13 @@ export const Patterns = () => { {pattern.id} - + diff --git a/sites/shared/components/social/icons.mjs b/sites/shared/components/social/icons.mjs index 1e5f8a24f1d..1db6d78d086 100644 --- a/sites/shared/components/social/icons.mjs +++ b/sites/shared/components/social/icons.mjs @@ -19,7 +19,7 @@ import { siteConfig } from 'site/site.config.mjs' const iconClasses = (color) => ({ className: `w-8 lg:w-12 h-8 lg:h-12 text-${color} hover:text-neutral-content`, }) -console.log(social) + export const socialList = (spectrum) => ({ MSF: { icon: , diff --git a/sites/shared/prebuild/org.mjs b/sites/shared/prebuild/org.mjs index 38797fd3a64..6d59312e0cb 100644 --- a/sites/shared/prebuild/org.mjs +++ b/sites/shared/prebuild/org.mjs @@ -30,7 +30,7 @@ export const generateNewPatternPages = async (designs, site = 'org') => { const generateEditPatternPages = async (designs, site = 'org') => { const page = await loadPageTemplate('edit-pattern.mjs') for (const design of designs) { - const dir = `../${site}/pages/account/patterns/${design}/[id]` + const dir = `../${site}/pages/account/patterns/${design}` await fs.promises.mkdir(path.resolve(dir), { recursive: true }) await fs.promises.writeFile( path.resolve(`${dir}/edit.mjs`), @@ -42,7 +42,22 @@ const generateEditPatternPages = async (designs, site = 'org') => { } } +const generateRewriteConfig = async (designs) => { + const rewrites = [] + for (const design of designs) { + rewrites.push({ + source: `/account/patterns/${design}/:id/edit`, + destination: `/account/patterns/${design}/edit?id=:id`, + }) + } + await fs.promises.writeFile( + path.resolve('..', 'org', 'vercel.json'), + JSON.stringify({ rewrites }, null, 2) + ) +} + export const prebuildOrg = async () => { await generateNewPatternPages(collection) await generateEditPatternPages(collection) + await generateRewriteConfig(collection) } diff --git a/sites/shared/utils.mjs b/sites/shared/utils.mjs index d4220a35d10..fe69a6ab30c 100644 --- a/sites/shared/utils.mjs +++ b/sites/shared/utils.mjs @@ -488,3 +488,6 @@ export const workbenchHash = ({ settings = {}, view = 'draft' }) => `#settings=${encodeURIComponent(JSON.stringify(settings))}&view=${encodeURIComponent( '"' + view + '"' )}` + +export const getSearchParam = (name = 'id') => + typeof window === 'undefined' ? undefined : new URLSearchParams(window.location.search).get(name) From 743660dba5e347d793765d3e6d1821114b3e65fd Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 22 Oct 2023 12:49:28 +0200 Subject: [PATCH 09/27] fix(org): Remove old docs passing --- sites/org/page-templates/edit-pattern.mjs | 7 +++---- sites/org/pages/account/patterns/aaron/edit.mjs | 7 +++---- sites/org/pages/account/patterns/albert/edit.mjs | 7 +++---- sites/org/pages/account/patterns/bee/edit.mjs | 7 +++---- sites/org/pages/account/patterns/bella/edit.mjs | 7 +++---- sites/org/pages/account/patterns/benjamin/edit.mjs | 7 +++---- sites/org/pages/account/patterns/bent/edit.mjs | 7 +++---- sites/org/pages/account/patterns/bob/edit.mjs | 7 +++---- sites/org/pages/account/patterns/breanna/edit.mjs | 7 +++---- sites/org/pages/account/patterns/brian/edit.mjs | 7 +++---- sites/org/pages/account/patterns/bruce/edit.mjs | 7 +++---- sites/org/pages/account/patterns/carlita/edit.mjs | 7 +++---- sites/org/pages/account/patterns/carlton/edit.mjs | 7 +++---- sites/org/pages/account/patterns/cathrin/edit.mjs | 7 +++---- sites/org/pages/account/patterns/charlie/edit.mjs | 7 +++---- sites/org/pages/account/patterns/cornelius/edit.mjs | 7 +++---- sites/org/pages/account/patterns/diana/edit.mjs | 7 +++---- sites/org/pages/account/patterns/florence/edit.mjs | 7 +++---- sites/org/pages/account/patterns/florent/edit.mjs | 7 +++---- sites/org/pages/account/patterns/gozer/edit.mjs | 7 +++---- sites/org/pages/account/patterns/hi/edit.mjs | 7 +++---- sites/org/pages/account/patterns/holmes/edit.mjs | 7 +++---- sites/org/pages/account/patterns/hortensia/edit.mjs | 7 +++---- sites/org/pages/account/patterns/huey/edit.mjs | 7 +++---- sites/org/pages/account/patterns/hugo/edit.mjs | 7 +++---- sites/org/pages/account/patterns/jaeger/edit.mjs | 7 +++---- sites/org/pages/account/patterns/lucy/edit.mjs | 7 +++---- sites/org/pages/account/patterns/lunetius/edit.mjs | 7 +++---- sites/org/pages/account/patterns/noble/edit.mjs | 7 +++---- sites/org/pages/account/patterns/octoplushy/edit.mjs | 7 +++---- sites/org/pages/account/patterns/otis/edit.mjs | 7 +++---- sites/org/pages/account/patterns/paco/edit.mjs | 7 +++---- sites/org/pages/account/patterns/penelope/edit.mjs | 7 +++---- sites/org/pages/account/patterns/sandy/edit.mjs | 7 +++---- sites/org/pages/account/patterns/shelly/edit.mjs | 7 +++---- sites/org/pages/account/patterns/shin/edit.mjs | 7 +++---- sites/org/pages/account/patterns/simon/edit.mjs | 7 +++---- sites/org/pages/account/patterns/simone/edit.mjs | 7 +++---- sites/org/pages/account/patterns/skully/edit.mjs | 7 +++---- sites/org/pages/account/patterns/sven/edit.mjs | 7 +++---- sites/org/pages/account/patterns/tamiko/edit.mjs | 7 +++---- sites/org/pages/account/patterns/teagan/edit.mjs | 7 +++---- sites/org/pages/account/patterns/tiberius/edit.mjs | 7 +++---- sites/org/pages/account/patterns/titan/edit.mjs | 7 +++---- sites/org/pages/account/patterns/trayvon/edit.mjs | 7 +++---- sites/org/pages/account/patterns/uma/edit.mjs | 7 +++---- sites/org/pages/account/patterns/wahid/edit.mjs | 7 +++---- sites/org/pages/account/patterns/walburga/edit.mjs | 7 +++---- sites/org/pages/account/patterns/waralee/edit.mjs | 7 +++---- sites/org/pages/account/patterns/yuri/edit.mjs | 7 +++---- 50 files changed, 150 insertions(+), 200 deletions(-) diff --git a/sites/org/page-templates/edit-pattern.mjs b/sites/org/page-templates/edit-pattern.mjs index ec3fc063ea3..01d0ecc51db 100644 --- a/sites/org/page-templates/edit-pattern.mjs +++ b/sites/org/page-templates/edit-pattern.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('$$design$$', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const Edit$$Design$$Page = ({ page, docs, id }) => { +const Edit$$Design$$Page = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const Edit$$Design$$Page = ({ page, docs, id }) => { settings={pattern.settings} design="$$design$$" Design={$$Design$$} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/aaron/edit.mjs b/sites/org/pages/account/patterns/aaron/edit.mjs index ed6d533ca5a..4612da2574e 100644 --- a/sites/org/pages/account/patterns/aaron/edit.mjs +++ b/sites/org/pages/account/patterns/aaron/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('aaron', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditAaronPage = ({ page, docs, id }) => { +const EditAaronPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditAaronPage = ({ page, docs, id }) => { settings={pattern.settings} design="aaron" Design={Aaron} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/albert/edit.mjs b/sites/org/pages/account/patterns/albert/edit.mjs index fa21c811628..eeda4de8731 100644 --- a/sites/org/pages/account/patterns/albert/edit.mjs +++ b/sites/org/pages/account/patterns/albert/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('albert', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditAlbertPage = ({ page, docs, id }) => { +const EditAlbertPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditAlbertPage = ({ page, docs, id }) => { settings={pattern.settings} design="albert" Design={Albert} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/bee/edit.mjs b/sites/org/pages/account/patterns/bee/edit.mjs index ace3c75287c..7ac62889707 100644 --- a/sites/org/pages/account/patterns/bee/edit.mjs +++ b/sites/org/pages/account/patterns/bee/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('bee', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditBeePage = ({ page, docs, id }) => { +const EditBeePage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditBeePage = ({ page, docs, id }) => { settings={pattern.settings} design="bee" Design={Bee} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/bella/edit.mjs b/sites/org/pages/account/patterns/bella/edit.mjs index 415d1a7e052..c60d67d235b 100644 --- a/sites/org/pages/account/patterns/bella/edit.mjs +++ b/sites/org/pages/account/patterns/bella/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('bella', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditBellaPage = ({ page, docs, id }) => { +const EditBellaPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditBellaPage = ({ page, docs, id }) => { settings={pattern.settings} design="bella" Design={Bella} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/benjamin/edit.mjs b/sites/org/pages/account/patterns/benjamin/edit.mjs index 31901cc3b46..574849f0948 100644 --- a/sites/org/pages/account/patterns/benjamin/edit.mjs +++ b/sites/org/pages/account/patterns/benjamin/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('benjamin', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditBenjaminPage = ({ page, docs, id }) => { +const EditBenjaminPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditBenjaminPage = ({ page, docs, id }) => { settings={pattern.settings} design="benjamin" Design={Benjamin} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/bent/edit.mjs b/sites/org/pages/account/patterns/bent/edit.mjs index 88bd5862a6a..eb3fee36a5b 100644 --- a/sites/org/pages/account/patterns/bent/edit.mjs +++ b/sites/org/pages/account/patterns/bent/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('bent', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditBentPage = ({ page, docs, id }) => { +const EditBentPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditBentPage = ({ page, docs, id }) => { settings={pattern.settings} design="bent" Design={Bent} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/bob/edit.mjs b/sites/org/pages/account/patterns/bob/edit.mjs index df6796bedfd..0b800b9ceee 100644 --- a/sites/org/pages/account/patterns/bob/edit.mjs +++ b/sites/org/pages/account/patterns/bob/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('bob', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditBobPage = ({ page, docs, id }) => { +const EditBobPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditBobPage = ({ page, docs, id }) => { settings={pattern.settings} design="bob" Design={Bob} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/breanna/edit.mjs b/sites/org/pages/account/patterns/breanna/edit.mjs index 98d061239da..8d1e464510d 100644 --- a/sites/org/pages/account/patterns/breanna/edit.mjs +++ b/sites/org/pages/account/patterns/breanna/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('breanna', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditBreannaPage = ({ page, docs, id }) => { +const EditBreannaPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditBreannaPage = ({ page, docs, id }) => { settings={pattern.settings} design="breanna" Design={Breanna} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/brian/edit.mjs b/sites/org/pages/account/patterns/brian/edit.mjs index 4b293230675..e2dda69ac5c 100644 --- a/sites/org/pages/account/patterns/brian/edit.mjs +++ b/sites/org/pages/account/patterns/brian/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('brian', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditBrianPage = ({ page, docs, id }) => { +const EditBrianPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditBrianPage = ({ page, docs, id }) => { settings={pattern.settings} design="brian" Design={Brian} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/bruce/edit.mjs b/sites/org/pages/account/patterns/bruce/edit.mjs index c68d8bba9d3..9ccf3903d71 100644 --- a/sites/org/pages/account/patterns/bruce/edit.mjs +++ b/sites/org/pages/account/patterns/bruce/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('bruce', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditBrucePage = ({ page, docs, id }) => { +const EditBrucePage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditBrucePage = ({ page, docs, id }) => { settings={pattern.settings} design="bruce" Design={Bruce} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/carlita/edit.mjs b/sites/org/pages/account/patterns/carlita/edit.mjs index 301a591b2b7..ba4691612ca 100644 --- a/sites/org/pages/account/patterns/carlita/edit.mjs +++ b/sites/org/pages/account/patterns/carlita/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('carlita', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditCarlitaPage = ({ page, docs, id }) => { +const EditCarlitaPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditCarlitaPage = ({ page, docs, id }) => { settings={pattern.settings} design="carlita" Design={Carlita} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/carlton/edit.mjs b/sites/org/pages/account/patterns/carlton/edit.mjs index 9f46f274680..1eebace2fbe 100644 --- a/sites/org/pages/account/patterns/carlton/edit.mjs +++ b/sites/org/pages/account/patterns/carlton/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('carlton', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditCarltonPage = ({ page, docs, id }) => { +const EditCarltonPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditCarltonPage = ({ page, docs, id }) => { settings={pattern.settings} design="carlton" Design={Carlton} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/cathrin/edit.mjs b/sites/org/pages/account/patterns/cathrin/edit.mjs index c7189f9a9c9..44db2fd10a5 100644 --- a/sites/org/pages/account/patterns/cathrin/edit.mjs +++ b/sites/org/pages/account/patterns/cathrin/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('cathrin', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditCathrinPage = ({ page, docs, id }) => { +const EditCathrinPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditCathrinPage = ({ page, docs, id }) => { settings={pattern.settings} design="cathrin" Design={Cathrin} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/charlie/edit.mjs b/sites/org/pages/account/patterns/charlie/edit.mjs index 6d60235acb8..76446677fec 100644 --- a/sites/org/pages/account/patterns/charlie/edit.mjs +++ b/sites/org/pages/account/patterns/charlie/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('charlie', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditCharliePage = ({ page, docs, id }) => { +const EditCharliePage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditCharliePage = ({ page, docs, id }) => { settings={pattern.settings} design="charlie" Design={Charlie} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/cornelius/edit.mjs b/sites/org/pages/account/patterns/cornelius/edit.mjs index 572dd385570..e94e082d8d8 100644 --- a/sites/org/pages/account/patterns/cornelius/edit.mjs +++ b/sites/org/pages/account/patterns/cornelius/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('cornelius', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditCorneliusPage = ({ page, docs, id }) => { +const EditCorneliusPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditCorneliusPage = ({ page, docs, id }) => { settings={pattern.settings} design="cornelius" Design={Cornelius} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/diana/edit.mjs b/sites/org/pages/account/patterns/diana/edit.mjs index eaa636656dc..acad8014168 100644 --- a/sites/org/pages/account/patterns/diana/edit.mjs +++ b/sites/org/pages/account/patterns/diana/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('diana', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditDianaPage = ({ page, docs, id }) => { +const EditDianaPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditDianaPage = ({ page, docs, id }) => { settings={pattern.settings} design="diana" Design={Diana} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/florence/edit.mjs b/sites/org/pages/account/patterns/florence/edit.mjs index f5e1c41fd2c..9763fbcf926 100644 --- a/sites/org/pages/account/patterns/florence/edit.mjs +++ b/sites/org/pages/account/patterns/florence/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('florence', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditFlorencePage = ({ page, docs, id }) => { +const EditFlorencePage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditFlorencePage = ({ page, docs, id }) => { settings={pattern.settings} design="florence" Design={Florence} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/florent/edit.mjs b/sites/org/pages/account/patterns/florent/edit.mjs index e266522159e..db33493ec79 100644 --- a/sites/org/pages/account/patterns/florent/edit.mjs +++ b/sites/org/pages/account/patterns/florent/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('florent', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditFlorentPage = ({ page, docs, id }) => { +const EditFlorentPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditFlorentPage = ({ page, docs, id }) => { settings={pattern.settings} design="florent" Design={Florent} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/gozer/edit.mjs b/sites/org/pages/account/patterns/gozer/edit.mjs index 808b4044d78..bd628c8ca27 100644 --- a/sites/org/pages/account/patterns/gozer/edit.mjs +++ b/sites/org/pages/account/patterns/gozer/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('gozer', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditGozerPage = ({ page, docs, id }) => { +const EditGozerPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditGozerPage = ({ page, docs, id }) => { settings={pattern.settings} design="gozer" Design={Gozer} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/hi/edit.mjs b/sites/org/pages/account/patterns/hi/edit.mjs index 8b1e5f82b73..17d03e2c1bd 100644 --- a/sites/org/pages/account/patterns/hi/edit.mjs +++ b/sites/org/pages/account/patterns/hi/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('hi', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditHiPage = ({ page, docs, id }) => { +const EditHiPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditHiPage = ({ page, docs, id }) => { settings={pattern.settings} design="hi" Design={Hi} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/holmes/edit.mjs b/sites/org/pages/account/patterns/holmes/edit.mjs index f8483b84571..96b64b36c97 100644 --- a/sites/org/pages/account/patterns/holmes/edit.mjs +++ b/sites/org/pages/account/patterns/holmes/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('holmes', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditHolmesPage = ({ page, docs, id }) => { +const EditHolmesPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditHolmesPage = ({ page, docs, id }) => { settings={pattern.settings} design="holmes" Design={Holmes} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/hortensia/edit.mjs b/sites/org/pages/account/patterns/hortensia/edit.mjs index e736e19f1df..8097814f76e 100644 --- a/sites/org/pages/account/patterns/hortensia/edit.mjs +++ b/sites/org/pages/account/patterns/hortensia/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('hortensia', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditHortensiaPage = ({ page, docs, id }) => { +const EditHortensiaPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditHortensiaPage = ({ page, docs, id }) => { settings={pattern.settings} design="hortensia" Design={Hortensia} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/huey/edit.mjs b/sites/org/pages/account/patterns/huey/edit.mjs index 5174a5ff0df..10f6ca0d0a9 100644 --- a/sites/org/pages/account/patterns/huey/edit.mjs +++ b/sites/org/pages/account/patterns/huey/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('huey', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditHueyPage = ({ page, docs, id }) => { +const EditHueyPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditHueyPage = ({ page, docs, id }) => { settings={pattern.settings} design="huey" Design={Huey} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/hugo/edit.mjs b/sites/org/pages/account/patterns/hugo/edit.mjs index 43a6e65e1da..c807f11c186 100644 --- a/sites/org/pages/account/patterns/hugo/edit.mjs +++ b/sites/org/pages/account/patterns/hugo/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('hugo', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditHugoPage = ({ page, docs, id }) => { +const EditHugoPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditHugoPage = ({ page, docs, id }) => { settings={pattern.settings} design="hugo" Design={Hugo} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/jaeger/edit.mjs b/sites/org/pages/account/patterns/jaeger/edit.mjs index df962a305b6..0473a24341f 100644 --- a/sites/org/pages/account/patterns/jaeger/edit.mjs +++ b/sites/org/pages/account/patterns/jaeger/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('jaeger', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditJaegerPage = ({ page, docs, id }) => { +const EditJaegerPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditJaegerPage = ({ page, docs, id }) => { settings={pattern.settings} design="jaeger" Design={Jaeger} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/lucy/edit.mjs b/sites/org/pages/account/patterns/lucy/edit.mjs index 9f79b5373a0..5f567e4f559 100644 --- a/sites/org/pages/account/patterns/lucy/edit.mjs +++ b/sites/org/pages/account/patterns/lucy/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('lucy', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditLucyPage = ({ page, docs, id }) => { +const EditLucyPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditLucyPage = ({ page, docs, id }) => { settings={pattern.settings} design="lucy" Design={Lucy} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/lunetius/edit.mjs b/sites/org/pages/account/patterns/lunetius/edit.mjs index 238f2da940a..5529b044510 100644 --- a/sites/org/pages/account/patterns/lunetius/edit.mjs +++ b/sites/org/pages/account/patterns/lunetius/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('lunetius', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditLunetiusPage = ({ page, docs, id }) => { +const EditLunetiusPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditLunetiusPage = ({ page, docs, id }) => { settings={pattern.settings} design="lunetius" Design={Lunetius} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/noble/edit.mjs b/sites/org/pages/account/patterns/noble/edit.mjs index e245db76ad5..424b4bfe18e 100644 --- a/sites/org/pages/account/patterns/noble/edit.mjs +++ b/sites/org/pages/account/patterns/noble/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('noble', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditNoblePage = ({ page, docs, id }) => { +const EditNoblePage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditNoblePage = ({ page, docs, id }) => { settings={pattern.settings} design="noble" Design={Noble} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/octoplushy/edit.mjs b/sites/org/pages/account/patterns/octoplushy/edit.mjs index 68cbbfc4501..cdead829257 100644 --- a/sites/org/pages/account/patterns/octoplushy/edit.mjs +++ b/sites/org/pages/account/patterns/octoplushy/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('octoplushy', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditOctoplushyPage = ({ page, docs, id }) => { +const EditOctoplushyPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditOctoplushyPage = ({ page, docs, id }) => { settings={pattern.settings} design="octoplushy" Design={Octoplushy} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/otis/edit.mjs b/sites/org/pages/account/patterns/otis/edit.mjs index a5d0b8e326a..c1284579db6 100644 --- a/sites/org/pages/account/patterns/otis/edit.mjs +++ b/sites/org/pages/account/patterns/otis/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('otis', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditOtisPage = ({ page, docs, id }) => { +const EditOtisPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditOtisPage = ({ page, docs, id }) => { settings={pattern.settings} design="otis" Design={Otis} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/paco/edit.mjs b/sites/org/pages/account/patterns/paco/edit.mjs index 84e01db34dc..6555fd408e8 100644 --- a/sites/org/pages/account/patterns/paco/edit.mjs +++ b/sites/org/pages/account/patterns/paco/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('paco', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditPacoPage = ({ page, docs, id }) => { +const EditPacoPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditPacoPage = ({ page, docs, id }) => { settings={pattern.settings} design="paco" Design={Paco} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/penelope/edit.mjs b/sites/org/pages/account/patterns/penelope/edit.mjs index bbdd55363ca..eb0b70d65ca 100644 --- a/sites/org/pages/account/patterns/penelope/edit.mjs +++ b/sites/org/pages/account/patterns/penelope/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('penelope', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditPenelopePage = ({ page, docs, id }) => { +const EditPenelopePage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditPenelopePage = ({ page, docs, id }) => { settings={pattern.settings} design="penelope" Design={Penelope} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/sandy/edit.mjs b/sites/org/pages/account/patterns/sandy/edit.mjs index 7ed2273c2e4..bb57d67f630 100644 --- a/sites/org/pages/account/patterns/sandy/edit.mjs +++ b/sites/org/pages/account/patterns/sandy/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('sandy', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditSandyPage = ({ page, docs, id }) => { +const EditSandyPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditSandyPage = ({ page, docs, id }) => { settings={pattern.settings} design="sandy" Design={Sandy} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/shelly/edit.mjs b/sites/org/pages/account/patterns/shelly/edit.mjs index 854e3a9f562..681e0f9d4aa 100644 --- a/sites/org/pages/account/patterns/shelly/edit.mjs +++ b/sites/org/pages/account/patterns/shelly/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('shelly', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditShellyPage = ({ page, docs, id }) => { +const EditShellyPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditShellyPage = ({ page, docs, id }) => { settings={pattern.settings} design="shelly" Design={Shelly} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/shin/edit.mjs b/sites/org/pages/account/patterns/shin/edit.mjs index f91bba7ef2d..54638cf746e 100644 --- a/sites/org/pages/account/patterns/shin/edit.mjs +++ b/sites/org/pages/account/patterns/shin/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('shin', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditShinPage = ({ page, docs, id }) => { +const EditShinPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditShinPage = ({ page, docs, id }) => { settings={pattern.settings} design="shin" Design={Shin} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/simon/edit.mjs b/sites/org/pages/account/patterns/simon/edit.mjs index 98f4c3ba81a..744e3d115ab 100644 --- a/sites/org/pages/account/patterns/simon/edit.mjs +++ b/sites/org/pages/account/patterns/simon/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('simon', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditSimonPage = ({ page, docs, id }) => { +const EditSimonPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditSimonPage = ({ page, docs, id }) => { settings={pattern.settings} design="simon" Design={Simon} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/simone/edit.mjs b/sites/org/pages/account/patterns/simone/edit.mjs index fb674bda276..75b3e29c981 100644 --- a/sites/org/pages/account/patterns/simone/edit.mjs +++ b/sites/org/pages/account/patterns/simone/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('simone', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditSimonePage = ({ page, docs, id }) => { +const EditSimonePage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditSimonePage = ({ page, docs, id }) => { settings={pattern.settings} design="simone" Design={Simone} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/skully/edit.mjs b/sites/org/pages/account/patterns/skully/edit.mjs index 12fcc539219..f44d8cf9a79 100644 --- a/sites/org/pages/account/patterns/skully/edit.mjs +++ b/sites/org/pages/account/patterns/skully/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('skully', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditSkullyPage = ({ page, docs, id }) => { +const EditSkullyPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditSkullyPage = ({ page, docs, id }) => { settings={pattern.settings} design="skully" Design={Skully} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/sven/edit.mjs b/sites/org/pages/account/patterns/sven/edit.mjs index fef5c6ec877..adb34679704 100644 --- a/sites/org/pages/account/patterns/sven/edit.mjs +++ b/sites/org/pages/account/patterns/sven/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('sven', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditSvenPage = ({ page, docs, id }) => { +const EditSvenPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditSvenPage = ({ page, docs, id }) => { settings={pattern.settings} design="sven" Design={Sven} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/tamiko/edit.mjs b/sites/org/pages/account/patterns/tamiko/edit.mjs index 46ec913701f..393fcf9f9b3 100644 --- a/sites/org/pages/account/patterns/tamiko/edit.mjs +++ b/sites/org/pages/account/patterns/tamiko/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('tamiko', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditTamikoPage = ({ page, docs, id }) => { +const EditTamikoPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditTamikoPage = ({ page, docs, id }) => { settings={pattern.settings} design="tamiko" Design={Tamiko} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/teagan/edit.mjs b/sites/org/pages/account/patterns/teagan/edit.mjs index b8dfae8da0e..170792e67a9 100644 --- a/sites/org/pages/account/patterns/teagan/edit.mjs +++ b/sites/org/pages/account/patterns/teagan/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('teagan', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditTeaganPage = ({ page, docs, id }) => { +const EditTeaganPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditTeaganPage = ({ page, docs, id }) => { settings={pattern.settings} design="teagan" Design={Teagan} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/tiberius/edit.mjs b/sites/org/pages/account/patterns/tiberius/edit.mjs index 3dca1a2032c..083507ff65a 100644 --- a/sites/org/pages/account/patterns/tiberius/edit.mjs +++ b/sites/org/pages/account/patterns/tiberius/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('tiberius', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditTiberiusPage = ({ page, docs, id }) => { +const EditTiberiusPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditTiberiusPage = ({ page, docs, id }) => { settings={pattern.settings} design="tiberius" Design={Tiberius} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/titan/edit.mjs b/sites/org/pages/account/patterns/titan/edit.mjs index 529d7fc136a..844f3619a86 100644 --- a/sites/org/pages/account/patterns/titan/edit.mjs +++ b/sites/org/pages/account/patterns/titan/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('titan', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditTitanPage = ({ page, docs, id }) => { +const EditTitanPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditTitanPage = ({ page, docs, id }) => { settings={pattern.settings} design="titan" Design={Titan} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/trayvon/edit.mjs b/sites/org/pages/account/patterns/trayvon/edit.mjs index 92abe3031e6..120f8ace4d0 100644 --- a/sites/org/pages/account/patterns/trayvon/edit.mjs +++ b/sites/org/pages/account/patterns/trayvon/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('trayvon', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditTrayvonPage = ({ page, docs, id }) => { +const EditTrayvonPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditTrayvonPage = ({ page, docs, id }) => { settings={pattern.settings} design="trayvon" Design={Trayvon} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/uma/edit.mjs b/sites/org/pages/account/patterns/uma/edit.mjs index 70f692c843d..4e7f285f41b 100644 --- a/sites/org/pages/account/patterns/uma/edit.mjs +++ b/sites/org/pages/account/patterns/uma/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('uma', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditUmaPage = ({ page, docs, id }) => { +const EditUmaPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditUmaPage = ({ page, docs, id }) => { settings={pattern.settings} design="uma" Design={Uma} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/wahid/edit.mjs b/sites/org/pages/account/patterns/wahid/edit.mjs index 18b95021e2a..5f810634d9f 100644 --- a/sites/org/pages/account/patterns/wahid/edit.mjs +++ b/sites/org/pages/account/patterns/wahid/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('wahid', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditWahidPage = ({ page, docs, id }) => { +const EditWahidPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditWahidPage = ({ page, docs, id }) => { settings={pattern.settings} design="wahid" Design={Wahid} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/walburga/edit.mjs b/sites/org/pages/account/patterns/walburga/edit.mjs index 069a68c430b..f390dcebfed 100644 --- a/sites/org/pages/account/patterns/walburga/edit.mjs +++ b/sites/org/pages/account/patterns/walburga/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('walburga', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditWalburgaPage = ({ page, docs, id }) => { +const EditWalburgaPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditWalburgaPage = ({ page, docs, id }) => { settings={pattern.settings} design="walburga" Design={Walburga} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/waralee/edit.mjs b/sites/org/pages/account/patterns/waralee/edit.mjs index 3961920f06c..564f1b83c37 100644 --- a/sites/org/pages/account/patterns/waralee/edit.mjs +++ b/sites/org/pages/account/patterns/waralee/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('waralee', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditWaraleePage = ({ page, docs, id }) => { +const EditWaraleePage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditWaraleePage = ({ page, docs, id }) => { settings={pattern.settings} design="waralee" Design={Waralee} - docs={docs} /> ) : (
diff --git a/sites/org/pages/account/patterns/yuri/edit.mjs b/sites/org/pages/account/patterns/yuri/edit.mjs index f7b325b973d..3349e0437a7 100644 --- a/sites/org/pages/account/patterns/yuri/edit.mjs +++ b/sites/org/pages/account/patterns/yuri/edit.mjs @@ -20,11 +20,11 @@ import { Loading } from 'shared/components/spinner.mjs' // Translation namespaces used on this page const ns = nsMerge('yuri', wbNs, pageNs) -const EditDesignComponent = ({ id, design, Design, settings, docs }) => ( - +const EditDesignComponent = ({ id, design, Design, settings }) => ( + ) -const EditYuriPage = ({ page, docs, id }) => { +const EditYuriPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t } = useTranslation(ns) @@ -59,7 +59,6 @@ const EditYuriPage = ({ page, docs, id }) => { settings={pattern.settings} design="yuri" Design={Yuri} - docs={docs} /> ) : (
From e2c774b2974599adbc5f0cac57adf43b990a5f87 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 22 Oct 2023 12:51:36 +0200 Subject: [PATCH 10/27] chore: Remove lint --- sites/org/page-templates/edit-pattern.mjs | 2 +- sites/org/pages/account/pattern.mjs | 11 ++++++++--- sites/org/pages/account/patterns/aaron/edit.mjs | 2 +- sites/org/pages/account/patterns/albert/edit.mjs | 2 +- sites/org/pages/account/patterns/bee/edit.mjs | 2 +- sites/org/pages/account/patterns/bella/edit.mjs | 2 +- sites/org/pages/account/patterns/benjamin/edit.mjs | 2 +- sites/org/pages/account/patterns/bent/edit.mjs | 2 +- sites/org/pages/account/patterns/bob/edit.mjs | 2 +- sites/org/pages/account/patterns/breanna/edit.mjs | 2 +- sites/org/pages/account/patterns/brian/edit.mjs | 2 +- sites/org/pages/account/patterns/bruce/edit.mjs | 2 +- sites/org/pages/account/patterns/carlita/edit.mjs | 2 +- sites/org/pages/account/patterns/carlton/edit.mjs | 2 +- sites/org/pages/account/patterns/cathrin/edit.mjs | 2 +- sites/org/pages/account/patterns/charlie/edit.mjs | 2 +- sites/org/pages/account/patterns/cornelius/edit.mjs | 2 +- sites/org/pages/account/patterns/diana/edit.mjs | 2 +- sites/org/pages/account/patterns/florence/edit.mjs | 2 +- sites/org/pages/account/patterns/florent/edit.mjs | 2 +- sites/org/pages/account/patterns/gozer/edit.mjs | 2 +- sites/org/pages/account/patterns/hi/edit.mjs | 2 +- sites/org/pages/account/patterns/holmes/edit.mjs | 2 +- sites/org/pages/account/patterns/hortensia/edit.mjs | 2 +- sites/org/pages/account/patterns/huey/edit.mjs | 2 +- sites/org/pages/account/patterns/hugo/edit.mjs | 2 +- sites/org/pages/account/patterns/jaeger/edit.mjs | 2 +- sites/org/pages/account/patterns/lucy/edit.mjs | 2 +- sites/org/pages/account/patterns/lunetius/edit.mjs | 2 +- sites/org/pages/account/patterns/noble/edit.mjs | 2 +- sites/org/pages/account/patterns/octoplushy/edit.mjs | 2 +- sites/org/pages/account/patterns/otis/edit.mjs | 2 +- sites/org/pages/account/patterns/paco/edit.mjs | 2 +- sites/org/pages/account/patterns/penelope/edit.mjs | 2 +- sites/org/pages/account/patterns/sandy/edit.mjs | 2 +- sites/org/pages/account/patterns/shelly/edit.mjs | 2 +- sites/org/pages/account/patterns/shin/edit.mjs | 2 +- sites/org/pages/account/patterns/simon/edit.mjs | 2 +- sites/org/pages/account/patterns/simone/edit.mjs | 2 +- sites/org/pages/account/patterns/skully/edit.mjs | 2 +- sites/org/pages/account/patterns/sven/edit.mjs | 2 +- sites/org/pages/account/patterns/tamiko/edit.mjs | 2 +- sites/org/pages/account/patterns/teagan/edit.mjs | 2 +- sites/org/pages/account/patterns/tiberius/edit.mjs | 2 +- sites/org/pages/account/patterns/titan/edit.mjs | 2 +- sites/org/pages/account/patterns/trayvon/edit.mjs | 2 +- sites/org/pages/account/patterns/uma/edit.mjs | 2 +- sites/org/pages/account/patterns/wahid/edit.mjs | 2 +- sites/org/pages/account/patterns/walburga/edit.mjs | 2 +- sites/org/pages/account/patterns/waralee/edit.mjs | 2 +- sites/org/pages/account/patterns/yuri/edit.mjs | 2 +- sites/org/pages/pattern.mjs | 4 ++-- 52 files changed, 60 insertions(+), 55 deletions(-) diff --git a/sites/org/page-templates/edit-pattern.mjs b/sites/org/page-templates/edit-pattern.mjs index 01d0ecc51db..921d474deb7 100644 --- a/sites/org/page-templates/edit-pattern.mjs +++ b/sites/org/page-templates/edit-pattern.mjs @@ -48,7 +48,7 @@ const Edit$$Design$$Page = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/pattern.mjs b/sites/org/pages/account/pattern.mjs index d6d88d24a49..c226b8faa90 100644 --- a/sites/org/pages/account/pattern.mjs +++ b/sites/org/pages/account/pattern.mjs @@ -35,10 +35,15 @@ const DynamicPattern = dynamic( */ const PatternPage = ({ page }) => { const { t } = useTranslation(ns) - const id = getSearchParam('id') + const [id, setId] = useState() + + useEffect(() => { + const newId = getSearchParam('id') + if (newId !== id) setId(newId) + }, [id]) return ( - + @@ -54,7 +59,7 @@ export async function getStaticProps({ locale }) { ...(await serverSideTranslations(locale, ns)), page: { locale, - path: ['account', 'patterns'], + path: ['account', 'pattern'], }, }, } diff --git a/sites/org/pages/account/patterns/aaron/edit.mjs b/sites/org/pages/account/patterns/aaron/edit.mjs index 4612da2574e..65ae7340ca8 100644 --- a/sites/org/pages/account/patterns/aaron/edit.mjs +++ b/sites/org/pages/account/patterns/aaron/edit.mjs @@ -48,7 +48,7 @@ const EditAaronPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/albert/edit.mjs b/sites/org/pages/account/patterns/albert/edit.mjs index eeda4de8731..174967625a4 100644 --- a/sites/org/pages/account/patterns/albert/edit.mjs +++ b/sites/org/pages/account/patterns/albert/edit.mjs @@ -48,7 +48,7 @@ const EditAlbertPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/bee/edit.mjs b/sites/org/pages/account/patterns/bee/edit.mjs index 7ac62889707..059cb5ed2f8 100644 --- a/sites/org/pages/account/patterns/bee/edit.mjs +++ b/sites/org/pages/account/patterns/bee/edit.mjs @@ -48,7 +48,7 @@ const EditBeePage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/bella/edit.mjs b/sites/org/pages/account/patterns/bella/edit.mjs index c60d67d235b..6ccde447b95 100644 --- a/sites/org/pages/account/patterns/bella/edit.mjs +++ b/sites/org/pages/account/patterns/bella/edit.mjs @@ -48,7 +48,7 @@ const EditBellaPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/benjamin/edit.mjs b/sites/org/pages/account/patterns/benjamin/edit.mjs index 574849f0948..b71c29222e0 100644 --- a/sites/org/pages/account/patterns/benjamin/edit.mjs +++ b/sites/org/pages/account/patterns/benjamin/edit.mjs @@ -48,7 +48,7 @@ const EditBenjaminPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/bent/edit.mjs b/sites/org/pages/account/patterns/bent/edit.mjs index eb3fee36a5b..db19b348558 100644 --- a/sites/org/pages/account/patterns/bent/edit.mjs +++ b/sites/org/pages/account/patterns/bent/edit.mjs @@ -48,7 +48,7 @@ const EditBentPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/bob/edit.mjs b/sites/org/pages/account/patterns/bob/edit.mjs index 0b800b9ceee..9fc65ef8a57 100644 --- a/sites/org/pages/account/patterns/bob/edit.mjs +++ b/sites/org/pages/account/patterns/bob/edit.mjs @@ -48,7 +48,7 @@ const EditBobPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/breanna/edit.mjs b/sites/org/pages/account/patterns/breanna/edit.mjs index 8d1e464510d..157617f179b 100644 --- a/sites/org/pages/account/patterns/breanna/edit.mjs +++ b/sites/org/pages/account/patterns/breanna/edit.mjs @@ -48,7 +48,7 @@ const EditBreannaPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/brian/edit.mjs b/sites/org/pages/account/patterns/brian/edit.mjs index e2dda69ac5c..e803d9f0551 100644 --- a/sites/org/pages/account/patterns/brian/edit.mjs +++ b/sites/org/pages/account/patterns/brian/edit.mjs @@ -48,7 +48,7 @@ const EditBrianPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/bruce/edit.mjs b/sites/org/pages/account/patterns/bruce/edit.mjs index 9ccf3903d71..7a924870804 100644 --- a/sites/org/pages/account/patterns/bruce/edit.mjs +++ b/sites/org/pages/account/patterns/bruce/edit.mjs @@ -48,7 +48,7 @@ const EditBrucePage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/carlita/edit.mjs b/sites/org/pages/account/patterns/carlita/edit.mjs index ba4691612ca..3273f0e99f2 100644 --- a/sites/org/pages/account/patterns/carlita/edit.mjs +++ b/sites/org/pages/account/patterns/carlita/edit.mjs @@ -48,7 +48,7 @@ const EditCarlitaPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/carlton/edit.mjs b/sites/org/pages/account/patterns/carlton/edit.mjs index 1eebace2fbe..276889ad410 100644 --- a/sites/org/pages/account/patterns/carlton/edit.mjs +++ b/sites/org/pages/account/patterns/carlton/edit.mjs @@ -48,7 +48,7 @@ const EditCarltonPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/cathrin/edit.mjs b/sites/org/pages/account/patterns/cathrin/edit.mjs index 44db2fd10a5..2bcd3415484 100644 --- a/sites/org/pages/account/patterns/cathrin/edit.mjs +++ b/sites/org/pages/account/patterns/cathrin/edit.mjs @@ -48,7 +48,7 @@ const EditCathrinPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/charlie/edit.mjs b/sites/org/pages/account/patterns/charlie/edit.mjs index 76446677fec..1bd290ddfc1 100644 --- a/sites/org/pages/account/patterns/charlie/edit.mjs +++ b/sites/org/pages/account/patterns/charlie/edit.mjs @@ -48,7 +48,7 @@ const EditCharliePage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/cornelius/edit.mjs b/sites/org/pages/account/patterns/cornelius/edit.mjs index e94e082d8d8..100fae8059e 100644 --- a/sites/org/pages/account/patterns/cornelius/edit.mjs +++ b/sites/org/pages/account/patterns/cornelius/edit.mjs @@ -48,7 +48,7 @@ const EditCorneliusPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/diana/edit.mjs b/sites/org/pages/account/patterns/diana/edit.mjs index acad8014168..3968db22f1c 100644 --- a/sites/org/pages/account/patterns/diana/edit.mjs +++ b/sites/org/pages/account/patterns/diana/edit.mjs @@ -48,7 +48,7 @@ const EditDianaPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/florence/edit.mjs b/sites/org/pages/account/patterns/florence/edit.mjs index 9763fbcf926..17f6d39aed9 100644 --- a/sites/org/pages/account/patterns/florence/edit.mjs +++ b/sites/org/pages/account/patterns/florence/edit.mjs @@ -48,7 +48,7 @@ const EditFlorencePage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/florent/edit.mjs b/sites/org/pages/account/patterns/florent/edit.mjs index db33493ec79..4b99619931b 100644 --- a/sites/org/pages/account/patterns/florent/edit.mjs +++ b/sites/org/pages/account/patterns/florent/edit.mjs @@ -48,7 +48,7 @@ const EditFlorentPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/gozer/edit.mjs b/sites/org/pages/account/patterns/gozer/edit.mjs index bd628c8ca27..78bff63c903 100644 --- a/sites/org/pages/account/patterns/gozer/edit.mjs +++ b/sites/org/pages/account/patterns/gozer/edit.mjs @@ -48,7 +48,7 @@ const EditGozerPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/hi/edit.mjs b/sites/org/pages/account/patterns/hi/edit.mjs index 17d03e2c1bd..ac2c7a89106 100644 --- a/sites/org/pages/account/patterns/hi/edit.mjs +++ b/sites/org/pages/account/patterns/hi/edit.mjs @@ -48,7 +48,7 @@ const EditHiPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/holmes/edit.mjs b/sites/org/pages/account/patterns/holmes/edit.mjs index 96b64b36c97..f2c2cb47a58 100644 --- a/sites/org/pages/account/patterns/holmes/edit.mjs +++ b/sites/org/pages/account/patterns/holmes/edit.mjs @@ -48,7 +48,7 @@ const EditHolmesPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/hortensia/edit.mjs b/sites/org/pages/account/patterns/hortensia/edit.mjs index 8097814f76e..e3f8cf0f6e4 100644 --- a/sites/org/pages/account/patterns/hortensia/edit.mjs +++ b/sites/org/pages/account/patterns/hortensia/edit.mjs @@ -48,7 +48,7 @@ const EditHortensiaPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/huey/edit.mjs b/sites/org/pages/account/patterns/huey/edit.mjs index 10f6ca0d0a9..8bcc76f548d 100644 --- a/sites/org/pages/account/patterns/huey/edit.mjs +++ b/sites/org/pages/account/patterns/huey/edit.mjs @@ -48,7 +48,7 @@ const EditHueyPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/hugo/edit.mjs b/sites/org/pages/account/patterns/hugo/edit.mjs index c807f11c186..3439dc28dd4 100644 --- a/sites/org/pages/account/patterns/hugo/edit.mjs +++ b/sites/org/pages/account/patterns/hugo/edit.mjs @@ -48,7 +48,7 @@ const EditHugoPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/jaeger/edit.mjs b/sites/org/pages/account/patterns/jaeger/edit.mjs index 0473a24341f..2c3e0425089 100644 --- a/sites/org/pages/account/patterns/jaeger/edit.mjs +++ b/sites/org/pages/account/patterns/jaeger/edit.mjs @@ -48,7 +48,7 @@ const EditJaegerPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/lucy/edit.mjs b/sites/org/pages/account/patterns/lucy/edit.mjs index 5f567e4f559..f3ef8bb17fd 100644 --- a/sites/org/pages/account/patterns/lucy/edit.mjs +++ b/sites/org/pages/account/patterns/lucy/edit.mjs @@ -48,7 +48,7 @@ const EditLucyPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/lunetius/edit.mjs b/sites/org/pages/account/patterns/lunetius/edit.mjs index 5529b044510..73b8a320b74 100644 --- a/sites/org/pages/account/patterns/lunetius/edit.mjs +++ b/sites/org/pages/account/patterns/lunetius/edit.mjs @@ -48,7 +48,7 @@ const EditLunetiusPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/noble/edit.mjs b/sites/org/pages/account/patterns/noble/edit.mjs index 424b4bfe18e..403e4b2f249 100644 --- a/sites/org/pages/account/patterns/noble/edit.mjs +++ b/sites/org/pages/account/patterns/noble/edit.mjs @@ -48,7 +48,7 @@ const EditNoblePage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/octoplushy/edit.mjs b/sites/org/pages/account/patterns/octoplushy/edit.mjs index cdead829257..a1b3d0ffa7d 100644 --- a/sites/org/pages/account/patterns/octoplushy/edit.mjs +++ b/sites/org/pages/account/patterns/octoplushy/edit.mjs @@ -48,7 +48,7 @@ const EditOctoplushyPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/otis/edit.mjs b/sites/org/pages/account/patterns/otis/edit.mjs index c1284579db6..971fade99ec 100644 --- a/sites/org/pages/account/patterns/otis/edit.mjs +++ b/sites/org/pages/account/patterns/otis/edit.mjs @@ -48,7 +48,7 @@ const EditOtisPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/paco/edit.mjs b/sites/org/pages/account/patterns/paco/edit.mjs index 6555fd408e8..5ae478f4f6f 100644 --- a/sites/org/pages/account/patterns/paco/edit.mjs +++ b/sites/org/pages/account/patterns/paco/edit.mjs @@ -48,7 +48,7 @@ const EditPacoPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/penelope/edit.mjs b/sites/org/pages/account/patterns/penelope/edit.mjs index eb0b70d65ca..627ca6f3bd4 100644 --- a/sites/org/pages/account/patterns/penelope/edit.mjs +++ b/sites/org/pages/account/patterns/penelope/edit.mjs @@ -48,7 +48,7 @@ const EditPenelopePage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/sandy/edit.mjs b/sites/org/pages/account/patterns/sandy/edit.mjs index bb57d67f630..cfb7ef7d33c 100644 --- a/sites/org/pages/account/patterns/sandy/edit.mjs +++ b/sites/org/pages/account/patterns/sandy/edit.mjs @@ -48,7 +48,7 @@ const EditSandyPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/shelly/edit.mjs b/sites/org/pages/account/patterns/shelly/edit.mjs index 681e0f9d4aa..f7d06c1ee6b 100644 --- a/sites/org/pages/account/patterns/shelly/edit.mjs +++ b/sites/org/pages/account/patterns/shelly/edit.mjs @@ -48,7 +48,7 @@ const EditShellyPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/shin/edit.mjs b/sites/org/pages/account/patterns/shin/edit.mjs index 54638cf746e..10fd581419f 100644 --- a/sites/org/pages/account/patterns/shin/edit.mjs +++ b/sites/org/pages/account/patterns/shin/edit.mjs @@ -48,7 +48,7 @@ const EditShinPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/simon/edit.mjs b/sites/org/pages/account/patterns/simon/edit.mjs index 744e3d115ab..9ee7173aef8 100644 --- a/sites/org/pages/account/patterns/simon/edit.mjs +++ b/sites/org/pages/account/patterns/simon/edit.mjs @@ -48,7 +48,7 @@ const EditSimonPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/simone/edit.mjs b/sites/org/pages/account/patterns/simone/edit.mjs index 75b3e29c981..ae536540eca 100644 --- a/sites/org/pages/account/patterns/simone/edit.mjs +++ b/sites/org/pages/account/patterns/simone/edit.mjs @@ -48,7 +48,7 @@ const EditSimonePage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/skully/edit.mjs b/sites/org/pages/account/patterns/skully/edit.mjs index f44d8cf9a79..076b10ed867 100644 --- a/sites/org/pages/account/patterns/skully/edit.mjs +++ b/sites/org/pages/account/patterns/skully/edit.mjs @@ -48,7 +48,7 @@ const EditSkullyPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/sven/edit.mjs b/sites/org/pages/account/patterns/sven/edit.mjs index adb34679704..ffeb4372c33 100644 --- a/sites/org/pages/account/patterns/sven/edit.mjs +++ b/sites/org/pages/account/patterns/sven/edit.mjs @@ -48,7 +48,7 @@ const EditSvenPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/tamiko/edit.mjs b/sites/org/pages/account/patterns/tamiko/edit.mjs index 393fcf9f9b3..8d0b135c2b0 100644 --- a/sites/org/pages/account/patterns/tamiko/edit.mjs +++ b/sites/org/pages/account/patterns/tamiko/edit.mjs @@ -48,7 +48,7 @@ const EditTamikoPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/teagan/edit.mjs b/sites/org/pages/account/patterns/teagan/edit.mjs index 170792e67a9..e9c09bd9c4e 100644 --- a/sites/org/pages/account/patterns/teagan/edit.mjs +++ b/sites/org/pages/account/patterns/teagan/edit.mjs @@ -48,7 +48,7 @@ const EditTeaganPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/tiberius/edit.mjs b/sites/org/pages/account/patterns/tiberius/edit.mjs index 083507ff65a..2f855615ad1 100644 --- a/sites/org/pages/account/patterns/tiberius/edit.mjs +++ b/sites/org/pages/account/patterns/tiberius/edit.mjs @@ -48,7 +48,7 @@ const EditTiberiusPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/titan/edit.mjs b/sites/org/pages/account/patterns/titan/edit.mjs index 844f3619a86..56ea340df10 100644 --- a/sites/org/pages/account/patterns/titan/edit.mjs +++ b/sites/org/pages/account/patterns/titan/edit.mjs @@ -48,7 +48,7 @@ const EditTitanPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/trayvon/edit.mjs b/sites/org/pages/account/patterns/trayvon/edit.mjs index 120f8ace4d0..1f5e3575c96 100644 --- a/sites/org/pages/account/patterns/trayvon/edit.mjs +++ b/sites/org/pages/account/patterns/trayvon/edit.mjs @@ -48,7 +48,7 @@ const EditTrayvonPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/uma/edit.mjs b/sites/org/pages/account/patterns/uma/edit.mjs index 4e7f285f41b..e280f955323 100644 --- a/sites/org/pages/account/patterns/uma/edit.mjs +++ b/sites/org/pages/account/patterns/uma/edit.mjs @@ -48,7 +48,7 @@ const EditUmaPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/wahid/edit.mjs b/sites/org/pages/account/patterns/wahid/edit.mjs index 5f810634d9f..c3f7bf01805 100644 --- a/sites/org/pages/account/patterns/wahid/edit.mjs +++ b/sites/org/pages/account/patterns/wahid/edit.mjs @@ -48,7 +48,7 @@ const EditWahidPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/walburga/edit.mjs b/sites/org/pages/account/patterns/walburga/edit.mjs index f390dcebfed..3db3cc3ee92 100644 --- a/sites/org/pages/account/patterns/walburga/edit.mjs +++ b/sites/org/pages/account/patterns/walburga/edit.mjs @@ -48,7 +48,7 @@ const EditWalburgaPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/waralee/edit.mjs b/sites/org/pages/account/patterns/waralee/edit.mjs index 564f1b83c37..290ffc41d73 100644 --- a/sites/org/pages/account/patterns/waralee/edit.mjs +++ b/sites/org/pages/account/patterns/waralee/edit.mjs @@ -48,7 +48,7 @@ const EditWaraleePage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/account/patterns/yuri/edit.mjs b/sites/org/pages/account/patterns/yuri/edit.mjs index 3349e0437a7..1f5f055ca3b 100644 --- a/sites/org/pages/account/patterns/yuri/edit.mjs +++ b/sites/org/pages/account/patterns/yuri/edit.mjs @@ -48,7 +48,7 @@ const EditYuriPage = ({ page }) => { } const id = getSearchParam('id') if (id) getPattern() - }, []) + }, [backend, setLoadingStatus, t]) return ( // prettier-ignore diff --git a/sites/org/pages/pattern.mjs b/sites/org/pages/pattern.mjs index d9d547f4e54..d54e392a886 100644 --- a/sites/org/pages/pattern.mjs +++ b/sites/org/pages/pattern.mjs @@ -38,7 +38,7 @@ const PatternPage = ({ page }) => { }, [id]) return ( - + ) @@ -52,7 +52,7 @@ export async function getStaticProps({ locale }) { ...(await serverSideTranslations(locale, ns)), page: { locale, - path: ['account', 'patterns'], + path: ['account', 'pattern'], }, }, } From 9f1fe751e8f5edb045c0a1ba765ed61d9816678e Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 22 Oct 2023 13:19:30 +0200 Subject: [PATCH 11/27] wip(org): More changes for #5230 Also clears some of the old stuff for showcase/blog posts --- sites/org/components/mdx/posts/utils.mjs | 62 ------------------- .../pages/account/{sets/[id].mjs => set.mjs} | 23 ++++--- .../account/{sets/index.mjs => sets.mjs} | 0 sites/org/pages/blog/[dir].mjs | 7 ++- sites/org/pages/designs/[design].mjs | 2 +- sites/org/pages/docs/[...slug].mjs | 15 ++--- sites/org/pages/showcase/[dir].mjs | 9 +-- sites/org/site.config.mjs | 4 -- sites/shared/components/account/sets.mjs | 4 +- 9 files changed, 31 insertions(+), 95 deletions(-) delete mode 100644 sites/org/components/mdx/posts/utils.mjs rename sites/org/pages/account/{sets/[id].mjs => set.mjs} (75%) rename sites/org/pages/account/{sets/index.mjs => sets.mjs} (100%) diff --git a/sites/org/components/mdx/posts/utils.mjs b/sites/org/components/mdx/posts/utils.mjs deleted file mode 100644 index f3cae659884..00000000000 --- a/sites/org/components/mdx/posts/utils.mjs +++ /dev/null @@ -1,62 +0,0 @@ -import { localePath } from 'shared/utils.mjs' -import { siteConfig as config } from 'site/site.config.mjs' - -/** - * get pre-generated paths for each language for post slug pages - * @param {Object} posts an object holding all the posts - * @return {String[]} paths for the most recent posts in all locales - */ -export const getPostSlugPaths = (posts) => { - const paths = [] - - for (const lang in posts) { - paths.push( - ...Object.keys(posts[lang]) - .slice(0, config.posts.preGenerate) - .map((slug) => localePath(lang, slug)) - ) - } - - return paths -} - -/** - * get pre-generated paths for each language for post index pages - * @param {Object} posts an object keyed by locale of posts sorted by date published - * @param {String} type post type: blog, showcase, or newsletter - * @return {String[]} paths for the first two pages of posts in all locales - */ -export const getPostIndexPaths = (posts, type) => { - const paths = [] - for (const language in posts) { - paths.push(localePath(language, `${type}/page/1`)) - paths.push(localePath(language, `${type}/page/2`)) - } - - return paths -} - -/** - * get static props for a post index page - * @param {Object} pagenr the current page number in the pagination - * @param {Object} posts on object keyed by slug holding the posts title - * @return {Object} meta on object keyed by slug holding the posts metadata - * @return {Object[]} props.posts the posts to link to on the page - * @return {Number} props.current the current page number - * @return {Number} props.total the total number of pages - */ -export const getPostIndexProps = (pagenr, posts, meta) => { - const pageNum = parseInt(pagenr) - const numLocPages = Math.ceil(Object.keys(posts).length / config.posts.perPage) - if (pageNum > numLocPages) return false - - const pagePosts = Object.entries(posts) - .slice(config.posts.perPage * (pageNum - 1), config.posts.perPage * pageNum) - .map(([slug, post]) => ({ - s: slug, - ...post, - ...meta[slug], - })) - - return { posts: pagePosts, current: pageNum, total: numLocPages } -} diff --git a/sites/org/pages/account/sets/[id].mjs b/sites/org/pages/account/set.mjs similarity index 75% rename from sites/org/pages/account/sets/[id].mjs rename to sites/org/pages/account/set.mjs index bf9302391af..7fbfcabde02 100644 --- a/sites/org/pages/account/sets/[id].mjs +++ b/sites/org/pages/account/set.mjs @@ -1,9 +1,10 @@ // Dependencies import dynamic from 'next/dynamic' import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useTranslation } from 'next-i18next' +import { useState, useEffect } from 'react' // Components import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs' @@ -32,8 +33,14 @@ const DynamicSet = dynamic( * when path and locale come from static props (as here) * or set them manually. */ -const SetPage = ({ page, id }) => { +const SetPage = ({ page }) => { const { t } = useTranslation(ns) + const [id, setId] = useState() + + useEffect(() => { + const newId = getSearchParam('id') + if (newId !== id) setId(newId) + }, [id]) return ( @@ -46,22 +53,14 @@ const SetPage = ({ page, id }) => { export default SetPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['account', 'sets', params.id], + path: ['account', 'set'], }, }, } } - -/* - * getStaticPaths() is used to specify for which routes (think URLs) - * this page should be used to generate the result. - * To learn more, see: https://nextjs.org/docs/basic-features/data-fetching - */ -export const getStaticPaths = async () => ({ paths: [], fallback: true }) diff --git a/sites/org/pages/account/sets/index.mjs b/sites/org/pages/account/sets.mjs similarity index 100% rename from sites/org/pages/account/sets/index.mjs rename to sites/org/pages/account/sets.mjs diff --git a/sites/org/pages/blog/[dir].mjs b/sites/org/pages/blog/[dir].mjs index 2cc10ac81e6..d7b327e2b86 100644 --- a/sites/org/pages/blog/[dir].mjs +++ b/sites/org/pages/blog/[dir].mjs @@ -47,10 +47,11 @@ export async function getStaticProps({ params, locale }) { } export const getStaticPaths = async () => { - return { - paths: getPostSlugPaths(posts), - fallback: 'blocking', + const paths = [] + for (const lang in posts) { + paths.push(...Object.keys(posts[lang]).map((slug) => localePath(lang, slug))) } + return { paths, fallback: false } } export default BlogPage diff --git a/sites/org/pages/designs/[design].mjs b/sites/org/pages/designs/[design].mjs index c681c23cdbe..a10ba87ebc5 100644 --- a/sites/org/pages/designs/[design].mjs +++ b/sites/org/pages/designs/[design].mjs @@ -54,6 +54,6 @@ export async function getStaticProps({ locale, params }) { export async function getStaticPaths() { return { paths: [...collection].map((design) => `/designs/${design}`), - fallback: 'blocking', + fallback: false, } } diff --git a/sites/org/pages/docs/[...slug].mjs b/sites/org/pages/docs/[...slug].mjs index 825d3ef7e4f..589edf833de 100644 --- a/sites/org/pages/docs/[...slug].mjs +++ b/sites/org/pages/docs/[...slug].mjs @@ -1,4 +1,5 @@ -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, localePath } from 'shared/utils.mjs' +import { siteConfig } from 'site/site.config.mjs' // Used in static paths import { pages } from 'site/prebuild/docs.en.mjs' // Dependencies @@ -69,11 +70,11 @@ export async function getStaticProps({ locale, params }) { * To learn more, see: https://nextjs.org/docs/basic-features/data-fetching */ export async function getStaticPaths() { - const somePaths = Object.keys(pages).filter((path) => path !== 'docs') - //.filter((path) => path.split('/').length < 5) - - return { - paths: somePaths.map((key) => `/${key}`), - fallback: false, + const allSlugs = Object.keys(pages).filter((path) => path !== 'docs') + const paths = [] + for (const lang of siteConfig.languages) { + paths.push(...allSlugs.map((slug) => localePath(lang, slug))) } + + return { paths, fallback: false } } diff --git a/sites/org/pages/showcase/[dir].mjs b/sites/org/pages/showcase/[dir].mjs index 03e2593c65e..6b0eecfaf49 100644 --- a/sites/org/pages/showcase/[dir].mjs +++ b/sites/org/pages/showcase/[dir].mjs @@ -1,4 +1,4 @@ -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, localePath } from 'shared/utils.mjs' import { pages as posts } from 'site/prebuild/showcase.mjs' import { getPostSlugPaths } from 'site/components/mdx/posts/utils.mjs' import { serverSideTranslations } from 'next-i18next/serverSideTranslations' @@ -52,10 +52,11 @@ export async function getStaticProps({ params, locale }) { } export const getStaticPaths = async () => { - return { - paths: getPostSlugPaths(posts), - fallback: 'blocking', + const paths = [] + for (const lang in posts) { + paths.push(...Object.keys(posts[lang]).map((slug) => localePath(lang, slug))) } + return { paths, fallback: false } } export default ShowcasePage diff --git a/sites/org/site.config.mjs b/sites/org/site.config.mjs index 9a5fdeec34c..453896d2f4f 100644 --- a/sites/org/site.config.mjs +++ b/sites/org/site.config.mjs @@ -20,8 +20,4 @@ export const siteConfig = { languagesWip: [], site: 'FreeSewing.org', tld: 'org', - posts: { - preGenerate: 6, - perPage: 50, - }, } diff --git a/sites/shared/components/account/sets.mjs b/sites/shared/components/account/sets.mjs index f1e161c9672..3050668c124 100644 --- a/sites/shared/components/account/sets.mjs +++ b/sites/shared/components/account/sets.mjs @@ -427,7 +427,7 @@ export const Mset = ({ id, publicOnly = false }) => { {mset.public && ( - + )} @@ -746,7 +746,7 @@ export const Sets = () => { />
- +
))} From 75853412f60eba4026c6b0dc1285645ea24b6b1d Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 22 Oct 2023 13:27:28 +0200 Subject: [PATCH 12/27] chore: Disable preview deploys for i18n branch --- sites/dev/vercel.json | 8 ++ sites/org/vercel.json | 204 +--------------------------------- sites/shared/prebuild/org.mjs | 13 ++- 3 files changed, 25 insertions(+), 200 deletions(-) create mode 100644 sites/dev/vercel.json diff --git a/sites/dev/vercel.json b/sites/dev/vercel.json new file mode 100644 index 00000000000..74181161a23 --- /dev/null +++ b/sites/dev/vercel.json @@ -0,0 +1,8 @@ +{ + "git": { + "deploymentEnabled": { + "i18n": false, + "producionBackend": false + } + } +} diff --git a/sites/org/vercel.json b/sites/org/vercel.json index d5ba7258dda..74181161a23 100644 --- a/sites/org/vercel.json +++ b/sites/org/vercel.json @@ -1,200 +1,8 @@ { - "rewrites": [ - { - "source": "/account/patterns/aaron/:id/edit", - "destination": "/account/patterns/aaron/edit?id=:id" - }, - { - "source": "/account/patterns/albert/:id/edit", - "destination": "/account/patterns/albert/edit?id=:id" - }, - { - "source": "/account/patterns/bee/:id/edit", - "destination": "/account/patterns/bee/edit?id=:id" - }, - { - "source": "/account/patterns/bella/:id/edit", - "destination": "/account/patterns/bella/edit?id=:id" - }, - { - "source": "/account/patterns/benjamin/:id/edit", - "destination": "/account/patterns/benjamin/edit?id=:id" - }, - { - "source": "/account/patterns/bent/:id/edit", - "destination": "/account/patterns/bent/edit?id=:id" - }, - { - "source": "/account/patterns/bob/:id/edit", - "destination": "/account/patterns/bob/edit?id=:id" - }, - { - "source": "/account/patterns/breanna/:id/edit", - "destination": "/account/patterns/breanna/edit?id=:id" - }, - { - "source": "/account/patterns/brian/:id/edit", - "destination": "/account/patterns/brian/edit?id=:id" - }, - { - "source": "/account/patterns/bruce/:id/edit", - "destination": "/account/patterns/bruce/edit?id=:id" - }, - { - "source": "/account/patterns/carlita/:id/edit", - "destination": "/account/patterns/carlita/edit?id=:id" - }, - { - "source": "/account/patterns/carlton/:id/edit", - "destination": "/account/patterns/carlton/edit?id=:id" - }, - { - "source": "/account/patterns/cathrin/:id/edit", - "destination": "/account/patterns/cathrin/edit?id=:id" - }, - { - "source": "/account/patterns/charlie/:id/edit", - "destination": "/account/patterns/charlie/edit?id=:id" - }, - { - "source": "/account/patterns/cornelius/:id/edit", - "destination": "/account/patterns/cornelius/edit?id=:id" - }, - { - "source": "/account/patterns/diana/:id/edit", - "destination": "/account/patterns/diana/edit?id=:id" - }, - { - "source": "/account/patterns/florence/:id/edit", - "destination": "/account/patterns/florence/edit?id=:id" - }, - { - "source": "/account/patterns/florent/:id/edit", - "destination": "/account/patterns/florent/edit?id=:id" - }, - { - "source": "/account/patterns/gozer/:id/edit", - "destination": "/account/patterns/gozer/edit?id=:id" - }, - { - "source": "/account/patterns/hi/:id/edit", - "destination": "/account/patterns/hi/edit?id=:id" - }, - { - "source": "/account/patterns/holmes/:id/edit", - "destination": "/account/patterns/holmes/edit?id=:id" - }, - { - "source": "/account/patterns/hortensia/:id/edit", - "destination": "/account/patterns/hortensia/edit?id=:id" - }, - { - "source": "/account/patterns/huey/:id/edit", - "destination": "/account/patterns/huey/edit?id=:id" - }, - { - "source": "/account/patterns/hugo/:id/edit", - "destination": "/account/patterns/hugo/edit?id=:id" - }, - { - "source": "/account/patterns/jaeger/:id/edit", - "destination": "/account/patterns/jaeger/edit?id=:id" - }, - { - "source": "/account/patterns/lucy/:id/edit", - "destination": "/account/patterns/lucy/edit?id=:id" - }, - { - "source": "/account/patterns/lunetius/:id/edit", - "destination": "/account/patterns/lunetius/edit?id=:id" - }, - { - "source": "/account/patterns/noble/:id/edit", - "destination": "/account/patterns/noble/edit?id=:id" - }, - { - "source": "/account/patterns/octoplushy/:id/edit", - "destination": "/account/patterns/octoplushy/edit?id=:id" - }, - { - "source": "/account/patterns/paco/:id/edit", - "destination": "/account/patterns/paco/edit?id=:id" - }, - { - "source": "/account/patterns/penelope/:id/edit", - "destination": "/account/patterns/penelope/edit?id=:id" - }, - { - "source": "/account/patterns/sandy/:id/edit", - "destination": "/account/patterns/sandy/edit?id=:id" - }, - { - "source": "/account/patterns/shelly/:id/edit", - "destination": "/account/patterns/shelly/edit?id=:id" - }, - { - "source": "/account/patterns/shin/:id/edit", - "destination": "/account/patterns/shin/edit?id=:id" - }, - { - "source": "/account/patterns/simon/:id/edit", - "destination": "/account/patterns/simon/edit?id=:id" - }, - { - "source": "/account/patterns/simone/:id/edit", - "destination": "/account/patterns/simone/edit?id=:id" - }, - { - "source": "/account/patterns/skully/:id/edit", - "destination": "/account/patterns/skully/edit?id=:id" - }, - { - "source": "/account/patterns/sven/:id/edit", - "destination": "/account/patterns/sven/edit?id=:id" - }, - { - "source": "/account/patterns/tamiko/:id/edit", - "destination": "/account/patterns/tamiko/edit?id=:id" - }, - { - "source": "/account/patterns/teagan/:id/edit", - "destination": "/account/patterns/teagan/edit?id=:id" - }, - { - "source": "/account/patterns/tiberius/:id/edit", - "destination": "/account/patterns/tiberius/edit?id=:id" - }, - { - "source": "/account/patterns/titan/:id/edit", - "destination": "/account/patterns/titan/edit?id=:id" - }, - { - "source": "/account/patterns/trayvon/:id/edit", - "destination": "/account/patterns/trayvon/edit?id=:id" - }, - { - "source": "/account/patterns/uma/:id/edit", - "destination": "/account/patterns/uma/edit?id=:id" - }, - { - "source": "/account/patterns/wahid/:id/edit", - "destination": "/account/patterns/wahid/edit?id=:id" - }, - { - "source": "/account/patterns/walburga/:id/edit", - "destination": "/account/patterns/walburga/edit?id=:id" - }, - { - "source": "/account/patterns/waralee/:id/edit", - "destination": "/account/patterns/waralee/edit?id=:id" - }, - { - "source": "/account/patterns/yuri/:id/edit", - "destination": "/account/patterns/yuri/edit?id=:id" - }, - { - "source": "/account/patterns/otis/:id/edit", - "destination": "/account/patterns/otis/edit?id=:id" + "git": { + "deploymentEnabled": { + "i18n": false, + "producionBackend": false } - ] -} \ No newline at end of file + } +} diff --git a/sites/shared/prebuild/org.mjs b/sites/shared/prebuild/org.mjs index 6d59312e0cb..ee9d162adf6 100644 --- a/sites/shared/prebuild/org.mjs +++ b/sites/shared/prebuild/org.mjs @@ -42,6 +42,15 @@ const generateEditPatternPages = async (designs, site = 'org') => { } } +const vercel = { + git: { + deploymentEnabled: { + i18n: false, + producionBackend: false, + }, + }, +} + const generateRewriteConfig = async (designs) => { const rewrites = [] for (const design of designs) { @@ -52,12 +61,12 @@ const generateRewriteConfig = async (designs) => { } await fs.promises.writeFile( path.resolve('..', 'org', 'vercel.json'), - JSON.stringify({ rewrites }, null, 2) + JSON.stringify({ rewrites, ...vercel }, null, 2) ) } export const prebuildOrg = async () => { await generateNewPatternPages(collection) await generateEditPatternPages(collection) - await generateRewriteConfig(collection) + //await generateRewriteConfig(collection) } From 6a22355d17b24379cc1d7cae8a5e2b5f92fd0a45 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 22 Oct 2023 13:38:38 +0200 Subject: [PATCH 13/27] chore: Remove lint --- sites/org/pages/blog/[dir].mjs | 1 - sites/org/pages/showcase/[dir].mjs | 1 - sites/shared/prebuild/org.mjs | 26 +++++++++++++------------- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/sites/org/pages/blog/[dir].mjs b/sites/org/pages/blog/[dir].mjs index d7b327e2b86..2fc01e26310 100644 --- a/sites/org/pages/blog/[dir].mjs +++ b/sites/org/pages/blog/[dir].mjs @@ -1,6 +1,5 @@ import { nsMerge } from 'shared/utils.mjs' import { pages as posts } from 'site/prebuild/blog.mjs' -import { getPostSlugPaths } from 'site/components/mdx/posts/utils.mjs' import { serverSideTranslations } from 'next-i18next/serverSideTranslations' import { loadMdxAsStaticProps } from 'shared/mdx/load.mjs' import { PostLayout, ns as layoutNs } from 'site/components/layouts/post.mjs' diff --git a/sites/org/pages/showcase/[dir].mjs b/sites/org/pages/showcase/[dir].mjs index 6b0eecfaf49..02b4aa49c24 100644 --- a/sites/org/pages/showcase/[dir].mjs +++ b/sites/org/pages/showcase/[dir].mjs @@ -1,6 +1,5 @@ import { nsMerge, localePath } from 'shared/utils.mjs' import { pages as posts } from 'site/prebuild/showcase.mjs' -import { getPostSlugPaths } from 'site/components/mdx/posts/utils.mjs' import { serverSideTranslations } from 'next-i18next/serverSideTranslations' import { loadMdxAsStaticProps } from 'shared/mdx/load.mjs' import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' diff --git a/sites/shared/prebuild/org.mjs b/sites/shared/prebuild/org.mjs index ee9d162adf6..90fe0cf6fbb 100644 --- a/sites/shared/prebuild/org.mjs +++ b/sites/shared/prebuild/org.mjs @@ -51,19 +51,19 @@ const vercel = { }, } -const generateRewriteConfig = async (designs) => { - const rewrites = [] - for (const design of designs) { - rewrites.push({ - source: `/account/patterns/${design}/:id/edit`, - destination: `/account/patterns/${design}/edit?id=:id`, - }) - } - await fs.promises.writeFile( - path.resolve('..', 'org', 'vercel.json'), - JSON.stringify({ rewrites, ...vercel }, null, 2) - ) -} +//const generateRewriteConfig = async (designs) => { +// const rewrites = [] +// for (const design of designs) { +// rewrites.push({ +// source: `/account/patterns/${design}/:id/edit`, +// destination: `/account/patterns/${design}/edit?id=:id`, +// }) +// } +// await fs.promises.writeFile( +// path.resolve('..', 'org', 'vercel.json'), +// JSON.stringify({ rewrites, ...vercel }, null, 2) +// ) +//} export const prebuildOrg = async () => { await generateNewPatternPages(collection) From 83db4867c2ddf3e78cf427d87eb7a3bf7b711845 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 22 Oct 2023 13:42:09 +0200 Subject: [PATCH 14/27] chore: Remove lint --- sites/shared/prebuild/org.mjs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sites/shared/prebuild/org.mjs b/sites/shared/prebuild/org.mjs index 90fe0cf6fbb..89c5170781a 100644 --- a/sites/shared/prebuild/org.mjs +++ b/sites/shared/prebuild/org.mjs @@ -42,14 +42,14 @@ const generateEditPatternPages = async (designs, site = 'org') => { } } -const vercel = { - git: { - deploymentEnabled: { - i18n: false, - producionBackend: false, - }, - }, -} +//const vercel = { +// git: { +// deploymentEnabled: { +// i18n: false, +// producionBackend: false, +// }, +// }, +//} //const generateRewriteConfig = async (designs) => { // const rewrites = [] From 4014534452b59a8e2bde230bf89f50c3a7377e2d Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 22 Oct 2023 13:45:35 +0200 Subject: [PATCH 15/27] fix(org): Add missing import --- sites/org/pages/blog/[dir].mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sites/org/pages/blog/[dir].mjs b/sites/org/pages/blog/[dir].mjs index 2fc01e26310..eb65566e6d2 100644 --- a/sites/org/pages/blog/[dir].mjs +++ b/sites/org/pages/blog/[dir].mjs @@ -1,4 +1,4 @@ -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, localePath } from 'shared/utils.mjs' import { pages as posts } from 'site/prebuild/blog.mjs' import { serverSideTranslations } from 'next-i18next/serverSideTranslations' import { loadMdxAsStaticProps } from 'shared/mdx/load.mjs' From b1ea21a420cd2906e927bcacbe138f824a7478fa Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 22 Oct 2023 13:53:36 +0200 Subject: [PATCH 16/27] chore: Don't use Linedrawing component in blog post --- markdown/org/blog/breanna-measurements-sizes-in-2-2/de.md | 2 -- markdown/org/blog/breanna-measurements-sizes-in-2-2/en.md | 2 -- markdown/org/blog/breanna-measurements-sizes-in-2-2/es.md | 2 -- markdown/org/blog/breanna-measurements-sizes-in-2-2/fr.md | 2 -- markdown/org/blog/breanna-measurements-sizes-in-2-2/nl.md | 2 -- markdown/org/blog/breanna-measurements-sizes-in-2-2/uk.md | 2 -- 6 files changed, 12 deletions(-) diff --git a/markdown/org/blog/breanna-measurements-sizes-in-2-2/de.md b/markdown/org/blog/breanna-measurements-sizes-in-2-2/de.md index d9756e11365..84f85413964 100644 --- a/markdown/org/blog/breanna-measurements-sizes-in-2-2/de.md +++ b/markdown/org/blog/breanna-measurements-sizes-in-2-2/de.md @@ -16,8 +16,6 @@ Schauen wir uns an, was das im Einzelnen bedeutet: ## Neues Schnittmuster: Breanna ist ein Grundschnittblock für Damenoberbekleidung - - Schauen Sie sich [Breanna](/designs/breanna/), unser Grundschnittblock für Damenoberbekleidung an. Ein Grundschnittblock ist vielleicht nicht das aufregendste Schnittmuster, das es gibt, aber er spielt eine wichtige Rolle, da er die Grundform ist, auf der andere Schnittmuster aufgebaut sind. diff --git a/markdown/org/blog/breanna-measurements-sizes-in-2-2/en.md b/markdown/org/blog/breanna-measurements-sizes-in-2-2/en.md index a004c0e688c..6ca7d075ac7 100644 --- a/markdown/org/blog/breanna-measurements-sizes-in-2-2/en.md +++ b/markdown/org/blog/breanna-measurements-sizes-in-2-2/en.md @@ -17,8 +17,6 @@ Let's have a look at what it all means: ## New pattern: Breanna is a bodice block for womenswear - - Meet [Breanna](/designs/breanna/), our bodice block for womenswear. A block (or sloper) may not the most exciting pattern to look at, but it plays an important diff --git a/markdown/org/blog/breanna-measurements-sizes-in-2-2/es.md b/markdown/org/blog/breanna-measurements-sizes-in-2-2/es.md index 825353d5648..76bd37133f1 100644 --- a/markdown/org/blog/breanna-measurements-sizes-in-2-2/es.md +++ b/markdown/org/blog/breanna-measurements-sizes-in-2-2/es.md @@ -16,8 +16,6 @@ Veamos qué significa todo esto: ## Nuevo patrón: Breanna es un bloque de corpiño para mujer - - Conoce [Breanna](/designs/breanna/), nuestro bloque de corpiños para ropa de mujer. Puede que un bloque (o sloper) no sea el patrón más emocionante a la vista, pero desempeña un importante papel en , ya que es la forma básica sobre la que se construyen otros patrones. diff --git a/markdown/org/blog/breanna-measurements-sizes-in-2-2/fr.md b/markdown/org/blog/breanna-measurements-sizes-in-2-2/fr.md index 65e6babae8c..96669ff5823 100644 --- a/markdown/org/blog/breanna-measurements-sizes-in-2-2/fr.md +++ b/markdown/org/blog/breanna-measurements-sizes-in-2-2/fr.md @@ -16,8 +16,6 @@ Voyons ce que cela signifie : ## Nouveau modèle : Breanna est un bloc de corsage pour les vêtements féminins. - - Rencontre [Breanna](/designs/breanna/), notre bloc de corsage pour les vêtements féminins. Un bloc (ou sloper) n'est peut-être pas le motif le plus excitant à regarder, mais il joue un rôle important car c'est la forme de base sur laquelle les autres motifs sont construits. diff --git a/markdown/org/blog/breanna-measurements-sizes-in-2-2/nl.md b/markdown/org/blog/breanna-measurements-sizes-in-2-2/nl.md index 2eb0e53ab40..ad6c1305737 100644 --- a/markdown/org/blog/breanna-measurements-sizes-in-2-2/nl.md +++ b/markdown/org/blog/breanna-measurements-sizes-in-2-2/nl.md @@ -16,8 +16,6 @@ Even kijken wat dat allemaal betekent: ## Nieuw patroon: Breanna is een basiscorsage voor dameskleding - - We stellen je [Breanna](/designs/breanna/) voor, ons basiscorsage voor vrouwenkleding. Een basisvorm is misschien niet het spannendste patroon om naar te kijken, maar het speelt een belangrijke rol als vertrekpunt voor andere patronen. diff --git a/markdown/org/blog/breanna-measurements-sizes-in-2-2/uk.md b/markdown/org/blog/breanna-measurements-sizes-in-2-2/uk.md index 3280061201d..b9dc2a5ed68 100644 --- a/markdown/org/blog/breanna-measurements-sizes-in-2-2/uk.md +++ b/markdown/org/blog/breanna-measurements-sizes-in-2-2/uk.md @@ -16,8 +16,6 @@ title: "Погляньте, що нового у FreeSewing 2.2, включаю ## Нова викрійка: Breanna - ліф-блок для жіночого одягу - - Зустрічайте [Breanna](/designs/breanna/), наш ліфовий блок для жіночого одягу. Блок (або слоупер), можливо, не найцікавіший шаблон, але він відіграє важливу роль, оскільки є базовою формою, на якій будуються інші шаблони. From e01578223fd93a0ad4ce5ee9aed58bedcb69d12d Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 22 Oct 2023 15:05:12 +0200 Subject: [PATCH 17/27] fix(lab): update prebuild to recent org changes --- sites/shared/prebuild/lab.mjs | 1 - 1 file changed, 1 deletion(-) diff --git a/sites/shared/prebuild/lab.mjs b/sites/shared/prebuild/lab.mjs index f23337768c7..20427aff3d9 100644 --- a/sites/shared/prebuild/lab.mjs +++ b/sites/shared/prebuild/lab.mjs @@ -7,7 +7,6 @@ const copyFromOrg = [ ['account'], ['designs'], ['new', 'index.mjs'], - ['patterns'], ['sets'], ['signin'], ['signup'], From 1a3350ee3d508085be8dba5069d4396115b2ec17 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 22 Oct 2023 15:06:27 +0200 Subject: [PATCH 18/27] chore(lab): Updated prebuild pages --- sites/lab/pages/account/bookmark.mjs | 82 ++++++++++++++++++ sites/lab/pages/account/bookmarks.mjs | 59 +++++++++++++ sites/lab/pages/account/pattern.mjs | 66 ++++++++++++++ .../lab/pages/account/patterns/aaron/edit.mjs | 86 +++++++++++++++++++ .../pages/account/patterns/albert/edit.mjs | 86 +++++++++++++++++++ sites/lab/pages/account/patterns/bee/edit.mjs | 86 +++++++++++++++++++ .../lab/pages/account/patterns/bella/edit.mjs | 86 +++++++++++++++++++ .../pages/account/patterns/benjamin/edit.mjs | 86 +++++++++++++++++++ .../lab/pages/account/patterns/bent/edit.mjs | 86 +++++++++++++++++++ sites/lab/pages/account/patterns/bob/edit.mjs | 86 +++++++++++++++++++ .../pages/account/patterns/breanna/edit.mjs | 86 +++++++++++++++++++ .../lab/pages/account/patterns/brian/edit.mjs | 86 +++++++++++++++++++ .../lab/pages/account/patterns/bruce/edit.mjs | 86 +++++++++++++++++++ .../pages/account/patterns/carlita/edit.mjs | 86 +++++++++++++++++++ .../pages/account/patterns/carlton/edit.mjs | 86 +++++++++++++++++++ .../pages/account/patterns/cathrin/edit.mjs | 86 +++++++++++++++++++ .../pages/account/patterns/charlie/edit.mjs | 86 +++++++++++++++++++ .../pages/account/patterns/cornelius/edit.mjs | 86 +++++++++++++++++++ .../lab/pages/account/patterns/diana/edit.mjs | 86 +++++++++++++++++++ .../pages/account/patterns/florence/edit.mjs | 86 +++++++++++++++++++ .../pages/account/patterns/florent/edit.mjs | 86 +++++++++++++++++++ .../lab/pages/account/patterns/gozer/edit.mjs | 86 +++++++++++++++++++ sites/lab/pages/account/patterns/hi/edit.mjs | 86 +++++++++++++++++++ .../pages/account/patterns/holmes/edit.mjs | 86 +++++++++++++++++++ .../pages/account/patterns/hortensia/edit.mjs | 86 +++++++++++++++++++ .../lab/pages/account/patterns/huey/edit.mjs | 86 +++++++++++++++++++ .../lab/pages/account/patterns/hugo/edit.mjs | 86 +++++++++++++++++++ .../pages/account/patterns/jaeger/edit.mjs | 86 +++++++++++++++++++ .../lab/pages/account/patterns/lucy/edit.mjs | 86 +++++++++++++++++++ .../pages/account/patterns/lunetius/edit.mjs | 86 +++++++++++++++++++ .../lab/pages/account/patterns/noble/edit.mjs | 86 +++++++++++++++++++ .../account/patterns/octoplushy/edit.mjs | 86 +++++++++++++++++++ .../lab/pages/account/patterns/otis/edit.mjs | 86 +++++++++++++++++++ .../lab/pages/account/patterns/paco/edit.mjs | 86 +++++++++++++++++++ .../pages/account/patterns/penelope/edit.mjs | 86 +++++++++++++++++++ .../lab/pages/account/patterns/sandy/edit.mjs | 86 +++++++++++++++++++ .../pages/account/patterns/shelly/edit.mjs | 86 +++++++++++++++++++ .../lab/pages/account/patterns/shin/edit.mjs | 86 +++++++++++++++++++ .../lab/pages/account/patterns/simon/edit.mjs | 86 +++++++++++++++++++ .../pages/account/patterns/simone/edit.mjs | 86 +++++++++++++++++++ .../pages/account/patterns/skully/edit.mjs | 86 +++++++++++++++++++ .../lab/pages/account/patterns/sven/edit.mjs | 86 +++++++++++++++++++ .../pages/account/patterns/tamiko/edit.mjs | 86 +++++++++++++++++++ .../pages/account/patterns/teagan/edit.mjs | 86 +++++++++++++++++++ .../pages/account/patterns/tiberius/edit.mjs | 86 +++++++++++++++++++ .../lab/pages/account/patterns/titan/edit.mjs | 86 +++++++++++++++++++ .../pages/account/patterns/trayvon/edit.mjs | 86 +++++++++++++++++++ sites/lab/pages/account/patterns/uma/edit.mjs | 86 +++++++++++++++++++ .../lab/pages/account/patterns/wahid/edit.mjs | 86 +++++++++++++++++++ .../pages/account/patterns/walburga/edit.mjs | 86 +++++++++++++++++++ .../pages/account/patterns/waralee/edit.mjs | 86 +++++++++++++++++++ .../lab/pages/account/patterns/yuri/edit.mjs | 86 +++++++++++++++++++ sites/lab/pages/account/set.mjs | 66 ++++++++++++++ sites/lab/pages/account/sets.mjs | 59 +++++++++++++ sites/lab/pages/designs/[design].mjs | 2 +- sites/org/pages/account/bookmark.mjs | 2 +- sites/org/pages/blog/index.mjs | 2 + sites/org/pages/patrons/index.mjs | 3 +- sites/org/pages/showcase/index.mjs | 2 + 59 files changed, 4554 insertions(+), 3 deletions(-) create mode 100644 sites/lab/pages/account/bookmark.mjs create mode 100644 sites/lab/pages/account/bookmarks.mjs create mode 100644 sites/lab/pages/account/pattern.mjs create mode 100644 sites/lab/pages/account/patterns/aaron/edit.mjs create mode 100644 sites/lab/pages/account/patterns/albert/edit.mjs create mode 100644 sites/lab/pages/account/patterns/bee/edit.mjs create mode 100644 sites/lab/pages/account/patterns/bella/edit.mjs create mode 100644 sites/lab/pages/account/patterns/benjamin/edit.mjs create mode 100644 sites/lab/pages/account/patterns/bent/edit.mjs create mode 100644 sites/lab/pages/account/patterns/bob/edit.mjs create mode 100644 sites/lab/pages/account/patterns/breanna/edit.mjs create mode 100644 sites/lab/pages/account/patterns/brian/edit.mjs create mode 100644 sites/lab/pages/account/patterns/bruce/edit.mjs create mode 100644 sites/lab/pages/account/patterns/carlita/edit.mjs create mode 100644 sites/lab/pages/account/patterns/carlton/edit.mjs create mode 100644 sites/lab/pages/account/patterns/cathrin/edit.mjs create mode 100644 sites/lab/pages/account/patterns/charlie/edit.mjs create mode 100644 sites/lab/pages/account/patterns/cornelius/edit.mjs create mode 100644 sites/lab/pages/account/patterns/diana/edit.mjs create mode 100644 sites/lab/pages/account/patterns/florence/edit.mjs create mode 100644 sites/lab/pages/account/patterns/florent/edit.mjs create mode 100644 sites/lab/pages/account/patterns/gozer/edit.mjs create mode 100644 sites/lab/pages/account/patterns/hi/edit.mjs create mode 100644 sites/lab/pages/account/patterns/holmes/edit.mjs create mode 100644 sites/lab/pages/account/patterns/hortensia/edit.mjs create mode 100644 sites/lab/pages/account/patterns/huey/edit.mjs create mode 100644 sites/lab/pages/account/patterns/hugo/edit.mjs create mode 100644 sites/lab/pages/account/patterns/jaeger/edit.mjs create mode 100644 sites/lab/pages/account/patterns/lucy/edit.mjs create mode 100644 sites/lab/pages/account/patterns/lunetius/edit.mjs create mode 100644 sites/lab/pages/account/patterns/noble/edit.mjs create mode 100644 sites/lab/pages/account/patterns/octoplushy/edit.mjs create mode 100644 sites/lab/pages/account/patterns/otis/edit.mjs create mode 100644 sites/lab/pages/account/patterns/paco/edit.mjs create mode 100644 sites/lab/pages/account/patterns/penelope/edit.mjs create mode 100644 sites/lab/pages/account/patterns/sandy/edit.mjs create mode 100644 sites/lab/pages/account/patterns/shelly/edit.mjs create mode 100644 sites/lab/pages/account/patterns/shin/edit.mjs create mode 100644 sites/lab/pages/account/patterns/simon/edit.mjs create mode 100644 sites/lab/pages/account/patterns/simone/edit.mjs create mode 100644 sites/lab/pages/account/patterns/skully/edit.mjs create mode 100644 sites/lab/pages/account/patterns/sven/edit.mjs create mode 100644 sites/lab/pages/account/patterns/tamiko/edit.mjs create mode 100644 sites/lab/pages/account/patterns/teagan/edit.mjs create mode 100644 sites/lab/pages/account/patterns/tiberius/edit.mjs create mode 100644 sites/lab/pages/account/patterns/titan/edit.mjs create mode 100644 sites/lab/pages/account/patterns/trayvon/edit.mjs create mode 100644 sites/lab/pages/account/patterns/uma/edit.mjs create mode 100644 sites/lab/pages/account/patterns/wahid/edit.mjs create mode 100644 sites/lab/pages/account/patterns/walburga/edit.mjs create mode 100644 sites/lab/pages/account/patterns/waralee/edit.mjs create mode 100644 sites/lab/pages/account/patterns/yuri/edit.mjs create mode 100644 sites/lab/pages/account/set.mjs create mode 100644 sites/lab/pages/account/sets.mjs diff --git a/sites/lab/pages/account/bookmark.mjs b/sites/lab/pages/account/bookmark.mjs new file mode 100644 index 00000000000..b00b99ad60f --- /dev/null +++ b/sites/lab/pages/account/bookmark.mjs @@ -0,0 +1,82 @@ +// Dependencies +import dynamic from 'next/dynamic' +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Hooks +import { useTranslation } from 'next-i18next' +import { useState, useEffect, useContext } from 'react' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs' +import { ns as bookmarksNs } from 'shared/components/account/bookmarks.mjs' + +// Translation namespaces used on this page +const ns = nsMerge(bookmarksNs, authNs, pageNs, 'status') + +/* + * Some things should never generated as SSR + * So for these, we run a dynamic import and disable SSR rendering + */ +const DynamicAuthWrapper = dynamic( + () => import('shared/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper), + { ssr: false } +) + +const DynamicBookmark = dynamic( + () => import('shared/components/account/bookmarks.mjs').then((mod) => mod.Bookmark), + { ssr: false } +) + +/* + * Each page MUST be wrapped in the PageWrapper component. + * You also MUST spread props.page into this wrapper component + * when path and locale come from static props (as here) + * or set them manually. + */ +const BookmarkPage = ({ page }) => { + const { t } = useTranslation(ns) + const backend = useBackend() + const { setLoadingStatus } = useContext(LoadingStatusContext) + + const [id, setId] = useState() + const [bookmark, setBookmark] = useState() + + useEffect(() => { + const getBookmark = async (id) => { + const result = await backend.getBookmark(id) + if (result.success) setBookmark(result.data.bookmark) + else setLoadingStatus([false]) + } + const newId = getSearchParam('id') + console.log({ newId }) + if (newId !== id) { + setId(newId) + getBookmark(newId) + } + }, [id, backend, setLoadingStatus]) + + return ( + + + + + + ) +} + +export default BookmarkPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'bookmark'], + }, + }, + } +} diff --git a/sites/lab/pages/account/bookmarks.mjs b/sites/lab/pages/account/bookmarks.mjs new file mode 100644 index 00000000000..73cd278a9a8 --- /dev/null +++ b/sites/lab/pages/account/bookmarks.mjs @@ -0,0 +1,59 @@ +// Dependencies +import dynamic from 'next/dynamic' +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge } from 'shared/utils.mjs' +// Hooks +import { useTranslation } from 'next-i18next' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs' +import { ns as bookmarksNs } from 'shared/components/account/bookmarks.mjs' + +// Translation namespaces used on this page +const ns = nsMerge(bookmarksNs, authNs, pageNs) + +/* + * Some things should never generated as SSR + * So for these, we run a dynamic import and disable SSR rendering + */ +const DynamicAuthWrapper = dynamic( + () => import('shared/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper), + { ssr: false } +) + +const DynamicBookmarks = dynamic( + () => import('shared/components/account/bookmarks.mjs').then((mod) => mod.Bookmarks), + { ssr: false } +) + +/* + * Each page MUST be wrapped in the PageWrapper component. + * You also MUST spread props.page into this wrapper component + * when path and locale come from static props (as here) + * or set them manually. + */ +const AccountBookmarksPage = ({ page }) => { + const { t } = useTranslation(ns) + + return ( + + + + + + ) +} + +export default AccountBookmarksPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'bookmarks'], + }, + }, + } +} diff --git a/sites/lab/pages/account/pattern.mjs b/sites/lab/pages/account/pattern.mjs new file mode 100644 index 00000000000..c226b8faa90 --- /dev/null +++ b/sites/lab/pages/account/pattern.mjs @@ -0,0 +1,66 @@ +// Dependencies +import dynamic from 'next/dynamic' +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useTranslation } from 'next-i18next' +import { useState, useEffect } from 'react' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs' +import { ns as patternsNs } from 'shared/components/account/patterns.mjs' + +// Translation namespaces used on this page +const ns = nsMerge(patternsNs, authNs, pageNs, 'status') + +/* + * Some things should never generated as SSR + * So for these, we run a dynamic import and disable SSR rendering + */ +const DynamicAuthWrapper = dynamic( + () => import('shared/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper), + { ssr: false } +) + +const DynamicPattern = dynamic( + () => import('shared/components/account/patterns.mjs').then((mod) => mod.Pattern), + { ssr: false } +) + +/* + * Each page MUST be wrapped in the PageWrapper component. + * You also MUST spread props.page into this wrapper component + * when path and locale come from static props (as here) + * or set them manually. + */ +const PatternPage = ({ page }) => { + const { t } = useTranslation(ns) + const [id, setId] = useState() + + useEffect(() => { + const newId = getSearchParam('id') + if (newId !== id) setId(newId) + }, [id]) + + return ( + + + + + + ) +} + +export default PatternPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'pattern'], + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/aaron/edit.mjs b/sites/lab/pages/account/patterns/aaron/edit.mjs new file mode 100644 index 00000000000..65ae7340ca8 --- /dev/null +++ b/sites/lab/pages/account/patterns/aaron/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Aaron } from 'designs/aaron/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('aaron', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditAaronPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditAaronPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'aaron'], + title: 'Aaron', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/albert/edit.mjs b/sites/lab/pages/account/patterns/albert/edit.mjs new file mode 100644 index 00000000000..174967625a4 --- /dev/null +++ b/sites/lab/pages/account/patterns/albert/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Albert } from 'designs/albert/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('albert', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditAlbertPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditAlbertPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'albert'], + title: 'Albert', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/bee/edit.mjs b/sites/lab/pages/account/patterns/bee/edit.mjs new file mode 100644 index 00000000000..059cb5ed2f8 --- /dev/null +++ b/sites/lab/pages/account/patterns/bee/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Bee } from 'designs/bee/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('bee', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditBeePage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditBeePage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'bee'], + title: 'Bee', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/bella/edit.mjs b/sites/lab/pages/account/patterns/bella/edit.mjs new file mode 100644 index 00000000000..6ccde447b95 --- /dev/null +++ b/sites/lab/pages/account/patterns/bella/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Bella } from 'designs/bella/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('bella', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditBellaPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditBellaPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'bella'], + title: 'Bella', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/benjamin/edit.mjs b/sites/lab/pages/account/patterns/benjamin/edit.mjs new file mode 100644 index 00000000000..b71c29222e0 --- /dev/null +++ b/sites/lab/pages/account/patterns/benjamin/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Benjamin } from 'designs/benjamin/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('benjamin', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditBenjaminPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditBenjaminPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'benjamin'], + title: 'Benjamin', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/bent/edit.mjs b/sites/lab/pages/account/patterns/bent/edit.mjs new file mode 100644 index 00000000000..db19b348558 --- /dev/null +++ b/sites/lab/pages/account/patterns/bent/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Bent } from 'designs/bent/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('bent', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditBentPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditBentPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'bent'], + title: 'Bent', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/bob/edit.mjs b/sites/lab/pages/account/patterns/bob/edit.mjs new file mode 100644 index 00000000000..9fc65ef8a57 --- /dev/null +++ b/sites/lab/pages/account/patterns/bob/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Bob } from 'designs/bob/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('bob', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditBobPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditBobPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'bob'], + title: 'Bob', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/breanna/edit.mjs b/sites/lab/pages/account/patterns/breanna/edit.mjs new file mode 100644 index 00000000000..157617f179b --- /dev/null +++ b/sites/lab/pages/account/patterns/breanna/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Breanna } from 'designs/breanna/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('breanna', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditBreannaPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditBreannaPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'breanna'], + title: 'Breanna', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/brian/edit.mjs b/sites/lab/pages/account/patterns/brian/edit.mjs new file mode 100644 index 00000000000..e803d9f0551 --- /dev/null +++ b/sites/lab/pages/account/patterns/brian/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Brian } from 'designs/brian/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('brian', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditBrianPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditBrianPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'brian'], + title: 'Brian', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/bruce/edit.mjs b/sites/lab/pages/account/patterns/bruce/edit.mjs new file mode 100644 index 00000000000..7a924870804 --- /dev/null +++ b/sites/lab/pages/account/patterns/bruce/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Bruce } from 'designs/bruce/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('bruce', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditBrucePage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditBrucePage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'bruce'], + title: 'Bruce', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/carlita/edit.mjs b/sites/lab/pages/account/patterns/carlita/edit.mjs new file mode 100644 index 00000000000..3273f0e99f2 --- /dev/null +++ b/sites/lab/pages/account/patterns/carlita/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Carlita } from 'designs/carlita/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('carlita', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditCarlitaPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditCarlitaPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'carlita'], + title: 'Carlita', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/carlton/edit.mjs b/sites/lab/pages/account/patterns/carlton/edit.mjs new file mode 100644 index 00000000000..276889ad410 --- /dev/null +++ b/sites/lab/pages/account/patterns/carlton/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Carlton } from 'designs/carlton/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('carlton', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditCarltonPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditCarltonPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'carlton'], + title: 'Carlton', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/cathrin/edit.mjs b/sites/lab/pages/account/patterns/cathrin/edit.mjs new file mode 100644 index 00000000000..2bcd3415484 --- /dev/null +++ b/sites/lab/pages/account/patterns/cathrin/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Cathrin } from 'designs/cathrin/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('cathrin', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditCathrinPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditCathrinPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'cathrin'], + title: 'Cathrin', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/charlie/edit.mjs b/sites/lab/pages/account/patterns/charlie/edit.mjs new file mode 100644 index 00000000000..1bd290ddfc1 --- /dev/null +++ b/sites/lab/pages/account/patterns/charlie/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Charlie } from 'designs/charlie/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('charlie', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditCharliePage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditCharliePage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'charlie'], + title: 'Charlie', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/cornelius/edit.mjs b/sites/lab/pages/account/patterns/cornelius/edit.mjs new file mode 100644 index 00000000000..100fae8059e --- /dev/null +++ b/sites/lab/pages/account/patterns/cornelius/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Cornelius } from 'designs/cornelius/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('cornelius', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditCorneliusPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditCorneliusPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'cornelius'], + title: 'Cornelius', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/diana/edit.mjs b/sites/lab/pages/account/patterns/diana/edit.mjs new file mode 100644 index 00000000000..3968db22f1c --- /dev/null +++ b/sites/lab/pages/account/patterns/diana/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Diana } from 'designs/diana/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('diana', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditDianaPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditDianaPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'diana'], + title: 'Diana', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/florence/edit.mjs b/sites/lab/pages/account/patterns/florence/edit.mjs new file mode 100644 index 00000000000..17f6d39aed9 --- /dev/null +++ b/sites/lab/pages/account/patterns/florence/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Florence } from 'designs/florence/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('florence', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditFlorencePage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditFlorencePage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'florence'], + title: 'Florence', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/florent/edit.mjs b/sites/lab/pages/account/patterns/florent/edit.mjs new file mode 100644 index 00000000000..4b99619931b --- /dev/null +++ b/sites/lab/pages/account/patterns/florent/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Florent } from 'designs/florent/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('florent', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditFlorentPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditFlorentPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'florent'], + title: 'Florent', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/gozer/edit.mjs b/sites/lab/pages/account/patterns/gozer/edit.mjs new file mode 100644 index 00000000000..78bff63c903 --- /dev/null +++ b/sites/lab/pages/account/patterns/gozer/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Gozer } from 'designs/gozer/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('gozer', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditGozerPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditGozerPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'gozer'], + title: 'Gozer', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/hi/edit.mjs b/sites/lab/pages/account/patterns/hi/edit.mjs new file mode 100644 index 00000000000..ac2c7a89106 --- /dev/null +++ b/sites/lab/pages/account/patterns/hi/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Hi } from 'designs/hi/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('hi', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditHiPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditHiPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'hi'], + title: 'Hi', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/holmes/edit.mjs b/sites/lab/pages/account/patterns/holmes/edit.mjs new file mode 100644 index 00000000000..f2c2cb47a58 --- /dev/null +++ b/sites/lab/pages/account/patterns/holmes/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Holmes } from 'designs/holmes/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('holmes', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditHolmesPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditHolmesPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'holmes'], + title: 'Holmes', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/hortensia/edit.mjs b/sites/lab/pages/account/patterns/hortensia/edit.mjs new file mode 100644 index 00000000000..e3f8cf0f6e4 --- /dev/null +++ b/sites/lab/pages/account/patterns/hortensia/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Hortensia } from 'designs/hortensia/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('hortensia', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditHortensiaPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditHortensiaPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'hortensia'], + title: 'Hortensia', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/huey/edit.mjs b/sites/lab/pages/account/patterns/huey/edit.mjs new file mode 100644 index 00000000000..8bcc76f548d --- /dev/null +++ b/sites/lab/pages/account/patterns/huey/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Huey } from 'designs/huey/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('huey', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditHueyPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditHueyPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'huey'], + title: 'Huey', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/hugo/edit.mjs b/sites/lab/pages/account/patterns/hugo/edit.mjs new file mode 100644 index 00000000000..3439dc28dd4 --- /dev/null +++ b/sites/lab/pages/account/patterns/hugo/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Hugo } from 'designs/hugo/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('hugo', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditHugoPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditHugoPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'hugo'], + title: 'Hugo', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/jaeger/edit.mjs b/sites/lab/pages/account/patterns/jaeger/edit.mjs new file mode 100644 index 00000000000..2c3e0425089 --- /dev/null +++ b/sites/lab/pages/account/patterns/jaeger/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Jaeger } from 'designs/jaeger/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('jaeger', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditJaegerPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditJaegerPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'jaeger'], + title: 'Jaeger', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/lucy/edit.mjs b/sites/lab/pages/account/patterns/lucy/edit.mjs new file mode 100644 index 00000000000..f3ef8bb17fd --- /dev/null +++ b/sites/lab/pages/account/patterns/lucy/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Lucy } from 'designs/lucy/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('lucy', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditLucyPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditLucyPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'lucy'], + title: 'Lucy', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/lunetius/edit.mjs b/sites/lab/pages/account/patterns/lunetius/edit.mjs new file mode 100644 index 00000000000..73b8a320b74 --- /dev/null +++ b/sites/lab/pages/account/patterns/lunetius/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Lunetius } from 'designs/lunetius/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('lunetius', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditLunetiusPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditLunetiusPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'lunetius'], + title: 'Lunetius', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/noble/edit.mjs b/sites/lab/pages/account/patterns/noble/edit.mjs new file mode 100644 index 00000000000..403e4b2f249 --- /dev/null +++ b/sites/lab/pages/account/patterns/noble/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Noble } from 'designs/noble/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('noble', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditNoblePage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditNoblePage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'noble'], + title: 'Noble', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/octoplushy/edit.mjs b/sites/lab/pages/account/patterns/octoplushy/edit.mjs new file mode 100644 index 00000000000..a1b3d0ffa7d --- /dev/null +++ b/sites/lab/pages/account/patterns/octoplushy/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Octoplushy } from 'designs/octoplushy/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('octoplushy', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditOctoplushyPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditOctoplushyPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'octoplushy'], + title: 'Octoplushy', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/otis/edit.mjs b/sites/lab/pages/account/patterns/otis/edit.mjs new file mode 100644 index 00000000000..971fade99ec --- /dev/null +++ b/sites/lab/pages/account/patterns/otis/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Otis } from 'designs/otis/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('otis', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditOtisPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditOtisPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'otis'], + title: 'Otis', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/paco/edit.mjs b/sites/lab/pages/account/patterns/paco/edit.mjs new file mode 100644 index 00000000000..5ae478f4f6f --- /dev/null +++ b/sites/lab/pages/account/patterns/paco/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Paco } from 'designs/paco/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('paco', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditPacoPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditPacoPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'paco'], + title: 'Paco', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/penelope/edit.mjs b/sites/lab/pages/account/patterns/penelope/edit.mjs new file mode 100644 index 00000000000..627ca6f3bd4 --- /dev/null +++ b/sites/lab/pages/account/patterns/penelope/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Penelope } from 'designs/penelope/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('penelope', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditPenelopePage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditPenelopePage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'penelope'], + title: 'Penelope', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/sandy/edit.mjs b/sites/lab/pages/account/patterns/sandy/edit.mjs new file mode 100644 index 00000000000..cfb7ef7d33c --- /dev/null +++ b/sites/lab/pages/account/patterns/sandy/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Sandy } from 'designs/sandy/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('sandy', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditSandyPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditSandyPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'sandy'], + title: 'Sandy', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/shelly/edit.mjs b/sites/lab/pages/account/patterns/shelly/edit.mjs new file mode 100644 index 00000000000..f7d06c1ee6b --- /dev/null +++ b/sites/lab/pages/account/patterns/shelly/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Shelly } from 'designs/shelly/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('shelly', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditShellyPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditShellyPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'shelly'], + title: 'Shelly', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/shin/edit.mjs b/sites/lab/pages/account/patterns/shin/edit.mjs new file mode 100644 index 00000000000..10fd581419f --- /dev/null +++ b/sites/lab/pages/account/patterns/shin/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Shin } from 'designs/shin/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('shin', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditShinPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditShinPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'shin'], + title: 'Shin', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/simon/edit.mjs b/sites/lab/pages/account/patterns/simon/edit.mjs new file mode 100644 index 00000000000..9ee7173aef8 --- /dev/null +++ b/sites/lab/pages/account/patterns/simon/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Simon } from 'designs/simon/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('simon', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditSimonPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditSimonPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'simon'], + title: 'Simon', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/simone/edit.mjs b/sites/lab/pages/account/patterns/simone/edit.mjs new file mode 100644 index 00000000000..ae536540eca --- /dev/null +++ b/sites/lab/pages/account/patterns/simone/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Simone } from 'designs/simone/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('simone', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditSimonePage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditSimonePage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'simone'], + title: 'Simone', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/skully/edit.mjs b/sites/lab/pages/account/patterns/skully/edit.mjs new file mode 100644 index 00000000000..076b10ed867 --- /dev/null +++ b/sites/lab/pages/account/patterns/skully/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Skully } from 'designs/skully/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('skully', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditSkullyPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditSkullyPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'skully'], + title: 'Skully', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/sven/edit.mjs b/sites/lab/pages/account/patterns/sven/edit.mjs new file mode 100644 index 00000000000..ffeb4372c33 --- /dev/null +++ b/sites/lab/pages/account/patterns/sven/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Sven } from 'designs/sven/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('sven', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditSvenPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditSvenPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'sven'], + title: 'Sven', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/tamiko/edit.mjs b/sites/lab/pages/account/patterns/tamiko/edit.mjs new file mode 100644 index 00000000000..8d0b135c2b0 --- /dev/null +++ b/sites/lab/pages/account/patterns/tamiko/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Tamiko } from 'designs/tamiko/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('tamiko', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditTamikoPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditTamikoPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'tamiko'], + title: 'Tamiko', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/teagan/edit.mjs b/sites/lab/pages/account/patterns/teagan/edit.mjs new file mode 100644 index 00000000000..e9c09bd9c4e --- /dev/null +++ b/sites/lab/pages/account/patterns/teagan/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Teagan } from 'designs/teagan/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('teagan', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditTeaganPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditTeaganPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'teagan'], + title: 'Teagan', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/tiberius/edit.mjs b/sites/lab/pages/account/patterns/tiberius/edit.mjs new file mode 100644 index 00000000000..2f855615ad1 --- /dev/null +++ b/sites/lab/pages/account/patterns/tiberius/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Tiberius } from 'designs/tiberius/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('tiberius', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditTiberiusPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditTiberiusPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'tiberius'], + title: 'Tiberius', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/titan/edit.mjs b/sites/lab/pages/account/patterns/titan/edit.mjs new file mode 100644 index 00000000000..56ea340df10 --- /dev/null +++ b/sites/lab/pages/account/patterns/titan/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Titan } from 'designs/titan/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('titan', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditTitanPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditTitanPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'titan'], + title: 'Titan', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/trayvon/edit.mjs b/sites/lab/pages/account/patterns/trayvon/edit.mjs new file mode 100644 index 00000000000..1f5e3575c96 --- /dev/null +++ b/sites/lab/pages/account/patterns/trayvon/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Trayvon } from 'designs/trayvon/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('trayvon', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditTrayvonPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditTrayvonPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'trayvon'], + title: 'Trayvon', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/uma/edit.mjs b/sites/lab/pages/account/patterns/uma/edit.mjs new file mode 100644 index 00000000000..e280f955323 --- /dev/null +++ b/sites/lab/pages/account/patterns/uma/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Uma } from 'designs/uma/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('uma', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditUmaPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditUmaPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'uma'], + title: 'Uma', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/wahid/edit.mjs b/sites/lab/pages/account/patterns/wahid/edit.mjs new file mode 100644 index 00000000000..c3f7bf01805 --- /dev/null +++ b/sites/lab/pages/account/patterns/wahid/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Wahid } from 'designs/wahid/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('wahid', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditWahidPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditWahidPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'wahid'], + title: 'Wahid', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/walburga/edit.mjs b/sites/lab/pages/account/patterns/walburga/edit.mjs new file mode 100644 index 00000000000..3db3cc3ee92 --- /dev/null +++ b/sites/lab/pages/account/patterns/walburga/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Walburga } from 'designs/walburga/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('walburga', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditWalburgaPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditWalburgaPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'walburga'], + title: 'Walburga', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/waralee/edit.mjs b/sites/lab/pages/account/patterns/waralee/edit.mjs new file mode 100644 index 00000000000..290ffc41d73 --- /dev/null +++ b/sites/lab/pages/account/patterns/waralee/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Waralee } from 'designs/waralee/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('waralee', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditWaraleePage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditWaraleePage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'waralee'], + title: 'Waralee', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/yuri/edit.mjs b/sites/lab/pages/account/patterns/yuri/edit.mjs new file mode 100644 index 00000000000..1f5f055ca3b --- /dev/null +++ b/sites/lab/pages/account/patterns/yuri/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Yuri } from 'designs/yuri/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('yuri', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditYuriPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditYuriPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'yuri'], + title: 'Yuri', + }, + }, + } +} diff --git a/sites/lab/pages/account/set.mjs b/sites/lab/pages/account/set.mjs new file mode 100644 index 00000000000..7fbfcabde02 --- /dev/null +++ b/sites/lab/pages/account/set.mjs @@ -0,0 +1,66 @@ +// Dependencies +import dynamic from 'next/dynamic' +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useTranslation } from 'next-i18next' +import { useState, useEffect } from 'react' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs' +import { ns as setsNs } from 'shared/components/account/sets.mjs' + +// Translation namespaces used on this page +const ns = nsMerge(setsNs, authNs, pageNs) + +/* + * Some things should never generated as SSR + * So for these, we run a dynamic import and disable SSR rendering + */ +const DynamicAuthWrapper = dynamic( + () => import('shared/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper), + { ssr: false } +) + +const DynamicSet = dynamic( + () => import('shared/components/account/sets.mjs').then((mod) => mod.Mset), + { ssr: false } +) + +/* + * Each page MUST be wrapped in the PageWrapper component. + * You also MUST spread props.page into this wrapper component + * when path and locale come from static props (as here) + * or set them manually. + */ +const SetPage = ({ page }) => { + const { t } = useTranslation(ns) + const [id, setId] = useState() + + useEffect(() => { + const newId = getSearchParam('id') + if (newId !== id) setId(newId) + }, [id]) + + return ( + + + + + + ) +} + +export default SetPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'set'], + }, + }, + } +} diff --git a/sites/lab/pages/account/sets.mjs b/sites/lab/pages/account/sets.mjs new file mode 100644 index 00000000000..5c79ea23be9 --- /dev/null +++ b/sites/lab/pages/account/sets.mjs @@ -0,0 +1,59 @@ +// Dependencies +import dynamic from 'next/dynamic' +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge } from 'shared/utils.mjs' +// Hooks +import { useTranslation } from 'next-i18next' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs' +import { ns as setsNs } from 'shared/components/account/bookmarks.mjs' + +// Translation namespaces used on this page +const ns = nsMerge(setsNs, authNs, pageNs) + +/* + * Some things should never generated as SSR + * So for these, we run a dynamic import and disable SSR rendering + */ +const DynamicAuthWrapper = dynamic( + () => import('shared/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper), + { ssr: false } +) + +const DynamicSets = dynamic( + () => import('shared/components/account/sets.mjs').then((mod) => mod.Sets), + { ssr: false } +) + +/* + * Each page MUST be wrapped in the PageWrapper component. + * You also MUST spread props.page into this wrapper component + * when path and locale come from static props (as here) + * or set them manually. + */ +const AccountSetsPage = ({ page }) => { + const { t } = useTranslation(ns) + + return ( + + + + + + ) +} + +export default AccountSetsPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'bookmarks'], + }, + }, + } +} diff --git a/sites/lab/pages/designs/[design].mjs b/sites/lab/pages/designs/[design].mjs index c681c23cdbe..a10ba87ebc5 100644 --- a/sites/lab/pages/designs/[design].mjs +++ b/sites/lab/pages/designs/[design].mjs @@ -54,6 +54,6 @@ export async function getStaticProps({ locale, params }) { export async function getStaticPaths() { return { paths: [...collection].map((design) => `/designs/${design}`), - fallback: 'blocking', + fallback: false, } } diff --git a/sites/org/pages/account/bookmark.mjs b/sites/org/pages/account/bookmark.mjs index 6efbcf1df35..b00b99ad60f 100644 --- a/sites/org/pages/account/bookmark.mjs +++ b/sites/org/pages/account/bookmark.mjs @@ -56,7 +56,7 @@ const BookmarkPage = ({ page }) => { setId(newId) getBookmark(newId) } - }, [id]) + }, [id, backend, setLoadingStatus]) return ( diff --git a/sites/org/pages/blog/index.mjs b/sites/org/pages/blog/index.mjs index 47ea653400b..7723224ce15 100644 --- a/sites/org/pages/blog/index.mjs +++ b/sites/org/pages/blog/index.mjs @@ -30,9 +30,11 @@ const textShadow = { }, } +/* eslint-disable @next/next/no-img-element */ export const BlogPreview = ({ post }) => ( {post.caption} (
- + {patron.username} {patron.username}
) diff --git a/sites/org/pages/showcase/index.mjs b/sites/org/pages/showcase/index.mjs index 0222b34574b..214902fc06d 100644 --- a/sites/org/pages/showcase/index.mjs +++ b/sites/org/pages/showcase/index.mjs @@ -25,6 +25,7 @@ const count = Object.values(examples).reduce((acc, val) => * when path and locale come from static props (as here) * or set them manually. */ +/* eslint-disable @next/next/no-img-element */ const ShowcaseIndexPage = ({ page }) => { const { t } = useTranslation() const [filter, setFilter] = useFilter() @@ -84,6 +85,7 @@ const ShowcaseIndexPage = ({ page }) => { {list.map((slug) => ( {slug} Date: Sun, 22 Oct 2023 15:34:48 +0200 Subject: [PATCH 19/27] fix(markdown): Issues in french translations --- markdown/org/docs/designs/brian/options/fr.md | 16 ++++----- sites/org/pages/patrons/index.mjs | 36 ++++++++++--------- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/markdown/org/docs/designs/brian/options/fr.md b/markdown/org/docs/designs/brian/options/fr.md index a0915eec8b9..e64c950289a 100644 --- a/markdown/org/docs/designs/brian/options/fr.md +++ b/markdown/org/docs/designs/brian/options/fr.md @@ -86,14 +86,14 @@ Nous disposons maintenant de tous les points de départ et d'arrivée pour dessi For each of the anchor points (the ones marked in orange, not points 1 and 2) there is an option to control the spread upwards, and downwards: -- [Répartition de tête de manche vers le bas Q1](/docs/designs/brian/options/sleevecapq1spread1) : contrôle la répartition vers le bas dans le premier quadrant<0><0> -- [Répartition de tête de manche vers le haut Q1](/docs/designs/brian/options/sleevecapq1spread2) : contrôle la répartition vers le haut dans le premier quadrant<0><0> -- [Répartition de tête de manche vers le bas Q2](/docs/designs/brian/options/sleevecapq2spread1) : contrôle la répartition vers le bas dans le deuxième quadrant<0><0> -- [Répartition de tête de manche vers le haut Q2](/docs/designs/brian/options/sleevecapq2spread2) : contrôle la répartition vers le haut dans le deuxième quadrant<0><0> -- [Répartition de tête de manche vers le haut Q3](/docs/designs/brian/options/sleevecapq3spread1) : contrôle la répartition vers le haut dans le troisième quadrant<0><0> -- [Répartition de tête de manche vers le bas Q3](/docs/designs/brian/options/sleevecapq3spread2) : contrôle la répartition vers le bas dans le troisième quadrant<0><0> -- [Répartition de tête de manche vers le haut Q4](/docs/designs/brian/options/sleevecapq4spread1) : contrôle la répartition vers le haut dans le quatrième quadrant<0><0> -- [Répartition de tête de manche vers le bas Q4](/docs/designs/brian/options/sleevecapq4spread2) : contrôle la répartition vers le bas dans le quatrième quadrant<0><0> +- [Répartition de tête de manche vers le bas Q1](/docs/designs/brian/options/sleevecapq1spread1) : contrôle la répartition vers le bas dans le premier quadrant +- [Répartition de tête de manche vers le haut Q1](/docs/designs/brian/options/sleevecapq1spread2) : contrôle la répartition vers le haut dans le premier quadrant +- [Répartition de tête de manche vers le bas Q2](/docs/designs/brian/options/sleevecapq2spread1) : contrôle la répartition vers le bas dans le deuxième quadrant +- [Répartition de tête de manche vers le haut Q2](/docs/designs/brian/options/sleevecapq2spread2) : contrôle la répartition vers le haut dans le deuxième quadrant +- [Répartition de tête de manche vers le haut Q3](/docs/designs/brian/options/sleevecapq3spread1) : contrôle la répartition vers le haut dans le troisième quadrant +- [Répartition de tête de manche vers le bas Q3](/docs/designs/brian/options/sleevecapq3spread2) : contrôle la répartition vers le bas dans le troisième quadrant +- [Répartition de tête de manche vers le haut Q4](/docs/designs/brian/options/sleevecapq4spread1) : contrôle la répartition vers le haut dans le quatrième quadrant +- [Répartition de tête de manche vers le bas Q4](/docs/designs/brian/options/sleevecapq4spread2) : contrôle la répartition vers le bas dans le quatrième quadrant diff --git a/sites/org/pages/patrons/index.mjs b/sites/org/pages/patrons/index.mjs index 2985649051f..9d799d2621f 100644 --- a/sites/org/pages/patrons/index.mjs +++ b/sites/org/pages/patrons/index.mjs @@ -1,7 +1,6 @@ // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' import { nsMerge } from 'shared/utils.mjs' -import patrons from 'site/prebuild/patrons.js' // Hooks import { useTranslation } from 'next-i18next' import { useAccount } from 'shared/hooks/use-account.mjs' @@ -9,6 +8,7 @@ import { useEffect, useState } from 'react' // Components import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' import { PageLink } from 'shared/components/link.mjs' +import { Popout } from 'shared/components/popout/index.mjs' // Translation namespaces used on this page const namespaces = nsMerge(pageNs, 'patrons') @@ -24,7 +24,23 @@ const Patron = ({ patron }) => ( {patron.username}
) - +/* +

+ FreeSewing is made possible by the financial support of our patrons. Together, they are a + formidable force for good in the world, and we love them all very much. +

+ {patron && ( +

+ To join this awesome group of people,{' '} + . +

+ )} +
+ {patrons.map((patron) => ( + + ))} +
+*/ /* * Each page MUST be wrapped in the PageWrapper component. * You also MUST spread props.page into this wrapper component @@ -43,21 +59,7 @@ const PatronsPage = ({ page }) => { return ( -

- FreeSewing is made possible by the financial support of our patrons. Together, they are a - formidable force for good in the world, and we love them all very much. -

- {patron && ( -

- To join this awesome group of people,{' '} - . -

- )} -
- {patrons.map((patron) => ( - - ))} -
+ Create new v3 patrons page ) } From 7f4c1528afbf5a158302c9d1a9a2c062715eeb5e Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 22 Oct 2023 16:12:47 +0200 Subject: [PATCH 20/27] chore(shared): move translations files --- sites/shared/{components => i18n}/sets/de.yaml | 0 sites/shared/{components => i18n}/sets/en.yaml | 0 sites/shared/{components => i18n}/sets/es.yaml | 0 sites/shared/{components => i18n}/sets/fr.yaml | 0 sites/shared/{components => i18n}/sets/nl.yaml | 0 sites/shared/{components => i18n}/sets/uk.yaml | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename sites/shared/{components => i18n}/sets/de.yaml (100%) rename sites/shared/{components => i18n}/sets/en.yaml (100%) rename sites/shared/{components => i18n}/sets/es.yaml (100%) rename sites/shared/{components => i18n}/sets/fr.yaml (100%) rename sites/shared/{components => i18n}/sets/nl.yaml (100%) rename sites/shared/{components => i18n}/sets/uk.yaml (100%) diff --git a/sites/shared/components/sets/de.yaml b/sites/shared/i18n/sets/de.yaml similarity index 100% rename from sites/shared/components/sets/de.yaml rename to sites/shared/i18n/sets/de.yaml diff --git a/sites/shared/components/sets/en.yaml b/sites/shared/i18n/sets/en.yaml similarity index 100% rename from sites/shared/components/sets/en.yaml rename to sites/shared/i18n/sets/en.yaml diff --git a/sites/shared/components/sets/es.yaml b/sites/shared/i18n/sets/es.yaml similarity index 100% rename from sites/shared/components/sets/es.yaml rename to sites/shared/i18n/sets/es.yaml diff --git a/sites/shared/components/sets/fr.yaml b/sites/shared/i18n/sets/fr.yaml similarity index 100% rename from sites/shared/components/sets/fr.yaml rename to sites/shared/i18n/sets/fr.yaml diff --git a/sites/shared/components/sets/nl.yaml b/sites/shared/i18n/sets/nl.yaml similarity index 100% rename from sites/shared/components/sets/nl.yaml rename to sites/shared/i18n/sets/nl.yaml diff --git a/sites/shared/components/sets/uk.yaml b/sites/shared/i18n/sets/uk.yaml similarity index 100% rename from sites/shared/components/sets/uk.yaml rename to sites/shared/i18n/sets/uk.yaml From 235c74864224a50f68c72bdbd24163f0cee69f48 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 22 Oct 2023 16:13:30 +0200 Subject: [PATCH 21/27] wip: More changes for #5230 --- sites/org/pages/curate/set.mjs | 45 ++++++++++++++++ sites/org/pages/curate/sets/index.mjs | 2 +- sites/org/pages/set.mjs | 54 +++++++++++++++++++ sites/shared/components/curated-sets.mjs | 4 +- sites/shared/components/submissions/index.mjs | 10 ++-- 5 files changed, 107 insertions(+), 8 deletions(-) create mode 100644 sites/org/pages/curate/set.mjs create mode 100644 sites/org/pages/set.mjs diff --git a/sites/org/pages/curate/set.mjs b/sites/org/pages/curate/set.mjs new file mode 100644 index 00000000000..ae4d294e227 --- /dev/null +++ b/sites/org/pages/curate/set.mjs @@ -0,0 +1,45 @@ +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useTranslation } from 'next-i18next' +import { useState, useEffect } from 'react' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { AuthWrapper, ns as authNs } from 'shared/components/wrappers/auth/index.mjs' +import { EditCuratedSet, ns as csetNs } from 'shared/components/curated-sets.mjs' + +// Translation namespaces used on this page +const ns = nsMerge(pageNs, authNs, csetNs, 'curate') + +const EditCuratedSetPage = ({ page }) => { + const { t } = useTranslation(ns) + const [id, setId] = useState() + + useEffect(() => { + const newId = getSearchParam('id') + if (newId !== id) setId(newId) + }, [id]) + + return ( + + + + + + ) +} + +export default EditCuratedSetPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['curate', 'set'], + }, + }, + } +} diff --git a/sites/org/pages/curate/sets/index.mjs b/sites/org/pages/curate/sets/index.mjs index 87fdb7057ff..a44120978a1 100644 --- a/sites/org/pages/curate/sets/index.mjs +++ b/sites/org/pages/curate/sets/index.mjs @@ -29,7 +29,7 @@ const CuratorPage = ({ page }) => {

{t('curate:suggestedSets')}

{t('curate:sets')}

- `/curate/sets/${id}`} /> + `/curate/set?id=${id}`} />
diff --git a/sites/org/pages/set.mjs b/sites/org/pages/set.mjs new file mode 100644 index 00000000000..acb1f568cc4 --- /dev/null +++ b/sites/org/pages/set.mjs @@ -0,0 +1,54 @@ +// Dependencies +import dynamic from 'next/dynamic' +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useTranslation } from 'next-i18next' +import { useState, useEffect } from 'react' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { ns as setsNs } from 'shared/components/account/sets.mjs' + +// Translation namespaces used on this page +const ns = nsMerge(setsNs, pageNs) + +const DynamicSet = dynamic( + () => import('shared/components/account/sets.mjs').then((mod) => mod.Mset), + { ssr: false } +) + +/* + * Each page MUST be wrapped in the PageWrapper component. + * You also MUST spread props.page into this wrapper component + * when path and locale come from static props (as here) + * or set them manually. + */ +const SetPage = ({ page }) => { + const { t } = useTranslation(ns) + const [id, setId] = useState() + + useEffect(() => { + const newId = getSearchParam('id') + if (newId !== id) setId(newId) + }, [id]) + + return ( + + + + ) +} + +export default SetPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['set'], + }, + }, + } +} diff --git a/sites/shared/components/curated-sets.mjs b/sites/shared/components/curated-sets.mjs index 51ae36f2a09..0bc421fa2ad 100644 --- a/sites/shared/components/curated-sets.mjs +++ b/sites/shared/components/curated-sets.mjs @@ -132,7 +132,7 @@ const ShowCuratedSet = ({ cset }) => {

{t('data')}

- + {cset.height}cm {control >= controlLevels.sets.notes && ( @@ -445,7 +445,7 @@ export const EditCuratedSet = ({ id }) => { return (
- + updateData('published', val)} diff --git a/sites/shared/components/submissions/index.mjs b/sites/shared/components/submissions/index.mjs index d9b1c2071e6..96585993410 100644 --- a/sites/shared/components/submissions/index.mjs +++ b/sites/shared/components/submissions/index.mjs @@ -128,13 +128,13 @@ export const CsetSubmissions = () => { /> - + - + - + {sug.data.height} @@ -190,10 +190,10 @@ export const CsetSubmission = ({ id }) => { {submission.name} - + - + {submission.height} From 88a60a1ac4915eddb6dad8ebeb2bbdcd78c74ad2 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 22 Oct 2023 18:43:17 +0200 Subject: [PATCH 22/27] fix(org): Final (I hope) changes. Fixes #5230 --- .../pages/admin/{cset/[id].mjs => cset.mjs} | 23 +++-- .../pages/admin/{cset/index.mjs => csets.mjs} | 2 +- sites/org/pages/admin/index.mjs | 2 +- .../pages/admin/{user/[id].mjs => user.mjs} | 35 ++++---- .../[...confirmation].mjs => emailchange.mjs} | 27 +++--- .../[...confirmation].mjs => signin.mjs} | 19 ++--- .../[...confirmation].mjs => signup-aea.mjs} | 41 +++++---- .../[...confirmation].mjs => signup.mjs} | 40 +++++---- sites/org/pages/curated-set.mjs | 50 +++++++++++ .../[...tokens].mjs => subscribe.mjs} | 40 +++++---- .../[...tokens].mjs => unsubscribe.mjs} | 26 +++--- sites/shared/components/admin.mjs | 5 +- sites/shared/components/hodl/en.yaml | 13 +++ sites/shared/components/hodl/index.mjs | 84 +++++++++++++++++++ sites/shared/components/wrappers/page.mjs | 2 +- sites/shared/config/tailwind-force.html | 12 +++ 16 files changed, 291 insertions(+), 130 deletions(-) rename sites/org/pages/admin/{cset/[id].mjs => cset.mjs} (71%) rename sites/org/pages/admin/{cset/index.mjs => csets.mjs} (93%) rename sites/org/pages/admin/{user/[id].mjs => user.mjs} (51%) rename sites/org/pages/confirm/{emailchange/[...confirmation].mjs => emailchange.mjs} (91%) rename sites/org/pages/confirm/{signin/[...confirmation].mjs => signin.mjs} (93%) rename sites/org/pages/confirm/{signup-aea/[...confirmation].mjs => signup-aea.mjs} (76%) rename sites/org/pages/confirm/{signup/[...confirmation].mjs => signup.mjs} (83%) create mode 100644 sites/org/pages/curated-set.mjs rename sites/org/pages/newsletter/{subscribe/[...tokens].mjs => subscribe.mjs} (78%) rename sites/org/pages/newsletter/{unsubscribe/[...tokens].mjs => unsubscribe.mjs} (88%) create mode 100644 sites/shared/components/hodl/en.yaml create mode 100644 sites/shared/components/hodl/index.mjs diff --git a/sites/org/pages/admin/cset/[id].mjs b/sites/org/pages/admin/cset.mjs similarity index 71% rename from sites/org/pages/admin/cset/[id].mjs rename to sites/org/pages/admin/cset.mjs index 4098e901544..889e30c699e 100644 --- a/sites/org/pages/admin/cset/[id].mjs +++ b/sites/org/pages/admin/cset.mjs @@ -1,8 +1,9 @@ -import { nsMerge } from 'shared/utils.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useTranslation } from 'next-i18next' +import { useState, useEffect } from 'react' // Components import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' import { AuthWrapper, ns as authNs } from 'shared/components/wrappers/auth/index.mjs' @@ -11,8 +12,14 @@ import { EditCuratedSet, ns as csetNs } from 'shared/components/curated-sets.mjs // Translation namespaces used on this page const ns = nsMerge(pageNs, authNs, csetNs, 'curate') -const EditCuratedSetPage = ({ page, id }) => { +const EditCuratedSetPage = ({ page }) => { const { t } = useTranslation(ns) + const [id, setId] = useState() + + useEffect(() => { + const newId = getSearchParam('id') + if (newId !== id) setId(newId) + }, [id]) return ( @@ -25,22 +32,14 @@ const EditCuratedSetPage = ({ page, id }) => { export default EditCuratedSetPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, ns)), - id: params.id, page: { locale, - path: ['curate', 'sets', params.id], + path: ['curate', 'csets'], }, }, } } - -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/admin/cset/index.mjs b/sites/org/pages/admin/csets.mjs similarity index 93% rename from sites/org/pages/admin/cset/index.mjs rename to sites/org/pages/admin/csets.mjs index ee6a385f1b3..5b04e3b22a9 100644 --- a/sites/org/pages/admin/cset/index.mjs +++ b/sites/org/pages/admin/csets.mjs @@ -12,7 +12,7 @@ const namespaces = nsMerge(pageNs, authNs) const AdminPage = ({ page }) => ( - `/admin/cset/${id}`} /> + `/admin/cset?id=${id}`} /> ) diff --git a/sites/org/pages/admin/index.mjs b/sites/org/pages/admin/index.mjs index dcc1b1db3a1..d3d11ba2bb1 100644 --- a/sites/org/pages/admin/index.mjs +++ b/sites/org/pages/admin/index.mjs @@ -42,7 +42,7 @@ const AdminPage = ({ page }) => {

Other admin links: - +

Search users
( - - {userId ? : null} - -) +const UserAdminPage = ({ page }) => { + const [id, setId] = useState() + + useEffect(() => { + const newId = getSearchParam('id') + if (newId !== id) setId(newId) + }, [id]) + + return ( + + {id ? : null} + + ) +} export default UserAdminPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, namespaces)), - userId: params.id, page: { locale, - path: ['admin', params.id], + path: ['admin', 'user'], }, }, } } - -export const getStaticPaths = async () => { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/confirm/emailchange/[...confirmation].mjs b/sites/org/pages/confirm/emailchange.mjs similarity index 91% rename from sites/org/pages/confirm/emailchange/[...confirmation].mjs rename to sites/org/pages/confirm/emailchange.mjs index ea70309fb05..1129fe4cc4e 100644 --- a/sites/org/pages/confirm/emailchange/[...confirmation].mjs +++ b/sites/org/pages/confirm/emailchange.mjs @@ -1,3 +1,6 @@ +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useEffect, useState, useContext } from 'react' import { useBackend } from 'shared/hooks/use-backend.mjs' @@ -6,10 +9,8 @@ import { useRouter } from 'next/router' import { useTranslation } from 'next-i18next' // Context import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' -// Dependencies -import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import Link from 'next/link' // Components +import Link from 'next/link' import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' import { BareLayout } from 'site/components/layouts/bare.mjs' import { Spinner } from 'shared/components/spinner.mjs' @@ -18,7 +19,7 @@ import { BackToAccountButton } from 'shared/components/account/shared.mjs' import { HelpIcon } from 'shared/components/icons.mjs' // Translation namespaces used on this page -const ns = Array.from(new Set([...pageNs, 'account'])) +const ns = nsMerge(pageNs, 'account') const ConfirmSignUpPage = ({ page }) => { // Hooks @@ -27,11 +28,18 @@ const ConfirmSignUpPage = ({ page }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const { t } = useTranslation(ns) const router = useRouter() - // Get confirmation ID and check from url - const [id, check] = router.asPath.slice(1).split('/').slice(2) // State const [error, setError] = useState(false) + const [id, setId] = useState() + const [check, setCheck] = useState() + + useEffect(() => { + const newId = getSearchParam('id') + const newCheck = getSearchParam('check') + if (newId !== id) setId(newId) + if (newCheck !== check) setId(newCheck) + }, [id]) // Effects useEffect(() => { @@ -108,10 +116,3 @@ export async function getStaticProps({ locale }) { }, } } - -export async function getStaticPaths() { - return { - paths: [], - fallback: true, - } -} diff --git a/sites/org/pages/confirm/signin/[...confirmation].mjs b/sites/org/pages/confirm/signin.mjs similarity index 93% rename from sites/org/pages/confirm/signin/[...confirmation].mjs rename to sites/org/pages/confirm/signin.mjs index 421ca33007f..b7f9544a0af 100644 --- a/sites/org/pages/confirm/signin/[...confirmation].mjs +++ b/sites/org/pages/confirm/signin.mjs @@ -1,6 +1,6 @@ // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge, horFlexClasses } from 'shared/utils.mjs' +import { nsMerge, horFlexClasses, getSearchParam } from 'shared/utils.mjs' // Hooks import { useEffect, useState } from 'react' import { useAccount } from 'shared/hooks/use-account.mjs' @@ -74,6 +74,12 @@ const ConfirmSignInPage = ({ page }) => { const { t } = useTranslation(ns) const [error, setError] = useState(false) + const [id, setId] = useState() + + useEffect(() => { + const newId = getSearchParam('id') + if (newId !== id) setId(newId) + }, [id]) useEffect(() => { const storeAccount = async (data) => { @@ -97,8 +103,8 @@ const ConfirmSignInPage = ({ page }) => { return setError(true) } // Call async method - getConfirmation() - }, [backend, confirmationCheck, confirmationId, router, setAccount, setToken]) + if (id) getConfirmation() + }, [backend, confirmationCheck, confirmationId, router, setAccount, setToken, id]) if (page) page.path = ['confirm', 'emailchange', confirmationId] @@ -127,10 +133,3 @@ export async function getStaticProps({ locale }) { }, } } - -export async function getStaticPaths() { - return { - paths: [], - fallback: true, - } -} diff --git a/sites/org/pages/confirm/signup-aea/[...confirmation].mjs b/sites/org/pages/confirm/signup-aea.mjs similarity index 76% rename from sites/org/pages/confirm/signup-aea/[...confirmation].mjs rename to sites/org/pages/confirm/signup-aea.mjs index bca6c54916d..a65a3a1cc0a 100644 --- a/sites/org/pages/confirm/signup-aea/[...confirmation].mjs +++ b/sites/org/pages/confirm/signup-aea.mjs @@ -1,10 +1,11 @@ +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useEffect, useState } from 'react' import { useBackend } from 'shared/hooks/use-backend.mjs' import { useRouter } from 'next/router' import { useTranslation } from 'next-i18next' -// Dependencies -import { serverSideTranslations } from 'next-i18next/serverSideTranslations' // Components import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' import { BareLayout, ns as layoutNs } from 'site/components/layouts/bare.mjs' @@ -13,38 +14,43 @@ import { Spinner } from 'shared/components/spinner.mjs' import { Popout } from 'shared/components/popout/index.mjs' // Translation namespaces used on this page -const ns = Array.from(new Set([...pageNs, ...layoutNs, 'confirm', 'locales', 'themes'])) +const ns = nsMerge(pageNs, layoutNs, 'confirm', 'locales', 'themes') const SignupLinkExpired = () => Implement SignupLinkExpired compnonent const ActiveSignUpPage = () => { const router = useRouter() // Get confirmation ID and check from url - const [confirmationId, confirmationCheck] = router.asPath.slice(1).split('/').slice(2) - const page = { - path: ['confirm', 'emailchange', confirmationId], - } + //const [confirmationId, confirmationCheck] = router.asPath.slice(1).split('/').slice(2) const backend = useBackend() const { t } = useTranslation(ns) - const [id, setId] = useState(false) const [error, setError] = useState(false) + const [id, setId] = useState() + const [check, setCheck] = useState() + + useEffect(() => { + const newId = getSearchParam('id') + const newCheck = getSearchParam('check') + if (newId !== id) setId(newId) + if (newCheck !== check) setId(newCheck) + }, [id]) useEffect(() => { // Async inside useEffect requires this approach const getConfirmation = async () => { // Reach out to backend - const data = await backend.loadConfirmation({ - id: confirmationId, - check: confirmationCheck, - }) + const data = await backend.loadConfirmation({ id, check }) if (data instanceof Error) setError(true) - setId(confirmationId) } // Call async method getConfirmation() - }, [backend, confirmationCheck, confirmationId]) + }, [backend, id, check]) + + const page = { + path: ['confirm', 'emailchange', id], + } // Short-circuit errors if (error) @@ -76,10 +82,3 @@ export async function getStaticProps({ locale }) { }, } } - -export async function getStaticPaths() { - return { - paths: [], - fallback: true, - } -} diff --git a/sites/org/pages/confirm/signup/[...confirmation].mjs b/sites/org/pages/confirm/signup.mjs similarity index 83% rename from sites/org/pages/confirm/signup/[...confirmation].mjs rename to sites/org/pages/confirm/signup.mjs index ae1a64a6bf3..000d6e5ec3b 100644 --- a/sites/org/pages/confirm/signup/[...confirmation].mjs +++ b/sites/org/pages/confirm/signup.mjs @@ -1,12 +1,12 @@ +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useEffect, useState } from 'react' import { useAccount } from 'shared/hooks/use-account.mjs' import { useBackend } from 'shared/hooks/use-backend.mjs' import { useRouter } from 'next/router' import { useTranslation } from 'next-i18next' -import { nsMerge } from 'shared/utils.mjs' -// Dependencies -import { serverSideTranslations } from 'next-i18next/serverSideTranslations' // Components import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' import { BareLayout, ns as layoutNs } from 'site/components/layouts/bare.mjs' @@ -24,18 +24,16 @@ const ConfirmSignUpPage = () => { // Hooks const router = useRouter() // Get confirmation ID and check from url - const [confirmationId, confirmationCheck] = router.asPath.slice(1).split('/').slice(2) - const page = { - path: ['confirm', 'emailchange', confirmationId], - } + //const [confirmationId, confirmationCheck] = router.asPath.slice(1).split('/').slice(2) const { setAccount, setToken } = useAccount() const backend = useBackend() const { t } = useTranslation(ns) - const [id, setId] = useState(false) const [ready, setReady] = useState(false) const [error, setError] = useState(false) + const [id, setId] = useState() + const [check, setCheck] = useState() const createAccount = async ({ consent1, consent2 }) => { let consent = 0 @@ -54,21 +52,28 @@ const ConfirmSignUpPage = () => { } } + useEffect(() => { + const newId = getSearchParam('id') + const newCheck = getSearchParam('check') + if (newId !== id) setId(newId) + if (newCheck !== check) setId(newCheck) + }, [id]) + useEffect(() => { // Async inside useEffect requires this approach const getConfirmation = async () => { // Reach out to backend - const data = await backend.loadConfirmation({ - id: confirmationId, - check: confirmationCheck, - }) + const data = await backend.loadConfirmation({ id, check }) if (data instanceof Error) setError(true) setReady(true) - setId(confirmationId) } // Call async method getConfirmation() - }, [backend, confirmationCheck, confirmationId]) + }, [backend, id, check]) + + const page = { + path: ['confirm', 'emailchange', id], + } // Short-circuit errors if (error) @@ -99,10 +104,3 @@ export async function getStaticProps({ locale }) { }, } } - -export async function getStaticPaths() { - return { - paths: [], - fallback: true, - } -} diff --git a/sites/org/pages/curated-set.mjs b/sites/org/pages/curated-set.mjs new file mode 100644 index 00000000000..2e8b537d359 --- /dev/null +++ b/sites/org/pages/curated-set.mjs @@ -0,0 +1,50 @@ +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useTranslation } from 'next-i18next' +import { useState, useEffect } from 'react' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { ns as setsNs } from 'shared/components/account/sets.mjs' +import { CuratedSet } from 'shared/components/curated-sets.mjs' + +// Translation namespaces used on this page +const ns = nsMerge(setsNs, pageNs) + +/* + * Each page MUST be wrapped in the PageWrapper component. + * You also MUST spread props.page into this wrapper component + * when path and locale come from static props (as here) + * or set them manually. + */ +const CuratedSetPage = ({ page }) => { + const { t } = useTranslation(ns) + + const [id, setId] = useState() + + useEffect(() => { + const newId = getSearchParam('id') + if (newId !== id) setId(newId) + }, [id]) + + return ( + + + + ) +} + +export default CuratedSetPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['curated-set'], + }, + }, + } +} diff --git a/sites/org/pages/newsletter/subscribe/[...tokens].mjs b/sites/org/pages/newsletter/subscribe.mjs similarity index 78% rename from sites/org/pages/newsletter/subscribe/[...tokens].mjs rename to sites/org/pages/newsletter/subscribe.mjs index 2592302d36a..9e5f9c47ecd 100644 --- a/sites/org/pages/newsletter/subscribe/[...tokens].mjs +++ b/sites/org/pages/newsletter/subscribe.mjs @@ -1,8 +1,8 @@ // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks -import { useState, useContext } from 'react' +import { useEffect, useState, useContext } from 'react' import { useTranslation } from 'next-i18next' import { useBackend } from 'shared/hooks/use-backend.mjs' // Context @@ -11,6 +11,8 @@ import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' import { Popout } from 'shared/components/popout/index.mjs' import { PageLink } from 'shared/components/link.mjs' +import { Loading } from 'shared/components/spinner.mjs' +import { Hodl } from 'shared/components/hodl/index.mjs' // Translation namespaces used on this page const namespaces = nsMerge(pageNs, 'newsletter') @@ -21,12 +23,21 @@ const namespaces = nsMerge(pageNs, 'newsletter') * when path and locale come from static props (as here) * or set them manually. */ -const NewsletterPage = ({ page, id, ehash }) => { +const NewsletterPage = ({ page }) => { const { t } = useTranslation(namespaces) const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const [confirmed, setConfirmed] = useState(false) + const [id, setId] = useState() + const [ehash, setEhash] = useState() + + useEffect(() => { + const newId = getSearchParam('id') + const newEhash = getSearchParam('ehash') + if (newId !== id) setId(newId) + if (newEhash !== ehash) setId(newEhash) + }, [id]) const handler = async () => { setLoadingStatus([true, 'status:contactingBackend']) @@ -35,6 +46,13 @@ const NewsletterPage = ({ page, id, ehash }) => { setConfirmed(true) } + if (!id || !ehash) + return ( + + + + ) + return (
@@ -82,26 +100,14 @@ const NewsletterPage = ({ page, id, ehash }) => { export default NewsletterPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, namespaces)), - id: params.tokens[0] || null, - ehash: params.tokens[1] || null, page: { locale, - path: ['newsletter'], + path: ['newsletter', 'subscribe'], }, }, } } - -/* - * Do not generate anything statically - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/org/pages/newsletter/unsubscribe/[...tokens].mjs b/sites/org/pages/newsletter/unsubscribe.mjs similarity index 88% rename from sites/org/pages/newsletter/unsubscribe/[...tokens].mjs rename to sites/org/pages/newsletter/unsubscribe.mjs index 648721e6123..7706f31e9e7 100644 --- a/sites/org/pages/newsletter/unsubscribe/[...tokens].mjs +++ b/sites/org/pages/newsletter/unsubscribe.mjs @@ -1,6 +1,6 @@ // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge } from 'shared/utils.mjs' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useState, useContext } from 'react' import { useTranslation } from 'next-i18next' @@ -11,6 +11,7 @@ import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' import { Popout } from 'shared/components/popout/index.mjs' import { PageLink } from 'shared/components/link.mjs' +import { Hodl } from 'shared/components/hodl/index.mjs' // Translation namespaces used on this page const namespaces = nsMerge(pageNs, 'newsletter') @@ -35,6 +36,13 @@ const NewsletterPage = ({ page, id, ehash }) => { setConfirmed(true) } + if (!id || !ehash) + return ( + + + + ) + return (
@@ -73,26 +81,14 @@ const NewsletterPage = ({ page, id, ehash }) => { export default NewsletterPage -export async function getStaticProps({ locale, params }) { +export async function getStaticProps({ locale }) { return { props: { ...(await serverSideTranslations(locale, namespaces)), - id: params.tokens[0] || null, - ehash: params.tokens[1] || null, page: { locale, - path: ['newsletter'], + path: ['newsletter', 'unsubscribe'], }, }, } } - -/* - * Do not generate anything statically - */ -export async function getStaticPaths() { - return { - paths: [], - fallback: 'blocking', - } -} diff --git a/sites/shared/components/admin.mjs b/sites/shared/components/admin.mjs index 2ab3fa475b9..feabd378e13 100644 --- a/sites/shared/components/admin.mjs +++ b/sites/shared/components/admin.mjs @@ -73,8 +73,9 @@ export const ShowUser = ({ user, button = null }) => (
@@ -124,7 +125,7 @@ export const User = ({ user }) => ( + Manage user } diff --git a/sites/shared/components/hodl/en.yaml b/sites/shared/components/hodl/en.yaml new file mode 100644 index 00000000000..c1a2a0ac4a6 --- /dev/null +++ b/sites/shared/components/hodl/en.yaml @@ -0,0 +1,13 @@ +oneMoment: One moment please +giveUp: This is taking longer than expected +0: Ordering more coffee +1: Re-threading machine +2: Doing some stuff that would bore you to death +3: Removing pins from mouth +4: Sending love to the FreeSewing patrons +5: HODL! +6: Turning it off and on again +7: Searching for scissors +8: Eating cookies +9: Wait, what were we doing again? +10: Not not loading something diff --git a/sites/shared/components/hodl/index.mjs b/sites/shared/components/hodl/index.mjs new file mode 100644 index 00000000000..305d0a8ea1d --- /dev/null +++ b/sites/shared/components/hodl/index.mjs @@ -0,0 +1,84 @@ +// Hooks +import { useEffect, useState } from 'react' +import { useTranslation } from 'next-i18next' +// Components +import { Spinner } from 'shared/components/spinner.mjs' +import { WarningIcon } from 'shared/components/icons.mjs' + +// Update this when more translations are added +const messages = 11 + +// Gets a random id for a loading message +const msg = () => Math.floor(Math.random() * messages) + +export const Hodl = ({ delay = 1.25, step = 2, noTitle = false }) => { + const { t } = useTranslation(['hodl']) + const timeout = delay * 1000 + + const [fade, setFade] = useState('opacity-100') + const [timer, setTimer] = useState(false) + const [tick, setTick] = useState(0) + const [loadingStatus, setLoadingStatus] = useState([true, t('hodl:oneMoment')]) + const [shown, setShown] = useState({}) + const [color, setColor] = useState('secondary') + + useEffect(() => { + if (tick > 0 && tick < 10) { + let newMsg + do { + newMsg = msg() + } while (typeof shown[newMsg] !== 'undefined') + setLoadingStatus([true, t(`hodl:${newMsg}`)]) + const newShown = { ...shown } + shown[newMsg] = true + setShown(newShown) + } else if (tick > 0) setLoadingStatus([true, t(`hodl:giveUp`), true]) + }, [tick]) + + useEffect(() => { + if (loadingStatus[1]) { + if (loadingStatus[2]) { + setTimer( + window.setTimeout(() => { + setFade('opacity-0') + }, 2000 * delay) + ) + } else { + setTimer( + window.setTimeout(() => { + setTick(tick + step) + }, 1000 * delay) + ) + } + } + }, [loadingStatus[1]]) + + if (!loadingStatus[1]) return null + + return ( + <> + {!noTitle &&

{t('hodl:oneMoment')}

} +
+
+ {loadingStatus[2] ? : } +
+ {typeof loadingStatus[1] === 'object' && loadingStatus[1].props + ? loadingStatus[1] + : t(loadingStatus[1])} +
+
+
+
+ + ) +} diff --git a/sites/shared/components/wrappers/page.mjs b/sites/shared/components/wrappers/page.mjs index 844e4427b79..962b3801a23 100644 --- a/sites/shared/components/wrappers/page.mjs +++ b/sites/shared/components/wrappers/page.mjs @@ -14,7 +14,7 @@ import { DefaultLayout, ns as defaultLayoutNs } from 'site/components/layouts/de import { Feeds } from 'site/components/feeds.mjs' import { ModalContext } from 'shared/context/modal-context.mjs' -export const ns = nsMerge(layoutNs, defaultLayoutNs, 'status') +export const ns = nsMerge(layoutNs, defaultLayoutNs, 'status', 'hodl') /* This component should wrap all page content */ export const PageWrapper = (props) => { diff --git a/sites/shared/config/tailwind-force.html b/sites/shared/config/tailwind-force.html index 25baf00986e..71bb28fc8a5 100644 --- a/sites/shared/config/tailwind-force.html +++ b/sites/shared/config/tailwind-force.html @@ -11,6 +11,18 @@
+
+
+
+
+
+
+
+
+
+
+
+

From cf2e2139a344f5ad3ccc4325ed5674437a16af6d Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 22 Oct 2023 18:49:22 +0200 Subject: [PATCH 23/27] chore: Remove lint --- sites/org/pages/confirm/emailchange.mjs | 4 +-- sites/org/pages/confirm/signup-aea.mjs | 9 ++--- sites/org/pages/confirm/signup.mjs | 4 +-- sites/org/pages/newsletter/subscribe.mjs | 5 ++- sites/org/pages/newsletter/unsubscribe.mjs | 13 +++++-- sites/org/pages/patrons/index.mjs | 40 ++-------------------- 6 files changed, 21 insertions(+), 54 deletions(-) diff --git a/sites/org/pages/confirm/emailchange.mjs b/sites/org/pages/confirm/emailchange.mjs index 1129fe4cc4e..845f0730da3 100644 --- a/sites/org/pages/confirm/emailchange.mjs +++ b/sites/org/pages/confirm/emailchange.mjs @@ -38,8 +38,8 @@ const ConfirmSignUpPage = ({ page }) => { const newId = getSearchParam('id') const newCheck = getSearchParam('check') if (newId !== id) setId(newId) - if (newCheck !== check) setId(newCheck) - }, [id]) + if (newCheck !== check) setCheck(newCheck) + }, [id, check]) // Effects useEffect(() => { diff --git a/sites/org/pages/confirm/signup-aea.mjs b/sites/org/pages/confirm/signup-aea.mjs index a65a3a1cc0a..640e27ff607 100644 --- a/sites/org/pages/confirm/signup-aea.mjs +++ b/sites/org/pages/confirm/signup-aea.mjs @@ -4,7 +4,6 @@ import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks import { useEffect, useState } from 'react' import { useBackend } from 'shared/hooks/use-backend.mjs' -import { useRouter } from 'next/router' import { useTranslation } from 'next-i18next' // Components import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' @@ -19,10 +18,6 @@ const ns = nsMerge(pageNs, layoutNs, 'confirm', 'locales', 'themes') const SignupLinkExpired = () => Implement SignupLinkExpired compnonent const ActiveSignUpPage = () => { - const router = useRouter() - // Get confirmation ID and check from url - //const [confirmationId, confirmationCheck] = router.asPath.slice(1).split('/').slice(2) - const backend = useBackend() const { t } = useTranslation(ns) @@ -34,8 +29,8 @@ const ActiveSignUpPage = () => { const newId = getSearchParam('id') const newCheck = getSearchParam('check') if (newId !== id) setId(newId) - if (newCheck !== check) setId(newCheck) - }, [id]) + if (newCheck !== check) setCheck(newCheck) + }, [id, check]) useEffect(() => { // Async inside useEffect requires this approach diff --git a/sites/org/pages/confirm/signup.mjs b/sites/org/pages/confirm/signup.mjs index 000d6e5ec3b..81efffbc947 100644 --- a/sites/org/pages/confirm/signup.mjs +++ b/sites/org/pages/confirm/signup.mjs @@ -56,8 +56,8 @@ const ConfirmSignUpPage = () => { const newId = getSearchParam('id') const newCheck = getSearchParam('check') if (newId !== id) setId(newId) - if (newCheck !== check) setId(newCheck) - }, [id]) + if (newCheck !== check) setCheck(newCheck) + }, [id, check]) useEffect(() => { // Async inside useEffect requires this approach diff --git a/sites/org/pages/newsletter/subscribe.mjs b/sites/org/pages/newsletter/subscribe.mjs index 9e5f9c47ecd..db314bcf847 100644 --- a/sites/org/pages/newsletter/subscribe.mjs +++ b/sites/org/pages/newsletter/subscribe.mjs @@ -11,7 +11,6 @@ import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' import { Popout } from 'shared/components/popout/index.mjs' import { PageLink } from 'shared/components/link.mjs' -import { Loading } from 'shared/components/spinner.mjs' import { Hodl } from 'shared/components/hodl/index.mjs' // Translation namespaces used on this page @@ -36,8 +35,8 @@ const NewsletterPage = ({ page }) => { const newId = getSearchParam('id') const newEhash = getSearchParam('ehash') if (newId !== id) setId(newId) - if (newEhash !== ehash) setId(newEhash) - }, [id]) + if (newEhash !== ehash) setEhash(newEhash) + }, [id, ehash]) const handler = async () => { setLoadingStatus([true, 'status:contactingBackend']) diff --git a/sites/org/pages/newsletter/unsubscribe.mjs b/sites/org/pages/newsletter/unsubscribe.mjs index 7706f31e9e7..1d8567fd03b 100644 --- a/sites/org/pages/newsletter/unsubscribe.mjs +++ b/sites/org/pages/newsletter/unsubscribe.mjs @@ -2,7 +2,7 @@ import { serverSideTranslations } from 'next-i18next/serverSideTranslations' import { nsMerge, getSearchParam } from 'shared/utils.mjs' // Hooks -import { useState, useContext } from 'react' +import { useState, useEffect, useContext } from 'react' import { useTranslation } from 'next-i18next' import { useBackend } from 'shared/hooks/use-backend.mjs' // Context @@ -22,12 +22,21 @@ const namespaces = nsMerge(pageNs, 'newsletter') * when path and locale come from static props (as here) * or set them manually. */ -const NewsletterPage = ({ page, id, ehash }) => { +const NewsletterPage = ({ page }) => { const { t } = useTranslation(namespaces) const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const [confirmed, setConfirmed] = useState(false) + const [id, setId] = useState() + const [ehash, setEhash] = useState() + + useEffect(() => { + const newId = getSearchParam('id') + const newEhash = getSearchParam('ehash') + if (newId !== id) setId(newId) + if (newEhash !== ehash) setEhash(newEhash) + }, [id, ehash]) const handler = async () => { setLoadingStatus([true, 'status:contactingBackend']) diff --git a/sites/org/pages/patrons/index.mjs b/sites/org/pages/patrons/index.mjs index 9d799d2621f..bbba25c75c4 100644 --- a/sites/org/pages/patrons/index.mjs +++ b/sites/org/pages/patrons/index.mjs @@ -3,44 +3,15 @@ import { serverSideTranslations } from 'next-i18next/serverSideTranslations' import { nsMerge } from 'shared/utils.mjs' // Hooks import { useTranslation } from 'next-i18next' -import { useAccount } from 'shared/hooks/use-account.mjs' -import { useEffect, useState } from 'react' +//import { useAccount } from 'shared/hooks/use-account.mjs' +//import { useEffect, useState } from 'react' // Components import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' -import { PageLink } from 'shared/components/link.mjs' import { Popout } from 'shared/components/popout/index.mjs' // Translation namespaces used on this page const namespaces = nsMerge(pageNs, 'patrons') -/* - * FIXME: This entire page needs to be adapted once we - * migrate users from v2 to v3 - */ -/* eslint-disable @next/next/no-img-element */ -const Patron = ({ patron }) => ( -

- {patron.username} - {patron.username} -
-) -/* -

- FreeSewing is made possible by the financial support of our patrons. Together, they are a - formidable force for good in the world, and we love them all very much. -

- {patron && ( -

- To join this awesome group of people,{' '} - . -

- )} -
- {patrons.map((patron) => ( - - ))} -
-*/ /* * Each page MUST be wrapped in the PageWrapper component. * You also MUST spread props.page into this wrapper component @@ -49,13 +20,6 @@ const Patron = ({ patron }) => ( */ const PatronsPage = ({ page }) => { const { t } = useTranslation(namespaces) - const { account } = useAccount() - const [patron, setPatron] = useState(false) - - useEffect(() => { - // Do this here to avoid hydration issues - if (account.patron && account.patron > 0) setPatron(true) - }, [account.patron]) return ( From 5f11da267cb826d4306d495c2dd33c918a9f39a8 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 22 Oct 2023 18:54:32 +0200 Subject: [PATCH 24/27] chore: Remove lint --- sites/shared/components/admin.mjs | 2 +- sites/shared/components/hodl/index.mjs | 19 ++++++------------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/sites/shared/components/admin.mjs b/sites/shared/components/admin.mjs index feabd378e13..c0d4fa42049 100644 --- a/sites/shared/components/admin.mjs +++ b/sites/shared/components/admin.mjs @@ -75,7 +75,7 @@ export const ShowUser = ({ user, button = null }) => ( style={{ backgroundImage: `url(${cloudflareConfig.url}uid-${user.ihash}/sq500)`, backgroundSize: 'cover', - backgroundColor: 'linear-gradient(#80FFDB, #64DFDF, #48BFE3, #5390D9, #5E60CE);', + backgroundColor: '#ccc', }} >
diff --git a/sites/shared/components/hodl/index.mjs b/sites/shared/components/hodl/index.mjs index 305d0a8ea1d..08a6c7ef903 100644 --- a/sites/shared/components/hodl/index.mjs +++ b/sites/shared/components/hodl/index.mjs @@ -13,14 +13,11 @@ const msg = () => Math.floor(Math.random() * messages) export const Hodl = ({ delay = 1.25, step = 2, noTitle = false }) => { const { t } = useTranslation(['hodl']) - const timeout = delay * 1000 const [fade, setFade] = useState('opacity-100') - const [timer, setTimer] = useState(false) const [tick, setTick] = useState(0) const [loadingStatus, setLoadingStatus] = useState([true, t('hodl:oneMoment')]) const [shown, setShown] = useState({}) - const [color, setColor] = useState('secondary') useEffect(() => { if (tick > 0 && tick < 10) { @@ -38,17 +35,13 @@ export const Hodl = ({ delay = 1.25, step = 2, noTitle = false }) => { useEffect(() => { if (loadingStatus[1]) { if (loadingStatus[2]) { - setTimer( - window.setTimeout(() => { - setFade('opacity-0') - }, 2000 * delay) - ) + window.setTimeout(() => { + setFade('opacity-0') + }, 2000 * delay) } else { - setTimer( - window.setTimeout(() => { - setTick(tick + step) - }, 1000 * delay) - ) + window.setTimeout(() => { + setTick(tick + step) + }, 1000 * delay) } } }, [loadingStatus[1]]) From 82c119e6171ac1262173cab0486cdd71792046f8 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 22 Oct 2023 19:13:00 +0200 Subject: [PATCH 25/27] fix(shared): Old URLs used in router.push --- sites/shared/components/account/sets.mjs | 2 +- sites/shared/components/submissions/index.mjs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sites/shared/components/account/sets.mjs b/sites/shared/components/account/sets.mjs index 3050668c124..54740bc0152 100644 --- a/sites/shared/components/account/sets.mjs +++ b/sites/shared/components/account/sets.mjs @@ -73,7 +73,7 @@ export const NewSet = () => { const result = await backend.createSet({ name }) if (result.success) { setLoadingStatus([true, t('nailedIt'), true, true]) - router.push(`/account/sets/${result.data.set.id}`) + router.push(`/account/set?id=${result.data.set.id}`) } else setLoadingStatus([true, 'backendError', true, false]) } diff --git a/sites/shared/components/submissions/index.mjs b/sites/shared/components/submissions/index.mjs index 96585993410..6295a27e91f 100644 --- a/sites/shared/components/submissions/index.mjs +++ b/sites/shared/components/submissions/index.mjs @@ -176,7 +176,7 @@ export const CsetSubmission = ({ id }) => { console.log(result) if (result.success) { setLoadingStatus([true, 'status:nailedIt', true, true]) - router.push(`/curated-sets/${result.data.set.id}`) + router.push(`/curated-set?id=${result.data.set.id}`) } else setLoadingStatus([true, 'backendError', true, false]) } From 1e78a2891b3c0961abb13184dccd30a92f8b4c84 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 22 Oct 2023 19:21:02 +0200 Subject: [PATCH 26/27] chore(org): Put up a warning message --- sites/org/pages/index.mjs | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/sites/org/pages/index.mjs b/sites/org/pages/index.mjs index 35e0e966d13..448909dccd5 100644 --- a/sites/org/pages/index.mjs +++ b/sites/org/pages/index.mjs @@ -28,8 +28,9 @@ import { SignUp, ns as susiNs } from 'shared/components/susi/sign-up.mjs' import { PleaseSubscribe, ns as subNs } from 'shared/components/patrons/please-subscribe.mjs' import { CardLink } from 'shared/components/link.mjs' import { ns as nlNs } from 'shared/components/newsletter/index.mjs' +import { Popout, ns as popoutNs } from 'shared/components/popout/index.mjs' -const ns = nsMerge(pageNs, subNs, susiNs, nlNs, 'homepage') +const ns = nsMerge(pageNs, subNs, susiNs, nlNs, 'homepage', popoutNs) const Card = ({ bg = 'bg-base-200', textColor = 'text-base-content', title, children, icon }) => (
@@ -70,6 +71,17 @@ const HomePage = ({ page }) => { FreeSewing

{t('homepage:freePatterns')}

+
+ +
Everything is new, some things are broken
+

+ Hello there +
+ This is the new freesewing.org website. It is still a work in progress so if it + breaks, you get to keep the pieces. +

+ +
From e516ccfa2cb1bc4acdd7d2f1d0238457d23f1b9e Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 23 Oct 2023 09:37:17 +0200 Subject: [PATCH 27/27] fix(backend): update urls after frontend changes --- sites/backend/src/models/subscriber.mjs | 3 +-- sites/backend/src/models/user.mjs | 16 +++++++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/sites/backend/src/models/subscriber.mjs b/sites/backend/src/models/subscriber.mjs index 12466e68149..f768a4e1111 100644 --- a/sites/backend/src/models/subscriber.mjs +++ b/sites/backend/src/models/subscriber.mjs @@ -63,14 +63,13 @@ SubscriberModel.prototype.guardedCreate = async function ({ body }) { */ const actionUrl = i18nUrl( body.language, - `/newsletter/${this.record.active ? 'un' : ''}subscribe/${this.record.id}/${ehash}` + `/newsletter/${this.record.active ? 'un' : ''}subscribe?id=${this.record.id}&check=${ehash}` ) /* * Send out confirmation email unless it's a test and we don't want to send test emails */ if (!isTest || this.config.use.tests.email) { - console.log({ actionUrl }) const template = newSubscriber ? 'nlsub' : this.record.active ? 'nlsubact' : 'nlsubinact' await this.mailer.send({ template, diff --git a/sites/backend/src/models/user.mjs b/sites/backend/src/models/user.mjs index 7a6d2b9cb60..70dda17c38a 100644 --- a/sites/backend/src/models/user.mjs +++ b/sites/backend/src/models/user.mjs @@ -695,9 +695,15 @@ UserModel.prototype.guardedCreate = async function ({ body }) { */ let actionUrl = false if (this.record.status === 0) - actionUrl = i18nUrl(body.language, `/confirm/${type}/${this.Confirmation.record.id}/${check}`) + actionUrl = i18nUrl( + body.language, + `/confirm/${type}?id=${this.Confirmation.record.id}&check=${check}` + ) else if (this.record.status === 1) - actionUrl = i18nUrl(body.language, `/confirm/signin/${this.Confirmation.record.id}/${check}`) + actionUrl = i18nUrl( + body.language, + `/confirm/signin?id=${this.Confirmation.record.id}&check=${check}` + ) /* * Send email unless it's a test and we don't want to send test emails @@ -822,7 +828,7 @@ UserModel.prototype.guardedCreate = async function ({ body }) { replacements: { actionUrl: i18nUrl( this.language, - `/confirm/signup/${this.Confirmation.record.id}/${check}` + `/confirm/signup?id=${this.Confirmation.record.id}&check=${check}` ), whyUrl: i18nUrl(this.language, `/docs/faq/email/why-signup`), supportUrl: i18nUrl(this.language, `/patrons/join`), @@ -1071,7 +1077,7 @@ UserModel.prototype.sendSigninlink = async function (req) { replacements: { actionUrl: i18nUrl( this.record.language, - `/confirm/signin/${this.Confirmation.record.id}/${check}` + `/confirm/signin?id=${this.Confirmation.record.id}&check=${check}` ), whyUrl: i18nUrl(this.record.language, `/docs/faq/email/why-signin-link`), supportUrl: i18nUrl(this.record.language, `/patrons/join`), @@ -1350,7 +1356,7 @@ UserModel.prototype.guardedUpdate = async function ({ body, user }) { replacements: { actionUrl: i18nUrl( this.record.language, - `/confirm/emailchange/${this.Confirmation.record.id}/${check}` + `/confirm/emailchange?id=${this.Confirmation.record.id}&check=${check}` ), whyUrl: i18nUrl(this.record.language, `/docs/faq/email/why-emailchange`), supportUrl: i18nUrl(this.record.language, `/patrons/join`),