From e13296c02a0fc7cb766c9ce63af46e9bb8961165 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Fri, 25 Mar 2022 10:10:42 -0700 Subject: [PATCH 1/4] Small visual tweaks to the toastbar message Dropped the font down a little because the degular font is slighty smaller than inter. Made the X icon bold. --- packages/web/lib/toastHelpers.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/web/lib/toastHelpers.tsx b/packages/web/lib/toastHelpers.tsx index ea76bb39b..e0cefe827 100644 --- a/packages/web/lib/toastHelpers.tsx +++ b/packages/web/lib/toastHelpers.tsx @@ -16,7 +16,7 @@ const toastStyles = { } const messageStyles = { - fontSize: 16, + fontSize: 14, fontWeight: 'bolder', color: 'white', flex: 1, @@ -42,7 +42,7 @@ const showToast = ( {type === 'success' ? : } {message} - toast.dismiss(id)} /> + toast.dismiss(id)} /> ), From 166ff3f906582613b2b6b67bdc0f66183900a9fb Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Fri, 25 Mar 2022 10:12:46 -0700 Subject: [PATCH 2/4] Remove exclamation marks from messages --- packages/web/pages/settings/emails.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/web/pages/settings/emails.tsx b/packages/web/pages/settings/emails.tsx index 76e4697f7..fb9e2157e 100644 --- a/packages/web/pages/settings/emails.tsx +++ b/packages/web/pages/settings/emails.tsx @@ -183,14 +183,14 @@ export default function EmailsPage(): JSX.Element { applyStoredTheme(false) async function createEmail(): Promise { - showSuccessToast('Email Created!') + showSuccessToast('Email Created') await createNewsletterEmailMutation() revalidate() } async function deleteEmail(id: string): Promise { await deleteNewsletterEmailMutation(id) revalidate() - showSuccessToast('Email Deleted!') + showSuccessToast('Email Deleted') } return ( From c668835c3abad0c6d16a30a8bb627df0c52b9458 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Fri, 25 Mar 2022 10:13:16 -0700 Subject: [PATCH 3/4] Update yarn.lock --- yarn.lock | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/yarn.lock b/yarn.lock index 4d670d192..da860aa7c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4432,6 +4432,27 @@ "@babel/runtime" "^7.13.10" "@radix-ui/react-compose-refs" "0.1.0" +"@radix-ui/react-tooltip@^0.1.7": + version "0.1.7" + resolved "https://registry.yarnpkg.com/@radix-ui/react-tooltip/-/react-tooltip-0.1.7.tgz#6f8c00d6e489565d14abf209ce0fb8853c8c8ee3" + integrity sha512-eiBUsVOHenZ0JR16tl970bB0DafJBz6mFgSGfIGIVpflFj0LIsIDiLMsYyvYdx1KwwsIUDTEZtxcPm/sWjPzqA== + dependencies: + "@babel/runtime" "^7.13.10" + "@radix-ui/primitive" "0.1.0" + "@radix-ui/react-compose-refs" "0.1.0" + "@radix-ui/react-context" "0.1.1" + "@radix-ui/react-id" "0.1.5" + "@radix-ui/react-popper" "0.1.4" + "@radix-ui/react-portal" "0.1.4" + "@radix-ui/react-presence" "0.1.2" + "@radix-ui/react-primitive" "0.1.4" + "@radix-ui/react-slot" "0.1.2" + "@radix-ui/react-use-controllable-state" "0.1.0" + "@radix-ui/react-use-escape-keydown" "0.1.0" + "@radix-ui/react-use-previous" "0.1.1" + "@radix-ui/react-use-rect" "0.1.1" + "@radix-ui/react-visually-hidden" "0.1.4" + "@radix-ui/react-use-body-pointer-events@0.1.0": version "0.1.0" resolved "https://registry.yarnpkg.com/@radix-ui/react-use-body-pointer-events/-/react-use-body-pointer-events-0.1.0.tgz#29b211464493f8ca5149ce34b96b95abbc97d741" From 0a459a20c4b769e1079e545f06b18ae4acdd800b Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Fri, 25 Mar 2022 10:35:19 -0700 Subject: [PATCH 4/4] Show success/error toasts for archiving and removing --- .../queries/useGetLibraryItemsQuery.tsx | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/packages/web/lib/networking/queries/useGetLibraryItemsQuery.tsx b/packages/web/lib/networking/queries/useGetLibraryItemsQuery.tsx index 64cf8d78d..70a66ca71 100644 --- a/packages/web/lib/networking/queries/useGetLibraryItemsQuery.tsx +++ b/packages/web/lib/networking/queries/useGetLibraryItemsQuery.tsx @@ -7,6 +7,7 @@ import { setLinkArchivedMutation } from '../mutations/setLinkArchivedMutation' import { deleteLinkMutation } from '../mutations/deleteLinkMutation' import { articleReadingProgressMutation } from '../mutations/articleReadingProgressMutation' import { Label } from './useGetLabelsQuery' +import { showErrorToast, showSuccessToast } from '../../toastHelpers' export type LibraryItemsQueryInput = { limit: number @@ -206,6 +207,12 @@ export function useGetLibraryItemsQuery({ setLinkArchivedMutation({ linkId: item.node.id, archived: true, + }).then((res) => { + if (res) { + showSuccessToast('Link archived', { position: 'bottom-right' }) + } else { + showErrorToast('Error archiving link', { position: 'bottom-right' }) + } }) break @@ -225,11 +232,24 @@ export function useGetLibraryItemsQuery({ setLinkArchivedMutation({ linkId: item.node.id, archived: false, + }).then((res) => { + if (res) { + showSuccessToast('Link unarchived', { position: 'bottom-right' }) + } else { + showErrorToast('Error unarchiving link', { position: 'bottom-right' }) + } }) break case 'delete': updateData(undefined) deleteLinkMutation(item.node.id) + .then((res) => { + if (res) { + showSuccessToast('Link removed', { position: 'bottom-right' }) + } else { + showErrorToast('Error removing link', { position: 'bottom-right' }) + } + }) break case 'mark-read': updateData({