VSinerva/freesewing
1
0
Fork 0
Code Activity

fix(lab): Fixed lab after moving to esm and named exports

Browse source
This commit is contained in:
joostdecock 2023-02-05 17:59:22 +01:00
parent dc1f1d7029
commit d6d8c6f122
31 changed files with 244 additions and 248 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sites/lab/hooks/useApp.mjs
View file

@ -53,7 +53,7 @@ for (const type in designsByType) {
} }
} }
function useApp(full = true) { export const useApp = () => {
// Load translation method // Load translation method
const locale = useRouter().locale const locale = useRouter().locale
const { t } = useTranslation(['app']) const { t } = useTranslation(['app'])
@ -108,5 +108,3 @@ function useApp(full = true) {
standalone: false, standalone: false,
} }
} }
export default useApp

0
sites/shared/components/workbench/exporting/export-worker.mjs → sites/shared/components/workbench/exporting/export-worker.js
View file

2
sites/shared/components/workbench/exporting/pdf-maker.mjs
View file

@ -1,6 +1,6 @@
import PDFDocument from 'pdfkit/js/pdfkit.standalone' import PDFDocument from 'pdfkit/js/pdfkit.standalone'
import SVGtoPDF from 'svg-to-pdfkit' import SVGtoPDF from 'svg-to-pdfkit'
import { logoPath } from 'shared/logos/freesewing.mjs' import { logoPath } from 'shared/components/logos/freesewing.mjs'
/** an svg of the logo to put on the cover page */ /** an svg of the logo to put on the cover page */
const logoSvg = `<svg viewBox="0 0 25 25"> const logoSvg = `<svg viewBox="0 0 25 25">

2
sites/shared/components/workbench/inputs/design-option-pct-deg.mjs
View file

@ -1,6 +1,6 @@
import { useState } from 'react' import { useState } from 'react'
import { ClearIcon, EditIcon } from 'shared/components/icons.mjs' import { ClearIcon, EditIcon } from 'shared/components/icons.mjs'
import { formatMm, round } from 'shared/utils' import { formatMm, round } from 'shared/utils.mjs'
import { useTranslation } from 'next-i18next' import { useTranslation } from 'next-i18next'
const EditOption = (props) => ( const EditOption = (props) => (

4
sites/shared/components/workbench/logs.mjs
View file

@ -1,6 +1,6 @@
import Markdown from 'react-markdown' import Markdown from 'react-markdown'
import { formatMm } from 'shared/utils' import { formatMm } from 'shared/utils.mjs'
import { Tab, Tabs } from '../mdx/tabs.js' import { Tab, Tabs } from '../mdx/tabs.mjs'
export const Error = ({ err }) => { export const Error = ({ err }) => {
// Include the error name and message info if it isn't already at the top // Include the error name and message info if it isn't already at the top

14
sites/shared/components/workbench/measurements/index.js → sites/shared/components/workbench/measurements/index.mjs
View file

@ -1,14 +1,14 @@
import React, { useMemo, useEffect, useState } from 'react' import React, { useMemo, useEffect, useState } from 'react'
import MeasurementInput from '../inputs/measurement.js' import { MeasurementInput } from '../inputs/measurement.mjs'
import { adult, doll, giant } from '@freesewing/models' import { adult, doll, giant } from '@freesewing/models'
import { import {
CisFemalIcon as WomenswearIcon, CisFemaleIcon as WomenswearIcon,
CisMaleIcon as MenswearIcon, CisMaleIcon as MenswearIcon,
} from 'shared/components/icons.mjs' } from 'shared/components/icons.mjs'
import { useTranslation } from 'next-i18next' import { useTranslation } from 'next-i18next'
import Setting from '../menu/core-settings/setting' import { Setting } from '../menu/core-settings/setting.mjs'
import { settings } from '../menu/core-settings/index' import { settings } from '../menu/core-settings/index.mjs'
import { Tab, Tabs } from 'shared/components/mdx/tabs.js' import { Tab, Tabs } from 'shared/components/mdx/tabs.mjs'
const groups = { adult, doll, giant } const groups = { adult, doll, giant }
@ -17,7 +17,7 @@ const icons = {
cisMale: <MenswearIcon />, cisMale: <MenswearIcon />,
} }
const WorkbenchMeasurements = ({ app, design, gist, updateGist, gistReady }) => { export const WorkbenchMeasurements = ({ app, design, gist, updateGist, gistReady }) => {
const { t } = useTranslation(['app', 'cfp']) const { t } = useTranslation(['app', 'cfp'])
// Method to handle measurement updates // Method to handle measurement updates
@ -111,5 +111,3 @@ const WorkbenchMeasurements = ({ app, design, gist, updateGist, gistReady }) =>
</div> </div>
) )
} }
export default WorkbenchMeasurements

27
sites/shared/components/workbench/measurements/non-human.js → sites/shared/components/workbench/measurements/non-human.mjs
View file

@ -8,43 +8,34 @@ const nonHuman = {
womenswear: { womenswear: {
dolls: dolls.cisFemale, dolls: dolls.cisFemale,
giants: giants.cisMale, giants: giants.cisMale,
} },
} }
const round = val => Math.round(val*10)/10 const round = (val) => Math.round(val * 10) / 10
for (let i=0.1;i<0.7;i+=0.1) { for (let i = 0.1; i < 0.7; i += 0.1) {
const name = `${Math.round(i*10)}/10` const name = `${Math.round(i * 10)}/10`
nonHuman.womenswear.dolls[name] = {} nonHuman.womenswear.dolls[name] = {}
// womenswear: Based on womenswear34 // womenswear: Based on womenswear34
for (const [m, val] of Object.entries(womenswear34)) { for (const [m, val] of Object.entries(womenswear34)) {
nonHuman.womenswear.dolls[name][m] = (m === 'shoulderSlope') nonHuman.womenswear.dolls[name][m] = m === 'shoulderSlope' ? val : round(val * i)
? val
: round(val * i)
} }
nonHuman.menswear.dolls[name] = {} nonHuman.menswear.dolls[name] = {}
// menswear: Based on menswear42 // menswear: Based on menswear42
for (const [m, val] of Object.entries(menswear42)) { for (const [m, val] of Object.entries(menswear42)) {
nonHuman.menswear.dolls[name][m] = (m === 'shoulderSlope') nonHuman.menswear.dolls[name][m] = m === 'shoulderSlope' ? val : round(val * i)
? val
: round(val * i)
} }
} }
for (let i=1.5;i<=3;i+=0.5) { for (let i = 1.5; i <= 3; i += 0.5) {
const name = `${i}/1` const name = `${i}/1`
nonHuman.womenswear.giants[name] = {} nonHuman.womenswear.giants[name] = {}
// womenswear: Based on womenswear34 // womenswear: Based on womenswear34
for (const [m, val] of Object.entries(womenswear34)) { for (const [m, val] of Object.entries(womenswear34)) {
nonHuman.womenswear.giants[name][m] = (m === 'shoulderSlope') nonHuman.womenswear.giants[name][m] = m === 'shoulderSlope' ? val : round(val * i)
? val
: round(val * i)
} }
nonHuman.menswear.giants[name] = {} nonHuman.menswear.giants[name] = {}
// menswear: Based on menswear42 // menswear: Based on menswear42
for (const [m, val] of Object.entries(menswear42)) { for (const [m, val] of Object.entries(menswear42)) {
nonHuman.menswear.giants[name][m] = (m === 'shoulderSlope') nonHuman.menswear.giants[name][m] = m === 'shoulderSlope' ? val : round(val * i)
? val
: round(val * i)
} }
} }
export default nonHuman export default nonHuman

