diff --git a/packages/freesewing.dev/' b/packages/freesewing.dev/' deleted file mode 100644 index 0e736d490af..00000000000 --- a/packages/freesewing.dev/' +++ /dev/null @@ -1,93 +0,0 @@ -const colors = require('tailwindcss/colors') - -const bg = '#002808' -module.exports = { - 'fontFamily': `ui-monospace, Menlo, Monaco, "Cascadia Mono", "Segoe UI Mono", "Roboto Mono", "Oxygen Mono", "Ubuntu Monospace", "Source Code Pro", "Fira Mono", "Droid Sans Mono", "Courier New", monospace;`, - 'primary': colors.lime['700'], - 'primary-focus': colors.lime['600'], - 'primary-content': colors.lime['50'], - - 'secondary': colors.lime['200'], - 'secondary-focus': colors.lime['600'], - 'secondary-content': bg, - - 'accent': colors.lime['700'], - 'accent-focus': colors.lime['600'], - 'accent-content': colors.yellow['200'], - - 'neutral': colors.lime['700'], - 'neutral-focus': colors.lime['600'], - 'neutral-content': colors.lime['200'], - - 'base-100': bg, - 'base-200': colors.lime['900'], - 'base-300': colors.lime['800'], - 'base-content': colors.lime['500'], - - 'info': colors.lime['700'], - 'success': colors.lime['700'], - 'warning': colors.lime['700'], - 'error': colors.lime['700'], - - '--btn-info-content': colors.teal[300], - '--btn-success-content': colors.green[300], - '--btn-warning-content': colors.orange[300], - '--btn-error-content': colors.red[300], - '--rounded-btn': '0', - - '--theme-gradient': `repeating-linear-gradient( - -45deg, - ${colors.lime['700']}, - ${colors.lime['700']} 15px, - ${bg} 15px, - ${bg} 30px - )`, - - '--code-background-color': '#002407', - '--code-border-color': colors.lime['900'], - '--code-color': colors.lime['600'], - '--code-font-family': `"SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace`, - '--code-border-radius': 0, - '--code-border-style': 'solid', - '--code-border-width': 1, - '--code-outer-padding': '0 0.5rem', - '--code-inner-padding': '1rem', - '--code-color-keyword': colors.lime['400'], - '--code-font-weight-keyword': 'bold', - '--code-color-entity': colors.lime['400'], - '--code-font-weight-entity': 'bold', - '--code-color-constant': colors.lime['200'], - '--code-color-string': colors.lime['200'], - '--code-font-style-string': 'italic', - '--code-color-variable': colors.lime['400'], - '--code-color-comment': colors.lime['600'], - '--code-color-tag': colors.lime['400'], - '--code-color-property': colors.lime['200'], - '--code-font-weight-property': 'bold', - - '--pattern-bg': colors.lime['900'], - '--pattern-fabric': colors.neutral['700'], - '--pattern-lining': colors.emerald['500'], - '--pattern-interfacing': colors.neutral['400'], - '--pattern-canvas': colors.amber['600'], - '--pattern-various': colors.red['500'], - '--pattern-mark': colors.blue['500'], - '--pattern-contrast': colors.pink['500'], - '--pattern-note': colors.violet['500'], - '--pattern-fabric': colors.neutral['700'], - '--pattern-lining': colors.emerald['500'], - '--pattern-interfacing': colors.neutral['400'], - '--pattern-canvas': colors.amber['600'], - '--pattern-various': colors.red['500'], - '--pattern-mark': colors.blue['500'], - '--pattern-contrast': colors.pink['500'], - '--pattern-note': colors.violet['500'], - - '--pattern-scale': 1, - '--pattern-stroke-xs': "0.2", - '--pattern-stroke-sm': "0.4", - '--pattern-stroke': "0.7", - '--pattern-stroke-lg': "1.3", - '--pattern-stroke-xl': "2", - '--pattern-stroke-xxl': "4", -} diff --git a/packages/freesewing.dev/components/footer.js b/packages/freesewing.dev/components/footer.js index aa5c8292237..9201c804c22 100644 --- a/packages/freesewing.dev/components/footer.js +++ b/packages/freesewing.dev/components/footer.js @@ -72,8 +72,8 @@ const Footer = ({ app }) => (

Our Discord server is - the best place to ask questions and get help. It's where our community hangs out - so you'll get the fastest response and might even make a few new friends along the way. + the best place to ask questions and get help. It's where our community hangs out + so you'll get the fastest response and might even make a few new friends along the way.

