diff --git a/sites/lab/components/wrappers/layout.js b/sites/lab/components/wrappers/layout.js
index 33268ae68c6..37bb69a6908 100644
--- a/sites/lab/components/wrappers/layout.js
+++ b/sites/lab/components/wrappers/layout.js
@@ -1,64 +1,8 @@
-import React from 'react'
-import { useState } from 'react'
import { useRouter } from 'next/router'
-import Link from 'next/link'
-// Shared components
-import Logo from 'shared/components/logos/freesewing.js'
-import PrimaryNavigation from 'shared/components/navigation/primary'
-import get from 'lodash.get'
-import Right from 'shared/components/icons/right.js'
-import Left from 'shared/components/icons/left.js'
// Site components
import Header from 'site/components/header'
import Footer from 'site/components/footer'
-export const PageTitle = ({ app, slug, title }) => {
- if (title) return
- readdirSync(source, { withFileTypes: true })
- .filter(dirent => dirent.isDirectory())
- .map(dirent => dirent.name)
-
-const pkgs = getDirectories(path.resolve(`../`))
-
let greeting = false
const config = {
diff --git a/sites/lab/page-templates/design-list.js b/sites/lab/page-templates/design-list.js
index 72a1f72bdb4..b13b98db443 100644
--- a/sites/lab/page-templates/design-list.js
+++ b/sites/lab/page-templates/design-list.js
@@ -1,17 +1,10 @@
-import React from 'react'
import Page from 'site/components/wrappers/page.js'
import useApp from 'site/hooks/useApp.js'
-import Head from 'next/head'
import Link from 'next/link'
import { useTranslation } from 'next-i18next'
-import { defaultVersion, formatVersionTitle, formatVersionUri } from 'site/components/version-picker.js'
-import TutorialIcon from 'shared/components/icons/tutorial.js'
-import DesignIcon from 'shared/components/icons/design.js'
-import BoxIcon from 'shared/components/icons/box.js'
-import CogIcon from 'shared/components/icons/cog.js'
+import { formatVersionTitle } from 'site/components/version-picker.js'
import Layout from 'site/components/layouts/bare'
-import Popout from 'shared/components/popout'
-import { PageTitle, Breadcrumbs } from 'site/components/wrappers/layout'
+import { PageTitle } from 'site/components/wrappers/layout'
import availableVersions from 'site/available-versions.json'
const DesignLinks = ({ list, prefix='', version=false }) => {
diff --git a/sites/lab/pages/index.js b/sites/lab/pages/index.js
index 3970912aa2c..addd98c23b1 100644
--- a/sites/lab/pages/index.js
+++ b/sites/lab/pages/index.js
@@ -1,11 +1,10 @@
import Page from 'site/components/wrappers/page.js'
import useApp from 'site/hooks/useApp.js'
import Head from 'next/head'
-import Link from 'next/link'
import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
import Layout from 'site/components/layouts/bare'
import { useTranslation } from 'next-i18next'
-import Navigation, { Icons } from 'shared/components/navigation/primary'
+import { Icons } from 'shared/components/navigation/primary'
const HomePage = (props) => {
const app = useApp()
diff --git a/sites/lab/pages/v/index.js b/sites/lab/pages/v/index.js
index 0bb4b45ed1e..e80cc40ca45 100644
--- a/sites/lab/pages/v/index.js
+++ b/sites/lab/pages/v/index.js
@@ -4,14 +4,9 @@ import useApp from 'site/hooks/useApp.js'
import Head from 'next/head'
import Link from 'next/link'
import { useTranslation } from 'next-i18next'
-import { defaultVersion, formatVersionTitle, formatVersionUri } from 'site/components/version-picker.js'
-import TutorialIcon from 'shared/components/icons/tutorial.js'
-import DesignIcon from 'shared/components/icons/design.js'
-import BoxIcon from 'shared/components/icons/box.js'
-import CogIcon from 'shared/components/icons/cog.js'
+import { formatVersionTitle } from 'site/components/version-picker.js'
import Layout from 'site/components/layouts/bare'
-import Popout from 'shared/components/popout'
-import { PageTitle, Breadcrumbs } from 'site/components/wrappers/layout'
+import { PageTitle } from 'site/components/wrappers/layout'
import availableVersions from 'site/available-versions.json'
const DesignLinks = ({ list, prefix='', version=false }) => {
@@ -59,10 +54,6 @@ const VersionListPage = ({ section=false, version=false }) => {
const app = useApp()
const { t } = useTranslation(['app'])
- const title = section
- ? app.navigation[section].__title
- : t('designs')
-
const currentDesigns = []
for (const section in app.designs) currentDesigns.push(...app.designs[section])
diff --git a/sites/org/components/design.js b/sites/org/components/design.js
index a7a282069dc..63d5ffebe4e 100644
--- a/sites/org/components/design.js
+++ b/sites/org/components/design.js
@@ -42,7 +42,6 @@ const loadDesign = async (design, setExamples) => {
const Design = ({ design }) => {
const { t } = useTranslation(['patterns'])
const {
- code="Anonymous",
difficulty=3,
} = configs[design]
diff --git a/sites/org/components/footer.js b/sites/org/components/footer.js
index 6fe3910d72d..46919fab27a 100644
--- a/sites/org/components/footer.js
+++ b/sites/org/components/footer.js
@@ -3,10 +3,8 @@ import OsiLogo from 'shared/components/logos/osi.js'
import CreativeCommonsLogo from 'shared/components/logos/cc.js'
import CcByLogo from 'shared/components/logos/cc-by.js'
import { useTranslation } from 'next-i18next'
-import PageLink from 'shared/components/page-link'
import DocsLink from 'shared/components/docs-link'
import PinkedRibbon from 'shared/components/pinked-ribbon.js'
-import Worm from 'shared/components/worm.js'
import Link from 'next/link'
import DiscordIcon from 'shared/components/icons/discord.js'
diff --git a/sites/org/components/layouts/docs.js b/sites/org/components/layouts/docs.js
index 1c20b6d059c..fa7df9a452f 100644
--- a/sites/org/components/layouts/docs.js
+++ b/sites/org/components/layouts/docs.js
@@ -1,5 +1,4 @@
import { useRouter } from 'next/router'
-import Link from 'next/link'
// Shared components
import Aside from 'shared/components/navigation/aside'
import ThemePicker from 'shared/components/theme-picker'
@@ -21,10 +20,7 @@ const DefaultLayout = ({ app, title=false, crumbs=false, children=[] }) => {
{title && (
<>
- {title
- ?
{title}
- :
{app.getTitle(slug)}
- }
+
{title}
>
)}
{children}
diff --git a/sites/org/components/mdx/pattern-docs.js b/sites/org/components/mdx/pattern-docs.js
index 6418c851e29..44d30e6ca13 100644
--- a/sites/org/components/mdx/pattern-docs.js
+++ b/sites/org/components/mdx/pattern-docs.js
@@ -1,6 +1,5 @@
import React from 'react'
import { capitalize } from 'shared/utils.js'
-import Link from 'next/link'
import { getConfig } from 'shared/designs/index.js'
import Popout from 'shared/components/popout.js'
import { useTranslation } from 'next-i18next'
diff --git a/sites/org/components/mdx/pattern-measurements.js b/sites/org/components/mdx/pattern-measurements.js
index 4d20433d020..1a6d4623c78 100644
--- a/sites/org/components/mdx/pattern-measurements.js
+++ b/sites/org/components/mdx/pattern-measurements.js
@@ -6,21 +6,6 @@ import PageLink from 'shared/components/page-link.js'
const PatternMeasurements = ({ pattern, before=null, after=null }) => {
const { t } = useTranslation(['measurements'])
- const sortMeasurements = (measurements) => {
- if (typeof measurements === 'undefined') return []
- let sorted = []
- let translated = {}
- for (let m of measurements) {
- let translation = intl.messages['measurements.' + m] || m
- translated[translation] = m
- }
- let order = Object.keys(translated)
- order.sort()
- for (let m of order) sorted.push(translated[m])
-
- return sorted
- }
-
const measurements = {}
for (const m of configs[pattern].measurements) {
measurements[m] = {
diff --git a/sites/org/components/mdx/pattern-options.js b/sites/org/components/mdx/pattern-options.js
index 1b7ef06846a..5e9b753178d 100644
--- a/sites/org/components/mdx/pattern-options.js
+++ b/sites/org/components/mdx/pattern-options.js
@@ -52,21 +52,6 @@ const renderOptions = (groups, pattern, t) => {
const PatternOptions = ({ pattern, before=null, after=null }) => {
const { t } = useTranslation([`o_${pattern}`, 'og'])
- const sortOptions = (options) => {
- if (typeof options === 'undefined') return []
- const sorted = []
- const translated = {}
- for (const o of options) {
- const translation = intl.messages['measurements.' + o] || o
- translated[translation] = o
- }
- const order = Object.keys(translated)
- order.sort()
- for (const o of order) sorted.push(translated[o])
-
- return sorted
- }
-
return (
{before}
diff --git a/sites/org/components/wrappers/layout.js b/sites/org/components/wrappers/layout.js
index e60819d2ef8..8015a371e59 100644
--- a/sites/org/components/wrappers/layout.js
+++ b/sites/org/components/wrappers/layout.js
@@ -25,7 +25,6 @@ const LayoutWrapper = ({
const router = useRouter()
router.events?.on('routeChangeStart', startNavigation)
router.events?.on('routeChangeComplete', () => app.stopLoading())
- const slug = router.asPath.slice(1)
const [collapsePrimaryNav, setCollapsePrimaryNav] = useState(workbench || false)
const [collapseAltMenu, setCollapseAltMenu] = useState(false)
diff --git a/sites/org/components/wrappers/page.js b/sites/org/components/wrappers/page.js
index bd53d6ea597..f8bca2edf0d 100644
--- a/sites/org/components/wrappers/page.js
+++ b/sites/org/components/wrappers/page.js
@@ -8,10 +8,6 @@ import Docs from 'site/components/layouts/docs'
// Add feeds
import Feeds from 'site/components/feeds.js'
-const layouts = {
- docs: Docs,
-}
-
/* This component should wrap all page content */
const PageWrapper= ({
title="FIXME: No title set",
diff --git a/sites/org/pages/blog/[slug].js b/sites/org/pages/blog/[slug].js
index 864928bd804..51ee93e9ae4 100644
--- a/sites/org/pages/blog/[slug].js
+++ b/sites/org/pages/blog/[slug].js
@@ -3,16 +3,12 @@ import useApp from 'site/hooks/useApp.js'
import TimeAgo from 'react-timeago'
import MdxWrapper from 'shared/components/wrappers/mdx'
import mdxCompiler from 'shared/mdx/compiler'
-import Markdown from 'react-markdown'
import Head from 'next/head'
import Lightbox from 'shared/components/lightbox.js'
import ImageWrapper from 'shared/components/wrappers/img.js'
import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
import { strapiHost } from 'shared/config/freesewing.mjs'
import { strapiImage } from 'shared/utils.js'
-import { useTranslation } from 'next-i18next'
-
-const strapi = "https://posts.freesewing.org"
const Author = ({ author }) => (
diff --git a/sites/org/pages/designs/index.js b/sites/org/pages/designs/index.js
index d6b554ac815..59f04f842f0 100644
--- a/sites/org/pages/designs/index.js
+++ b/sites/org/pages/designs/index.js
@@ -1,7 +1,5 @@
import Page from 'site/components/wrappers/page.js'
import useApp from 'site/hooks/useApp.js'
-import Popout from 'shared/components/popout.js'
-import Link from 'next/link'
import PageLink from 'shared/components/page-link'
import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
import { useTranslation } from 'next-i18next'
diff --git a/sites/org/pages/docs/[...mdxslug].js b/sites/org/pages/docs/[...mdxslug].js
index 6039a1902a6..28d1f00b110 100644
--- a/sites/org/pages/docs/[...mdxslug].js
+++ b/sites/org/pages/docs/[...mdxslug].js
@@ -4,7 +4,6 @@ import mdxLoader from 'shared/mdx/loader'
import MdxWrapper from 'shared/components/wrappers/mdx'
import TocWrapper from 'shared/components/wrappers/toc'
import Head from 'next/head'
-import HelpUs from 'site/components/help-us.js'
import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
import components from 'site/components/mdx/index.js'
// MDX paths
diff --git a/sites/org/pages/docs/index.js b/sites/org/pages/docs/index.js
index 9bf3098a8ad..72eb0aade71 100644
--- a/sites/org/pages/docs/index.js
+++ b/sites/org/pages/docs/index.js
@@ -1,4 +1,3 @@
-import { useEffect } from 'react'
import Page from 'site/components/wrappers/page.js'
import useApp from 'site/hooks/useApp.js'
import mdxLoader from 'shared/mdx/loader'
@@ -37,7 +36,7 @@ export default DocsPage
*/
export async function getStaticProps({ params, locale }) {
- const { mdx, intro, toc, frontmatter } = await mdxLoader(
+ const { mdx, frontmatter } = await mdxLoader(
locale,
'org',
['docs']
diff --git a/sites/org/pages/index.js b/sites/org/pages/index.js
index 09aab842415..c30a293cbe0 100644
--- a/sites/org/pages/index.js
+++ b/sites/org/pages/index.js
@@ -2,11 +2,10 @@ import Page from 'site/components/wrappers/page.js'
import useApp from 'site/hooks/useApp.js'
import Head from 'next/head'
import Popout from 'shared/components/popout.js'
-import Link from 'next/link'
import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
import { useTranslation } from 'next-i18next'
import Layout from 'site/components/layouts/bare'
-import Navigation, { Icons } from 'shared/components/navigation/primary'
+import { Icons } from 'shared/components/navigation/primary'
import DownIcon from 'shared/components/icons/down.js'
const HomePage = (props) => {
diff --git a/sites/org/pages/showcase/[slug].js b/sites/org/pages/showcase/[slug].js
index df25be8131d..fb09647efd3 100644
--- a/sites/org/pages/showcase/[slug].js
+++ b/sites/org/pages/showcase/[slug].js
@@ -3,8 +3,6 @@ import useApp from 'site/hooks/useApp.js'
import TimeAgo from 'react-timeago'
import MdxWrapper from 'shared/components/wrappers/mdx'
import mdxCompiler from 'shared/mdx/compiler'
-import Markdown from 'react-markdown'
-import Head from 'next/head'
import PageLink from 'shared/components/page-link.js'
import Lightbox from 'shared/components/lightbox.js'
import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
@@ -12,8 +10,6 @@ import { strapiHost } from 'shared/config/freesewing.mjs'
import { strapiImage } from 'shared/utils.js'
import { useTranslation } from 'next-i18next'
-const strapi = "https://posts.freesewing.org"
-
const Maker = ({ maker }) => {
const { t } = useTranslation(['posts'])
diff --git a/sites/org/pages/showcase/designs/[design].js b/sites/org/pages/showcase/designs/[design].js
index 1a03fa288e4..dd98a804dd9 100644
--- a/sites/org/pages/showcase/designs/[design].js
+++ b/sites/org/pages/showcase/designs/[design].js
@@ -1,37 +1,11 @@
import Page from 'site/components/wrappers/page.js'
import useApp from 'site/hooks/useApp.js'
-import TimeAgo from 'react-timeago'
-import MdxWrapper from 'shared/components/wrappers/mdx'
-import mdxCompiler from 'shared/mdx/compiler'
-import Markdown from 'react-markdown'
-import Head from 'next/head'
import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
import { strapiHost } from 'shared/config/freesewing.mjs'
import { strapiImage } from 'shared/utils.js'
import { useTranslation } from 'next-i18next'
import designs from 'shared/config/designs.json'
import { PreviewTile } from '../index.js'
-import PageLink from 'shared/components/page-link.js'
-
-const DesignPosts = ({ design, posts }) => {
- const { t } = useTranslation(['patterns'])
- return (
-
-
- {posts.slice(0, 10).map(post =>
)}
-
-
- )
-}
const DesignIndexPage = (props) => {
const app = useApp()
@@ -68,7 +42,7 @@ const DesignIndexPage = (props) => {
md:-mr-12 md:pl-12
`}>
{props.posts.map(post =>
{
md:-mr-12 md:pl-12
`}>
{posts.slice(0, 10).map(post => {
md:-mr-12 md:pl-12
`} style={{maxWidth: "calc(100vw - 3rem)"}}>
{posts.slice(0, 10).map(post => Array.prototype.slice.call(element.attributes)
-const getNum = (element, attributes) => attributes.map(attr => parseFloat(element.getAttribute(attr), 10))
+const getNum = (element, attributes) => attributes.map(attr => parseFloat(element.getAttribute(attr)))
-const getDiam = (element, attributes) => attributes.map(attr => 2 * parseFloat(element.getAttribute(attr), 10))
+const getDiam = (element, attributes) => attributes.map(attr => 2 * parseFloat(element.getAttribute(attr)))
const getCoords = (element, attribute) => element
.getAttribute(attribute)
.trim()
.split(' ')
.filter(item => item.length > 0)
- .map(item => item.trim().split(',').map(num => parseFloat(num, 10)))
+ .map(item => item.trim().split(',').map(num => parseFloat(num)))
const getSettings = element => {
const settings = {};
@@ -25,7 +25,7 @@ const getSettings = element => {
}
if(element.hasAttribute('stroke-width') && !element.getAttribute('stroke-width').includes('%')) {
- settings.strokeWidth = parseFloat(element.getAttribute('stroke-width', 10));
+ settings.strokeWidth = parseFloat(element.getAttribute('stroke-width'));
}
return settings;
@@ -69,10 +69,10 @@ const coarse = (svg, options) => {
'y2'
];
- const flatten = () => {
+ const flatten = (...args) => {
const rv = []
- for(let i = 0; i < arguments.length; i++) {
- const arr = arguments[i]
+ for(let i = 0; i < args.length; i++) {
+ const arr = args[i]
for(let j = 0; j < arr.length; j++) {
rv.push(arr[j])
}