diff --git a/CHANGELOG.md b/CHANGELOG.md index 2afe05f57d1..2bd58616b9d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1086,6 +1086,16 @@ - Migrated from Rollup to Esbuild for all builds - The `pctBasedOn()` helper method for pattern config was moved to config-helpers We did not make this a breaking change since it's only used internally. +### i18n + +#### Changed + + - Migrated from Rollup to Esbuild for all builds + +#### Fixed + + - Added missing lab namespace for English + ### models #### Changed @@ -1225,6 +1235,12 @@ ## 2.20.2 (2022-01-27) +### i18n + +#### Fixed + + - Patterns options were always in English due to symlinks being used + ## 2.20.1 (2022-01-27) @@ -1553,6 +1569,12 @@ - Added support for `settings.scale` +### i18n + +#### Fixed + + - Fixed issue that was causing plugin translations to always be in English + ## 2.19.9 (2022-01-09) @@ -1985,6 +2007,13 @@ - Pattern.on() is now chainable as it returns the Pattern object +### i18n + +#### Fixed + + - Fixed bug in resolving of shared pattern options + - Removed optional chaining which broke node v12 support + ### snapseries #### Added @@ -2031,6 +2060,16 @@ - Handle path.offset() of very short curves with control points on the start or end point Closes [#1257](https://github.com/freesewing/freesewing/issues/1257) +### i18n + +#### Added + + - Added translations for Yuri + +#### Fixed + + - Added optional chaining so missing options always lead to clear error message + ## 2.17.4 (2021-08-20) @@ -2043,6 +2082,12 @@ ## 2.17.3 (2021-08-16) +### i18n + +#### Added + + - New translations + ### utils #### Fixed @@ -2064,6 +2109,12 @@ - Added new ffsa option to let the user control the extra SA for flat-felled seams Closes [#1251](https://github.com/freesewing/freesewing/issues/1251) +### i18n + +#### Added + + - Added new ffsa option for simon & simone + ### models #### Added @@ -2185,9 +2236,21 @@ - Fix a bug in `path.shiftAlong` where no point is returned if the distance to shift is a fraction of one step (1/25mm) into a new path segment See [#1140](https://github.com/freesewing/freesewing/issues/1140) +### i18n + +#### Changed + + - Changed antman references to antperson + ## 2.16.2 (2021-05-05) +### i18n + +#### Changed + + - String updates + ## 2.16.1 (2021-05-30) @@ -2395,6 +2458,12 @@ - Changed `department` setting in config in line with new grouping +### i18n + +#### Added + + - New translations for pattern filter + ### utils #### Changed @@ -2430,6 +2499,12 @@ - Fixed third button not showing up See [#973](https://github.com/freesewing/freesewing/issues/973) +### i18n + +#### Changed + + - Changes to cfp strings + ## 2.15.4 (2021-05-08) @@ -2561,6 +2636,13 @@ - Don't round coordinates internally to avoid path.split misses +### i18n + +#### Added + + - Added translation for new Titan options + - Added translations for Charlie + ## 2.14.0 (2021-03-07) @@ -2576,6 +2658,12 @@ - Replaced grainline indicator on pocket with cut-on-fold indicator +### i18n + +#### Added + + - Added translations for Cornelius + ## 2.13.2 (2021-02-21) @@ -2683,6 +2771,12 @@ - Make sure roudEnd and roundStart points are always available +### i18n + +#### Added + + - Translation for Hortensia + ## 2.12.1 (2021-01-27) @@ -2807,6 +2901,16 @@ - Removed unused lengthBonus option +### i18n + +#### Changed + + - New strings for new features + +#### Fixed + + - Type in Simon title + ## 2.10.7 (2020-11-18) @@ -2822,6 +2926,12 @@ ## 2.10.5 (2020-11-14) +### i18n + +#### Fixed + + - Added missing `cty.` translations to non-English language files + ## 2.10.4 (2020-11-13) @@ -2884,6 +2994,18 @@ - Added the `info` type to raised events - Added support for conditional loading of plugins +### i18n + +#### Added + + - Added translations for plugin-title + - Added translations for teagan + - Added some translations for the UI + +#### Fixed + + - Replaced a few identical files with symlinks + ## 2.8.1 (2020-08-16) @@ -3277,6 +3399,13 @@ - [Properly escape quotes in imperial units](https://github.com/freesewing/freesewing/issues/437) +### i18n + +#### Changed + + - Added translations for Titan + - Removed `Circumference` suffix from measurement names + ### models #### Changed @@ -3344,6 +3473,12 @@ - utils now includes `Bezier` which holds the bezier-js library so you don't need to re-import it - We no longer set the plugin configuration/data object to fall in `pattern.use()` +### i18n + +#### Changed + + - Changes to support the renaming of @freesewing/fu to @freesewing/florence + ## 2.5.0 (2020-04-05) @@ -3353,9 +3488,21 @@ - Diana is a top with a draped neck +### i18n + +#### Added + + - title, description, and options for Dianna + ## 2.4.6 (2020-03-23) +### i18n + +#### Fixed + + - Fixed an bug in the i18n package + ## 2.4.5 (2020-03-19) @@ -3413,9 +3560,21 @@ ## 2.4.3 (2020-03-12) +### i18n + +#### Added + + - Added more translations + ## 2.4.2 (2020-03-08) +### i18n + +#### Added + + - Added more strings + ## 2.4.1 (2020-03-04) @@ -3588,6 +3747,22 @@ - Added the `Path.noop()` method - Added the `Path.insop()` methods +### i18n + +#### Added + + - Added translations for Breanna + +#### Changed + + - Added/Updated strings for the 2.2 frontend changes + - Changed `Joost De Cock` to `Joost` because spam filters don't like cock + +#### Removed + + - Removed the files for homepage translation, and moved that content to markdown + - Removed the files for editor translation, as it is no longer used + ### models #### Changed @@ -3652,6 +3827,12 @@ ## 2.1.3 (2019-10-18) +### i18n + +#### Added + + - More translated strings + ### utils #### Changed @@ -3665,6 +3846,12 @@ ## 2.1.2 (2019-10-14) +### i18n + +#### Fixed + + - Fixed issue where symlinks were causing all languages to export English strings + ## 2.1.1 (2019-10-13) @@ -3719,6 +3906,12 @@ - The pattern super constructor now sets a `config` property that holds the pattern configuration. This means that unlike before, there is no need to instantiate a pattern to access its config. You can just import the pattern, and it's config property will contain the pattern config. +### i18n + +#### Added + + - Added translations for Penelope, Waralee, and Simone + ### utils #### Added @@ -3777,6 +3970,12 @@ - [#102](https://github.com/freesewing/freesewing.org/issues/102): Fixed 'Snippets not defined' error when drafting a seperate button placket - [#103](https://github.com/freesewing/freesewing.org/issues/103): Fixed 'hemSa not defined' when drafting paperless Simon without seam allowance +### i18n + +#### Added + + - [#90](https://github.com/freesewing/freesewing/issues/90): Added missing option translations for Benjamin, Florent, Sandy, Shin, and Theo + ### utils #### Fixed @@ -3980,6 +4179,12 @@ ### core +#### Added + + - Initial release + +### i18n + #### Added - Initial release diff --git a/config/software/packages.json b/config/software/packages.json index a053dd74ea5..4e9d2b64af1 100644 --- a/config/software/packages.json +++ b/config/software/packages.json @@ -2,6 +2,7 @@ "collection": "All FreeSewing designs bundles into one pacakge, our collection", "config": "Various configurations for FreeSewing", "core": "A library for creating made-to-measure sewing patterns", + "i18n": "Translation for the FreeSewing project", "models": "Body measurements data for a range of default sizes", "new-design": "Initializer package for a new FreeSewing design: npx @freesewing/new-design", "prettier-config": "FreeSewing's shared configuration for prettier", diff --git a/packages/collection/src/index.mjs b/packages/collection/src/index.mjs index 2c24c35a2cc..8ec09158b21 100644 --- a/packages/collection/src/index.mjs +++ b/packages/collection/src/index.mjs @@ -119,3 +119,16 @@ export const designs = { } export const collection = Object.keys(designs) + +export const requiredMeasurements = {} +export const optionalMeasurements = {} +export const measurements = {} + +for (const design in designs) { + requiredMeasurements[design] = designs[design].patternConfig.measurements + optionalMeasurements[design] = designs[design].patternConfig.optionalMeasurements + measurements[design] = [ + ...designs[design].patternConfig.measurements, + ...designs[design].patternConfig.optionalMeasurements, + ] +} diff --git a/packages/i18n/CHANGELOG.md b/packages/i18n/CHANGELOG.md new file mode 100644 index 00000000000..7210c271dbb --- /dev/null +++ b/packages/i18n/CHANGELOG.md @@ -0,0 +1,222 @@ +# Change log for: @freesewing/i18n + + +## 3.0.0 (2023-09-30) + +### Changed + + - All FreeSewing packages are now ESM only. + - All FreeSewing packages now use named exports. + - Dropped support for NodeJS 14. NodeJS 18 (LTS/hydrogen) or more recent is now required. + +## 2.21.0 (2022-06-27) + +### Changed + + - Migrated from Rollup to Esbuild for all builds + +### Fixed + + - Added missing lab namespace for English + +## 2.20.2 (2022-01-27) + +### Fixed + + - Patterns options were always in English due to symlinks being used + +## 2.20.0 (2022-01-24) + +### Fixed + + - Fixed issue that was causing plugin translations to always be in English + +## 2.19.0 (2021-10-17) + +### Fixed + + - Fixed bug in resolving of shared pattern options + - Removed optional chaining which broke node v12 support + +## 2.18.0 (2021-09-09) + +### Added + + - Added translations for Yuri + +### Fixed + + - Added optional chaining so missing options always lead to clear error message + +## 2.17.3 (2021-08-16) + +### Added + + - New translations + +## 2.17.2 (2021-08-15) + +### Added + + - Added new ffsa option for simon & simone + +## 2.17.0 (2021-07-01) + +### Changed + + - Changed antman references to antperson + +## 2.16.2 (2021-05-05) + +### Changed + + - String updates + +## 2.16.1 (2021-05-30) + +### Added + + - New translations for pattern filter + +## 2.16.0 (2021-05-24) + +### Changed + + - Changes to cfp strings + +## 2.15.0 (2021-04-15) + +### Added + + - Added translation for new Titan options + - Added translations for Charlie + +## 2.14.0 (2021-03-07) + +### Added + + - Added translations for Cornelius + +## 2.13.0 (2021-02-13) + +### Added + + - Translation for Hortensia + +## 2.11.0 (2021-01-10) + +### Changed + + - New strings for new features + +### Fixed + + - Type in Simon title + +## 2.10.5 (2020-11-14) + +### Fixed + + - Added missing `cty.` translations to non-English language files + +## 2.9.0 (2020-10-02) + +### Added + + - Added translations for plugin-title + - Added translations for teagan + - Added some translations for the UI + +### Fixed + + - Replaced a few identical files with symlinks + +## 2.7.0 (2020-07-12) + +### Changed + + - Added translations for Titan + - Removed `Circumference` suffix from measurement names + +## 2.6.0 (2020-05-01) + +### Changed + + - Changes to support the renaming of @freesewing/fu to @freesewing/florence + +## 2.5.0 (2020-04-05) + +### Added + + - title, description, and options for Dianna + +## 2.4.6 (2020-03-23) + +### Fixed + + - Fixed an bug in the i18n package + +## 2.4.3 (2020-03-12) + +### Added + + - Added more translations + +## 2.4.2 (2020-03-08) + +### Added + + - Added more strings + +## 2.2.0 (2020-02-22) + +### Added + + - Added translations for Breanna + +### Changed + + - Added/Updated strings for the 2.2 frontend changes + - Changed `Joost De Cock` to `Joost` because spam filters don't like cock + +### Removed + + - Removed the files for homepage translation, and moved that content to markdown + - Removed the files for editor translation, as it is no longer used + +## 2.1.3 (2019-10-18) + +### Added + + - More translated strings + +## 2.1.2 (2019-10-14) + +### Fixed + + - Fixed issue where symlinks were causing all languages to export English strings + +## 2.1.0 (2019-10-06) + +### Added + + - Added translations for Penelope, Waralee, and Simone + +## 2.0.2 (2019-09-06) + +### Added + + - [#90](https://github.com/freesewing/freesewing/issues/90): Added missing option translations for Benjamin, Florent, Sandy, Shin, and Theo + +## 2.0.0 (2019-08-25) + +### Added + + - Initial release + + +This is the **initial release**, and the start of this change log. + +> Prior to version 2, FreeSewing was not a JavaScript project. +> As such, that history is out of scope for this change log. + diff --git a/packages/i18n/README.md b/packages/i18n/README.md new file mode 100644 index 00000000000..0a90a472bc3 --- /dev/null +++ b/packages/i18n/README.md @@ -0,0 +1,162 @@ +

