Tell people a little bit about yourself.
-
+
+
{welcomeSteps[account.control].length > 0 ? (
<>
+
6 / {welcomeSteps[account.control].length}
{
for (const type in types) perType[type] = bookmarks.filter((b) => b.type === type)
return (
-
-
+
+
setModal(
{
slideFrom="right"
keepOpenOnClick
>
-
+
New Bookmark
setRefresh(refresh + 1)} />
@@ -114,7 +114,7 @@ export const Bookmarks = () => {
{bookmarks.length > 0 ? (
@@ -125,18 +125,18 @@ export const Bookmarks = () => {
perType[type].length > 0 ? (
{title}
-
-
+
+
-
+
- Title
+ Title
Location
@@ -145,16 +145,16 @@ export const Bookmarks = () => {
.filter((bookmark) => bookmark.type === type)
.map((bookmark, i) => (
-
+
- {bookmark.title}
-
+ {bookmark.title}
+
{bookmark.url.length > 30
? bookmark.url.slice(0, 30) + '...'
@@ -210,7 +210,7 @@ export const NewBookmark = ({ onCreated = false }) => {
// Render the form
return (
-
+
{
valid={(val) => val.length > 0}
placeholder={'https://freesewing.org/account'}
/>
-
+
0 && url.length > 0)}
onClick={createBookmark}
>
@@ -256,7 +256,7 @@ export const BookmarkButton = ({ slug, type, title }) => {
return (
setModal(
@@ -305,10 +305,10 @@ export const CreateBookmark = ({ type, title, slug }) => {
}
return (
-
+
New bookmark
+
Create bookmark
diff --git a/packages/react/components/Account/Compare.mjs b/packages/react/components/Account/Compare.mjs
index 97d2ab258d6..9ffb4667144 100644
--- a/packages/react/components/Account/Compare.mjs
+++ b/packages/react/components/Account/Compare.mjs
@@ -70,19 +70,19 @@ export const Compare = ({ welcome = false }) => {
: '/docs/about/guide'
return (
-
+
({
val,
label: (
-
+
{strings[val].title}
{val === 'yes' ? (
-
),
@@ -93,17 +93,17 @@ export const Compare = ({ welcome = false }) => {
/>
{welcome ? (
<>
-
+
{welcomeSteps[account?.control].length > 0 ? (
<>
+
4 / {welcomeSteps[account?.control].length}
{
}
return (
-
- {title ?
Privacy Matters : null}
+
+ {title ?
Privacy Matters : null}
{text.intro}
-
Do you give your consent to process your account data?
+
Do you give your consent to process your account data?
{text.account}
{consent1 ? (
) : (
setConsent1(!consent1)}
>
Click here to give your consent
@@ -103,7 +103,7 @@ export const Consent = ({ signUp = false, Link = false, title = false }) => {
)}
{consent1 ? (
<>
-
+
Do you give your consent to share your anonymized measurements
{
) : null}
{!consent1 && This consent is required for a FreeSewing account. }
{consent1 ? (
-
+
{signUp ? 'Create Account' : 'Save'}
) : signUp ? null : (
Remove your account
)}
-
-
+
@@ -138,19 +138,19 @@ export const Consent = ({ signUp = false, Link = false, title = false }) => {
const Checkbox = ({ value, setter, label, children = null }) => (
setter(value ? false : true)}
>
-
+
{label}
+ {label}
{children}
@@ -174,7 +174,7 @@ const text = {
),
account: (
-
+
What is account data?
Your email address , username , and password , and any measurements {' '}
@@ -194,7 +194,7 @@ const text = {
No , never.
-
+
Note: Freesewing publishes anonymized measurements as open data for scientific research. You
have the right to object to this.
diff --git a/packages/react/components/Account/Control.mjs b/packages/react/components/Account/Control.mjs
index a83764d99b2..9adb5dcdb00 100644
--- a/packages/react/components/Account/Control.mjs
+++ b/packages/react/components/Account/Control.mjs
@@ -52,14 +52,14 @@ export const Control = ({ welcome = false }) => {
: false
return (
-
+
({
val,
label: (
-
+
{controlDesc[val].title}
@@ -71,17 +71,17 @@ export const Control = ({ welcome = false }) => {
/>
{welcome ? (
<>
-
+
{welcomeSteps[control].length > 1 ? (
<>
+
1 / {welcomeSteps[control].length}
+
{changed ? (
Please confirm this change
@@ -72,9 +72,9 @@ export const Email = ({ welcome = false, Link = false }) => {
original={account.email}
valid={() => valid}
/>
-
+
@@ -151,7 +151,7 @@ export const EmailChangeConfirmation = ({ onSuccess = false }) => {
return (
<>
One moment pleae
-
+
{link ? (
Your data was exported and is available for download at the following location:
-
+
{link}
diff --git a/packages/react/components/Account/Github.mjs b/packages/react/components/Account/Github.mjs
index da2885f2ec7..4e2e9962db6 100644
--- a/packages/react/components/Account/Github.mjs
+++ b/packages/react/components/Account/Github.mjs
@@ -34,7 +34,7 @@ export const Github = () => {
}
return (
-
+
{
valid={(val) => val.length > 0}
placeholder={'joostdecock'}
/>
-
+
+
{
}
return (
-
+
{
valid={(val) => val.length > 0}
placeholder={'joostdecock'}
/>
-
+
-
+
+
-
Your Data
+
Your Data
{Object.keys(controlConfig.account.fields.data).map((item) =>
controlConfig.flat[item] > control ? null : (
{
href={`/account/data/${item}/`}
className={`${itemClasses} ${linkClasses}`}
>
-
+
{itemIcons[item]}
{titles[item] ? titles[item] : capitalize(item)}
-
{itemPreviews[item]}
+
{itemPreviews[item]}
)
)}
@@ -186,7 +186,7 @@ export const Links = ({ Link = false }) => {
{control > 1 && (
-
About You
+
About You
{Object.keys(controlConfig.account.fields.info).map((item) =>
controlConfig.flat[item] > control ? null : (
{
href={`/account/about/${item === 'img' ? 'avatar' : item}/`}
className={`${itemClasses} ${linkClasses}`}
>
-
+
{itemIcons[item]}
{titles[item] ? titles[item] : capitalize(item)}
-
{itemPreviews[item]}
+
{itemPreviews[item]}
)
)}
-
-
+
+
Role
-
{account.role}
+
{account.role}
-
-
+
+
ID
@@ -221,7 +221,7 @@ export const Links = ({ Link = false }) => {
)}
-
Preferences
+
Preferences
{Object.keys(controlConfig.account.fields.settings).map((item) =>
controlConfig.flat[item] > control ? null : (
{
href={`/account/preferences/${item}/`}
className={`${itemClasses} ${linkClasses}`}
>
-
+
{itemIcons[item]}
{titles[item] ? titles[item] : capitalize(item)}
-
{itemPreviews[item]}
+
{itemPreviews[item]}
)
)}
@@ -242,7 +242,7 @@ export const Links = ({ Link = false }) => {
{control > 2 && (
-
Linked Identities
+
Linked Identities
{Object.keys(controlConfig.account.fields.identities).map((item) =>
controlConfig.flat[item] > control ? null : (
{
href={`/account/social/${item}/`}
className={`${itemClasses} ${linkClasses}`}
>
-
+
{itemIcons[item]}
{titles[item] ? titles[item] : capitalize(item)}
-
{itemPreviews[item]}
+
{itemPreviews[item]}
)
)}
@@ -264,7 +264,7 @@ export const Links = ({ Link = false }) => {
{control > 1 && (
-
Security
+
Security
{Object.keys(controlConfig.account.fields.security).map((item) =>
controlConfig.flat[item] > control ? null : (
{
href={`/account/security/${item}/`}
className={`${itemClasses} ${linkClasses}`}
>
-
+
{itemIcons[item]}
{titles[item] ? titles[item] : capitalize(item)}
-
{itemPreviews[item]}
+
{itemPreviews[item]}
)
)}
@@ -286,15 +286,15 @@ export const Links = ({ Link = false }) => {
{control > 1 && (
-
Actions
+ Actions
{control > 2 && (
Import data
+ Import data
)}
{control > 2 && (
@@ -303,8 +303,8 @@ export const Links = ({ Link = false }) => {
title="Export your data"
href="/account/actions/export/"
>
- Export your data
+ Export your data
)}
{control > 2 && (
@@ -313,8 +313,8 @@ export const Links = ({ Link = false }) => {
title="Reload account data"
href="/account/actions/reload/"
>
- Reload account data
+ Reload account data
)}
{control > 3 && (
@@ -323,8 +323,10 @@ export const Links = ({ Link = false }) => {
title="Restrict processing of your data"
href="/account/actions/restrict/"
>
- Restrict processing of your data
+
+ Restrict processing of your data
+
)}
Remove your account
+ Remove your account
)}
-
+
{account.role === 'admin' && (
-
-
- Administration
+
+
+
Administration
)}
{control > 1 && (
-
-
- Your Profile
+
+
+
Your Profile
)}
signOut()}
>
+
{title ?
{titleText} : null}
{enable ? (
<>
-
+
-
{enable.secret}
+
{enable.secret}
Add FreeSewing to your Authenticator App by scanning the QR code above. If you cannot
scan the QR code, you can manually enter the secret below it.
@@ -107,14 +107,14 @@ export const Mfa = ({ welcome = false, title = true }) => {
+
Please enter your password to confirm this action
{
@@ -163,8 +163,8 @@ export const Mfa = ({ welcome = false, title = true }) => {
You can use each of these codes only once. Write them down, because this is the only
time you will get to see them.
-
-
+
+
MFA Scratch Codes
{
}
/>
-
+
{scratchCodes.map((code) => code + '\n')}
) : (
-
+
{account.mfaEnabled ? (
disable ? null : (
setDisable(true)}
>
-
+
+
{num}
-
{children}
+
{children}
+
({
val,
label: (
-
+
{val === 'yes' ? 'Yes, I would like to receive the newsletter' : 'No thanks'}
{val === 'yes' ? (
-
),
@@ -86,17 +86,17 @@ export const Newsletter = ({ welcome = false, Link = false }) => {
/>
{welcome ? (
<>
-
+
{welcomeSteps[account?.control].length > 0 ? (
<>
+
2 / {welcomeSteps[account?.control].length}
{
Unsubscribe link
-
+
This link is to unsubscribe you specifically, do not share it with other subscribers.
diff --git a/packages/react/components/Account/Password.mjs b/packages/react/components/Account/Password.mjs
index a68f8613f45..3c20a9c4324 100644
--- a/packages/react/components/Account/Password.mjs
+++ b/packages/react/components/Account/Password.mjs
@@ -43,7 +43,7 @@ export const Password = ({ welcome = false, Link = false }) => {
}
return (
-
+
{
placeholder="Tip: use a password manager"
/>
@@ -66,9 +66,9 @@ export const Password = ({ welcome = false, Link = false }) => {
We do not enforce a password policy, but we do recommend you enable Two-Factor
Authentication to keep your FreeSewing account safe.
-
-
+
diff --git a/packages/react/components/Account/Pattern.mjs b/packages/react/components/Account/Pattern.mjs
index ae2d09bc5a3..34f53caffa9 100644
--- a/packages/react/components/Account/Pattern.mjs
+++ b/packages/react/components/Account/Pattern.mjs
@@ -135,7 +135,7 @@ export const Pattern = ({ id, Link }) => {
if (!edit)
return (
-
+
{pattern.public ? (
This is the private view of your pattern
@@ -144,9 +144,9 @@ export const Pattern = ({ id, Link }) => {
+
+
Edit pattern {pattern.name}
{/* Name is always shown */}
@@ -204,10 +204,10 @@ export const Pattern = ({ id, Link }) => {
{
val: true,
label: (
-
+
Public Pattern
@@ -217,10 +217,10 @@ export const Pattern = ({ id, Link }) => {
{
val: false,
label: (
-
+
Private Pattern
@@ -237,15 +237,15 @@ export const Pattern = ({ id, Link }) => {
{account.control >= controlConfig.account.patterns.notes ? (
) : null}
-
+
setEdit(false)}
- className={`tw-daisy-btn tw-daisy-btn-primary tw-daisy-btn-outline`}
+ className={`tw:daisy-btn tw:daisy-btn-primary tw:daisy-btn-outline`}
>
-
+
@@ -272,7 +272,7 @@ export const PatternCard = ({
const s = sizes[size]
const wrapperProps = {
- className: `tw-bg-base-300 tw-w-full tw-mb-2 tw-mx-auto tw-flex tw-flex-col tw-items-start tw-text-center tw-justify-center tw-rounded tw-shadow tw-py-4 tw-w-${s} tw-aspect-square`,
+ className: `tw:bg-base-300 tw:w-full tw:mb-2 tw:mx-auto tw:flex tw:flex-col tw:items-start tw:text-center tw:justify-center tw:rounded tw:shadow tw:py-4 tw:w-${s} tw:aspect-square`,
style: {
backgroundImage: `url(${cloudflareImageUrl({ type: 'w1000', id: pattern.img })})`,
backgroundSize: 'cover',
@@ -315,7 +315,7 @@ export const PatternCard = ({
const BadgeLink = ({ label, href }) => (
{label}
@@ -336,19 +336,19 @@ const PatternHeader = ({
}) => (
<>
{pattern.name}
-
+
-
-
+
+
-
+
{account.control > 3 && (pattern?.public || pattern.userId === account.id) ? (
-
+
@@ -358,12 +358,12 @@ const PatternHeader = ({
setModal(
-
+
)
}
- className={`tw-daisy-btn tw-daisy-btn-secondary tw-daisy-btn-outline ${horFlexClasses}`}
+ className={`tw:daisy-btn tw:daisy-btn-secondary tw:daisy-btn-outline ${horFlexClasses}`}
>
togglePublic()}
- className={`tw-daisy-btn tw-daisy-btn-${pattern.public ? 'error' : 'success'} tw-daisy-btn-outline ${horFlexClasses} hover:tw-text-${pattern.public ? 'error' : 'success'}-content`}
+ className={`tw:daisy-btn tw:daisy-btn-${pattern.public ? 'error' : 'success'} tw:daisy-btn-outline ${horFlexClasses} hover:tw:text-${pattern.public ? 'error' : 'success'}-content`}
>
{pattern.public ?
setEdit(true)}
- className={`tw-daisy-btn tw-daisy-btn-primary ${horFlexClasses}`}
+ className={`tw:daisy-btn tw:daisy-btn-primary ${horFlexClasses}`}
>
diff --git a/packages/react/components/Account/Patterns.mjs b/packages/react/components/Account/Patterns.mjs
index 189be0ec8b5..60be067f39b 100644
--- a/packages/react/components/Account/Patterns.mjs
+++ b/packages/react/components/Account/Patterns.mjs
@@ -89,16 +89,16 @@ export const Patterns = ({ Link = false }) => {
return (
<>
-
+
@@ -106,13 +106,13 @@ export const Patterns = ({ Link = false }) => {
-
-
+
+
(order === field ? setDesc(!desc) : setOrder(field))}
>
{fields[field]}{' '}
@@ -136,16 +136,16 @@ export const Patterns = ({ Link = false }) => {
{orderBy(patterns, order, desc ? 'desc' : 'asc').map((pattern, i) => (
-
+
- {pattern.id}
-
+ {pattern.id}
+
{
Link={Link}
/>
-
+
-
+
- {shortDate(pattern.createdAt)}
-
+ {shortDate(pattern.createdAt)}
+
{pattern.public ?
diff --git a/packages/react/components/Account/Platform.mjs b/packages/react/components/Account/Platform.mjs
index 3e4c692647f..a5f435bf978 100644
--- a/packages/react/components/Account/Platform.mjs
+++ b/packages/react/components/Account/Platform.mjs
@@ -56,7 +56,7 @@ const Platform = ({ platform = false }) => {
}
return (
-
+
{
valid={(val) => val.length > 0}
placeholder={'joostdecock'}
/>
-
+
+
The data stored in your browser can sometimes get out of sync with the data stored in our
backend.
diff --git a/packages/react/components/Account/Remove.mjs b/packages/react/components/Account/Remove.mjs
index 92d2c124740..913056d123a 100644
--- a/packages/react/components/Account/Remove.mjs
+++ b/packages/react/components/Account/Remove.mjs
@@ -48,22 +48,22 @@ export const Remove = () => {
)
return (
-
+
setModal(
-
+
There is no way back from this
If this is what you want, then go ahead.
-
+
+
The GDPR guarantees{' '}
-
+
Proceed with caution
While no data will be removed, this will disable your account. Furthermore, you
can not undo this on your own, but will have to contact support when you want to
restore access to your account.
-
+
-
+
+
-
+
{account.control > 2 && mset.public && mset.userId !== account.id ? (
-
+
JSON
YAML
@@ -232,9 +232,9 @@ export const Set = ({ id, publicOnly = false, Link = false, measurementHelpProvi
+
setModal(
@@ -246,7 +246,7 @@ export const Set = ({ id, publicOnly = false, Link = false, measurementHelpProvi
JSON
setModal(
@@ -263,11 +263,11 @@ export const Set = ({ id, publicOnly = false, Link = false, measurementHelpProvi
)}
{account.id && account.control > 2 && mset.public && mset.userId !== account.id ? (
-
+
@@ -284,7 +284,7 @@ export const Set = ({ id, publicOnly = false, Link = false, measurementHelpProvi
)
}
- className={`tw-daisy-btn tw-daisy-btn-secondary tw-btn-outline ${horFlexClasses}`}
+ className={`tw:daisy-btn tw:daisy-btn-secondary tw:btn-outline ${horFlexClasses}`}
>
Show Image
@@ -297,9 +297,9 @@ export const Set = ({ id, publicOnly = false, Link = false, measurementHelpProvi
setSuggest(!suggest)
setEdit(false)
}}
- className={`tw-daisy-btn ${
- suggest ? 'tw-daisy-btn-neutral' : 'tw-daisy-btn-primary'
- } tw-daisy-btn-outline ${horFlexClasses}`}
+ className={`tw:daisy-btn ${
+ suggest ? 'tw:daisy-btn-neutral' : 'tw:daisy-btn-primary'
+ } tw:daisy-btn-outline ${horFlexClasses}`}
>
{suggest ?
:
}
{suggest ? 'Cancel' : 'Suggest for curation'}
@@ -312,14 +312,14 @@ export const Set = ({ id, publicOnly = false, Link = false, measurementHelpProvi
setEdit(false)
setSuggest(false)
}}
- className={`tw-daisy-btn tw-daisy-btn-neutral tw-daisy-btn-outline ${horFlexClasses}`}
+ className={`tw:daisy-btn tw:daisy-btn-neutral tw:daisy-btn-outline ${horFlexClasses}`}
>
Cancel
@@ -340,14 +340,14 @@ export const Set = ({ id, publicOnly = false, Link = false, measurementHelpProvi
)}
{account.control > 1 && account?.compare ? (
{
setRender(!render)
setEdit(false)
}}
>
-
+
@@ -355,11 +355,11 @@ export const Set = ({ id, publicOnly = false, Link = false, measurementHelpProvi
) : null}
{account.control > 2 && mset.userId === account.id ? (
-
+
@@ -367,13 +367,13 @@ export const Set = ({ id, publicOnly = false, Link = false, measurementHelpProvi
) : null}
+
)
if (suggest)
return (
-
+
{heading}
@@ -382,14 +382,14 @@ export const Set = ({ id, publicOnly = false, Link = false, measurementHelpProvi
if (!edit) {
if (render)
return (
-
+
{heading}
)
return (
-
+
{heading}
Data
@@ -404,14 +404,14 @@ export const Set = ({ id, publicOnly = false, Link = false, measurementHelpProvi
<>
{mset.userId === account.id && (
-
+
{mset.public ? (
-
+
) : (
-
+
)}
Make {mset.public ? 'Private' : 'Public'}
@@ -432,13 +432,13 @@ export const Set = ({ id, publicOnly = false, Link = false, measurementHelpProvi
{control >= controlConfig.account.sets.createdAt && (
{timeAgo(mset.createdAt, false)}
- ({shortDate(mset.createdAt, false)})
+ ({shortDate(mset.createdAt, false)})
)}
{control >= controlConfig.account.sets.updatedAt && (
{timeAgo(mset.updatedAt, false)}
- ({shortDate(mset.updatedAt, false)})
+ ({shortDate(mset.updatedAt, false)})
)}
{control >= controlConfig.account.sets.id && {mset.id} }
@@ -458,7 +458,7 @@ export const Set = ({ id, publicOnly = false, Link = false, measurementHelpProvi
title={{measurementTranslations[m]}
+ {measurementTranslations[m]}
) : null
)}
@@ -469,10 +469,10 @@ export const Set = ({ id, publicOnly = false, Link = false, measurementHelpProvi
}
return (
-
+
{heading}
Measurements
-
+
+
Public measurements set
@@ -544,10 +544,10 @@ export const Set = ({ id, publicOnly = false, Link = false, measurementHelpProvi
{
val: false,
label: (
-
+
Private measurements set
@@ -571,9 +571,9 @@ export const Set = ({ id, publicOnly = false, Link = false, measurementHelpProvi
{
val: false,
label: (
-
+
Metric units (cm)
- cm
+ cm
),
desc: 'Pick this if you prefer cm over inches',
@@ -581,9 +581,9 @@ export const Set = ({ id, publicOnly = false, Link = false, measurementHelpProvi
{
val: true,
label: (
-
+
Imperial units (inch)
- ″
+ ″
),
desc: 'Pick this if you prefer inches over cm',
@@ -591,7 +591,7 @@ export const Set = ({ id, publicOnly = false, Link = false, measurementHelpProvi
]}
current={imperial}
/>
-
+
Note: You must save after changing Units to have the change take effect on this page.
@@ -610,7 +610,7 @@ export const Set = ({ id, publicOnly = false, Link = false, measurementHelpProvi
) : null}
Suggest a measurements set for curation
-
+
{missing.length > 0 ?
@@ -696,7 +696,7 @@ export const SuggestCset = ({ mset, Link }) => {
of measurements.
Your measurements set is missing the following measurements:
-
- 
- 
- 
- 
- 
- 
-