You can also reach out on Twitter or (

{contributors.map(person => ( - - + + {`Avatar ))}
@@ -121,8 +124,17 @@ const Footer = ({ app }) => (

{patrons.map(person => ( - - + + {`Avatar ))}
@@ -134,16 +146,16 @@ const Footer = ({ app }) => (

- + Search powered by Algolia - - + + Translation powered by Crowdin - - + + Deploys & hosting by Netlify - + Error handling by bugsnag
diff --git a/packages/freesewing.dev/components/header.js b/packages/freesewing.dev/components/header.js index af9d6b74792..ee120a9e834 100644 --- a/packages/freesewing.dev/components/header.js +++ b/packages/freesewing.dev/components/header.js @@ -20,7 +20,7 @@ const Header = ({ app }) => { sm:hidden z-30 `}> -
+
- + - +
diff --git a/packages/freesewing.dev/package.json b/packages/freesewing.dev/package.json index c137560fb6c..83ca5e12d87 100644 --- a/packages/freesewing.dev/package.json +++ b/packages/freesewing.dev/package.json @@ -9,6 +9,7 @@ "build": "next build", "export": "next build && next export", "start": "next start -p 3002", + "lint": "next lint", "serve": "pm2 start npm --name 'freesewing.dev' -- run start" }, "dependencies": { @@ -22,6 +23,7 @@ "lodash.get": "^4.4.2", "lodash.orderby": "^4.6.0", "lodash.set": "^4.3.2", + "netlify-cli": "^8.4.2", "next": "latest", "react-markdown": "^7.1.1", "react-swipeable": "^6.2.0", @@ -33,6 +35,7 @@ }, "devDependencies": { "autoprefixer": "^10.4.0", + "eslint-config-next": "12.0.7", "js-yaml": "^4.1.0", "postcss": "^8.4.4", "tailwindcss": "^3.0.1" diff --git a/packages/freesewing.dev/pages/blog/[slug].js b/packages/freesewing.dev/pages/blog/[slug].js index 8ac05938331..b09d7b38b82 100644 --- a/packages/freesewing.dev/pages/blog/[slug].js +++ b/packages/freesewing.dev/pages/blog/[slug].js @@ -5,6 +5,7 @@ import { posts } from 'site/prebuild/strapi.blog.en.js' import TimeAgo from 'react-timeago' import MdxWrapper from 'shared/components/wrappers/mdx' import Markdown from 'react-markdown' +import Image from 'next/image' const strapi = "https://posts.freesewing.org" diff --git a/packages/freesewing.dev/pages/blog/index.js b/packages/freesewing.dev/pages/blog/index.js index 5c5757489c8..cbab44d357f 100644 --- a/packages/freesewing.dev/pages/blog/index.js +++ b/packages/freesewing.dev/pages/blog/index.js @@ -45,17 +45,18 @@ const Preview = ({ app, post }) => (
) -export default (props) => { +const BlogIndexPage = (props) => { const app = useApp() return (
{Object.values(orderBy(posts, ['date'], ['desc'])) - .map(post => ) + .map(post => ) }
) } +export default BlogIndexPage diff --git a/packages/freesewing.dev/pages/index.js b/packages/freesewing.dev/pages/index.js index f345ab4f9b1..f0449fc7f28 100644 --- a/packages/freesewing.dev/pages/index.js +++ b/packages/freesewing.dev/pages/index.js @@ -3,7 +3,7 @@ import useApp from 'site/hooks/useApp.js' import Logo from 'shared/components/logos/freesewing.js' import Popout from 'shared/components/popout.js' -export default (props) => { +const HomePage = (props) => { const app = useApp() return ( @@ -32,3 +32,4 @@ export default (props) => { ) } +export default HomePage diff --git a/packages/freesewing.dev/pages/typography.js b/packages/freesewing.dev/pages/typography.js index 370b1428fef..49140ad1373 100644 --- a/packages/freesewing.dev/pages/typography.js +++ b/packages/freesewing.dev/pages/typography.js @@ -3,11 +3,12 @@ import Page from 'shared/components/wrappers/page.js' import useApp from 'site/hooks/useApp.js' import Popout from 'shared/components/popout.js' -export default (props) => { +const TypographyPage = (props) => { const app = useApp() + const { updateNavigation } = app useEffect(() => { - app.updateNavigation( + updateNavigation( ['typography'], { __title: 'Typography', @@ -15,12 +16,12 @@ export default (props) => { __slug: 'typography', __order: 'typography' }) - }, []) + }, [updateNavigation]) const p = (

This paragraph is here to show the vertical spacing between headings and paragraphs. - In addition, let's make it a bit longer so we can see the line height as the text wraps. + In addition, let's make it a bit longer so we can see the line height as the text wraps.

) @@ -28,7 +29,7 @@ export default (props) => {

This typography page shows an overview of different elements and how they are styled.

-

It's a good starting point for theme development.

+

It's a good starting point for theme development.

Headings (this is h2)

{p}

This is h3

{p} @@ -94,3 +95,5 @@ export default (props) => { ) } +export default TypographyPage + diff --git a/packages/freesewing.dev/public/support.jpg b/packages/freesewing.dev/public/support.jpg new file mode 100644 index 00000000000..3c476403b0b Binary files /dev/null and b/packages/freesewing.dev/public/support.jpg differ