From 6494e622bacc01616edf0f9924f60aff8ce797be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fe=CC=81lix=20Pe=CC=81ault?= Date: Mon, 12 Sep 2022 12:43:49 +0200 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Finish=20and=20animate=20About=20pa?= =?UTF-8?q?ge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- pnpm-lock.yaml | 84 +++---- src/components/SmoothScroll.svelte | 2 +- src/components/molecules/ProcessStep.svelte | 2 +- src/components/organisms/Banner.svelte | 58 ----- src/components/organisms/ShopBanner.svelte | 1 + src/routes/about/+page.svelte | 247 +++++++++++++------- src/style/pages/_about.scss | 38 ++- 8 files changed, 234 insertions(+), 200 deletions(-) diff --git a/package.json b/package.json index 5a44c24..6362adc 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "@typescript-eslint/parser": "^5.36.2", "browserslist": "^4.21.3", "cssnano": "^5.1.13", - "eslint": "^8.23.0", + "eslint": "^8.23.1", "eslint-plugin-svelte3": "^4.0.0", "postcss": "^8.4.16", "postcss-focus-visible": "^7.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cba2f1f..c2e6bae 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,7 +12,7 @@ specifiers: cssnano: ^5.1.13 dayjs: ^1.11.5 embla-carousel: ^7.0.2 - eslint: ^8.23.0 + eslint: ^8.23.1 eslint-plugin-svelte3: ^4.0.0 focus-visible: ^5.2.0 motion: ^10.14.2 @@ -48,12 +48,12 @@ devDependencies: '@sveltejs/adapter-node': 1.0.0-next.89 '@sveltejs/adapter-vercel': 1.0.0-next.73 '@sveltejs/kit': 1.0.0-next.480_svelte@3.50.1+vite@3.1.0 - '@typescript-eslint/eslint-plugin': 5.36.2_2l2r3i3lm6jysqd4ac3ql4n2mm - '@typescript-eslint/parser': 5.36.2_itqs5654cmlnjraw6gjzqacppi + '@typescript-eslint/eslint-plugin': 5.36.2_wxqvmnl3i4rbvz4ixyoiufmx3e + '@typescript-eslint/parser': 5.36.2_irgkl5vooow2ydyo6aokmferha browserslist: 4.21.3 cssnano: 5.1.13_postcss@8.4.16 - eslint: 8.23.0 - eslint-plugin-svelte3: 4.0.0_jtvgu4usxe4xoavzb5jpyaoyje + eslint: 8.23.1 + eslint-plugin-svelte3: 4.0.0_rhh4tpcyg7zwtq6pdnkzw5gxma postcss: 8.4.16 postcss-focus-visible: 7.1.0_postcss@8.4.16 postcss-normalize: 10.0.1_mu2kzpkteq3ketk6piffleamkq @@ -251,8 +251,8 @@ packages: dev: true optional: true - /@eslint/eslintrc/1.3.1: - resolution: {integrity: sha512-OhSY22oQQdw3zgPOOwdoj01l/Dzl1Z+xyUP33tkSN+aqyEhymJCcPHyXt+ylW8FSe0TfRC2VG+ROQOapD0aZSQ==} + /@eslint/eslintrc/1.3.2: + resolution: {integrity: sha512-AXYd23w1S/bv3fTs3Lz0vjiYemS08jWkI3hYyS9I1ry+0f+Yjs1wm+sU0BS8qDOPrBIkp4qHYC16I8uVtpLajQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: ajv: 6.12.6 @@ -549,7 +549,7 @@ packages: '@types/node': 18.7.16 dev: true - /@typescript-eslint/eslint-plugin/5.36.2_2l2r3i3lm6jysqd4ac3ql4n2mm: + /@typescript-eslint/eslint-plugin/5.36.2_wxqvmnl3i4rbvz4ixyoiufmx3e: resolution: {integrity: sha512-OwwR8LRwSnI98tdc2z7mJYgY60gf7I9ZfGjN5EjCwwns9bdTuQfAXcsjSB2wSQ/TVNYSGKf4kzVXbNGaZvwiXw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -560,12 +560,12 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/parser': 5.36.2_itqs5654cmlnjraw6gjzqacppi + '@typescript-eslint/parser': 5.36.2_irgkl5vooow2ydyo6aokmferha '@typescript-eslint/scope-manager': 5.36.2 - '@typescript-eslint/type-utils': 5.36.2_itqs5654cmlnjraw6gjzqacppi - '@typescript-eslint/utils': 5.36.2_itqs5654cmlnjraw6gjzqacppi + '@typescript-eslint/type-utils': 5.36.2_irgkl5vooow2ydyo6aokmferha + '@typescript-eslint/utils': 5.36.2_irgkl5vooow2ydyo6aokmferha debug: 4.3.4 - eslint: 8.23.0 + eslint: 8.23.1 functional-red-black-tree: 1.0.1 ignore: 5.2.0 regexpp: 3.2.0 @@ -576,7 +576,7 @@ packages: - supports-color dev: true - /@typescript-eslint/parser/5.36.2_itqs5654cmlnjraw6gjzqacppi: + /@typescript-eslint/parser/5.36.2_irgkl5vooow2ydyo6aokmferha: resolution: {integrity: sha512-qS/Kb0yzy8sR0idFspI9Z6+t7mqk/oRjnAYfewG+VN73opAUvmYL3oPIMmgOX6CnQS6gmVIXGshlb5RY/R22pA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -590,7 +590,7 @@ packages: '@typescript-eslint/types': 5.36.2 '@typescript-eslint/typescript-estree': 5.36.2_typescript@4.8.3 debug: 4.3.4 - eslint: 8.23.0 + eslint: 8.23.1 typescript: 4.8.3 transitivePeerDependencies: - supports-color @@ -604,7 +604,7 @@ packages: '@typescript-eslint/visitor-keys': 5.36.2 dev: true - /@typescript-eslint/type-utils/5.36.2_itqs5654cmlnjraw6gjzqacppi: + /@typescript-eslint/type-utils/5.36.2_irgkl5vooow2ydyo6aokmferha: resolution: {integrity: sha512-rPQtS5rfijUWLouhy6UmyNquKDPhQjKsaKH0WnY6hl/07lasj8gPaH2UD8xWkePn6SC+jW2i9c2DZVDnL+Dokw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -615,9 +615,9 @@ packages: optional: true dependencies: '@typescript-eslint/typescript-estree': 5.36.2_typescript@4.8.3 - '@typescript-eslint/utils': 5.36.2_itqs5654cmlnjraw6gjzqacppi + '@typescript-eslint/utils': 5.36.2_irgkl5vooow2ydyo6aokmferha debug: 4.3.4 - eslint: 8.23.0 + eslint: 8.23.1 tsutils: 3.21.0_typescript@4.8.3 typescript: 4.8.3 transitivePeerDependencies: @@ -650,7 +650,7 @@ packages: - supports-color dev: true - /@typescript-eslint/utils/5.36.2_itqs5654cmlnjraw6gjzqacppi: + /@typescript-eslint/utils/5.36.2_irgkl5vooow2ydyo6aokmferha: resolution: {integrity: sha512-uNcopWonEITX96v9pefk9DC1bWMdkweeSsewJ6GeC7L6j2t0SJywisgkr9wUTtXk90fi2Eljj90HSHm3OGdGRg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -660,9 +660,9 @@ packages: '@typescript-eslint/scope-manager': 5.36.2 '@typescript-eslint/types': 5.36.2 '@typescript-eslint/typescript-estree': 5.36.2_typescript@4.8.3 - eslint: 8.23.0 + eslint: 8.23.1 eslint-scope: 5.1.1 - eslint-utils: 3.0.0_eslint@8.23.0 + eslint-utils: 3.0.0_eslint@8.23.1 transitivePeerDependencies: - supports-color - typescript @@ -777,15 +777,15 @@ packages: resolution: {integrity: sha512-tLRNUXati5MFePdAk8dw7Qt7DpxPB60ofAgn8WRhW6a2rcimZnYBP9oxHiv0OHy+Wz7kPMG+t4LGdt31+4EmGg==} dev: true - /autoprefixer/10.4.8_postcss@8.4.16: - resolution: {integrity: sha512-75Jr6Q/XpTqEf6D2ltS5uMewJIx5irCU1oBYJrWjFenq/m12WRRrz6g15L1EIoYvPLXTbEry7rDOwrcYNj77xw==} + /autoprefixer/10.4.9_postcss@8.4.16: + resolution: {integrity: sha512-Uu67eduPEmOeA0vyJby5ghu1AAELCCNSsLAjK+lz6kYzNM5sqnBO36MqfsjhPjQF/BaJM5U/UuFYyl7PavY/wQ==} engines: {node: ^10 || ^12 || >=14} hasBin: true peerDependencies: postcss: ^8.1.0 dependencies: browserslist: 4.21.3 - caniuse-lite: 1.0.30001393 + caniuse-lite: 1.0.30001397 fraction.js: 4.2.0 normalize-range: 0.1.2 picocolors: 1.0.0 @@ -831,8 +831,8 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001393 - electron-to-chromium: 1.4.246 + caniuse-lite: 1.0.30001397 + electron-to-chromium: 1.4.247 node-releases: 2.0.6 update-browserslist-db: 1.0.7_browserslist@4.21.3 dev: true @@ -850,13 +850,13 @@ packages: resolution: {integrity: sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==} dependencies: browserslist: 4.21.3 - caniuse-lite: 1.0.30001393 + caniuse-lite: 1.0.30001397 lodash.memoize: 4.1.2 lodash.uniq: 4.5.0 dev: true - /caniuse-lite/1.0.30001393: - resolution: {integrity: sha512-N/od11RX+Gsk+1qY/jbPa0R6zJupEa0lxeBG598EbrtblxVCTJsQwbRBm6+V+rxpc5lHKdsXb9RY83cZIPLseA==} + /caniuse-lite/1.0.30001397: + resolution: {integrity: sha512-SW9N2TbCdLf0eiNDRrrQXx2sOkaakNZbCjgNpPyMJJbiOrU5QzMIrXOVMRM1myBXTD5iTkdrtU/EguCrBocHlA==} dev: true /chalk/4.1.2: @@ -1163,8 +1163,8 @@ packages: domhandler: 4.3.1 dev: true - /electron-to-chromium/1.4.246: - resolution: {integrity: sha512-/wFCHUE+Hocqr/LlVGsuKLIw4P2lBWwFIDcNMDpJGzyIysQV4aycpoOitAs32FT94EHKnNqDR/CVZJFbXEufJA==} + /electron-to-chromium/1.4.247: + resolution: {integrity: sha512-FLs6R4FQE+1JHM0hh3sfdxnYjKvJpHZyhQDjc2qFq/xFvmmRt/TATNToZhrcGUFzpF2XjeiuozrA8lI0PZmYYw==} dev: true /embla-carousel/7.0.2: @@ -1611,13 +1611,13 @@ packages: engines: {node: '>=10'} dev: true - /eslint-plugin-svelte3/4.0.0_jtvgu4usxe4xoavzb5jpyaoyje: + /eslint-plugin-svelte3/4.0.0_rhh4tpcyg7zwtq6pdnkzw5gxma: resolution: {integrity: sha512-OIx9lgaNzD02+MDFNLw0GEUbuovNcglg+wnd/UY0fbZmlQSz7GlQiQ1f+yX0XvC07XPcDOnFcichqI3xCwp71g==} peerDependencies: eslint: '>=8.0.0' svelte: ^3.2.0 dependencies: - eslint: 8.23.0 + eslint: 8.23.1 svelte: 3.50.1 dev: true @@ -1637,13 +1637,13 @@ packages: estraverse: 5.3.0 dev: true - /eslint-utils/3.0.0_eslint@8.23.0: + /eslint-utils/3.0.0_eslint@8.23.1: resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==} engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0} peerDependencies: eslint: '>=5' dependencies: - eslint: 8.23.0 + eslint: 8.23.1 eslint-visitor-keys: 2.1.0 dev: true @@ -1657,12 +1657,12 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /eslint/8.23.0: - resolution: {integrity: sha512-pBG/XOn0MsJcKcTRLr27S5HpzQo4kLr+HjLQIyK4EiCsijDl/TB+h5uEuJU6bQ8Edvwz1XWOjpaP2qgnXGpTcA==} + /eslint/8.23.1: + resolution: {integrity: sha512-w7C1IXCc6fNqjpuYd0yPlcTKKmHlHHktRkzmBPZ+7cvNBQuiNjx0xaMTjAJGCafJhQkrFJooREv0CtrVzmHwqg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} hasBin: true dependencies: - '@eslint/eslintrc': 1.3.1 + '@eslint/eslintrc': 1.3.2 '@humanwhocodes/config-array': 0.10.4 '@humanwhocodes/gitignore-to-minimatch': 1.0.2 '@humanwhocodes/module-importer': 1.0.1 @@ -1673,7 +1673,7 @@ packages: doctrine: 3.0.0 escape-string-regexp: 4.0.0 eslint-scope: 7.1.1 - eslint-utils: 3.0.0_eslint@8.23.0 + eslint-utils: 3.0.0_eslint@8.23.1 eslint-visitor-keys: 3.3.0 espree: 9.4.0 esquery: 1.4.0 @@ -1681,7 +1681,6 @@ packages: fast-deep-equal: 3.1.3 file-entry-cache: 6.0.1 find-up: 5.0.0 - functional-red-black-tree: 1.0.1 glob-parent: 6.0.2 globals: 13.17.0 globby: 11.1.0 @@ -1690,6 +1689,7 @@ packages: import-fresh: 3.3.0 imurmurhash: 0.1.4 is-glob: 4.0.3 + js-sdsl: 4.1.4 js-yaml: 4.1.0 json-stable-stringify-without-jsonify: 1.0.1 levn: 0.4.1 @@ -2045,6 +2045,10 @@ packages: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} dev: true + /js-sdsl/4.1.4: + resolution: {integrity: sha512-Y2/yD55y5jteOAmY50JbUZYwk3CP3wnLPEZnlR1w9oKhITrBEtAxwuWKebFf8hMrPMgbYwFoWK/lH2sBkErELw==} + dev: true + /js-yaml/4.1.0: resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==} hasBin: true @@ -2913,7 +2917,7 @@ packages: '@csstools/postcss-text-decoration-shorthand': 1.0.0_postcss@8.4.16 '@csstools/postcss-trigonometric-functions': 1.0.2_postcss@8.4.16 '@csstools/postcss-unset-value': 1.0.2_postcss@8.4.16 - autoprefixer: 10.4.8_postcss@8.4.16 + autoprefixer: 10.4.9_postcss@8.4.16 browserslist: 4.21.3 css-blank-pseudo: 3.0.3_postcss@8.4.16 css-has-pseudo: 3.0.4_postcss@8.4.16 diff --git a/src/components/SmoothScroll.svelte b/src/components/SmoothScroll.svelte index 85600db..89b1d22 100644 --- a/src/components/SmoothScroll.svelte +++ b/src/components/SmoothScroll.svelte @@ -11,7 +11,7 @@ if (browser) { $smoothScroll = new Lenis({ duration: 1.2, - easing: (t) => (t === 1 ? 1 : 1 - Math.pow(2, -10 * t)), // https://easings.net/ + easing: (t: number) => (t === 1 ? 1 : 1 - Math.pow(2, -10 * t)), // https://easings.net/ smooth: true, direction: 'vertical', }) diff --git a/src/components/molecules/ProcessStep.svelte b/src/components/molecules/ProcessStep.svelte index bedbccb..27bc1a0 100644 --- a/src/components/molecules/ProcessStep.svelte +++ b/src/components/molecules/ProcessStep.svelte @@ -54,7 +54,7 @@ {/if} -
+
{@html text}
diff --git a/src/components/organisms/Banner.svelte b/src/components/organisms/Banner.svelte index 0f9a2a6..4be0554 100644 --- a/src/components/organisms/Banner.svelte +++ b/src/components/organisms/Banner.svelte @@ -3,70 +3,12 @@