From 8a7824bc7b9455f8eab6ff5ffbf8a55e5ae37411 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 22 Nov 2020 14:34:49 +0100 Subject: [PATCH] feat: Bella, initial work on another womenswear bodice --- .github/workflows/tests.bella.yml | 32 ++++ config/descriptions.yaml | 1 + packages/bella/CHANGELOG.md | 9 + packages/bella/README.md | 100 +++++++++++ packages/bella/config/index.js | 82 +++++++++ packages/bella/example/.babelrc | 13 ++ packages/bella/example/README.md | 96 +++++++++++ packages/bella/example/netlify.toml | 9 + packages/bella/example/package.json | 50 ++++++ packages/bella/example/public/favicon.ico | Bin 0 -> 12053 bytes packages/bella/example/public/index.html | 40 +++++ packages/bella/example/public/manifest.json | 15 ++ packages/bella/example/src/App.js | 29 ++++ packages/bella/example/src/index.js | 11 ++ packages/bella/example/src/serviceWorker.js | 123 +++++++++++++ packages/bella/package.json | 94 ++++++++++ packages/bella/rollup.config.js | 37 ++++ packages/bella/src/back.js | 170 ++++++++++++++++++ packages/bella/src/bella.js | 17 ++ packages/bella/src/front-shoulder-dart.js | 29 ++++ packages/bella/src/front-side-dart.js | 181 ++++++++++++++++++++ packages/bella/src/index.js | 20 +++ packages/bella/tests/shared.test.js | 39 +++++ 23 files changed, 1197 insertions(+) create mode 100644 .github/workflows/tests.bella.yml create mode 100644 packages/bella/CHANGELOG.md create mode 100644 packages/bella/README.md create mode 100644 packages/bella/config/index.js create mode 100644 packages/bella/example/.babelrc create mode 100644 packages/bella/example/README.md create mode 100644 packages/bella/example/netlify.toml create mode 100644 packages/bella/example/package.json create mode 100644 packages/bella/example/public/favicon.ico create mode 100644 packages/bella/example/public/index.html create mode 100644 packages/bella/example/public/manifest.json create mode 100644 packages/bella/example/src/App.js create mode 100644 packages/bella/example/src/index.js create mode 100644 packages/bella/example/src/serviceWorker.js create mode 100644 packages/bella/package.json create mode 100644 packages/bella/rollup.config.js create mode 100644 packages/bella/src/back.js create mode 100644 packages/bella/src/bella.js create mode 100644 packages/bella/src/front-shoulder-dart.js create mode 100644 packages/bella/src/front-side-dart.js create mode 100644 packages/bella/src/index.js create mode 100644 packages/bella/tests/shared.test.js diff --git a/.github/workflows/tests.bella.yml b/.github/workflows/tests.bella.yml new file mode 100644 index 00000000000..e56f1ee5ee5 --- /dev/null +++ b/.github/workflows/tests.bella.yml @@ -0,0 +1,32 @@ +name: Unit tests - Bella + +on: [pull_request] + +jobs: + test: + + runs-on: ubuntu-latest + + strategy: + matrix: + node-version: [12.x] + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + - name: Setup Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node-version }} + - name: Install dependencies + run: cd packages/bella && npm install + env: + CI: true + - name: Install peer & test dependencies + run: "cd packages/bella && npm install @freesewing/core@^2.10.2 @freesewing/plugin-bundle@^2.10.2 @freesewing/models@2.10.2 @freesewing/pattern-info@2.10.2 mocha chai" + env: + CI: true + - name: Build pattern + run: cd packages/bella && npm run build + - name: Run pattern unit tests + run: cd packages/bella && npm run testci diff --git a/config/descriptions.yaml b/config/descriptions.yaml index 30a1510bd13..2248dc2d4b9 100644 --- a/config/descriptions.yaml +++ b/config/descriptions.yaml @@ -1,5 +1,6 @@ aaron: 'A FreeSewing pattern for a A-shirt or tank top' albert: 'A FreeSewing pattern for an apron' +bella: 'A FreeSewing pattern for a womenswear bodice block' benjamin: 'A FreeSewing pattern for a bow tie' bent: 'A FreeSewing pattern for a menswear body block with a two-part sleeve' breanna: 'A FreeSewing pattern for a basic body block for womenswear' diff --git a/packages/bella/CHANGELOG.md b/packages/bella/CHANGELOG.md new file mode 100644 index 00000000000..e4dc5450fe4 --- /dev/null +++ b/packages/bella/CHANGELOG.md @@ -0,0 +1,9 @@ +# Change log for: @freesewing/bella + + + +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/bella/README.md b/packages/bella/README.md new file mode 100644 index 00000000000..8d2a3e15c26 --- /dev/null +++ b/packages/bella/README.md @@ -0,0 +1,100 @@ +![FreeSewing](https://freesewing.org/banner.jpg) +

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

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

