diff --git a/packages/freesewing.lab/hooks/useApp.js b/packages/freesewing.lab/hooks/useApp.js index 2cc070134c5..37d31ebaaa8 100644 --- a/packages/freesewing.lab/hooks/useApp.js +++ b/packages/freesewing.lab/hooks/useApp.js @@ -1,4 +1,4 @@ -import { useState, useEffect } from 'react' +import { useState } from 'react' import set from 'lodash.set' // Stores state in local storage import useLocalStorage from 'shared/hooks/useLocalStorage.js' @@ -10,7 +10,7 @@ import { useTranslation } from 'next-i18next' import { capitalize } from 'shared/utils' // Initial navigation -const initialNavigation = (locale, t) => { +const initialNavigation = (t) => { const base = { accessories: { __title: t('accessoryPatterns'), @@ -69,7 +69,7 @@ function useApp(full = true) { // React State const [primaryMenu, setPrimaryMenu] = useState(false) - const [navigation, setNavigation] = useState(initialNavigation(locale, t)) + const [navigation, setNavigation] = useState(initialNavigation(t)) const [slug, setSlug] = useState('/') const [pattern, setPattern] = useState(false) const [loading, setLoading] = useState(false) diff --git a/packages/freesewing.shared/components/layouts/default.js b/packages/freesewing.shared/components/layouts/default.js index d372adfd946..18c33ab486e 100644 --- a/packages/freesewing.shared/components/layouts/default.js +++ b/packages/freesewing.shared/components/layouts/default.js @@ -162,7 +162,7 @@ const DefaultLayout = ({ ${asideClasses} ${app.primaryMenu ? '' : 'translate-x-[-100%]'} transition-transform sm:flex-row - ${workbench && collapseAltMenu + ${collapseAltMenu ? 'sm:px-0 sm:w-16' : 'sm:px-1 md:px-4 lg:px-8 sm:w-[38.2%]' } diff --git a/packages/freesewing.shared/components/logos/freesewing.js b/packages/freesewing.shared/components/logos/freesewing.js index edb97b89a61..532c3b5b2c8 100644 --- a/packages/freesewing.shared/components/logos/freesewing.js +++ b/packages/freesewing.shared/components/logos/freesewing.js @@ -11,7 +11,7 @@ const strokes = { } let step = 0 -const fill = { +const fills = { light: ( @@ -81,7 +81,7 @@ const Logo = ({ size=false, className='stroke-0', theme='light', fill=false, str return ( - {fill && fill[theme]} + {fill && fills[theme]} diff --git a/packages/freesewing.shared/components/workbench/draft/index.js b/packages/freesewing.shared/components/workbench/draft/index.js index a00c5f86e90..35d8183bb17 100644 --- a/packages/freesewing.shared/components/workbench/draft/index.js +++ b/packages/freesewing.shared/components/workbench/draft/index.js @@ -1,7 +1,5 @@ import SvgWrapper from './svg-wrapper' import Error from './error.js' -import { capitalize } from 'shared/utils.js' -import { TransformWrapper, TransformComponent } from "react-zoom-pan-pinch" const LabDraft = props => { const { app, draft, pattern, gist, updateGist, unsetGist } = props diff --git a/packages/freesewing.shared/components/workbench/draft/part/index.js b/packages/freesewing.shared/components/workbench/draft/part/index.js index 7b120d3fed9..ef2cce7c626 100644 --- a/packages/freesewing.shared/components/workbench/draft/part/index.js +++ b/packages/freesewing.shared/components/workbench/draft/part/index.js @@ -6,7 +6,9 @@ import { getProps } from '../utils' const XrayPart = props => { // Don't bother if this is the only part on display if (props.gist.only && props.gist.only.length === 1) return null - const i = Object.keys(props.gist.xray?.reveal).indexOf(props.partName)%10 + const i = props.gist.xray?.reveal + ? Object.keys(props.gist.xray?.reveal).indexOf(props.partName)%10 + : 0 const { topLeft, bottomRight } = props.part return ( diff --git a/packages/freesewing.shared/components/workbench/draft/point/index.js b/packages/freesewing.shared/components/workbench/draft/point/index.js index 267a5040560..3c38b1367e1 100644 --- a/packages/freesewing.shared/components/workbench/draft/point/index.js +++ b/packages/freesewing.shared/components/workbench/draft/point/index.js @@ -117,7 +117,7 @@ const PassiveXrayPoint = props => ( cy={props.point.y} r={7.5 * props.gist.scale} className="opacity-0 stroke-lining fill-lining hover:opacity-25 hover:cursor-pointer" - onClick={props.gist?.xray?.parts?.[props.partName]?.points?.[props.pointName] + onClick={props.gist.xray?.parts?.[props.partName]?.points?.[props.pointName] ? () => props.unsetGist( ['xray', 'parts', props.partName, 'points', props.pointName] ) diff --git a/packages/freesewing.shared/components/workbench/events.js b/packages/freesewing.shared/components/workbench/events.js index 107cb50ee72..baaa34f926a 100644 --- a/packages/freesewing.shared/components/workbench/events.js +++ b/packages/freesewing.shared/components/workbench/events.js @@ -1,5 +1,4 @@ import Markdown from 'react-markdown' -import { linkClasses } from 'shared/components/navigation/primary.js' const eventBlock = events => events.join(" \n") diff --git a/packages/freesewing.shared/components/workbench/inputs/design-option-list.js b/packages/freesewing.shared/components/workbench/inputs/design-option-list.js index 182d25143c7..2525826c848 100644 --- a/packages/freesewing.shared/components/workbench/inputs/design-option-list.js +++ b/packages/freesewing.shared/components/workbench/inputs/design-option-list.js @@ -28,7 +28,7 @@ const DesignOptionList = props => {
{list.map(choice => ( -