@freesewing/i18n on NPM + License: MIT + Code quality on DeepScan + Open issues tagged pkg:i18n + All Contributors +

Follow @freesewing_org on Twitter + Chat with us on Discord + Become a FreeSewing Patron + Follow @freesewing_org on Twitter +

+ +# @freesewing/i18n + +Translation for the FreeSewing project + + + +# FreeSewing + +> [!TIP] +>#### Support FreeSewing: Become a patron, or make a one-time donation 🥰 +> +> FreeSewing is an open source project maintained by Joost De Cock and financially supported by the FreeSewing patrons. +> +> If you feel FreeSewing is worthwhile, and you can spend a few coins without +hardship, then you should [join us and become a patron](https://freesewing.org/community/join). + +## What am I looking at? 🤔 + +This repository is the FreeSewing *monorepo* holding all FreeSewing's websites, documentation, designs, plugins, and other NPM packages. + +This folder holds: @freesewing/i18n + +If you're not entirely sure what to do or how to start, type this command: + +``` +npm run tips +``` + +> [!NOTE] +> If you don't want to set up a dev environment, you can run it in your browser: +> +> [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/freesewing/freesewing) +> +> We recommend that you fork our repository and then +> put `gitpod.io/# to start up a browser-based dev environment of your own. + +## About FreeSewing 💀 + +Where the world of makers and developers collide, that's where you'll find FreeSewing. + +If you're a maker, checkout [freesewing.org](https://freesewing.org/) where you can generate +sewing patterns adapted to your measurements. + +If you're a developer, the FreeSewing documentation lives at [freesewing.dev](https://freesewing.dev/). +The FreeSewing [core library](https://freesewing.dev/reference/api/) is a *batteries-included* toolbox +for parametric design of sewing patterns. But FreeSewing also provides a range +of [plugins](https://freesewing.dev/reference/plugins/) that further extend the +functionality of the platform. + +If you have NodeJS installed, you can try it right now by running: + +```bash +npx @freesewing/new-design +``` + +Getting started guides are available for: +- [Linux](https://freesewing.dev/tutorials/getting-started-linux/) +- [MacOS](https://freesewing.dev/tutorials/getting-started-mac/) +- [Windows](https://freesewing.dev/tutorials/getting-started-windows/) + +The [pattern design tutorial](https://freesewing.dev/tutorials/pattern-design/) will +show you how to create your first parametric design. + +## Getting started ⚡ + +To get started with FreeSewing, you can spin up our development environment with: + +```bash +npx @freesewing/new-design +``` + +To work with FreeSewing's monorepo, you'll need [NodeJS v20](https://nodejs.org) on your system. +Once you have that, clone (or fork) this repo and run `npm run kickstart`: + +```bash +git clone git@github.com:freesewing/freesewing.git +cd freesewing +npm run kickstart +``` + +## Links 👩‍💻 + +**Official channels** + + - 💻 Makers website: [FreeSewing.org](https://freesewing.org) + - 💻 Developers website: [FreeSewing.dev](https://freesewing.dev) + - ✅ [Support](https://github.com/freesewing/freesewing/issues/new/choose), + [Issues](https://github.com/freesewing/freesewing/issues) & + [Discussions](https://github.com/freesewing/freesewing/discussions) on + [GitHub](https://github.com/freesewing/freesewing) + +**Social media** + + - 🐦 Twitter: [@freesewing_org](https://twitter.com/freesewing_org) + - 📷 Instagram: [@freesewing_org](https://instagram.com/freesewing_org) + +**Places the FreeSewing community hangs out** + + - 💬 [Discord](https://discord.freesewing.org/) + - 💬 [Facebook](https://www.facebook.com/groups/627769821272714/) + - 💬 [Reddit](https://www.reddit.com/r/freesewing/) + +## License: MIT 🤓 + +© [Joost De Cock](https://github.com/joostdecock). +See [the license file](https://github.com/freesewing/freesewing/blob/develop/LICENSE) for details. + +## Where to get help 🤯 + +For [Support](https://github.com/freesewing/freesewing/issues/new/choose), +please use the [Issues](https://github.com/freesewing/freesewing/issues) & +[Discussions](https://github.com/freesewing/freesewing/discussions) on +[GitHub](https://github.com/freesewing/freesewing). + diff --git a/packages/i18n/data.mjs b/packages/i18n/data.mjs new file mode 100644 index 00000000000..1620a169bb4 --- /dev/null +++ b/packages/i18n/data.mjs @@ -0,0 +1,4 @@ +// This file is auto-generated | All changes you make will be overwritten. +export const name = '@freesewing/i18n' +export const version = '3.3.0-rc.1' +export const data = { name, version } diff --git a/packages/i18n/package.json b/packages/i18n/package.json new file mode 100644 index 00000000000..c3f09a9e83e --- /dev/null +++ b/packages/i18n/package.json @@ -0,0 +1,50 @@ +{ + "name": "@freesewing/i18n", + "version": "3.3.0-rc.1", + "description": "Translation for the FreeSewing project", + "author": "Joost De Cock (https://github.com/joostdecock)", + "homepage": "https://freesewing.org/", + "repository": "github:freesewing/freesewing", + "license": "MIT", + "bugs": { + "url": "https://github.com/freesewing/freesewing/issues" + }, + "funding": { + "type": "individual", + "url": "https://freesewing.org/patrons/join" + }, + "keywords": [ + "freesewing", + "i18n", + "internationalisation", + "languages", + "localisation", + "translation" + ], + "type": "module", + "module": "src/index.mjs", + "exports": { + ".": "./src/index.mjs" + }, + "scripts": { + "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", + "test": "echo \"i18n: No tests configured. Perhaps you could write some?\" && exit 0", + "tips": "node ../../scripts/help.mjs", + "lint": "npx eslint 'src/**' 'tests/*.mjs'" + }, + "peerDependencies": {}, + "dependencies": {}, + "devDependencies": {}, + "files": [ + "src/**", + "README.md" + ], + "publishConfig": { + "access": "public", + "tag": "next" + }, + "engines": { + "node": ">= 20" + }, + "private": true +} diff --git a/packages/i18n/src/index.mjs b/packages/i18n/src/index.mjs new file mode 100644 index 00000000000..a5da4272088 --- /dev/null +++ b/packages/i18n/src/index.mjs @@ -0,0 +1,3 @@ +import { measurements } from './measurements.mjs' + +export { measurements } diff --git a/packages/i18n/src/measurements.mjs b/packages/i18n/src/measurements.mjs new file mode 100644 index 00000000000..b1e8beccc75 --- /dev/null +++ b/packages/i18n/src/measurements.mjs @@ -0,0 +1,40 @@ +export const measurements = { + ankle: 'Ankle circumference', + biceps: 'Biceps circumference', + bustFront: 'Bust front', + bustPointToUnderbust: 'Bust point to underbust', + bustSpan: 'Bust span', + chest: 'Chest circumference', + crossSeam: 'Cross seam', + crossSeamFront: 'Cross seam front', + head: 'Head circumference', + heel: 'Heel circumference', + highBustFront: 'High bust front', + highBust: 'High bust', + hips: 'Hips circumference', + hpsToBust: 'HPS to bust', + hpsToWaistBack: 'HPS to waist back', + hpsToWaistFront: 'HPS to waist front', + inseam: 'Inseam', + knee: 'Knee circumference', + neck: 'Neck circumference', + seat: 'Seat circumference', + seatBack: 'Seat back', + crotchDepth: 'Crotch depth', + shoulderSlope: 'Shoulder slope', + shoulderToElbow: 'Shoulder to elbow', + shoulderToShoulder: 'Shoulder to shoulder', + shoulderToWrist: 'Shoulder to wrist', + underbust: 'Underbust', + upperLeg: 'Upper leg circumference', + waist: 'Waist circumference', + waistBack: 'Waist back', + waistToArmpit: 'Waist to armpit', + waistToFloor: 'Waist to floor', + waistToHips: 'Waist to hips', + waistToKnee: 'Waist to knee', + waistToSeat: 'Waist to seat', + waistToUnderbust: 'Waist to underbust', + waistToUpperLeg: 'Waist to upper leg', + wrist: 'Wrist circumference', +} diff --git a/packages/react/components/Account/Set.mjs b/packages/react/components/Account/Set.mjs index 8e9ce117eb0..0c57065141d 100644 --- a/packages/react/components/Account/Set.mjs +++ b/packages/react/components/Account/Set.mjs @@ -1,11 +1,19 @@ // Dependencies -import { measurements, isDegreeMeasurement, control as controlConfig } from '@freesewing/config' +import { + measurements, + isDegreeMeasurement, + control as controlConfig, + urls, +} from '@freesewing/config' +import { measurements as measurementTranslations } from '@freesewing/i18n' +import { measurements as designMeasurements } from '@freesewing/collection' import { cloudflareImageUrl, capitalize, formatMm, horFlexClasses, linkClasses, + notEmpty, roundDistance, shortDate, timeAgo, @@ -18,8 +26,10 @@ import React, { useState, useEffect, Fragment, useContext } from 'react' import { useAccount } from '@freesewing/react/hooks/useAccount' import { useBackend } from '@freesewing/react/hooks/useBackend' // Components -import { Link as WebLink } from '@freesewing/react/components/Link' +import { Link as WebLink, AnchorLink } from '@freesewing/react/components/Link' import { + BoolNoIcon, + BoolYesIcon, CloneIcon, CuratedMeasurementsSetIcon, EditIcon, @@ -36,54 +46,26 @@ import { // BoolNoIcon, } from '@freesewing/react/components/Icon' import { BookmarkButton, MsetCard } from '@freesewing/react/components/Account' -import { ToggleInput } from '@freesewing/react/components/Input' +import { + DesignInput, + MarkdownInput, + ListInput, + MeasieInput, + PassiveImageInput, + StringInput, + ToggleInput, +} from '@freesewing/react/components/Input' import { DisplayRow } from './shared.mjs' import Markdown from 'react-markdown' import { ModalWrapper } from '@freesewing/react/components/Modal' import { Json } from '@freesewing/react/components/Json' import { Yaml } from '@freesewing/react/components/Yaml' +import { Popout } from '@freesewing/react/components/Popout' -//import { measurements as designMeasurements } from 'shared/prebuild/data/design-measurements.mjs' -//import { freeSewingConfig as conf, controlLevels } from 'shared/config/freesewing.config.mjs' -//import { isDegreeMeasurement } from 'config/measurements.mjs' -//import { -// shortDate, -// cloudflareImageUrl, -// formatMm, -// hasRequiredMeasurements, -// capitalize, -// horFlexClasses, -//} from 'shared/utils.mjs' -//// Hooks -//import { useState, useEffect, useContext } from 'react' -//import { useTranslation } from 'next-i18next' -//import { useAccount } from 'shared/hooks/use-account.mjs' -//import { useBackend } from 'shared/hooks/use-backend.mjs' -//import { useRouter } from 'next/router' -//// Context -//import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' -//import { ModalContext } from 'shared/context/modal-context.mjs' -//// Components -//import { Popout } from 'shared/components/popout/index.mjs' -//import { BackToAccountButton } from './shared.mjs' -//import { AnchorLink, PageLink, Link } from 'shared/components/link.mjs' -//import { Json } from 'shared/components/json.mjs' -//import { Yaml } from 'shared/components/yaml.mjs' -//import { ModalWrapper } from 'shared/components/wrappers/modal.mjs' -//import { Mdx } from 'shared/components/mdx/dynamic.mjs' -//import Timeago from 'react-timeago' -//import { -// StringInput, -// ToggleInput, -// PassiveImageInput, -// ListInput, -// MarkdownInput, -// MeasieInput, -// DesignDropdown, -// ns as inputNs, -//} from 'shared/components/inputs.mjs' -//import { BookmarkButton } from 'shared/components/bookmarks.mjs' -//import { DynamicMdx } from 'shared/components/mdx/dynamic.mjs' +const t = (input) => { + console.log('t called', input) + return input +} /* * Component to show an individual measurements set @@ -163,10 +145,8 @@ export const Set = ({ id, publicOnly = false, Link = false }) => { } }, [id, publicOnly]) - const filterMeasurements = () => { - if (!filter) return measurements.map((m) => `measurements:${m}` + `|${m}`).sort() - else return designMeasurements[filter].map((m) => `measurements:${m}` + `|${m}`).sort() - } + const filterMeasurements = () => + filter ? designMeasurements[filter].sort() : measurements.sort() if (!id || !mset) return null @@ -192,7 +172,7 @@ export const Set = ({ id, publicOnly = false, Link = false }) => { setLoadingStatus([true, 'Saving measurements set']) const [status, body] = await backend.updateSet(mset.id, data) if (status === 200 && body.result === 'success') { - setMset(body.data.set) + setMset(body.set) setEdit(false) setLoadingStatus([true, 'Nailed it', true, true]) } else @@ -218,10 +198,9 @@ export const Set = ({ id, publicOnly = false, Link = false }) => { } delete data.img const [status, body] = await backend.createSet(data) - if (status === 200 && body.result === 'success') { - setMset(body.data.set) - setEdit(false) - setLoadingStatus([true, 'Nailed it', true, true]) + if (status === 201 && body.result === 'created') { + setLoadingStatus([true, 'Loading newly created set', true, true]) + window.location = `/account/set/?id=${body.set.id}` } else setLoadingStatus([true, 'We failed to create this measurements set', true, false]) } @@ -235,14 +214,14 @@ export const Set = ({ id, publicOnly = false, Link = false }) => { {account.control > 2 && mset.public && mset.userId !== account.id ? (
JSON YAML @@ -253,7 +232,7 @@ export const Set = ({ id, publicOnly = false, Link = false }) => { {account.control > 3 && mset.userId === account.id ? (
) : null} @@ -379,7 +358,7 @@ export const Set = ({ id, publicOnly = false, Link = false }) => { return (
{heading} - +
) @@ -466,56 +445,27 @@ export const Set = ({ id, publicOnly = false, Link = false }) => { return (
{heading} -
    - {['measies', 'data'].map((s) => ( -
  • - {s} -
    • - ))} -
      -
    • - Name -
      • - {account.control >= conf.account.sets.img ? ( -
    • - Image -
      • - ) : null} - {['public', 'units', 'notes'].map((id) => - account.control >= conf.account.sets[id] ? ( -
    • - {id} -
      • - ) : null - )} -
    -
- -

{t('measies')}

+

Measurements

- Clear filter} />
- {filterMeasurements().map((mplus) => { - const [translated, m] = mplus.split('|') - - return ( - - ) - })} + {filterMeasurements().map((m) => ( + + ))}

Data

@@ -533,7 +483,7 @@ export const Set = ({ id, publicOnly = false, Link = false }) => { {/* img: Control level determines whether or not to show this */} - {account.control >= conf.account.sets.img ? ( + {account.control >= controlConfig.account.sets.img ? ( { {/* public: Control level determines whether or not to show this */} - {account.control >= conf.account.sets.public ? ( + {account.control >= controlConfig.account.sets.public ? ( { {/* units: Control level determines whether or not to show this */} - {account.control >= conf.account.sets.units ? ( + {account.control >= controlConfig.account.sets.units ? ( <> { ]} current={imperial} /> - {t('unitsMustSave')} + + Note: You must save after changing Units to have the change take effect on this page. + ) : null} {/* notes: Control level determines whether or not to show this */} - {account.control >= conf.account.sets.notes ? ( + {account.control >= controlConfig.account.sets.notes ? ( ) -/* +/** + * React component to suggest a measurements set for curation + * + * @param {object} props - All React props + * @param {string} mset - The measurements set + */ +export const SuggestCset = ({ mset, Link }) => { + // State + const [height, setHeight] = useState('') + const [img, setImg] = useState('') + const [name, setName] = useState('') + const [notes, setNotes] = useState('') + const [submission, setSubmission] = useState(false) + + console.log(mset) + + // Hooks + const backend = useBackend() + + // Method to submit the form + const suggestSet = async () => { + setLoadingStatus([true, 'Contacting backend']) + const result = await backend.suggestCset({ set: mset.id, height, img, name, notes }) + if (result.success && result.data.submission) { + setSubmission(result.data.submission) + setLoadingStatus([true, 'Nailed it', true, true]) + } else setLoadingStatus([true, 'An unexpected error occured. Please report this.', true, false]) + } + + const missing = [] + for (const m of measurements) { + if (typeof mset.measies[m] === 'undefined') missing.push(m) + } + + if (submission) { + const url = `/curate/sets/suggested/${submission.id}` + + return ( + <> +

Thank you

+

Your submission has been registered and will be processed by one of our curators.

+

+ It is available at: {url} +

+ + ) + } + + return ( + <> +

Suggest a measurements set for curation

+

+ {missing.length > 0 ? : } + Measurements +

+ {missing.length > 0 ? ( + <> +

+ To ensure curated measurements sets work for all designs, you need to provide a full set + of measurements. +

+

Your measurements set is missing the following measurements:

+
    + {missing.map((m) => ( +
  • {m}
    • + ))} +
+ + ) : ( +

All measurements are available.

+ )} +

+ {name.length > 1 ? : } + Name +

+

Each curated set has a name. You can suggest your own name or a pseudonym.

+ val.length > 1} /> +

+ {height.length > 1 ? : } + Height +

+

+ To allow organizing and presenting our curated sets in a structured way, we organize them by + height. +

+ val.length > 1} + /> +

+ {img.length > 0 ? : } + Image +

+

+ Finally, we need a picture. Please refer to the documentation to see what makes a good + picture for a curated measurements set. + Documentation +

+ val.length > 1} + /> +

+ + Notes +

+

If you would like to add any notes, you can do so here.

+ + This field supports markdown + + true} /> + + + ) +} + export const NewSet = () => { // Hooks - const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() - const { t } = useTranslation(ns) - const router = useRouter() const { account } = useAccount() + const { setLoadingStatus, LoadingProgress } = useContext(LoadingStatusContext) // State const [name, setName] = useState('') @@ -669,39 +744,46 @@ export const NewSet = () => { // Helper method to create a new set const createSet = async () => { - setLoadingStatus([true, 'processingUpdate']) - const result = await backend.createSet({ name, imperial }) - if (result.success) { - setLoadingStatus([true, t('nailedIt'), true, true]) - router.push(`/account/set?id=${result.data.set.id}`) - } else setLoadingStatus([true, 'backendError', true, false]) + setLoadingStatus([true, 'Storing new measurements set']) + const [status, body] = await backend.createSet({ name, imperial }) + if (status === 201 && body.result === 'created') { + setLoadingStatus([true, 'Nailed it', true, true]) + window.location = `/account/set?id=${body.set.id}` + } else + setLoadingStatus([ + true, + 'Failed to save the measurments set. Please report this.', + true, + false, + ]) } return (
-
{t('name')}
-

{t('setNameDesc')}

- setName(evt.target.value)} - className="input w-full input-bordered flex flex-row" - type="text" +
Name
+

Give this set of measurements a name. That will help tell them apart.

+ val && val.length > 0} placeholder={'Georg Cantor'} />
) } +/* export const SetCard = ({ set, @@ -950,122 +1032,5 @@ export const BookmarkedSetPicker = ({ design, clickHandler, t, size, href }) => ) } -const SuggestCset = ({ mset, backend, setLoadingStatus, t }) => { - // State - const [height, setHeight] = useState('') - const [img, setImg] = useState('') - const [name, setName] = useState('') - const [notes, setNotes] = useState('') - const [submission, setSubmission] = useState(false) - - // Method to submit the form - const suggestSet = async () => { - setLoadingStatus([true, 'status:contactingBackend']) - const result = await backend.suggestCset({ set: mset.id, height, img, name, notes }) - if (result.success && result.data.submission) { - setSubmission(result.data.submission) - setLoadingStatus([true, 'status:nailedIt', true, true]) - } else setLoadingStatus([true, 'backendError', true, false]) - } - - const missing = [] - for (const m of measurements) { - if (typeof mset.measies[m] === 'undefined') missing.push(m) - } - - if (submission) { - const url = `/curate/sets/suggested/${submission.id}` - - return ( - <> -

{t('account:thankYouVeryMuch')}

-

{t('account:csetSuggestedMsg')}

-

- {t('account:itIsAvailableAt')}: -

- - ) - } - - return ( - <> -

{t('account:suggestCset')}

-

- {missing.length > 0 ? : } - {t('account:measurements')} -

- {missing.length > 0 ? ( - <> -

{t('account:csetAllMeasies')}

-

{t('account:csetMissing')}:

-
    - {missing.map((m) => ( -
  • {t(`measurements:${m}`)}
    • - ))} -
- - ) : ( -

{t('account:allMeasiesAvailable')}

- )} -

- {name.length > 1 ? : } - {t('account:name')} -

-

{t('account:csetNameMsg')}

- val.length > 1} - /> -

- {height.length > 1 ? : } - {t('measurements:height')} -

-

{t('account:csetHeightMsg1')}

- val.length > 1} - /> -

- {img.length > 0 ? : } - {t('account:img')} -

-

- {t('account:csetImgMsg')}:{' '} - {t('account:docs')} -

- val.length > 1} - /> -

- - {t('account:notes')} -

-

{t('account:csetNotesMsg')}

- - {t('account:mdSupport')} - - true} - /> - - - ) -} */ diff --git a/packages/react/components/Account/index.mjs b/packages/react/components/Account/index.mjs index 93ff2e4b52f..83df04c04ff 100644 --- a/packages/react/components/Account/index.mjs +++ b/packages/react/components/Account/index.mjs @@ -2,7 +2,7 @@ import React from 'react' import { Bookmarks, BookmarkButton } from './Bookmarks.mjs' import { Links } from './Links.mjs' -import { Set } from './Set.mjs' +import { Set, NewSet } from './Set.mjs' import { Sets, MsetCard } from './Sets.mjs' -export { Bookmarks, BookmarkButton, Links, Set, Sets, MsetCard } +export { Bookmarks, BookmarkButton, Links, Set, NewSet, Sets, MsetCard } diff --git a/packages/react/components/CopyToClipboard/index.mjs b/packages/react/components/CopyToClipboard/index.mjs index 4218a6beb1c..5d14fa3bd97 100644 --- a/packages/react/components/CopyToClipboard/index.mjs +++ b/packages/react/components/CopyToClipboard/index.mjs @@ -1,26 +1,34 @@ -import React, { useState } from 'react' +import React, { useContext, useState } from 'react' import ReactDOMServer from 'react-dom/server' import { CopyIcon, OkIcon } from '@freesewing/react/components/Icon' import { CopyToClipboard as Copy } from 'react-copy-to-clipboard' +import { LoadingStatusContext } from '@freesewing/react/context/LoadingStatus' const strip = (html) => typeof DOMParser === 'undefined' ? html : new DOMParser().parseFromString(html, 'text/html').body.textContent || '' -const handleCopied = (setCopied) => { +const handleCopied = (setCopied, setLoadingStatus, label) => { setCopied(true) + setLoadingStatus([ + true, + label ? `${label} copied to clipboard` : 'Copied to clipboard', + true, + true, + ]) setTimeout(() => setCopied(false), 1000) } -export const CopyToClipboard = ({ content }) => { +export const CopyToClipboard = ({ content, label = false }) => { const [copied, setCopied] = useState(false) + const { setLoadingStatus } = useContext(LoadingStatusContext) const text = typeof content === 'string' ? content : strip(ReactDOMServer.renderToStaticMarkup(content)) return ( - handleCopied(setCopied)}> + handleCopied(setCopied, setLoadingStatus, label)}>
) } diff --git a/packages/react/components/Input/index.mjs b/packages/react/components/Input/index.mjs index 37ac86f8ddd..46a91c4c579 100644 --- a/packages/react/components/Input/index.mjs +++ b/packages/react/components/Input/index.mjs @@ -14,13 +14,11 @@ import React, { useState, useCallback, useContext } from 'react' import { useDropzone } from 'react-dropzone' import { useBackend } from '@freesewing/react/hooks/useBackend' // Components -//import { Mdx } from 'shared/components/mdx/dynamic.mjs' -import { ResetIcon, DocsIcon, UploadIcon } from '@freesewing/react/components/Icon' +import { ResetIcon, UploadIcon } from '@freesewing/react/components/Icon' import { ModalWrapper } from '@freesewing/react/components/Modal' import { isDegreeMeasurement } from '@freesewing/config' import { Tabs, Tab } from '@freesewing/react/components/Tab' - -export const ns = ['account', 'measurements', 'designs'] +import Markdown from 'react-markdown' /* * Helper component to display a tab heading @@ -32,8 +30,8 @@ export const _Tab = ({ setActiveTab, // Method to set the active tab }) => ( - - ) : null} - + + {label} + ) const bottomLabelChildren = ( <> @@ -149,7 +121,6 @@ export const NumberInput = ({ current, // The current value original, // The original value placeholder, // The placeholder text - docs = false, // Docs to load, if any id = '', // An id to tie the input to the label labelBL = false, // Bottom-Left label labelBR = false, // Bottom-Right label @@ -157,7 +128,7 @@ export const NumberInput = ({ min = 220, step = 1, }) => ( - + ( - + val.length > 4} {...{ update, current, id }} placeholder="MFA Code" - docs={false} /> ) } @@ -234,7 +203,6 @@ export const PasswordInput = ({ valid, // Method that should return whether the value is valid or not current, // The current value placeholder = '¯\\_(ツ)_/¯', // The placeholder text - docs = false, // Docs to load, if any id = '', // An id to tie the input to the label onKeyDown = false, // Optionall capture certain keys (like enter) }) => { @@ -245,7 +213,6 @@ export const PasswordInput = ({ return ( ( - + { return ( - +