+ +## What am I looking at? 🤔 + +This repository is our *monorepo* holding [all our NPM packages](https://www.npmjs.com/search?q=keywords:freesewing). +This folder holds **@freesewing/bella** + +A FreeSewing pattern for a womenswear bodice block + + + +## About FreeSewing 💀 + +Where the world of makers and developers collide, that's where you'll find FreeSewing. + +Our [core library](https://freesewing.dev/reference/api/) is a *batteries-included* toolbox +for parametric design of sewing patterns. It's a modular system (check our list +of [plugins](https://freesewing.dev/reference/plugins/) and getting started is as simple as: + +```bash +npm init freesewing-pattern +``` + +The [getting started](https://freesewing.dev/guides/getting-started/) section on [freesewing.dev](https://freesewing.dev/) is a good +entrypoint to our documentation, but you'll find a lot more there, including +our [API reference](https://freesewing.dev/reference/api/), +as well as [our turorial](https://freesewing.dev/tutorials/pattern-design/), +and [howtos](https://freesewing.dev/howtos/). + +If you're a maker, checkout [freesewing.org](https://freesewing/) where you can generate +our sewing patterns adapted to your measurements. + +## Support FreeSewing: Become a patron 🥰 + +FreeSewing is an open source project run by a community, +and financially supported by our patrons. + +If you feel what we do is worthwhile, you too +should [become a patron](https://freesewing.org/patrons/join). + +## Links 👩‍💻 + + - 💻 Makers website: [freesewing.org](https://freesewing.org) + - 💻 Developers website: [freesewing.dev](https://freesewing.dev) + - 💬 Chat: On Discord via [chat.freesewing.org](https://chat.freesewing.org/) + - 🐦 Twitter: [@freesewing_org](https://twitter.com/freesewing_org) + - 📷 Instagram: [@freesewing_org](https://instagram.com/freesewing_org) + +## 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 🤯 + +Our [chatrooms on Discord](https://chat.freesewing.org/) are the best place to ask questions, +share your feedback, or just hang out. + +If you want to report a problem, please [create an issue](https://github.com/freesewing/freesewing/issues/new). diff --git a/packages/bella/config/index.js b/packages/bella/config/index.js new file mode 100644 index 00000000000..c2fad0168da --- /dev/null +++ b/packages/bella/config/index.js @@ -0,0 +1,82 @@ +import { version } from '../package.json' + +export default { + name: 'bella', + version, + design: 'Bella Incognito', + code: 'Joost De Cock', + department: 'womenswear', + type: 'block', + difficulty: 3, + tags: ['block', 'top', 'basics'], + optionGroups: { + fit: ['chestEase', 'waistEase'], + advanced: [ + 'backNeckCutout', + 'backHemSlope', + 'backDartHeight', + 'armholeDepth', + 'backArmholeSlant', + 'backArmholeCurvature', + 'frontShoulderWidth', + 'frontArmholePitchDepth', + 'backArmholePitchDepth', + 'highBustWidth' + ] + }, + measurements: [ + 'highBust', + 'chest', + 'underbust', + 'waist', + 'waistBack', + //'waistToHips', + //'hips', + 'bustSpan', + 'neck', + 'hpsToBust', + 'hpsToWaistFront', + 'hpsToWaistBack', + 'shoulderToShoulder', + 'shoulderSlope' + // FIXME: Measurement from waist up to armhole (for sleeveless) + ], + dependencies: { + back: 'frontSideDart' + }, + inject: {}, + hide: [], + parts: [ + 'back', + 'frontSideDart' + // 'frontShoulderDart' + ], + options: { + // Constants + acrossBackFactor: 0.925, + shoulderSlopeBack: 1.23, + neckWidthBack: 0.197, + neckWidthFront: 0.17, + shoulderToShoulderCorrection: 0.995, + backDartLocation: 0.145, + backCenterWaistReduction: 0.35, + collarFactor: 0.19, + + // Percentages + backNeckCutout: { pct: 6, min: 3, max: 9 }, + waistEase: { pct: 5, min: 1, max: 9 }, + chestEase: { pct: 11, min: 5, max: 20 }, + backDartHeight: { pct: 46, min: 38, max: 54 }, + armholeDepth: { pct: 44, min: 38, max: 50 }, + backHemSlope: { deg: 2.5, min: 0, max: 5 }, + backArmholeSlant: { deg: 5, min: 2, max: 8 }, + backArmholeCurvature: { pct: 63, min: 50, max: 85 }, + frontArmholeCurvature: { pct: 63, min: 50, max: 85 }, + fullChestEaseReduction: { pct: 4, min: 0, max: 8 }, + frontShoulderWidth: { pct: 95, max: 98, min: 92 }, + frontArmholePitchDepth: { pct: 29, max: 35, min: 24 }, + backArmholePitchDepth: { pct: 35, max: 40, min: 30 }, + highBustWidth: { pct: 86, max: 92, min: 80 }, + bustDartLength: { pct: 92, min: 85, max: 98 } + } +} diff --git a/packages/bella/example/.babelrc b/packages/bella/example/.babelrc new file mode 100644 index 00000000000..a6551f4342d --- /dev/null +++ b/packages/bella/example/.babelrc @@ -0,0 +1,13 @@ +{ + "plugins": [ + [ + "prismjs", + { + "languages": ["javascript", "css", "markup"], + "plugins": ["line-numbers"], + "theme": "twilight", + "css": true + } + ] + ] +} diff --git a/packages/bella/example/README.md b/packages/bella/example/README.md new file mode 100644 index 00000000000..3fa4943e0a8 --- /dev/null +++ b/packages/bella/example/README.md @@ -0,0 +1,96 @@ +

+Freesewing logo +
+FreeSewing v2 +

+

A JavaScript library for made-to-measure sewing patterns

+

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

