chore: Ported latest changes to dev

Author: joostdecock

packages/freesewing.dev/components/navigation-buttons.js

@@ -3,18 +3,32 @@ import Icon from '@/shared/components/icon'
 import ThemeChooser from '@/shared/components/theme-chooser'
 import NavLink, { classes, iconSize, Mini } from '@/shared/components/navigation/navlink'
 
+const l = (to, title, subtitle, icon) => (
+  <NavLink href={to} title={title} subtitle={subtitle} icon={icon}/>
+)
+
 const ExtraNavs = props => {
   const navs = {
     theme: <ThemeChooser
       block={props.menu}
       iconSize={iconSize}
       classes={classes}
-      mini={<Mini>colors</Mini>}
+      mini={<Mini>Your colors</Mini>}
     />,
-    home: <NavLink href='/' title='Home' subtitle='freesewing.dev' icon='freesewing' />,
-    blog: <NavLink href='/blog' title='Blog' subtitle='for/by developers' icon='blog' />,
-    discord: <NavLink href='https://discord.freesewing.org/' title='Chat' subtitle='on Discord' icon='discord' />,
-    github: <NavLink href='https://github.com/freesewing/freesewing' title='Code' subtitle='on Github' icon='github' />,
+    home: l('/', 'home', 'freesewing.dev', 'freesewing'),
+    blog: l('/blog', 'blog', 'For/By Developers', 'blog'),
+    join: l('/patrons/join', 'supportUs', 'becomeAPatron', 'community'),
+    discord: l(
+      'https://discord.freesewing.org/',
+      'Or ask on Discord',
+      'Come say hi',
+      'discord'
+    ),
+    github: l(
+      'https://github.com/freesewing/freesewing', 'code',
+      'On Github',
+      'github'
+    ),
     search: (
       <button
         className={`${classes.btn} lg:w-auto`}
@@ -23,7 +37,7 @@ const ExtraNavs = props => {
         <div className={classes.btnWrap}>
           <Icon icon='search' size={iconSize} className="hidden lg:inline"/>
           <span className={classes.btnSpan}>
-            Search
+            Search for answers
             <Mini>[Ctrlk-k]</Mini>
           </span>
         </div>
@@ -47,18 +61,18 @@ const ExtraNavs = props => {
       : [navs.theme, navs.discord, navs.github]
     : (
       <>
-        <div className="hidden lg:flex lg:flex-row lg:gap-4 items-start">
+        <div className="hidden lg:flex lg:flex-row lg:gap-2 items-start">
           {navs.home}
           {navs.blog}
           {navs.search}
+          {navs.discord}
         </div>
         <div className="lg:hidden flex flex-row flex-1 divide-x divide-base-300 py-1">
           <div className="w-1/2 px-1">{navs.search}</div>
           <div className="w-1/2 px-1">{navs.menu}</div>
         </div>
         <div className='hidden lg:flex lg:flex-row'>
           {navs.theme}
-          {navs.discord}
           {navs.github}
         </div>
       </>

packages/freesewing.dev/components/wrap-sidebar.js

@@ -1,18 +1,3 @@
-import Link from 'next/link'
-import Icon from '@/shared/components/icon'
-
-const SidebarWrap = props => (
-  <>
-    <div className="flex flex-row mb-4 justify-between pr-4">
-      <Link href="/">
-        <a href="/" onClick={() => props.setMenu(false)}>
-        <h3 className="text-2xl font-bold hover:pointer">FreeSewing.dev</h3>
-        </a>
-      </Link>
-      <Icon icon="freesewing" size={36} />
-    </div>
-    {props.children}
-  </>
-)
+const SidebarWrap = props => props.children
 
 export default SidebarWrap

packages/freesewing.dev/pages/blog/[post].js

@@ -1,12 +1,12 @@
 import { getStrapiStaticProps, getStrapiPaths } from '@/shared/content/strapi'
 import { serialize } from 'next-mdx-remote/serialize'
 import AppWrapper from '@/shared/components/wrappers/app'
-import PageTemplate from '@/shared/pages/blog/post'
+import PageTemplate from '@/shared/pages/post/post'
 import config from '@/site/freesewing.config'
 
 const PostPage = (props) => (
   <AppWrapper title={props.post.title}>
-    <PageTemplate {...props} config={config} post={props.post} />
+    <PageTemplate {...props} config={config} post={props.post} type='blog'/>
   </AppWrapper>
 )
 

packages/freesewing.dev/pages/blog/index.js

@@ -1,5 +1,5 @@
 import AppWrapper from '@/shared/components/wrappers/app'
-import PageTemplate from '@/shared/pages/blog/index'
+import PageTemplate from '@/shared/pages/post/index'
 import Preview from '@/shared/components/strapi/preview'
 import useBlogposts from '@/shared/hooks/useBlogposts'
 import config from '@/site/freesewing.config'
@@ -12,7 +12,7 @@ const Page = props => {
       title='FreeSewing Developer Blog'
       crumbs={[]}
     >
-      <PageTemplate {...props} posts={posts} />
+      <PageTemplate {...props} posts={posts} type='blog'/>
     </AppWrapper>
   )
 }

packages/freesewing.shared/components/navigation/breadcrumbs.js

@@ -19,7 +19,7 @@ const getCrumbs = (pages, href) => {
 const defaultHome = <Icon icon='freesewing' size={24} className="inline" />
 
 const Breadcrumbs = (props) => {
-  const {path=false, tree, t, title='FIXME: No title'} = props
+  const {path=false, tree, t=(x)=>x, title='FIXME: No title'} = props
   console.log(props)
   if (!path) return null
   const crumbs = []

packages/freesewing.shared/components/strapi/author.js

@@ -1,7 +1,7 @@
 import config from '@/site/freesewing.config'
 import MDX from "@mdx-js/runtime";
 
-const Author = ({author, type, t}) => (
+const Author = ({author, type, t=false}) => (
   <div id="author" className="shadow flex flex-col lg:flex-row rounded-xl border border-base-300 max-w-prose py-4 mx-auto lg:p-0">
     <div
       className={`
@@ -29,7 +29,10 @@ const Author = ({author, type, t}) => (
       <p className="text-xl mb-2">
         <span className="font-semibold"> {author.displayname}</span>
         <span className="text-base-300 text-sm pl-2">
-          {t('xThis', {x: t(type === 'blog' ? 'wrote' : 'made')})}
+          {t
+            ? t('xThis', {x: t(type === 'blog' ? 'wrote' : 'made')})
+            : 'Wrote this'
+          }
         </span>
       </p>
       <div className="prose">

packages/freesewing.shared/pages/post/post.js

@@ -10,7 +10,7 @@ const PostPage = (props) => {
         <div className="flex flex-row justify-between text-sm mb-1 mt-2">
           <span><Timeago date={props.post.date} /> [{props.post.date}]</span>
           <span>
-            {props.t('by')}&nbsp;
+            {props.t ? props.t('by') : 'By'}&nbsp;
             <a
               href="#author"
               className="text-secondary hover:text-secondary-focus"
@@ -38,7 +38,7 @@ const PostPage = (props) => {
           />
         </div>
       </article>
-      <Author author={author} t={props.t} type={props.type}/>
+      <Author author={author} type={props.type}/>
     </>
   )
 }

yarn.lock

@@ -1348,6 +1348,13 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
+"@babel/runtime@^7.12.0", "@babel/runtime@^7.13.17", "@babel/runtime@^7.14.5":
+  version "7.14.8"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.8.tgz#7119a56f421018852694290b9f9148097391b446"
+  integrity sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
 "@babel/template@^7.10.4", "@babel/template@^7.12.7", "@babel/template@^7.14.5", "@babel/template@^7.3.3":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4"
@@ -3899,6 +3906,13 @@
   dependencies:
     "@types/node" "*"
 
+"@types/i18next-fs-backend@^1.0.0":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@types/i18next-fs-backend/-/i18next-fs-backend-1.0.1.tgz#275950fa3c1c3366c829cb3728dfbc4ef2566ceb"
+  integrity sha512-zJDqz/xg3j2qJNr4t+fUgGEC30Xq/rqM8iF8sraN/nBVwIoItcpUwc/Wvwqs9pEgNpDgZ0PXRoWhoicwozSM3g==
+  dependencies:
+    i18next "^19.7.0"
+
 "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762"
@@ -7235,7 +7249,7 @@ core-js@^2.4.0:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
   integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
 
-core-js@^3.15.0, core-js@^3.6.5:
+core-js@^3, core-js@^3.15.0, core-js@^3.6.5:
   version "3.15.2"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.15.2.tgz#740660d2ff55ef34ce664d7e2455119c5bdd3d61"
   integrity sha512-tKs41J7NJVuaya8DxIOCnl8QuPHx5/ZVbFo1oKgVl1qHFBBrDctzQGtuLjPpRdNTWmKPH6oEvgN/MUID+l485Q==
@@ -9856,6 +9870,15 @@ form-data@^3.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
+form-data@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
+  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.8"
+    mime-types "^2.1.12"
+
 form-data@~2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
@@ -10847,7 +10870,7 @@ hoist-non-react-statics@^1.0.0:
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb"
   integrity sha1-qkSM8JhtVcxAdzsXF0t90GbLfPs=
 
-hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
+hoist-non-react-statics@^3.2.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
   integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
@@ -10938,6 +10961,13 @@ html-minifier-terser@^5.0.1:
     relateurl "^0.2.7"
     terser "^4.6.3"
 
+html-parse-stringify@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz#dfc1017347ce9f77c8141a507f233040c59c55d2"
+  integrity sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==
+  dependencies:
+    void-elements "3.1.0"
+
 html-tags@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140"
@@ -11141,6 +11171,25 @@ hyphenate-style-name@^1.0.3:
   resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz#691879af8e220aea5750e8827db4ef62a54e361d"
   integrity sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ==
 
+i18next-fs-backend@^1.0.7:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/i18next-fs-backend/-/i18next-fs-backend-1.1.1.tgz#1d8028926803f63784ffa0f2b1478fb369f92735"
+  integrity sha512-RFkfy10hNxJqc7MVAp5iAZq0Tum6msBCNebEe3OelOBvrROvzHUPaR8Qe10RQrOGokTm0W4vJGEJzruFkEt+hQ==
+
+i18next@^19.7.0:
+  version "19.9.2"
+  resolved "https://registry.yarnpkg.com/i18next/-/i18next-19.9.2.tgz#ea5a124416e3c5ab85fddca2c8e3c3669a8da397"
+  integrity sha512-0i6cuo6ER6usEOtKajUUDj92zlG+KArFia0857xxiEHAQcUwh/RtOQocui1LPJwunSYT574Pk64aNva1kwtxZg==
+  dependencies:
+    "@babel/runtime" "^7.12.0"
+
+i18next@^20.1.0:
+  version "20.3.5"
+  resolved "https://registry.yarnpkg.com/i18next/-/i18next-20.3.5.tgz#14308b79a3f1cafb24fdcd8e182d3673baf1e979"
+  integrity sha512-//MGeU6n4TencJmCgG+TCrpdgAD/NDEU/KfKQekYbJX6QV7sD/NjWQdVdBi+bkT0snegnSoB7QhjSeatrk3a0w==
+  dependencies:
+    "@babel/runtime" "^7.12.0"
+
 [email protected], iconv-lite@^0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
@@ -14549,6 +14598,20 @@ netlify@^7.0.1:
     p-wait-for "^3.2.0"
     qs "^6.9.6"
 
+next-i18next@^8.5.5:
+  version "8.5.5"
+  resolved "https://registry.yarnpkg.com/next-i18next/-/next-i18next-8.5.5.tgz#d1a7476929236050986965eb59d6f44d7631d11a"
+  integrity sha512-zYXYToVB5W2qmDbWmuT/7j+PC/CqCysZsvMY2nmIyqpgaIBhMDKHYSi8+0nJ7SG1q7i9D+wQdJNd8KLdpe4/ng==
+  dependencies:
+    "@babel/runtime" "^7.13.17"
+    "@types/hoist-non-react-statics" "^3.3.1"
+    "@types/i18next-fs-backend" "^1.0.0"
+    core-js "^3"
+    hoist-non-react-statics "^3.2.0"
+    i18next "^20.1.0"
+    i18next-fs-backend "^1.0.7"
+    react-i18next "^11.8.13"
+
 next-mdx-remote@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/next-mdx-remote/-/next-mdx-remote-3.0.2.tgz#7e1159b4eb8a6bdd4000c0b6e6631f94d8683f04"
@@ -17305,6 +17368,14 @@ react-hotkeys-hook@^3.3.2:
   dependencies:
     hotkeys-js "3.8.7"
 
+react-i18next@^11.8.13:
+  version "11.11.3"
+  resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.11.3.tgz#38d083bb079c3e6ee376b3321b0d6e409d798f68"
+  integrity sha512-upzG5/SpyOlYP5oSF4K8TZBvDWVhnCo38JNV+KnWjrg0+IaJCBltyh6lRGZDO5ovLyA4dU6Ip0bwbUCjb6Yyxw==
+  dependencies:
+    "@babel/runtime" "^7.14.5"
+    html-parse-stringify "^3.0.1"
+
 react-instantsearch-core@^6.12.0:
   version "6.12.0"
   resolved "https://registry.yarnpkg.com/react-instantsearch-core/-/react-instantsearch-core-6.12.0.tgz#f4bd044c0b5939d2129b95d3bf298e407a41a2b5"
@@ -20867,6 +20938,11 @@ [email protected], vm-browserify@^1.0.1:
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
   integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
 
+[email protected]:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-3.1.0.tgz#614f7fbf8d801f0bb5f0661f5b2f5785750e4f09"
+  integrity sha1-YU9/v42AHwu18GYfWy9XhXUOTwk=
+
 w3c-hr-time@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"