VSinerva/freesewing
1
0
Fork 0
Code Activity

Merge branch 'develop' into joost

Browse source
This commit is contained in:
joostdecock 2023-06-20 19:28:48 +02:00
commit 7f7ceeb0e2
21 changed files with 1058 additions and 470 deletions
Download patch file Download diff file Expand all files Collapse all files

20
sites/shared/components/wrappers/mdx.mjs
View file

@ -16,7 +16,7 @@ import { useTranslation } from 'next-i18next'
//import { PrevNext } from '../mdx/prev-next.mjs'
//
//
const TimeAgo = ({ date, t }) => {
export const TimeAgo = ({ date, t }) => {
const i = Interval.fromDateTimes(DateTime.fromISO(date), DateTime.now())
.toDuration(['hours', 'days', 'months', 'years'])
.toObject()
@ -101,9 +101,21 @@ const MetaData = ({ authors = [], maintainers = [], updated = '20220825', locale
</div>
)
export const MdxWrapper = ({ MDX = false, frontmatter = {}, components = {}, children = [] }) => {
export const PlainMdxWrapper = ({ MDX = false, components = {}, children, site = 'org' }) => {
const allComponents = { ...baseComponents(site), ...components }
return <div className="searchme">{MDX ? <MDX components={allComponents} /> : children}</div>
}
export const MdxWrapper = ({
MDX = false,
frontmatter = {},
components = {},
children = [],
site = 'org',
}) => {
const { t } = useTranslation('docs')
const allComponents = { ...baseComponents, ...components }
const { locale, slug } = useContext(NavigationContext)
const updates = docUpdates[slug] || {}
@ -116,7 +128,7 @@ export const MdxWrapper = ({ MDX = false, frontmatter = {}, components = {}, chi
updated={updates.u}
{...{ locale, slug, t }}
/>
<div className="searchme">{MDX ? <MDX components={allComponents} /> : children}</div>
<PlainMdxWrapper {...{ MDX, components, children }} />
</div>
)
}

6
sites/shared/components/wrappers/page.mjs
View file

@ -4,6 +4,7 @@ import React, { useState, useEffect, useContext } from 'react'
// Hooks
import { useTheme } from 'shared/hooks/use-theme.mjs'
// Components
import Head from 'next/head'
import { SwipeWrapper } from 'shared/components/wrappers/swipes.mjs'
import { LayoutWrapper, ns as layoutNs } from 'site/components/wrappers/layout.mjs'
import { DocsLayout, ns as docsNs } from 'site/components/layouts/docs.mjs'
@ -80,6 +81,11 @@ export const PageWrapper = (props) => {
// Return wrapper
return (
<SwipeWrapper>
{pageTitle && (
<Head>
<meta property="og:title" content={pageTitle} key="title" />
</Head>
)}
<div
data-theme={currentTheme} // This facilitates CSS selectors
key={currentTheme} // This forces the data-theme update