From 6e9a9f4a82e622f96a77af7391572f9c2600913f Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Thu, 26 Oct 2023 11:57:50 +0800 Subject: [PATCH 1/6] Display account size --- packages/web/pages/settings/account.tsx | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/web/pages/settings/account.tsx b/packages/web/pages/settings/account.tsx index 0051bbbd2..a6b6f5f7d 100644 --- a/packages/web/pages/settings/account.tsx +++ b/packages/web/pages/settings/account.tsx @@ -8,7 +8,7 @@ import { } from '../../components/elements/LayoutPrimitives' import { StyledText } from '../../components/elements/StyledText' import { SettingsLayout } from '../../components/templates/SettingsLayout' -import { styled } from '../../components/tokens/stitches.config' +import { styled, theme } from '../../components/tokens/stitches.config' import { updateEmailMutation } from '../../lib/networking/mutations/updateEmailMutation' import { updateUserMutation } from '../../lib/networking/mutations/updateUserMutation' import { updateUserProfileMutation } from '../../lib/networking/mutations/updateUserProfileMutation' @@ -18,6 +18,7 @@ import { useValidateUsernameQuery } from '../../lib/networking/queries/useValida import { applyStoredTheme } from '../../lib/themeUpdater' import { showErrorToast, showSuccessToast } from '../../lib/toastHelpers' import { ConfirmationModal } from '../../components/patterns/ConfirmationModal' +import { ProgressBar } from '../../components/elements/ProgressBar' const StyledLabel = styled('label', { fontWeight: 600, @@ -371,7 +372,7 @@ export default function Account(): JSX.Element { - {/* - + {`${libraryCount} of 50K library items used.`} + + {`NOTE: this is a soft limit, if you are approaching or have exceeded this limit please contact support to have your limit raised.`} + )} - */} + Date: Thu, 26 Oct 2023 12:06:31 +0800 Subject: [PATCH 2/6] Add a link to the bulk tool on the delete account page --- packages/web/pages/settings/delete-my-account.tsx | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/packages/web/pages/settings/delete-my-account.tsx b/packages/web/pages/settings/delete-my-account.tsx index d1e65cbfd..566391511 100644 --- a/packages/web/pages/settings/delete-my-account.tsx +++ b/packages/web/pages/settings/delete-my-account.tsx @@ -89,8 +89,18 @@ export default function DeleteMyAccount(): JSX.Element { distribution="start" alignment="start" > - Deleting your account will delete all your saved items, notes, and - highlights. This operation can not be undone. +

+ Deleting your account will delete all your saved items, notes, and + highlights. This operation can not be undone. Note that once your + account is deleted you will not be able to create a new account + with the same username/email for at least 24hrs. +

+

+ If you are deleting your account because you've imported too many + items, and want a "fresh start" you can try using the{' '} + bulk tool to clean up your account + instead. +

{viewer && router ? ( + {/* */} Date: Thu, 26 Oct 2023 12:52:13 +0800 Subject: [PATCH 4/6] Multiply for percentage --- packages/web/pages/settings/account.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/web/pages/settings/account.tsx b/packages/web/pages/settings/account.tsx index 79f8270ef..d4cc1252a 100644 --- a/packages/web/pages/settings/account.tsx +++ b/packages/web/pages/settings/account.tsx @@ -388,7 +388,7 @@ export default function Account(): JSX.Element { {!isValidating && ( <> Date: Thu, 26 Oct 2023 12:59:28 +0800 Subject: [PATCH 5/6] Escaping --- packages/web/pages/settings/delete-my-account.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/web/pages/settings/delete-my-account.tsx b/packages/web/pages/settings/delete-my-account.tsx index 566391511..d9f78568e 100644 --- a/packages/web/pages/settings/delete-my-account.tsx +++ b/packages/web/pages/settings/delete-my-account.tsx @@ -96,9 +96,9 @@ export default function DeleteMyAccount(): JSX.Element { with the same username/email for at least 24hrs.

- If you are deleting your account because you've imported too many - items, and want a "fresh start" you can try using the{' '} - bulk tool to clean up your account + If you are deleting your account because you've imported too + many items, and want a "fresh start" you can try using + the bulk tool to clean up your account instead.

{viewer && router ? ( From 8e7a0a0bccf3750ae49014d734f11eedaeb1310e Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Thu, 26 Oct 2023 13:01:00 +0800 Subject: [PATCH 6/6] Use Link instead of a --- packages/web/pages/settings/delete-my-account.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/web/pages/settings/delete-my-account.tsx b/packages/web/pages/settings/delete-my-account.tsx index d9f78568e..250c76cc0 100644 --- a/packages/web/pages/settings/delete-my-account.tsx +++ b/packages/web/pages/settings/delete-my-account.tsx @@ -13,6 +13,7 @@ import { HStack, VStack } from '../../components/elements/LayoutPrimitives' import { useGetViewerQuery } from '../../lib/networking/queries/useGetViewerQuery' import { Loader } from '../../components/templates/SavingRequest' import { deleteAccountMutation } from '../../lib/networking/mutations/deleteAccountMutation' +import Link from 'next/link' export default function DeleteMyAccount(): JSX.Element { const router = useRouter() @@ -98,8 +99,8 @@ export default function DeleteMyAccount(): JSX.Element {

If you are deleting your account because you've imported too many items, and want a "fresh start" you can try using - the bulk tool to clean up your account - instead. + the bulk tool to clean up your + account instead.

{viewer && router ? (