1
0
Fork 0

[org] feat: Add curated measurments sets to site (#198)

Also includes fixes for darkmode.

Reviewed-on: https://codeberg.org/freesewing/freesewing/pulls/198
This commit is contained in:
Joost De Cock 2025-04-03 14:41:18 +00:00
parent 77e75fa940
commit 880f738973
11 changed files with 206 additions and 5 deletions

View file

@ -9,6 +9,7 @@ export const measurements = {
crossSeamFront: 'Cross seam front',
head: 'Head circumference',
heel: 'Heel circumference',
height: 'Height',
highBustFront: 'High bust front',
highBust: 'High bust',
hips: 'Hips circumference',

View file

@ -0,0 +1,162 @@
// Dependencies
import { orderBy, cloudflareImageUrl, getSearchParam, formatMm } from '@freesewing/utils'
import { isDegreeMeasurement } from '@freesewing/config'
import { measurements as measurementTranslations } from '@freesewing/i18n'
// Hooks
import { useBackend } from '@freesewing/react/hooks/useBackend'
import React, { useState, useEffect } from 'react'
// Components
import { Link as WebLink } from '@freesewing/react/components/Link'
import { MiniWarning } from '@freesewing/react/components/Mini'
import { Spinner } from '@freesewing/react/components/Spinner'
import { Markdown } from '@freesewing/react/components/Markdown'
import { KeyVal } from '@freesewing/react/components/KeyVal'
export const CuratedSetLineup = ({ href = false, clickHandler = false, Link = false }) => {
if (!Link) Link = WebLink
// Hooks
const backend = useBackend()
// State (local)
const [sets, setSets] = useState([])
// Effects
useEffect(() => {
const getSets = async () => {
const [status, body] = await backend.getCuratedSets()
if (status === 200 && body.result === 'success') {
const allSets = []
for (const set of body.curatedSets) {
if (set.published) allSets.push(set)
}
setSets(orderBy(allSets, 'height', 'asc'))
}
}
getSets()
}, [])
if (!href && !clickHandler)
return (
<MiniWarning>
Please provide either a <code>href</code> or <code>clickHandler</code> prop to the{' '}
<code>CuratedSetLineup</code> component.
</MiniWarning>
)
return (
<div
className={`tw-w-full tw-flex tw-flex-row ${
sets.length > 1 ? 'tw-justify-start tw-px-8' : 'tw-justify-center'
} tw-overflow-x-scroll`}
style={{
backgroundImage: `url(/img/lineup-backdrop.svg)`,
width: 'auto',
backgroundSize: 'auto 100%',
backgroundRepeat: 'repeat-x',
}}
>
{sets.map((set) => {
const props = {
className:
'tw-aspect-[1/3] tw-w-auto tw-h-96 tw-bg-transparent tw-border-0 hover:tw-cursor-pointer hover:tw-bg-secondary/20',
style: {
backgroundImage: `url(${cloudflareImageUrl({
id: `cset-${set.id}`,
type: 'lineup',
})})`,
width: 'auto',
backgroundSize: 'contain',
backgroundRepeat: 'no-repeat',
backgroundPosition: 'center',
},
key: set.id,
}
return (
<div className="tw-flex tw-flex-col tw-items-center" key={set.id}>
{typeof clickHandler === 'function' ? (
<button {...props} onClick={() => clickHandler(set)}></button>
) : null}
{typeof href === 'function' ? <Link {...props} href={href(set)}></Link> : null}
<b>{set.nameEn}</b>
</div>
)
})}
</div>
)
}
export const CuratedSet = ({ Link = false, id = false }) => {
if (!Link) Link = WebLink
// Hooks
const backend = useBackend()
// State (local)
const [set, setSet] = useState(false)
const [setId, setSetId] = useState(false)
// Effects
useEffect(() => {
if (id) setSetId(id)
else setSetId(getSearchParam('id'))
const getSet = async () => {
const [status, body] = await backend.getCuratedSet(setId)
if (status === 200 && body.result === 'success') {
setSet({
...body.curatedSet,
measies: {
...body.curatedSet.measies,
height: body.curatedSet.height * 10,
},
})
}
}
if (setId) getSet()
}, [setId, id])
if (!set) return <Spinner />
return (
<>
<h2 className="tw-flex tw-flex-row tw-items-center tw-gap-2">
{set.nameEn} <KeyVal k="id" val={set.id} />
</h2>
<Markdown>{set.notesEn}</Markdown>
<h2>Image</h2>
<img src={cloudflareImageUrl({ id: `cset-${set.id}`, variant: 'public' })} />
<h2>Measurements</h2>
<table className="tw-table">
<thead>
<tr>
<th>Measurement</th>
<th>Metric</th>
<th>Imperial</th>
</tr>
</thead>
<tbody>
{orderBy(
Object.entries(set.measies || {}).map(([m, val]) => ({
id: m,
val,
t: measurementTranslations[m],
})),
't',
'asc'
).map((entry) => (
<tr key={entry.id}>
<td className="tw-text-right">{entry.t}</td>
<td>{isDegreeMeasurement(entry.id) ? `${entry.val}°` : formatMm(entry.val)}</td>
<td
dangerouslySetInnerHTML={{
__html: isDegreeMeasurement(entry.id)
? `${entry.val}°`
: formatMm(entry.val, true),
}}
/>
</tr>
))}
</tbody>
</table>
</>
)
}

View file

@ -6,6 +6,7 @@ import {
} from '@freesewing/react/context/LoadingStatus'
import { ModalContext, ModalContextProvider } from '@freesewing/react/context/Modal'
import {
ChatIcon,
DesignIcon,
DocsIcon,
ShowcaseIcon,
@ -144,4 +145,12 @@ const navbarItems = {
<SimpleNavbarItem label="Showcase" href="/showcase/" Icon={ShowcaseIcon} Link={props.Link} />
),
blog: (props) => <SimpleNavbarItem label="Blog" href="/blog/" Icon={RssIcon} Link={props.Link} />,
forum: (props) => (
<SimpleNavbarItem
label="Forum"
href="https://forum.freesewing.eu/"
Icon={ChatIcon}
Link={props.Link}
/>
),
}

View file

@ -34,6 +34,7 @@
"./components/Collection": "./components/Collection/index.mjs",
"./components/Control": "./components/Control/index.mjs",
"./components/CopyToClipboardButton": "./components/CopyToClipboardButton/index.mjs",
"./components/CuratedSet": "./components/CuratedSet/index.mjs",
"./components/Design": "./components/Design/index.mjs",
"./components/DiffViewer": "./components/DiffViewer/index.mjs",
"./components/Docusaurus": "./components/Docusaurus/index.mjs",