From 71e1d2b42d553bbb08eb0ee0340ae558cd1e9a30 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 3 Oct 2023 08:44:50 +0200 Subject: [PATCH] fix(lab): Keep docs view out of the lab --- sites/lab/components/design-examples.mjs | 2 + sites/lab/pages/designs/index.mjs | 8 +- sites/lab/site.config.mjs | 1 + sites/org/components/design-examples.mjs | 3 + sites/sde/components/design-examples.mjs | 3 + sites/shared/components/designs/info.mjs | 88 ++++++++++--------- sites/shared/components/workbench/en.yaml | 2 + .../components/workbench/views/docs/index.mjs | 13 +++ 8 files changed, 78 insertions(+), 42 deletions(-) create mode 100644 sites/lab/components/design-examples.mjs create mode 100644 sites/org/components/design-examples.mjs create mode 100644 sites/sde/components/design-examples.mjs diff --git a/sites/lab/components/design-examples.mjs b/sites/lab/components/design-examples.mjs new file mode 100644 index 00000000000..2775c0050db --- /dev/null +++ b/sites/lab/components/design-examples.mjs @@ -0,0 +1,2 @@ +// Lab does not support this +export const examples = false diff --git a/sites/lab/pages/designs/index.mjs b/sites/lab/pages/designs/index.mjs index bcac018270b..bb27b080d14 100644 --- a/sites/lab/pages/designs/index.mjs +++ b/sites/lab/pages/designs/index.mjs @@ -22,9 +22,13 @@ const DesignsPage = ({ page }) => { return ( -
+

FreeSewing {t('account:designs')}

- `/designs/${design}`} /> + `/designs/${design}`} + linkTo="docs" + altLinkTo="new" + />
) diff --git a/sites/lab/site.config.mjs b/sites/lab/site.config.mjs index d4dce6cf5a0..74b8170e73a 100644 --- a/sites/lab/site.config.mjs +++ b/sites/lab/site.config.mjs @@ -4,4 +4,5 @@ export const siteConfig = { }, languages: ['en', 'es', 'de', 'fr', 'nl'], repo: 'https://github.com/freesewing/freesewing', + site: 'lab', } diff --git a/sites/org/components/design-examples.mjs b/sites/org/components/design-examples.mjs new file mode 100644 index 00000000000..1b555709cc3 --- /dev/null +++ b/sites/org/components/design-examples.mjs @@ -0,0 +1,3 @@ +import { examples } from 'site/prebuild/design-examples.mjs' + +export { examples } diff --git a/sites/sde/components/design-examples.mjs b/sites/sde/components/design-examples.mjs new file mode 100644 index 00000000000..1d17453477f --- /dev/null +++ b/sites/sde/components/design-examples.mjs @@ -0,0 +1,3 @@ +// __SDEFILE__ - This file is a dependency for the stand-alone environment +// SDE does not support this +export const examples = false diff --git a/sites/shared/components/designs/info.mjs b/sites/shared/components/designs/info.mjs index 77312e7e659..2f913067a13 100644 --- a/sites/shared/components/designs/info.mjs +++ b/sites/shared/components/designs/info.mjs @@ -7,7 +7,7 @@ import { cloudflareImageUrl, } from 'shared/utils.mjs' import { designs } from 'shared/config/designs.mjs' -import { examples } from 'site/prebuild/design-examples.mjs' +import { examples } from 'site/components/design-examples.mjs' // Hooks import { useTranslation } from 'next-i18next' import { useDesign } from 'site/hooks/use-design.mjs' @@ -141,7 +141,7 @@ export const DesignInfo = ({ design, docs = false, workbench = false }) => { format={(t) => t.split(':').pop().trim()} /> - + {examples && } {['needs', 'fabric'].map((page) => ( { )} {docs ? docsContent : null} -

{t('account:examples')}

- {examples[design] ? ( -
- {examples[design].map((ex) => ( - - ))} -
- ) : ( - -
{t('account:noExamples')}
-

{t('account:noExamplesMsg')}

-

- - {t('account:showcaseNew')} - -

-
- )} + {examples ? ( + <> +

{t('account:examples')}

+ {examples[design] ? ( +
+ {examples[design].map((ex) => ( + + ))} +
+ ) : ( + +
{t('account:noExamples')}
+

{t('account:noExamplesMsg')}

+

+ + {t('account:showcaseNew')} + +

+
+ )} + + ) : null} {docs ? null : ['needs', 'fabric'].map((page) => ( diff --git a/sites/shared/components/workbench/en.yaml b/sites/shared/components/workbench/en.yaml index eb0f6ad478d..a1983ab58ef 100644 --- a/sites/shared/components/workbench/en.yaml +++ b/sites/shared/components/workbench/en.yaml @@ -66,6 +66,8 @@ measurements.d: Test the effect of a measurement on the way this pattern looks menu: Menu name: Name noDesignFound: We could not find this design. This shouldn't happen, so we'd really appreciate you reporting it. +noInlineDocs: Documention is not included in this build +noInlineDocsDesc: Please visit FreeSewing.org to access our documentation notes: Notes pages: pages part: Pattern part diff --git a/sites/shared/components/workbench/views/docs/index.mjs b/sites/shared/components/workbench/views/docs/index.mjs index 3478ea0cbb8..058e11503c7 100644 --- a/sites/shared/components/workbench/views/docs/index.mjs +++ b/sites/shared/components/workbench/views/docs/index.mjs @@ -5,6 +5,7 @@ import { useTranslation } from 'next-i18next' import { DesignInfo } from 'shared/components/designs/info.mjs' import { Popout } from 'shared/components/popout/index.mjs' import { PageLink } from 'shared/components/link.mjs' +import { siteConfig } from 'site/site.config.mjs' export const ns = ['workbench', 'designs'] @@ -12,6 +13,18 @@ export const DocsView = ({ design }) => { // Hooks const { t } = useTranslation(ns) + if (siteConfig.site !== 'FreeSewing.org') + return ( +
+ +
{t('workbench:noInlineDocs')}
+

+ +

+
+
+ ) + return (