6
sites/shared/components/workbench/menu/core-settings/index.mjs
View file

@ -1,7 +1,7 @@
import { SettingsIcon } from 'shared/components/icons.mjs' import { SettingsIcon } from 'shared/components/icons.mjs'
import { Chevron } from 'shared/components/navigation/primary.js' import { Chevron } from 'shared/components/navigation/primary.mjs'
import Setting from './setting.js' import { Setting } from './setting.mjs'
import { Ul, Details, TopSummary, TopSumTitle } from '../index.js' import { Ul, Details, TopSummary, TopSumTitle } from '../index.mjs'
import { useTranslation } from 'next-i18next' import { useTranslation } from 'next-i18next'
export const settings = { export const settings = {

4
sites/shared/components/workbench/menu/design-options/index.mjs
View file

@ -1,8 +1,8 @@
import { OptionsIcon } from 'shared/components/icons.mjs' import { OptionsIcon } from 'shared/components/icons.mjs'
import { Chevron } from 'shared/components/navigation/primary.js' import { Chevron } from 'shared/components/navigation/primary.mjs'
import { OptionGroup } from './option-group.mjs' import { OptionGroup } from './option-group.mjs'
import { OptionComponent } from './option.mjs' import { OptionComponent } from './option.mjs'
import { Ul, Details, TopSummary, TopSumTitle } from 'shared/components/workbench/menu.mjs' import { Ul, Details, TopSummary, TopSumTitle } from 'shared/components/workbench/menu/index.mjs'
import { useTranslation } from 'next-i18next' import { useTranslation } from 'next-i18next'
import { optionsMenuStructure } from 'shared/utils.mjs' import { optionsMenuStructure } from 'shared/utils.mjs'

2
sites/shared/components/workbench/menu/design-options/option-group.mjs
View file

@ -1,5 +1,5 @@
import { Chevron } from 'shared/components/navigation/primary.mjs' import { Chevron } from 'shared/components/navigation/primary.mjs'
import { Li, Ul, Details, Summary, SumDiv, Deg } from 'shared/components/workbench/menu.mjs' import { Li, Ul, Details, Summary, SumDiv, Deg } from 'shared/components/workbench/menu/index.mjs'
import { useTranslation } from 'next-i18next' import { useTranslation } from 'next-i18next'
export const OptionGroup = (props) => { export const OptionGroup = (props) => {

6
sites/shared/components/workbench/menu/design-options/option-input.mjs
View file

@ -1,4 +1,4 @@
import { PctDegOption } from 'shared/components/workbench/inputs/design-option-pct-deg.mjs' import { DesignOptionPctDeg } from 'shared/components/workbench/inputs/design-option-pct-deg.mjs'
import { CountOption } from 'shared/components/workbench/inputs/design-option-count.mjs' import { CountOption } from 'shared/components/workbench/inputs/design-option-count.mjs'
import { ListOption } from 'shared/components/workbench/inputs/design-option-list.mjs' import { ListOption } from 'shared/components/workbench/inputs/design-option-list.mjs'
import { Popout } from 'shared/components/popout.mjs' import { Popout } from 'shared/components/popout.mjs'
@ -6,9 +6,9 @@ import { Popout } from 'shared/components/popout.mjs'
export const Tmp = (props) => <p>not yet</p> export const Tmp = (props) => <p>not yet</p>
export const inputs = { export const inputs = {
pct: PctDegOption, pct: DesignOptionPctDeg,
count: CountOption, count: CountOption,
deg: (props) => <PctDegOption {...props} type="deg" />, deg: (props) => <DesignOptionPctDeg {...props} type="deg" />,
list: ListOption, list: ListOption,
mm: () => ( mm: () => (
<Popout fixme compact> <Popout fixme compact>

9
sites/shared/components/workbench/menu/design-options/option.mjs
View file

@ -1,6 +1,13 @@
import { Chevron } from 'shared/components/navigation/primary.mjs' import { Chevron } from 'shared/components/navigation/primary.mjs'
import { optionType } from 'shared/utils.mjs' import { optionType } from 'shared/utils.mjs'
import { Li, Details, Summary, SumButton, SumDiv, Deg } from 'shared/components/workbench/menu.mjs' import {
Li,
Details,
Summary,
SumButton,
SumDiv,
Deg,
} from 'shared/components/workbench/menu/index.mjs'
import { useTranslation } from 'next-i18next' import { useTranslation } from 'next-i18next'
import { values } from 'shared/components/workbench/menu/design-options/option-value.mjs' import { values } from 'shared/components/workbench/menu/design-options/option-value.mjs'
import { inputs } from 'shared/components/workbench/menu/design-options/option-input.mjs' import { inputs } from 'shared/components/workbench/menu/design-options/option-input.mjs'

14
sites/shared/components/workbench/menu/index.mjs
View file

@ -1,9 +1,9 @@
import { linkClasses } from 'shared/components/navigation/primary.mjs' import { linkClasses } from 'shared/components/navigation/primary.mjs'
import { ViewMenu } from './view.mjs' import { ViewMenu } from './view.mjs'
import { DesignOptions } from './design-options.mjs' import { DesignOptions } from './design-options/index.mjs'
import { CoreSettings } from './core-settings.mjs' import { CoreSettings } from './core-settings/index.mjs'
import { Xray } from './xray' import { Xray } from './xray/index.mjs'
import { TestDesignOptions } from './test-design-options.mjs' import { TestDesignOptions } from './test-design-options/index.mjs'
export const Ul = (props) => <ul className="pl-5 list-inside">{props.children}</ul> export const Ul = (props) => <ul className="pl-5 list-inside">{props.children}</ul>
export const Li = (props) => ( export const Li = (props) => (
@ -111,11 +111,13 @@ export const WorkbenchMenu = (props) => {
{['draft', 'cuttingLayout', 'printingLayout'].indexOf(props.gist?._state?.view) > -1 && ( {['draft', 'cuttingLayout', 'printingLayout'].indexOf(props.gist?._state?.view) > -1 && (
<> <>
<DesignOptions {...props} /> <DesignOptions {...props} />
<CoreSettings {...props} />
{props.gist.renderer === 'react' && <Xray {...props} />}
</> </>
)} )}
{props.gist?._state?.view === 'test' && <TestDesignOptions {...props} />} {props.gist?._state?.view === 'test' && <TestDesignOptions {...props} />}
</nav> </nav>
) )
} }
//<DesignOptions {...props} />
//<CoreSettings {...props} />
//{props.gist.renderer === 'react' && <Xray {...props} />}

16
sites/shared/components/workbench/menu/test-design-options/index.js → sites/shared/components/workbench/menu/test-design-options/index.mjs
View file

@ -1,8 +1,8 @@
import { OptionsIcon } from 'shared/components/icons.mjs' import { OptionsIcon } from 'shared/components/icons.mjs'
import { Chevron } from 'shared/components/navigation/primary.js' import { Chevron } from 'shared/components/navigation/primary.mjs'
import OptionGroup from '../design-options/option-group' import OptionGroup from '../design-options/option-group.mjs'
import Option from './option' import Option from './option.mjs'
import { Ul, Details, TopSummary, TopSumTitle } from 'shared/components/workbench/menu' import { Ul, Details, TopSummary, TopSumTitle } from 'shared/components/workbench/menu/index.mjs'
import { useTranslation } from 'next-i18next' import { useTranslation } from 'next-i18next'
import { optionsMenuStructure } from 'shared/utils.mjs' import { optionsMenuStructure } from 'shared/utils.mjs'
import { adult, doll, giant } from '@freesewing/models' import { adult, doll, giant } from '@freesewing/models'
@ -24,10 +24,12 @@ const SampleDesignOption = (props) => {
) )
} }
const DesignOptions = (props) => { export const TestDesignOptions = (props) => {
const { t } = useTranslation(['app']) const { t } = useTranslation(['app'])
const optionsMenu = optionsMenuStructure(props.design.patternConfig.options) const optionsMenu = optionsMenuStructure(props.design.patternConfig.options)
// FIXME: This menu is broken right now
const measies = props.draft?.config?.measurements || [] const measies = props.draft?.config?.measurements || []
return ( return (
@ -45,7 +47,7 @@ const DesignOptions = (props) => {
type={options} type={options}
option={group} option={group}
key={group} key={group}
sampleSettings={{ type: 'option', option }} sampleSettings={{ type: 'option', options }}
/> />
) : ( ) : (
<OptionGroup <OptionGroup
@ -103,5 +105,3 @@ const DesignOptions = (props) => {
</> </>
) )
} }
export default DesignOptions

23
sites/shared/components/workbench/menu/test-design-options/option.js → sites/shared/components/workbench/menu/test-design-options/option.mjs
View file

@ -1,11 +1,8 @@
import { Li, SumButton, SumDiv } from 'shared/components/workbench/menu' import { Li, SumButton, SumDiv } from 'shared/components/workbench/menu/index.mjs'
import { useTranslation } from 'next-i18next' import { useTranslation } from 'next-i18next'
const Option = props => { const Option = (props) => {
const active = ( const active = props.sampleSettings?.type === 'option' && props.active === props.option
props.sampleSettings?.type === 'option' &&
props.active === props.option
)
const setSampleSettings = () => { const setSampleSettings = () => {
props.updateGist( props.updateGist(
@ -19,18 +16,18 @@ const Option = props => {
<Li> <Li>
<SumButton onClick={setSampleSettings}> <SumButton onClick={setSampleSettings}>
<SumDiv active={active}> <SumDiv active={active}>
<span className={` <span
className={`
text-3xl inline-block p-0 leading-3 px-2 text-3xl inline-block p-0 leading-3 px-2
${active ${
? 'text-secondary sm:text-secondary-focus translate-y-1 font-bold' active
: 'translate-y-3' ? 'text-secondary sm:text-secondary-focus translate-y-1 font-bold'
: 'translate-y-3'
}`} }`}
> >
{active ? <span>&bull;</span> : <span>&deg;</span>} {active ? <span>&bull;</span> : <span>&deg;</span>}
</span> </span>
<span className={active ? 'text-secondary font-bold' : ''}> <span className={active ? 'text-secondary font-bold' : ''}>{props.label}</span>
{props.label}
</span>
</SumDiv> </SumDiv>
</SumButton> </SumButton>
</Li> </Li>

50
sites/shared/components/workbench/menu/xray/attributes.js
View file

@ -1,50 +0,0 @@
import { Chevron } from 'shared/components/navigation/primary'
import { Ul, Li, Details, Summary, SumDiv, NoSumDiv, Deg } from 'shared/components/workbench/menu'
const XrayAttributes = ({ attr=false, t }) => {
if (!attr || !attr.list || Object.keys(attr.list).length < 1) return null
return (
<Li>
<Details>
<Summary>
<SumDiv>
<Deg />
Attributes
</SumDiv>
<Chevron />
</Summary>
<Ul>
{Object.keys(attr.list).map(at => (
<Li key={at}>
<Details>
<Summary>
<SumDiv>
<Deg />
{at}
</SumDiv>
<Chevron />
</Summary>
<Ul>
{attr.list[at].map(val => (
<Li key={val}>
<NoSumDiv>
<Deg />
<span>{val === true
? t('app.yes')
: val
}</span>
</NoSumDiv>
</Li>
))}
</Ul>
</Details>
</Li>
))}
</Ul>
</Details>
</Li>
)
}
export default XrayAttributes

45
sites/shared/components/workbench/menu/xray/attributes.mjs Normal file
View file

@ -0,0 +1,45 @@
import { Chevron } from 'shared/components/navigation/primary'
import { Ul, Li, Details, Summary, SumDiv, NoSumDiv, Deg } from 'shared/components/workbench/menu'
export const XrayAttributes = ({ attr = false, t }) => {
if (!attr || !attr.list || Object.keys(attr.list).length < 1) return null
return (
<Li>
<Details>
<Summary>
<SumDiv>
<Deg />
Attributes
</SumDiv>
<Chevron />
</Summary>
<Ul>
{Object.keys(attr.list).map((at) => (
<Li key={at}>
<Details>
<Summary>
<SumDiv>
<Deg />
{at}
</SumDiv>
<Chevron />
</Summary>
<Ul>
{attr.list[at].map((val) => (
<Li key={val}>
<NoSumDiv>
<Deg />
<span>{val === true ? t('app.yes') : val}</span>
</NoSumDiv>
</Li>
))}
</Ul>
</Details>
</Li>
))}
</Ul>
</Details>
</Li>
)
}

8
sites/shared/components/workbench/menu/xray/disable.js → sites/shared/components/workbench/menu/xray/disable.mjs
View file

@ -1,7 +1,7 @@
import { Li, SumButton, SumDiv, Deg } from 'shared/components/workbench/menu' import { Li, SumButton, SumDiv, Deg } from 'shared/components/workbench/menu'
import { useTranslation } from 'next-i18next' import { useTranslation } from 'next-i18next'
const DisableXray = props => { export const DisableXray = (props) => {
const { t } = useTranslation(['cfp', 'settings']) const { t } = useTranslation(['cfp', 'settings'])
return ( return (
@ -9,13 +9,9 @@ const DisableXray = props => {
<SumButton onClick={() => props.updateGist(['_state', 'xray', 'enabled'], false)}> <SumButton onClick={() => props.updateGist(['_state', 'xray', 'enabled'], false)}>
<SumDiv> <SumDiv>
<Deg /> <Deg />
<span> <span>{t('cfp:thingIsEnabled', { thing: t('settings:xray.t') })}</span>
{t('cfp:thingIsEnabled', { thing: t('settings:xray.t') })}
</span>
</SumDiv> </SumDiv>
</SumButton> </SumButton>
</Li> </Li>
) )
} }
export default DisableXray

22
sites/shared/components/workbench/menu/xray/index.js → sites/shared/components/workbench/menu/xray/index.mjs
View file

@ -1,13 +1,13 @@
import { XrayIcon } from 'shared/components/icons.mjs' import { XrayIcon } from 'shared/components/icons.mjs'
import { linkClasses, Chevron } from 'shared/components/navigation/primary.js' import { linkClasses, Chevron } from 'shared/components/navigation/primary.mjs'
import Log from './log.js' import { ConsoleLog } from './log.mjs'
import Reset from './reset.js' import { XrayReset } from './reset.mjs'
import Disable from './disable.js' import { XrayDisable } from './disable.mjs'
import List from './list.js' import { XrayList } from './list.mjs'
import { Ul, Details, TopSummary } from 'shared/components/workbench/menu' import { Ul, Details, TopSummary } from 'shared/components/workbench/menu'
import { useTranslation } from 'next-i18next' import { useTranslation } from 'next-i18next'
const Xray = (props) => { export const XrayMenu = (props) => {
const { t } = useTranslation(['app', 'settings']) const { t } = useTranslation(['app', 'settings'])
return ( return (
@ -36,17 +36,15 @@ const Xray = (props) => {
</TopSummary> </TopSummary>
{props.gist?._state?.xray?.enabled && ( {props.gist?._state?.xray?.enabled && (
<Ul> <Ul>
<Disable {...props} /> <XrayDisable {...props} />
<Log {...props} /> <ConsoleLog {...props} />
<Reset {...props} /> <XrayReset {...props} />
{props.gist?._state?.xray?.parts && {props.gist?._state?.xray?.parts &&
Object.keys(props.gist._state.xray.parts).map((partName) => ( Object.keys(props.gist._state.xray.parts).map((partName) => (
<List {...props} partName={partName} /> <XrayList {...props} partName={partName} />
))} ))}
</Ul> </Ul>
)} )}
</Details> </Details>
) )
} }
export default Xray

12
sites/shared/components/workbench/menu/xray/list.js → sites/shared/components/workbench/menu/xray/list.mjs
View file

@ -1,8 +1,8 @@
import { Chevron } from 'shared/components/navigation/primary.js' import { Chevron } from 'shared/components/navigation/primary.mjs'
import { ClearIcon, FilterIcon, SearchIcon } from 'shared/components/icons.mjs' import { ClearIcon, FilterIcon, SearchIcon } from 'shared/components/icons.mjs'
import { Ul, Li, Details, Summary, SumDiv, Deg } from 'shared/components/workbench/menu' import { Ul, Li, Details, Summary, SumDiv, Deg } from 'shared/components/workbench/menu/index.mjs'
import Path from './path.js' import Path from './path.mjs'
import Point from './point.js' import Point from './point.mjs'
import { useTranslation } from 'next-i18next' import { useTranslation } from 'next-i18next'
const types = { const types = {
@ -10,7 +10,7 @@ const types = {
points: Point, points: Point,
} }
const XrayList = (props) => { export const XrayList = (props) => {
const { t } = useTranslation(['app', 'parts']) const { t } = useTranslation(['app', 'parts'])
const title = t(`parts:${props.partName}`) + ` (${props.partName})` const title = t(`parts:${props.partName}`) + ` (${props.partName})`
@ -160,5 +160,3 @@ const XrayList = (props) => {
</Li> </Li>
) )
} }
export default XrayList

16
sites/shared/components/workbench/menu/xray/log.js → sites/shared/components/workbench/menu/xray/log.mjs
View file

@ -1,7 +1,15 @@
import { Chevron } from 'shared/components/navigation/primary.js' import { Chevron } from 'shared/components/navigation/primary.mjs'
import { Ul, Li, Details, Summary, SumButton, SumDiv, Deg } from 'shared/components/workbench/menu' import {
Ul,
Li,
Details,
Summary,
SumButton,
SumDiv,
Deg,
} from 'shared/components/workbench/menu/index.mjs'
const ConsoleLog = (props) => ( export const ConsoleLog = (props) => (
<Li> <Li>
<Details> <Details>
<Summary> <Summary>
@ -33,5 +41,3 @@ const ConsoleLog = (props) => (
</Details> </Details>
</Li> </Li>
) )
export default ConsoleLog

50
sites/shared/components/workbench/menu/xray/path-ops.js → sites/shared/components/workbench/menu/xray/path-ops.mjs
View file

@ -3,25 +3,25 @@ import { Ul, Li, Details, Summary, SumDiv, NoSumDiv, Deg } from 'shared/componen
import Point from './point' import Point from './point'
const MoveLine = ({ op }) => <Point point={op.to} /> const MoveLine = ({ op }) => <Point point={op.to} />
const Curve = ({ op }) => ['cp1', 'cp2', 'to'].map(pnt => ( const Curve = ({ op }) =>
<Li key={pnt}> ['cp1', 'cp2', 'to'].map((pnt) => (
<Details> <Li key={pnt}>
<Summary> <Details>
<SumDiv> <Summary>
<Deg /> <SumDiv>
<span className="font-bold">{pnt}</span> <Deg />
</SumDiv> <span className="font-bold">{pnt}</span>
<Chevron /> </SumDiv>
</Summary> <Chevron />
<Point point={op[pnt]} /> </Summary>
</Details> <Point point={op[pnt]} />
</Li> </Details>
)) </Li>
))
const XrayPathOp = ({ op }) => ( const XrayPathOp = ({ op }) => (
<Li> <Li>
{op.type === 'close' {op.type === 'close' ? (
? (
<NoSumDiv> <NoSumDiv>
<Deg /> <Deg />
<span className="font-bold">{op.type}</span> <span className="font-bold">{op.type}</span>
@ -36,19 +36,13 @@ const XrayPathOp = ({ op }) => (
</SumDiv> </SumDiv>
<Chevron /> <Chevron />
</Summary> </Summary>
<Ul> <Ul>{op.type === 'curve' ? <Curve op={op} /> : <MoveLine op={op} />}</Ul>
{op.type === 'curve'
? <Curve op={op} />
: <MoveLine op={op} />
}
</Ul>
</Details> </Details>
) )}
}
</Li> </Li>
) )
const XrayPathOps = ({ ops=false }) => { export const XrayPathOps = ({ ops = false }) => {
if (!ops || ops.length < 1) return null if (!ops || ops.length < 1) return null
return ( return (
@ -62,11 +56,11 @@ const XrayPathOps = ({ ops=false }) => {
<Chevron /> <Chevron />
</Summary> </Summary>
<Ul> <Ul>
{ops.map(op => <XrayPathOp op={op} />)} {ops.map((op) => (
<XrayPathOp op={op} />
))}
</Ul> </Ul>
</Details> </Details>
</Li> </Li>
) )
} }
export default XrayPathOps

20
sites/shared/components/workbench/menu/xray/path.js → sites/shared/components/workbench/menu/xray/path.mjs
View file

@ -1,9 +1,9 @@
import { Ul, Li, NoSumDiv, Deg } from 'shared/components/workbench/menu' import { Ul, Li, NoSumDiv, Deg } from 'shared/components/workbench/menu/index.mjs'
import { formatMm } from 'shared/utils' import { formatMm } from 'shared/utils.mjs'
import Attributes from './attributes' import Attributes from './attributes.mjs'
import Ops from './path-ops' import Ops from './path-ops.mjs'
const XrayPath = ({ pathName, partName, draft, t, units }) => { export const XrayPath = ({ pathName, partName, draft, t, units }) => {
const path = draft?.parts?.[partName]?.paths?.[pathName] const path = draft?.parts?.[partName]?.paths?.[pathName]
if (!path) return null if (!path) return null
@ -21,14 +21,14 @@ const XrayPath = ({ pathName, partName, draft, t, units }) => {
<NoSumDiv> <NoSumDiv>
<Deg /> <Deg />
<span className="font-bold mr-2">path.length() =</span> <span className="font-bold mr-2">path.length() =</span>
<span dangerouslySetInnerHTML={{ <span
__html: formatMm(path.length(), units) dangerouslySetInnerHTML={{
}} /> __html: formatMm(path.length(), units),
}}
/>
</NoSumDiv> </NoSumDiv>
</Li> </Li>
<Ops ops={path.ops} /> <Ops ops={path.ops} />
</Ul> </Ul>
) )
} }
export default XrayPath

25
sites/shared/components/workbench/menu/xray/point.js
View file

@ -1,25 +0,0 @@
import { Ul, Li, NoSumDiv, Deg } from 'shared/components/workbench/menu'
import { round } from 'shared/utils'
import Attributes from './attributes'
const XrayPoint = ({ pointName, partName, draft, t }) => {
const point = draft?.parts?.[partName]?.points?.[pointName]
return point
? (
<Ul>
{['x', 'y'].map(coord => (
<Li key={coord}>
<NoSumDiv>
<Deg />
<span className="font-bold mr-2">{coord} =</span>
<span>{round(point[coord])}</span>
</NoSumDiv>
</Li>
))}
<Attributes attr={point.attributes} t={t} />
</Ul>
) : null
}
export default XrayPoint

22
sites/shared/components/workbench/menu/xray/point.mjs Normal file
View file

@ -0,0 +1,22 @@
import { Ul, Li, NoSumDiv, Deg } from 'shared/components/workbench/menu'
import { round } from 'shared/utils'
import Attributes from './attributes'
export const XrayPoint = ({ pointName, partName, draft, t }) => {
const point = draft?.parts?.[partName]?.points?.[pointName]
return point ? (
<Ul>
{['x', 'y'].map((coord) => (
<Li key={coord}>
<NoSumDiv>
<Deg />
<span className="font-bold mr-2">{coord} =</span>
<span>{round(point[coord])}</span>
</NoSumDiv>
</Li>
))}
<Attributes attr={point.attributes} t={t} />
</Ul>
) : null
}

6
sites/shared/components/workbench/menu/xray/reset.js → sites/shared/components/workbench/menu/xray/reset.mjs
View file

@ -1,7 +1,7 @@
import { Li, SumButton, SumDiv, Deg } from 'shared/components/workbench/menu' import { Li, SumButton, SumDiv, Deg } from 'shared/components/workbench/menu'
import { useTranslation } from 'next-i18next' import { useTranslation } from 'next-i18next'
const ResetXray = props => { export const ResetXray = (props) => {
const { t } = useTranslation(['app']) const { t } = useTranslation(['app'])
return ( return (
@ -9,11 +9,9 @@ const ResetXray = props => {
<SumButton onClick={() => props.updateGist(['_state', 'xray'], { enabled: true })}> <SumButton onClick={() => props.updateGist(['_state', 'xray'], { enabled: true })}>
<SumDiv> <SumDiv>
<Deg /> <Deg />
<span>{ t(`reset`) }</span> <span>{t(`reset`)}</span>
</SumDiv> </SumDiv>
</SumButton> </SumButton>
</Li> </Li>
) )
} }
export default ResetXray

29
sites/shared/components/workbench/preloaders.mjs Normal file
View file

@ -0,0 +1,29 @@
import yaml from 'js-yaml'
import axios from 'axios'
export const preloaders = {
github: async (id, design) => {
let result
try {
result = await axios.get(`https://api.github.com/gists/${id}`)
} catch (err) {
console.log(err)
return [false, 'An unexpected error occured']
}
if (result.data.files['pattern.yaml'].content) {
let g = yaml.load(result.data.files['pattern.yaml'].content)
if (g.design !== undefined && g.design !== design.designConfig.data.name)
return [
false,
`You tried loading a configuration for ${g.design} into a ${design.designConfig.data.name} development environment`,
]
return g
}
// TODO notify people of these errors
else return [false, 'This gist does not seem to be a valid pattern configuration']
},
}

2
sites/shared/components/workbench/sample.mjs
View file

@ -1,6 +1,6 @@
import { useTranslation } from 'next-i18next' import { useTranslation } from 'next-i18next'
import { svgattrPlugin } from '@freesewing/plugin-svgattr' import { svgattrPlugin } from '@freesewing/plugin-svgattr'
import { SvgWrapper } from './draft/svg-wrapper.mjs' import { SvgWrapper } from './draft/svg.mjs'
import { Error } from './draft/error.mjs' import { Error } from './draft/error.mjs'
export const LabSample = ({ gist, draft, updateGist, unsetGist, showInfo, app, feedback }) => { export const LabSample = ({ gist, draft, updateGist, unsetGist, showInfo, app, feedback }) => {

25
sites/shared/components/wrappers/workbench.mjs
View file

@ -3,25 +3,24 @@ import { useEffect, useState, useMemo } from 'react'
import { useGist } from 'shared/hooks/useGist' import { useGist } from 'shared/hooks/useGist'
// Dependencies // Dependencies
import { pluginTheme } from '@freesewing/plugin-theme' import { pluginTheme } from '@freesewing/plugin-theme'
import preloaders from 'shared/components/workbench/preload.js' import { preloaders } from 'shared/components/workbench/preloaders.mjs'
// Components // Components
import { Menu } from 'shared/components/workbench/menu/index.mjs' import { WorkbenchMenu } from 'shared/components/workbench/menu/index.mjs'
import { DraftError } from 'shared/components/workbench/draft/error.mjs' import { DraftError } from 'shared/components/workbench/draft/error.mjs'
import { Modal } from 'shared/components/modal.mjs' import { Modal } from 'shared/components/modal.mjs'
import { ErrorBoundary } from 'shared/components/error/error-boundary.mjs' import { ErrorBoundary } from 'shared/components/error/error-boundary.mjs'
// Views // Views
import { Measurements } from 'shared/components/workbench/measurements/index.js' import { WorkbenchMeasurements } from 'shared/components/workbench/measurements/index.mjs'
import { LabDraft } from 'shared/components/workbench/draft/index.js' import { LabDraft } from 'shared/components/workbench/draft/index.mjs'
import { LabSample } from 'shared/components/workbench/sample.js' import { LabSample } from 'shared/components/workbench/sample.mjs'
import { ExportDraft } from 'shared/components/workbench/exporting/index.js' import { ExportDraft } from 'shared/components/workbench/exporting/index.mjs'
import { GistAsJson } from 'shared/components/workbench/gist-as-json.js' import { GistAsJson, GistAsYaml } from 'shared/components/workbench/gist.mjs'
import { GistAsYaml } from 'shared/components/workbench/yaml.js' import { DraftLogs } from 'shared/components/workbench/logs.mjs'
import { DraftLogs } from 'shared/components/workbench/logs.js' import { CutLayout } from 'shared/components/workbench/layout/cut/index.mjs'
import { CutLayout } from 'shared/components/workbench/layout/cut' import { PrintingLayout } from 'shared/components/workbench/layout/print/index.mjs'
import { PrintingLayout } from 'shared/components/workbench/layout/print'
const views = { const views = {
measurements: Measurements, measurements: WorkbenchMeasurements,
draft: LabDraft, draft: LabDraft,
test: LabSample, test: LabSample,
printingLayout: PrintingLayout, printingLayout: PrintingLayout,
@ -156,7 +155,7 @@ export const WorkbenchWrapper = ({
app: app, app: app,
noSearch: true, noSearch: true,
workbench: true, workbench: true,
AltMenu: <Menu {...componentProps} />, AltMenu: <WorkbenchMenu {...componentProps} />,
showInfo: setPopup, showInfo: setPopup,
} }

25
sites/shared/prebuild/lab.mjs
View file

@ -16,12 +16,12 @@ const header = `/*
* *
*/` */`
const pageTemplate = design => `${header} const pageTemplate = (design) => `${header}
import { ${capitalize(design)} } from 'designs/${design}/src/index.mjs' import { ${capitalize(design)} } from 'designs/${design}/src/index.mjs'
import { serverSideTranslations } from 'next-i18next/serverSideTranslations' import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
import PageTemplate from 'site/page-templates/workbench.mjs' import { WorkbenchPage } from 'site/page-templates/workbench.mjs'
const Page = (props) => <PageTemplate {...props} design={${capitalize(design)}} version="next"/> const Page = (props) => <WorkbenchPage {...props} design={${capitalize(design)}} version="next"/>
export default Page export default Page
export async function getStaticProps({ locale }) { export async function getStaticProps({ locale }) {
@ -49,21 +49,16 @@ export const prebuildLab = async (site) => {
const pages = ['..', 'lab', 'pages'] const pages = ['..', 'lab', 'pages']
await fs.mkdir(path.resolve(...pages, 'v', 'next'), { recursive: true }) await fs.mkdir(path.resolve(...pages, 'v', 'next'), { recursive: true })
promises.push( promises.push(
fs.writeFile( fs.writeFile(path.resolve(...pages, `${design}.mjs`), page),
path.resolve(...pages, `${design}.mjs`), fs.writeFile(path.resolve(...pages, section, `${design}.mjs`), page)
page
),
fs.writeFile(
path.resolve(...pages, section, `${design}.mjs`),
page
),
) )
} }
} }
// Write designs file // Write designs file
const header = "// This file is auto-generated by the prebuild script | Any changes will be overwritten\n" const header =
const nl = "\n" '// This file is auto-generated by the prebuild script | Any changes will be overwritten\n'
const nl = '\n'
promises.push( promises.push(
fs.writeFile( fs.writeFile(
path.resolve('..', 'lab', 'prebuild', 'designs.mjs'), path.resolve('..', 'lab', 'prebuild', 'designs.mjs'),
@ -76,10 +71,8 @@ export const prebuildLab = async (site) => {
fs.writeFile( fs.writeFile(
path.resolve('..', 'lab', 'prebuild', 'designs-by-type.mjs'), path.resolve('..', 'lab', 'prebuild', 'designs-by-type.mjs'),
`${header}export const designsByType = ${JSON.stringify(designsByType)}${nl}` `${header}export const designsByType = ${JSON.stringify(designsByType)}${nl}`
), )
) )
await Promise.all(promises) await Promise.all(promises)
} }

2
sites/shared/utils.mjs
View file

@ -175,7 +175,7 @@ export const optionsMenuStructure = (options) => {
else if (typeof option.menu === 'undefined') else if (typeof option.menu === 'undefined')
console.log( console.log(
`Warning: Option ${option.name} does not have a menu config. ` + `Warning: Option ${option.name} does not have a menu config. ` +
'Either configure it, or set it to falseo false to hide this option.' 'Either configure it, or set it to false to hide this option.'
) )
} }
} }