+ +# bella example + +This project was bootstrapped with [Create Freesewing Pattern](https://en.freesewing.dev/create-freesewing-pattern): + +```js +npm init freesewing-pattern +``` + +This example folder is part of the local development environment. +It is **not** part of the pattern's source code. + +To run this example, follow these steps: + + - In the folder above this one, run: `yarn start` (or `npm start`) + - Then, in new terminal, run the same command in this folder: `yarn start` (or `npm start`) + +This will spin up the development environment, similar to [our online demo](https://bella.freesewing.dev/). + +## About FreeSewing 🤔 + +Where the world of makers and developers collide, that's where you'll find FreeSewing. + +Our [core library](https://freesewing.dev/en/freesewing) is a *batteries-included* toolbox +for parametric design of sewing patterns. It's a modular system (check our list +of [plugins](https://freesewing.dev/en/plugins) and getting started is as simple as: + +```bash +npm init freesewing-pattern +``` + +The [getting started] section on [freesewing.dev](https://freesewing.dev/) is a good +entrypoint to our documentation, but you'll find a lot more there, including +our [API documentation](https://freesewing.dev/en/freesewing/api), +as well as [examples](https://freesewing.dev/en/freesewing/examples), +and [best practices](https://freesewing.dev/en/do). + +If you're a maker, checkout [freesewing.org](https://freesewing/) where you can generate +our sewing patterns adapted to your measurements. + +## Support FreeSewing: Become a patron 🥰 + +FreeSewing is an open source project run by a community, +and financially supported by our patrons. + +If you feel what we do is worthwhile, you too +should [become a patron](https://freesewing.org/patrons/join). + +## Links 👩‍💻 + + - 💻 Makers website: [freesewing.org](https://freesewing.org) + - 💻 Developers website: [freesewing.dev](https://freesewing.org) + - 💬 Chat: [gitter.im/freesewing](https://gitter.im/freesewing/freesewing) + - 🐦 Twitter: [@freesewing_org](https://twitter.com/freesewing_org) + - 📷 Instagram: [@freesewing_org](https://instagram.com/freesewing_org) + +## 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 🤯 + +Our [chatroom on Gitter](https://gitter.im) is the best place to ask questions, +share your feedback, or just hang out. + +If you want to report a problem, please [create an issue](https://github.com/freesewing/freesewing/issues/new). + diff --git a/packages/bella/example/netlify.toml b/packages/bella/example/netlify.toml new file mode 100644 index 00000000000..7df6648b739 --- /dev/null +++ b/packages/bella/example/netlify.toml @@ -0,0 +1,9 @@ +[build] + base = "packages/bella/example" + publish = "build" + command = "npm run build" + +[[redirects]] + from = "/*" + to = "/index.html" + status = 200 diff --git a/packages/bella/example/package.json b/packages/bella/example/package.json new file mode 100644 index 00000000000..85dd6ecdd5c --- /dev/null +++ b/packages/bella/example/package.json @@ -0,0 +1,50 @@ +{ + "name": "bella", + "homepage": "https://bella.freesewing.dev/", + "version": "2.10.2", + "private": true, + "dependencies": { + "@freesewing/components": "latest", + "@freesewing/core": "latest", + "@freesewing/css-theme": "latest", + "@freesewing/i18n": "latest", + "@freesewing/models": "latest", + "@freesewing/mui-theme": "latest", + "@freesewing/pattern-info": "latest", + "@freesewing/plugin-bundle": "latest", + "@freesewing/plugin-theme": "latest", + "@freesewing/plugin-i18n": "latest", + "@freesewing/plugin-svgattr": "latest", + "@freesewing/utils": "latest", + "@material-ui/core": "^4.11.0", + "@material-ui/icons": "^4.9.1", + "@material-ui/lab": "^v4.0.0-alpha.56", + "pattern": "link:..", + "prismjs": "1.22.0", + "react": "^16.13", + "react-dom": "^16.13", + "react-scripts": "^3.4.1", + "file-saver": "^2.0.2", + "react-markdown": "4.3.1", + "typeface-roboto-condensed": "latest", + "typeface-raleway": "latest" + }, + "scripts": { + "start": "react-scripts start", + "build": "react-scripts build", + "test": "react-scripts test", + "eject": "react-scripts eject" + }, + "eslintConfig": { + "extends": "react-app" + }, + "browserslist": [ + ">0.2%", + "not dead", + "not ie <= 11", + "not op_mini all" + ], + "devDependencies": { + "babel-plugin-prismjs": "2.0.1" + } +} diff --git a/packages/bella/example/public/favicon.ico b/packages/bella/example/public/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..95061a260f10f9f0fb6464069a6d65df8dc8a471 GIT binary patch literal 12053 zcmZQzU}Ruq00Bk@1&0563=Con3=EwCe(tgbC?LeQ2nsxfK}sMrrE6L9$cQ!&TshX)29^&uC!fvqkJK9 zLAyhI<7ZYjju^#)tp`GxrgMKezW?O;FCrE(3z+?`yZx}M{FU}gGv~;W^?mp6`ajTY zlxOu)_+kC=zxkt?6(1{)d@Gs46zQK}-)P5V&b>#&AUL7%fK;O{lQoN02gA&TO!Mz* zeb{}VsPR2Z8pj^h4?PF&GF|7G!+TW8_tRe1Zz35A0l}Kx({!W%t(>95vUin(ZevVi z8IwBaotFDwyB%gelibe9bNv0o-UG_h)IP>B?PZk{`yrE7IFpz0yU^4Cu}dQHx*I$m zWH>COxSYZFH^ZghUzajYmPZu2CUEioSWeom;A2j>R~>6xs8@z zpZ@*9(YT#;+wqVOPfZsJKWj2)>%TGMwydO;KZpPBpMpt28_gV^3ZM-IK= zGEy#@b)fT3tGCiQYg6o07luMfq{F)x1;@!)yr=ydidO-Pav&!EqF1~?X*k&UB=FAssSNz~{(tW} zrf%(I)tfM*-9;yi$;L*!Zf5T{KJgzca+6}dYJ@S_>=F8>b;9%i#8z#Sh!b87?c#^@ zrDI~aqqN1=e28SKk$o_6%Srv)1-2*S{$2RZa>MY%;f)_oADPE5n3UwmWv;T{K~bAg z&hOoC`;8A=xHj=0mRrM65y4qsT5|JmFRR+5lTM2tUVg}X{;~Wa{pv4wyVS&V3@*BG z-db)fYuUg5>&wY^ij{LqHm0`7zrOHq&R<5IKf8^7&+E-RK5s`7pOtCqlc!HN8XURt zCcmTZ`PTJ70WChPq9_}00=E}r#~=ATIpj||VfeD34eXtsvsk?NnD zE1qd5GbV7@^nTFi_TXuWSNj=rbW1D`^V$ggZA^>w{|MFYNMv_zez{6svHt~Ey?W!( zJvSw#rYJK{S=-Q|#ckhjo&0qbP&{T{4oFDrd{tv?_KCoF_?XOV*C9s`x&0j z-?LEiWWux_nU#D2HiwonsQkUmzo%1DPx0`vbZsHQbuv8dAH4P7aopR()4##@L22XU z3-ueM;(43i{;+P++$*7{7`dR{RHQrCJ-*|*qg?Uw0|t$=S=ttaR<66#{OQ&KW!vTZ zO|GhaU`wkA(9*HCi&y{P%M>4^IjLh^;L9VQ3?5CCJ3im!^0rTGX%!9Z2c%SIwp4TR zxQD!~O^~rrdAi^9QMThR(S|i2=O2=u{!nnA$PM3_UzW@=kzS$XUscA#_WX-IE1&ee zJv{mwJhzHI7VKLx-*Zo<^WpRI)6(}&^Zm`hpERpf{Kla}qFiTK1z+zHuvz`(NBTx4 zj=DSlEydPcNZ9F6{lR#T%m=5nt}#k7HLMq+5+u39Rv1WRt7q;!FBBp0KxIMR8iuB~ ze|FDUx!1YfpXJrbug)uc!*chDUnrG1Q`hi7i=ooKx|daJO6m7@A=U|vI=h}T-B_3@ zGr5H&obd^#PGTdMYTgoc?SK3C9azzz*_eO9v8z?Df$Kqq-cMfLd*<7o9h!A&^})%E zyZF|Kzc|6AFys6G*%1?*x}>Ppw$kzZ0?8jT*Dy3m{*yl6BogIu`mM#{ z1i|?ZikAwTKddp|tZY!hrQrS`TWm?dW2w0bg52v@AGpO}^IUrcbHYRJ2}~2zk9dhK z3V1BJd9rBze9Z#qx?i(*oNH>H)T-~mwSas1e>Wxh1>0sO2-Y8PXZ#Q@vVnFb`~;aa9CwvR!xfjgo>X`;ZDlU^G>{l9+q?bW=6%-jJg1_l!Y1hp0B z*7To0ta;LD#yLj|hPKTgT$svLtRg%0AD9??TlUy;xumgp9^ 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 literal 0 HcmV?d00001 diff --git a/packages/bella/example/public/index.html b/packages/bella/example/public/index.html new file mode 100644 index 00000000000..d62cf60a401 --- /dev/null +++ b/packages/bella/example/public/index.html @@ -0,0 +1,40 @@ + + + + + + + + + + + bella + + + +
+ + + diff --git a/packages/bella/example/public/manifest.json b/packages/bella/example/public/manifest.json new file mode 100644 index 00000000000..0f425d91dfb --- /dev/null +++ b/packages/bella/example/public/manifest.json @@ -0,0 +1,15 @@ +{ + "short_name": "bella", + "name": "bella", + "icons": [ + { + "src": "favicon.ico", + "sizes": "64x64 32x32 24x24 16x16", + "type": "image/x-icon" + } + ], + "start_url": ".", + "display": "standalone", + "theme_color": "#000000", + "background_color": "#ffffff" +} diff --git a/packages/bella/example/src/App.js b/packages/bella/example/src/App.js new file mode 100644 index 00000000000..562ad9dabc0 --- /dev/null +++ b/packages/bella/example/src/App.js @@ -0,0 +1,29 @@ +import React from 'react' +import freesewing from '@freesewing/core' +import Workbench from '@freesewing/components/Workbench' +import 'typeface-roboto-condensed' +import 'typeface-raleway' +import '@freesewing/css-theme' + +import Pattern from 'pattern' + +const App = (props) => { + // You can use this to add transations + /* + let translations = { + JSON: 'JSON', + someOtherString: 'Some other string that needs translation' + } + */ + + return ( + + ) +} + +export default App diff --git a/packages/bella/example/src/index.js b/packages/bella/example/src/index.js new file mode 100644 index 00000000000..9dd7ba788d4 --- /dev/null +++ b/packages/bella/example/src/index.js @@ -0,0 +1,11 @@ +import React from 'react' +import ReactDOM from 'react-dom' +import App from './App' +import * as serviceWorker from './serviceWorker' + +ReactDOM.render(, document.getElementById('root')) + +// If you want your app to work offline and load faster, you can change +// unregister() to register() below. Note this comes with some pitfalls. +// Learn more about service workers: http://bit.ly/CRA-PWA +serviceWorker.unregister() diff --git a/packages/bella/example/src/serviceWorker.js b/packages/bella/example/src/serviceWorker.js new file mode 100644 index 00000000000..44e1b1b2f8c --- /dev/null +++ b/packages/bella/example/src/serviceWorker.js @@ -0,0 +1,123 @@ +// In production, we register a service worker to serve assets from local cache. + +// This lets the app load faster on subsequent visits in production, and gives +// it offline capabilities. However, it also means that developers (and users) +// will only see deployed updates on the "N+1" visit to a page, since previously +// cached resources are updated in the background. + +// To learn more about the benefits of this model, read https://goo.gl/KwvDNy. +// This link also includes instructions on opting out of this behavior. + +const isLocalhost = Boolean( + window.location.hostname === 'localhost' || + // [::1] is the IPv6 localhost address. + window.location.hostname === '[::1]' || + // 127.0.0.1/8 is considered localhost for IPv4. + window.location.hostname.match(/^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/) +) + +export function register(config) { + if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) { + // The URL constructor is available in all browsers that support SW. + const publicUrl = new URL(process.env.PUBLIC_URL, window.location) + if (publicUrl.origin !== window.location.origin) { + // Our service worker won't work if PUBLIC_URL is on a different origin + // from what our page is served on. This might happen if a CDN is used to + // serve assets; see https://github.com/facebook/create-react-app/issues/2374 + return + } + + window.addEventListener('load', () => { + const swUrl = `${process.env.PUBLIC_URL}/service-worker.js` + + if (isLocalhost) { + // This is running on localhost. Let's check if a service worker still exists or not. + checkValidServiceWorker(swUrl, config) + + // Add some additional logging to localhost, pointing developers to the + // service worker/PWA documentation. + navigator.serviceWorker.ready.then(() => { + console.log( + 'This web app is being served cache-first by a service ' + + 'worker. To learn more, visit https://goo.gl/SC7cgQ' + ) + }) + } else { + // Is not local host. Just register service worker + registerValidSW(swUrl, config) + } + }) + } +} + +function registerValidSW(swUrl, config) { + navigator.serviceWorker + .register(swUrl) + .then(registration => { + registration.onupdatefound = () => { + const installingWorker = registration.installing + installingWorker.onstatechange = () => { + if (installingWorker.state === 'installed') { + if (navigator.serviceWorker.controller) { + // At this point, the old content will have been purged and + // the fresh content will have been added to the cache. + // It's the perfect time to display a "New content is + // available; please refresh." message in your web app. + console.log('New content is available; please refresh.') + + // Execute callback + if (config.onUpdate) { + config.onUpdate(registration) + } + } else { + // At this point, everything has been precached. + // It's the perfect time to display a + // "Content is cached for offline use." message. + console.log('Content is cached for offline use.') + + // Execute callback + if (config.onSuccess) { + config.onSuccess(registration) + } + } + } + } + } + }) + .catch(error => { + console.error('Error during service worker registration:', error) + }) +} + +function checkValidServiceWorker(swUrl, config) { + // Check if the service worker can be found. If it can't reload the page. + fetch(swUrl) + .then(response => { + // Ensure service worker exists, and that we really are getting a JS file. + if ( + response.status === 404 || + response.headers.get('content-type').indexOf('javascript') === -1 + ) { + // No service worker found. Probably a different app. Reload the page. + navigator.serviceWorker.ready.then(registration => { + registration.unregister().then(() => { + window.location.reload() + }) + }) + } else { + // Service worker found. Proceed as normal. + registerValidSW(swUrl, config) + } + }) + .catch(() => { + console.log('No internet connection found. App is running in offline mode.') + }) +} + +export function unregister() { + if ('serviceWorker' in navigator) { + navigator.serviceWorker.ready.then(registration => { + registration.unregister() + }) + } +} diff --git a/packages/bella/package.json b/packages/bella/package.json new file mode 100644 index 00000000000..2e6e7606e82 --- /dev/null +++ b/packages/bella/package.json @@ -0,0 +1,94 @@ +{ + "name": "@freesewing/bella", + "version": "2.10.2", + "description": "A FreeSewing pattern for a womenswear bodice block", + "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" + }, + "keywords": [ + "freesewing", + "design", + "diy", + "fashion", + "made to measure", + "parametric design", + "pattern", + "sewing", + "sewing pattern" + ], + "main": "dist/index.js", + "module": "dist/index.mjs", + "scripts": { + "clean": "rimraf dist", + "build": "rollup -c", + "test": "BABEL_ENV=production ../../node_modules/.bin/_mocha tests/*.test.js --require @babel/register", + "pubtest": "npm publish --registry http://localhost:6662", + "pubforce": "npm publish", + "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", + "start": "rollup -c -w", + "netlify": "echo \"Not configured yet\"", + "testci": "BABEL_ENV=production ./node_modules/.bin/_mocha tests/*.test.js --require @babel/register" + }, + "peerDependencies": { + "@freesewing/core": "^2.10.2", + "@freesewing/plugin-bundle": "^2.10.2" + }, + "dependencies": {}, + "devDependencies": { + "react": "^16.13.1", + "react-dom": "^16.13.1", + "@babel/plugin-proposal-class-properties": "^7.10.4", + "babel-eslint": "^10.1.0", + "eslint": "^7.6.0", + "babel-jest": "^26.2.2", + "jest": "26.2.2", + "@freesewing/components": "^2.10.2", + "@freesewing/css-theme": "^2.10.2", + "@freesewing/i18n": "^2.10.2", + "@freesewing/mui-theme": "^2.10.2", + "@freesewing/plugin-bust": "^2.10.2", + "@freesewing/plugin-buttons": "^2.10.2", + "@freesewing/plugin-flip": "^2.10.2", + "@freesewing/utils": "^2.10.2", + "@svgr/rollup": "^2.4.1", + "cross-env": "^7.0.2", + "react-scripts": "^3.4.1", + "webpack": "^4.44.1", + "rollup": "^2.23.0", + "@rollup/plugin-babel": "^5.1.0", + "rollup-plugin-terser": "^6.1.0", + "@rollup/plugin-commonjs": "^14.0.0", + "@rollup/plugin-json": "^4.1.0", + "@rollup/plugin-node-resolve": "^8.4.0", + "rollup-plugin-peer-deps-external": "^2.2.3", + "@material-ui/core": "^4.11.0", + "@material-ui/icons": "4.9.1", + "@material-ui/lab": "^v4.0.0-alpha.56", + "react-intl": "^5.4.5", + "prop-types": "^15.7.2", + "mocha": "^8.1.0", + "chai": "^4.2.0", + "chai-string": "^1.5.0", + "@babel/register": "^7.10.5" + }, + "files": [ + "dist/*", + "README.md", + "package.json" + ], + "publishConfig": { + "access": "public", + "tag": "latest" + }, + "engines": { + "node": ">=12.0.0", + "npm": ">=6" + }, + "rollup": { + "exports": "default" + } +} diff --git a/packages/bella/rollup.config.js b/packages/bella/rollup.config.js new file mode 100644 index 00000000000..a885f4cb4ec --- /dev/null +++ b/packages/bella/rollup.config.js @@ -0,0 +1,37 @@ +import resolve from '@rollup/plugin-node-resolve' +import commonjs from '@rollup/plugin-commonjs' +import json from '@rollup/plugin-json' +import { terser } from 'rollup-plugin-terser' +import peerDepsExternal from 'rollup-plugin-peer-deps-external' +import { name, version, description, author, license, main, module, rollup } from './package.json' + +const output = [ + { + file: main, + format: 'cjs', + sourcemap: true, + exports: rollup.exports + } +] +if (typeof module !== 'undefined') + output.push({ + file: module, + format: 'es', + sourcemap: true + }) + +export default { + input: 'src/index.js', + output, + plugins: [ + peerDepsExternal(), + resolve({ modulesOnly: true }), + commonjs(), + json(), + terser({ + output: { + preamble: `/**\n * ${name} | v${version}\n * ${description}\n * (c) ${new Date().getFullYear()} ${author}\n * @license ${license}\n */` + } + }) + ] +} diff --git a/packages/bella/src/back.js b/packages/bella/src/back.js new file mode 100644 index 00000000000..5827c1540d1 --- /dev/null +++ b/packages/bella/src/back.js @@ -0,0 +1,170 @@ +export default function (part) { + let { + store, + sa, + Point, + points, + Path, + paths, + options, + complete, + paperless, + macro, + utils, + units, + measurements, + Snippet, + snippets, + raise + } = part.shorthand() + + // Add original outline + points.origin = new Point(0, 0) + snippets.base = new Snippet('bella-back', points.origin) + + // Get to work + points.cbNeck = new Point(0, measurements.neck * options.backNeckCutout) + points.hps = new Point(measurements.neck * options.neckWidthBack, 0) + points.cbNeckCp1 = new Point(points.hps.x * 0.8, points.cbNeck.y) + let slope = measurements.shoulderSlope * options.shoulderSlopeBack * -1 + points.shoulder = utils.beamsIntersect( + new Point((measurements.shoulderToShoulder * options.shoulderToShoulderCorrection) / 2, 0), + new Point((measurements.shoulderToShoulder * options.shoulderToShoulderCorrection) / 2, 100), + points.hps, + points.hps.shift(slope, 85) + ) + points.armholePitch = new Point( + points.shoulder.x * options.acrossBackFactor, + measurements.hpsToWaistBack * options.backArmholePitchDepth + ) + + // Construct waist and dart + points.dartTip = new Point( + measurements.underbust * options.backDartLocation, + measurements.hpsToWaistBack * options.backDartHeight + ) + let backWidth = (measurements.underbust / 4) * (1 + options.chestEase) + let waistWidth = (measurements.waistBack / 2) * (1 + options.waistEase) + let reduction = backWidth - waistWidth + points.cbWaist = new Point(0, measurements.hpsToWaistBack) + points.waistCenter = points.cbWaist.shift(0, reduction * options.backCenterWaistReduction) + points.waistSide = points.waistCenter.shift( + options.backHemSlope, + waistWidth + reduction * (1 - options.backCenterWaistReduction / 2) + ) + points.dartBottomCenter = utils.beamIntersectsX( + points.waistCenter, + points.waistSide, + points.dartTip.x + ) + points.dartBottomLeft = points.dartBottomCenter.shift( + 180, + (reduction * (1 - options.backCenterWaistReduction * 0.5)) / 2 + ) + points.dartBottomRight = points.dartBottomLeft.rotate(180, points.dartBottomCenter) + points.dartLeftCp = points.dartBottomLeft.shift(90, points.dartTip.dy(points.dartBottomLeft) / 2) + points.dartRightCp = new Point(points.dartBottomRight.x, points.dartLeftCp.y) + // Find out location of the armhole + let armholeDepth = measurements.hpsToWaistBack * options.armholeDepth + points.shoulder.y + points.cbNeckCp2 = new Point(0, armholeDepth) + points.dartLeftArmhole = utils.curveIntersectsY( + points.dartBottomLeft, + points.dartLeftCp, + points.dartTip, + points.dartTip, + armholeDepth + ) + points.cbArmhole = utils.curveIntersectsY( + points.cbNeck, + points.cbNeckCp2, + points.waistCenter, + points.waistCenter, + armholeDepth + ) + let extra = points.dartLeftArmhole.dx(points.dartTip) * 2 + points.cbArmhole.x + points.armhole = new Point( + (measurements.underbust / 4) * (1 + options.chestEase) + extra, + armholeDepth + ) + + // Control points for the side seam + points.waistSideCp2 = points.waistSide.shift(90, points.armhole.dy(points.waistSide) / 2) + + // Construct armhole + points.armholeCp2 = points.armhole.shift(180 - options.backArmholeSlant, 40) + points.armholePitchCp1 = points.armholePitch.shift(-90 - options.backArmholeSlant, 40) + points.armholeCpTarget = utils.beamsIntersect( + points.armhole, + points.armhole.shift(180 - options.backArmholeSlant, 40), + points.armholePitch, + points.armholePitch.shift(-90 - options.backArmholeSlant, 40) + ) + points.armholeCp2 = points.armhole.shiftFractionTowards( + points.armholeCpTarget, + options.backArmholeCurvature + ) + points.armholePitchCp1 = points.armholePitch.shiftFractionTowards( + points.armholeCpTarget, + options.backArmholeCurvature + ) + points.armholePitchCp2 = points.armholePitchCp1.rotate(180, points.armholePitch) + + // Store the back width at bust level + points.bustSide = utils.curveIntersectsY( + points.waistSide, + points.waistSideCp2, + points.armhole, + points.armhole, + measurements.hpsToBust + ) + if (!points.bustSide) raise.error('Could not find bust height in side seam of back part') + points.bustCenter = utils.curveIntersectsY( + points.cbNeck, + points.cbNeckCp2, + points.waistCenter, + points.waistCenter, + measurements.hpsToBust + ) + if (!points.bustCenter) raise.error('Could not find bust height in center seam of back part') + points.bustDartLeft = utils.curveIntersectsY( + points.dartBottomLeft, + points.dartLeftCp, + points.dartTip, + points.dartTip, + measurements.hpsToBust + ) + if (!points.bustDartLeft) raise.error('Could not find bust height in back dart') + points.bustDartRight = points.bustDartLeft.flipX(points.dartTip) + store.set( + 'bustWidthBack', + points.bustCenter.dx(points.bustDartLeft) + points.bustDartRight.dx(points.bustSide) + ) + + // Store things we'll need in the front parts + store.set( + 'sideSeamLength', + new Path().move(points.waistSide).curve_(points.waistSideCp2, points.armhole).length() + ) + store.set( + 'backHemLength', + points.waistCenter.dist(points.dartBottomLeft) + points.dartBottomRight.dist(points.waistSide) + ) + store.set('sideReduction', points.armhole.x - points.waistSide.x) + + paths.saBase = new Path() + .move(points.cbNeck) + .curve_(points.cbNeckCp2, points.waistCenter) + .line(points.dartBottomLeft) + .curve_(points.dartLeftCp, points.dartTip) + ._curve(points.dartRightCp, points.dartBottomRight) + .line(points.waistSide) + .curve_(points.waistSideCp2, points.armhole) + .curve(points.armholeCp2, points.armholePitchCp1, points.armholePitch) + .curve_(points.armholePitchCp2, points.shoulder) + .line(points.hps) + ._curve(points.cbNeckCp1, points.cbNeck) + .close() + .attr('class', 'fabric') + + return part +} diff --git a/packages/bella/src/bella.js b/packages/bella/src/bella.js new file mode 100644 index 00000000000..9b445846100 --- /dev/null +++ b/packages/bella/src/bella.js @@ -0,0 +1,17 @@ +// Plugin that provides the base outlines +const bella = { + name: 'bella', + version: 1, + hooks: { + preRender: function (svg) { + if (svg.attributes.get('freesewing:plugin-bella') === false) + svg.attributes.set('freesewing:plugin-bella', 1) + let style = 'stroke: #3bc9db; stroke-width: 1; fill: none;' + svg.defs += `` + svg.defs += `` + svg.defs += `` + } + } +} + +export default bella diff --git a/packages/bella/src/front-shoulder-dart.js b/packages/bella/src/front-shoulder-dart.js new file mode 100644 index 00000000000..051864659af --- /dev/null +++ b/packages/bella/src/front-shoulder-dart.js @@ -0,0 +1,29 @@ +export default function (part) { + let { + store, + sa, + Point, + points, + Path, + paths, + options, + complete, + paperless, + macro, + utils, + units, + measurements, + Snippet, + snippets + } = part.shorthand() + + points.origin = new Point(0, 0) + snippets.base = new Snippet('bella-front-shoulder-dart', points.origin) + + points.a = new Point(0, 0) + points.b = new Point(280, 450) + + paths.diag = new Path().move(points.a).line(points.b).attr('class', 'hidden') + + return part +} diff --git a/packages/bella/src/front-side-dart.js b/packages/bella/src/front-side-dart.js new file mode 100644 index 00000000000..d6b3178f9bf --- /dev/null +++ b/packages/bella/src/front-side-dart.js @@ -0,0 +1,181 @@ +export default function (part) { + let { + store, + sa, + Point, + points, + Path, + paths, + options, + complete, + paperless, + macro, + utils, + units, + measurements, + Snippet, + snippets + } = part.shorthand() + + // Add original outline + points.origin = new Point(0, 0) + snippets.base = new Snippet('bella-front-side-dart', points.origin) + + // Diagonal line to make sure the original outline isn't cropped + points.a = new Point(0, 0) + points.b = new Point(290, 450) + paths.diag = new Path().move(points.a).line(points.b).attr('class', 'hidden') + + // Get to work + points.cfNeck = new Point(0, measurements.neck * options.collarFactor) + points.hps = new Point(measurements.neck * options.neckWidthFront, 0) + points.cfNeckCp1 = new Point(points.hps.x * 0.8, points.cfNeck.y) + points.hpsCp2 = new Point(points.hps.x, points.cfNeck.y / 2) + let slope = measurements.shoulderSlope * (2 - options.shoulderSlopeBack) * -1 + let xShoulder = + ((measurements.shoulderToShoulder * options.shoulderToShoulderCorrection) / 2) * + options.frontShoulderWidth + points.shoulder = utils.beamsIntersect( + new Point(xShoulder, 0), + new Point(xShoulder, 100), + points.hps, + points.hps.shift(slope, 85) + ) + // Front is more narrow + points.ex = points.shoulder.shift(180, 10) + points.armholePitch = new Point( + points.shoulder.x * options.acrossBackFactor, + measurements.hpsToWaistBack * options.frontArmholePitchDepth + ) + // Find out location of the armhole + let armholeDepth = measurements.hpsToWaistBack * options.armholeDepth + points.shoulder.y + points.armhole = new Point( + (measurements.highBust / 4) * (1 + options.chestEase) * options.highBustWidth, + armholeDepth + ) + + // Bust point + points.bust = new Point(measurements.bustSpan / 2, measurements.hpsToBust) + + // Construct armhole + points.armholeCp2 = points.armhole.shift(180, 40) + points.armholePitchCp1 = points.armholePitch.shift(-90, 40) + points.armholeCpTarget = utils.beamsIntersect( + points.armhole, + points.armhole.shift(180, 40), + points.armholePitch, + points.armholePitch.shift(-90, 40) + ) + points.armholeCp2 = points.armhole.shiftFractionTowards( + points.armholeCpTarget, + options.frontArmholeCurvature + ) + points.armholePitchCp1 = points.armholePitch.shiftFractionTowards( + points.armholeCpTarget, + options.frontArmholeCurvature + ) + points.armholePitchCp2 = points.armholePitchCp1.rotate(180, points.armholePitch) + + // Draft body without breasts + points.cfHem = new Point(0, measurements.hpsToWaistFront) + points.sideHem = new Point(points.armhole.x, points.cfHem.y) + + // Create room for breasts + // How much horizontal room do we need to add? + let target = + (measurements.chest * (1 + options.chestEase - options.fullChestEaseReduction)) / 2 - + store.get('bustWidthBack') + let rot = ['armhole', 'armholeCp2', 'armholePitchCp1', 'bustB', 'sideHem'] + // Rotate until we've got enough room + points.bustA = points.bust.clone() + points.bustB = points.bust.clone() + points.bustSide = utils.beamIntersectsY(points.armhole, points.sideHem, points.bust.y) + let steps = 0 + let angle = 0 + let increment = 0.5 + while (points.bustSide.x < target && steps < 80) { + for (const p of rot) points[p] = points[p].rotate(increment, points.armholePitch) + angle += increment + points.bustSide = utils.beamIntersectsY(points.armhole, points.sideHem, points.bust.y) + steps++ + } + store.set('bustDartAngleSide', angle) + + // Smooth out the armhole pitch point + points.pitchMax = utils.beamsIntersect( + points.armholePitchCp1, + points.armholePitchCp2, + points.armholePitch, + points.armholePitch.shift(points.armholePitchCp1.angle(points.armholePitchCp2) - 90, 30) + ) + points.armholePitch = points.armholePitch.shiftFractionTowards(points.pitchMax, 0.2) + points.armholePitchCp1 = points.armholePitch.shiftFractionTowards( + points.armholePitchCp2.rotate(180, points.armholePitch), + 0.8 + ) + + // Bust dart + points.bustDartTop = utils.beamsIntersect( + points.armhole, + points.sideHem, + points.bust, + points.bust.shift(0, 100) + ) + points.bustDartBottom = points.bustDartTop.rotate(angle * -1, points.bust) + points.bustDartTip = points.bustDartTop.shiftFractionTowards(points.bust, options.bustDartLength) + + // Side seam length + let aboveDart = points.armhole.dist(points.bustDartTop) + let belowDart = store.get('sideSeamLength') - aboveDart + points.sideHemInitial = points.bustDartBottom + .shift(-90, belowDart) + .shift(180, store.get('sideReduction')) + points.sideHem = points.bustDartBottom.shiftTowards(points.sideHemInitial, belowDart) + + // Hem + let hemLen = (measurements.waist / 2) * (1 + options.waistEase) - store.get('backHemLength') + let reduce = points.cfHem.dist(points.sideHemInitial) - hemLen + + // Waist dart + points.waistDartHem = new Point(points.bustDartTip.x, points.cfHem.y) + points.waistDartLeft = points.waistDartHem.shift(180, reduce / 2) + points.waistDartRight = points.waistDartHem.shift(0, reduce / 2) + points.waistDartTip = points.waistDartHem.shiftFractionTowards( + points.bustDartTip, + options.bustDartLength + ) + points.waistDartLeftCp = points.waistDartLeft.shift( + 90, + points.waistDartHem.dist(points.bustDartTip) / 2 + ) + points.waistDartRightCp = points.waistDartRight.shift( + 90, + points.waistDartHem.dist(points.bustDartTip) / 2 + ) + + points.f = new Point(0, 445.5) + points.g = new Point(95, 451) + points.h = new Point(144, 451) + points.i = new Point(258, 443) + points.i = new Point(0, 260) + points.j = new Point(274, 260) + + paths.saBase = new Path() + .move(points.cfHem) + .line(points.waistDartLeft) + .curve_(points.waistDartLeftCp, points.waistDartTip) + ._curve(points.waistDartRightCp, points.waistDartRight) + .line(points.sideHem) + .line(points.bustDartBottom) + .line(points.bustDartTip) + .line(points.bustDartTop) + .line(points.armhole) + .curve(points.armholeCp2, points.armholePitchCp1, points.armholePitch) + .curve_(points.armholePitchCp2, points.shoulder) + .line(points.hps) + .curve(points.hpsCp2, points.cfNeckCp1, points.cfNeck) + .line(points.cfHem) + .attr('class', 'fabric') + + return part +} diff --git a/packages/bella/src/index.js b/packages/bella/src/index.js new file mode 100644 index 00000000000..d529fcd1f00 --- /dev/null +++ b/packages/bella/src/index.js @@ -0,0 +1,20 @@ +import freesewing from '@freesewing/core' +import plugins from '@freesewing/plugin-bundle' +import config from '../config' +// Parts +import draftBack from './back' +import draftFrontSideDart from './front-side-dart' +import draftFrontShoulderDart from './front-shoulder-dart' + +// Base outlines +import bellaPlugin from './bella' + +// Create design +const Pattern = new freesewing.Design(config, [plugins, bellaPlugin]) + +// Attach draft methods to prototype +Pattern.prototype.draftBack = (part) => draftBack(part) +Pattern.prototype.draftFrontSideDart = (part) => draftFrontSideDart(part) +Pattern.prototype.draftFrontShoulderDart = (part) => draftFrontShoulderDart(part) + +export default Pattern diff --git a/packages/bella/tests/shared.test.js b/packages/bella/tests/shared.test.js new file mode 100644 index 00000000000..f3eb3b7d94a --- /dev/null +++ b/packages/bella/tests/shared.test.js @@ -0,0 +1,39 @@ +// This file is auto-generated. +// Changes you make will be overwritten. +const expect = require("chai").expect; +const models = require("@freesewing/models") +const patterns = require("@freesewing/pattern-info") + +const Bella = require('../dist') + +// Shared tests +const testPatternConfig = require('../../../tests/patterns/config') +const testPatternDrafting = require('../../../tests/patterns/drafting') +const testPatternSampling = require('../../../tests/patterns/sampling') + +// Test config +testPatternConfig( + 'bella', + new Bella(), + expect, + models, + patterns +) + +// Test drafting +testPatternDrafting( + 'bella', + Bella, + expect, + models, + patterns +) + +// Test sampling +testPatternSampling( + 'bella', + Bella, + expect, + models, + patterns +)