From a2ad8334c56f4e072fdb67bef455b5a34ec7ab94 Mon Sep 17 00:00:00 2001 From: Mayur Date: Tue, 19 Nov 2024 11:50:44 +0530 Subject: [PATCH 1/6] feat: New Cancel Subscription Illustration Added --- .../illustrations/PlanCancelIllustration.tsx | 149 ++++++++++++++++++ 1 file changed, 149 insertions(+) create mode 100644 apps/web/components/home/PlanDetails/illustrations/PlanCancelIllustration.tsx diff --git a/apps/web/components/home/PlanDetails/illustrations/PlanCancelIllustration.tsx b/apps/web/components/home/PlanDetails/illustrations/PlanCancelIllustration.tsx new file mode 100644 index 000000000..d90ea3ff1 --- /dev/null +++ b/apps/web/components/home/PlanDetails/illustrations/PlanCancelIllustration.tsx @@ -0,0 +1,149 @@ +export const PlanCancelIllustration = () => { + return ( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ); +}; From 540cf218251570314d7df8e32486c0fc4f0932aa Mon Sep 17 00:00:00 2001 From: Mayur Date: Tue, 19 Nov 2024 11:51:40 +0530 Subject: [PATCH 2/6] feat: New Illustration added as per design --- .../components/home/PlanDetails/CancelSubscriptionModal.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/web/components/home/PlanDetails/CancelSubscriptionModal.tsx b/apps/web/components/home/PlanDetails/CancelSubscriptionModal.tsx index 8d7b0bd41..b770f5eed 100644 --- a/apps/web/components/home/PlanDetails/CancelSubscriptionModal.tsx +++ b/apps/web/components/home/PlanDetails/CancelSubscriptionModal.tsx @@ -3,7 +3,7 @@ import { Checkbox, Flex, Text, Center, Stack } from '@mantine/core'; import { Button } from '@ui/button'; import { Controller } from 'react-hook-form'; -import { PlanCancelDetails } from './illustrations/PlanCancelDetails'; +import { PlanCancelIllustration } from './illustrations/PlanCancelIllustration'; import { colors, MEMBERSHIP_CANCELLATION_REASONS } from '@config'; @@ -28,7 +28,7 @@ export function CancelSubscriptionModal({
- +
From 0defa22495892e1bfd53f8fec962e1a03f5c51ff Mon Sep 17 00:00:00 2001 From: Mayur Date: Tue, 19 Nov 2024 11:52:07 +0530 Subject: [PATCH 3/6] feat: Old Illustration Renamed --- .../illustrations/PlanCancelDetails.tsx | 439 ------------------ 1 file changed, 439 deletions(-) delete mode 100644 apps/web/components/home/PlanDetails/illustrations/PlanCancelDetails.tsx diff --git a/apps/web/components/home/PlanDetails/illustrations/PlanCancelDetails.tsx b/apps/web/components/home/PlanDetails/illustrations/PlanCancelDetails.tsx deleted file mode 100644 index 90d647c53..000000000 --- a/apps/web/components/home/PlanDetails/illustrations/PlanCancelDetails.tsx +++ /dev/null @@ -1,439 +0,0 @@ -export const PlanCancelDetails = () => { - return ( - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ); -}; From 6f3edf9f02d7687e48fffadb1a5776083b7a82a4 Mon Sep 17 00:00:00 2001 From: Mayur Date: Tue, 19 Nov 2024 11:52:28 +0530 Subject: [PATCH 4/6] feat: Lock file added --- pnpm-lock.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a91c9e0ac..dd9fee3b4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -791,8 +791,8 @@ importers: specifier: '>=12.0.0' version: 18.2.11(rxjs@7.8.1)(zone.js@0.14.10) '@impler/client': - specifier: ^0.27.0 - version: 0.27.0 + specifier: ^0.27.1 + version: 0.27.1 devDependencies: '@angular/compiler': specifier: ^12.0.0 @@ -858,8 +858,8 @@ importers: packages/react: dependencies: '@impler/client': - specifier: ^0.27.0 - version: 0.27.0 + specifier: ^0.27.1 + version: 0.27.1 react: specifier: '>=16.8.0' version: 18.2.0 @@ -2268,8 +2268,8 @@ packages: resolution: {integrity: sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q==} engines: {node: '>=6.9.0'} - '@impler/client@0.27.0': - resolution: {integrity: sha512-SM4FFM3sXsJ18OsbBDAvIv7Gi53ld+sLaJ/ZGFW6gjtmpKSgAr29/HmrEKDdlvIHEG/6F9uv7yd3EdDn9gldNg==} + '@impler/client@0.27.1': + resolution: {integrity: sha512-5nU1rZwgRVq1ZK75lsA7yeBLElcmiqPpQ2yOb5rkaI1VlPS3ntKPH4yGNPKU1pVNqSKE51z2sZD17T3/0C8TQg==} engines: {node: '>=10'} '@isaacs/cliui@8.0.2': @@ -15280,7 +15280,7 @@ snapshots: '@hutson/parse-repository-url@3.0.2': {} - '@impler/client@0.27.0': {} + '@impler/client@0.27.1': {} '@isaacs/cliui@8.0.2': dependencies: From a372a8c04c9d842a6c7de1b4562aefcbfd07d747 Mon Sep 17 00:00:00 2001 From: Mayur Date: Tue, 19 Nov 2024 11:59:50 +0530 Subject: [PATCH 5/6] feat: Added camelCase strokeWidth to prevent react hydration issues --- .../illustrations/PlanCancelIllustration.tsx | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/apps/web/components/home/PlanDetails/illustrations/PlanCancelIllustration.tsx b/apps/web/components/home/PlanDetails/illustrations/PlanCancelIllustration.tsx index d90ea3ff1..83abb0759 100644 --- a/apps/web/components/home/PlanDetails/illustrations/PlanCancelIllustration.tsx +++ b/apps/web/components/home/PlanDetails/illustrations/PlanCancelIllustration.tsx @@ -9,25 +9,25 @@ export const PlanCancelIllustration = () => { d="M55.7706 205.877C52.9677 205.874 50.2806 204.789 48.2987 202.86C46.3169 200.931 45.2022 198.316 45.1992 195.588V57.9063C45.1981 55.1744 46.3105 52.5535 48.2923 50.6188C50.2741 48.684 52.9635 47.5933 55.7706 47.5859H240.154C242.961 47.5933 245.651 48.684 247.632 50.6188C249.614 52.5535 250.727 55.1744 250.725 57.9063V195.588C250.722 198.316 249.608 200.931 247.626 202.86C245.644 204.789 242.957 205.874 240.154 205.877H55.7706Z" fill="white" stroke="#35008B" - stroke-width="2" + strokeWidth="2" /> { d="M99.7551 61.7348C100.64 61.7348 101.505 61.9902 102.241 62.4688C102.977 62.9474 103.551 63.6276 103.889 64.4234C104.228 65.2192 104.317 66.0949 104.144 66.9397C103.971 67.7846 103.545 68.5606 102.919 69.1697C102.294 69.7788 101.496 70.1936 100.628 70.3616C99.76 70.5297 98.8603 70.4434 98.0426 70.1138C97.2249 69.7841 96.526 69.2259 96.0342 68.5097C95.5425 67.7935 95.2801 66.9514 95.2801 66.0901C95.2815 64.9354 95.7535 63.8285 96.5924 63.012C97.4313 62.1956 98.5687 61.7362 99.7551 61.7348ZM99.7551 60.9414C98.7088 60.9414 97.6859 61.2434 96.816 61.8091C95.946 62.3749 95.2679 63.179 94.8675 64.1197C94.4671 65.0605 94.3624 66.0958 94.5665 67.0945C94.7706 68.0932 95.2745 69.0106 96.0143 69.7307C96.7542 70.4507 97.6968 70.9411 98.723 71.1398C99.7492 71.3384 100.813 71.2365 101.78 70.8468C102.746 70.4571 103.572 69.7972 104.154 68.9505C104.735 68.1038 105.045 67.1084 105.045 66.0901C105.045 64.7246 104.488 63.4151 103.496 62.4496C102.504 61.4841 101.158 60.9416 99.7551 60.9414Z" fill="black" stroke="#35008B" - stroke-width="2" + strokeWidth="2" /> { d="M83.6965 61.7348C84.5815 61.7348 85.4467 61.9902 86.1826 62.4688C86.9186 62.9474 87.4921 63.6276 87.8308 64.4234C88.1695 65.2192 88.2581 66.0949 88.0855 66.9397C87.9128 67.7846 87.4866 68.5606 86.8608 69.1697C86.2349 69.7788 85.4376 70.1936 84.5695 70.3616C83.7014 70.5297 82.8017 70.4434 81.984 70.1138C81.1663 69.7841 80.4674 69.2259 79.9756 68.5097C79.4839 67.7935 79.2215 66.9514 79.2215 66.0901C79.2229 64.9354 79.6949 63.8285 80.5338 63.012C81.3727 62.1956 82.5101 61.7362 83.6965 61.7348ZM83.6965 60.9414C82.6502 60.9414 81.6274 61.2434 80.7574 61.8091C79.8874 62.3749 79.2093 63.179 78.8089 64.1197C78.4085 65.0605 78.3038 66.0958 78.5079 67.0945C78.712 68.0932 79.2159 69.0106 79.9557 69.7307C80.6956 70.4507 81.6382 70.9411 82.6644 71.1398C83.6906 71.3384 84.7543 71.2365 85.7209 70.8468C86.6876 70.4571 87.5138 69.7972 88.0951 68.9505C88.6764 68.1038 88.9867 67.1084 88.9867 66.0901C88.9865 64.7246 88.4291 63.4151 87.437 62.4496C86.4449 61.4841 85.0995 60.9416 83.6965 60.9414Z" fill="black" stroke="#35008B" - stroke-width="2" + strokeWidth="2" /> { d="M67.6418 61.7348C68.5268 61.7348 69.392 61.9902 70.128 62.4688C70.8639 62.9474 71.4374 63.6276 71.7761 64.4234C72.1148 65.2192 72.2035 66.0949 72.0308 66.9397C71.8581 67.7846 71.4319 68.5606 70.8061 69.1697C70.1802 69.7788 69.3829 70.1936 68.5148 70.3616C67.6467 70.5297 66.747 70.4434 65.9293 70.1138C65.1116 69.7841 64.4127 69.2259 63.921 68.5097C63.4292 67.7935 63.1668 66.9514 63.1668 66.0901C63.1683 64.9354 63.6402 63.8285 64.4791 63.012C65.318 62.1956 66.4554 61.7362 67.6418 61.7348ZM67.6418 60.9414C66.5955 60.9414 65.5727 61.2434 64.7027 61.8091C63.8327 62.3749 63.1547 63.179 62.7543 64.1197C62.3539 65.0605 62.2491 66.0958 62.4532 67.0945C62.6573 68.0932 63.1612 69.0106 63.901 69.7307C64.6409 70.4507 65.5835 70.9411 66.6097 71.1398C67.6359 71.3384 68.6996 71.2365 69.6663 70.8468C70.6329 70.4571 71.4591 69.7972 72.0404 68.9505C72.6217 68.1038 72.932 67.1084 72.932 66.0901C72.9318 64.7246 72.3744 63.4151 71.3823 62.4496C70.3903 61.4841 69.0448 60.9416 67.6418 60.9414Z" fill="black" stroke="#35008B" - stroke-width="2" + strokeWidth="2" /> { { { ); From 806d9ff1fd3d2796854135f2bc98f740d87e9326 Mon Sep 17 00:00:00 2001 From: Mayur Date: Tue, 19 Nov 2024 12:02:55 +0530 Subject: [PATCH 6/6] feat: Added camelCase strokeMiterLimit --- .../illustrations/PlanCancelIllustration.tsx | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/apps/web/components/home/PlanDetails/illustrations/PlanCancelIllustration.tsx b/apps/web/components/home/PlanDetails/illustrations/PlanCancelIllustration.tsx index 83abb0759..679a24fa5 100644 --- a/apps/web/components/home/PlanDetails/illustrations/PlanCancelIllustration.tsx +++ b/apps/web/components/home/PlanDetails/illustrations/PlanCancelIllustration.tsx @@ -75,26 +75,21 @@ export const PlanCancelIllustration = () => { d="M244.746 26.6296C247.86 24.5862 251.486 23.4059 255.237 23.215C258.987 23.0241 262.72 23.8299 266.036 25.5461C269.352 27.2622 272.125 29.824 274.059 32.957C275.993 36.09 277.015 39.6761 277.015 43.3311C277.015 44.8521 277.344 48.5626 277.015 49.9865" stroke="#35008B" strokeWidth="3" - stroke-miterlimit="10" + strokeMiterlimit="10" /> - + { d="M25.5781 52.2147C26.5575 47.0665 29.0393 42.3017 32.727 38.4897C36.4148 34.6778 41.1524 31.98 46.3736 30.7188" stroke="#35008B" strokeWidth="4" - stroke-miterlimit="10" + strokeMiterlimit="10" /> { d="M6.94922 49.2369C8.46875 40.8686 12.3607 33.08 18.186 26.7496C24.0114 20.4193 31.5383 15.7991 39.9179 13.4102" stroke="#35008B" strokeWidth="4" - stroke-miterlimit="10" + strokeMiterlimit="10" />