From 8f0ed347908d6253de0472522630584f1fc47f03 Mon Sep 17 00:00:00 2001 From: Fedor Katurov Date: Sun, 9 Jan 2022 20:52:02 +0700 Subject: [PATCH] fixed toasts --- src/hooks/auth/useLoginForm.ts | 1 - src/hooks/auth/useLoginLogoutRestore.ts | 9 ++++++++- src/utils/toast/styles.module.scss | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/hooks/auth/useLoginForm.ts b/src/hooks/auth/useLoginForm.ts index bd325a7a..ab783ffe 100644 --- a/src/hooks/auth/useLoginForm.ts +++ b/src/hooks/auth/useLoginForm.ts @@ -24,7 +24,6 @@ export const useLoginForm = ( try { await fetcher(values.username, values.password); onSuccess(); - showToastSuccess(getRandomPhrase('WELCOME')); } catch (error) { showErrorToast(error); diff --git a/src/hooks/auth/useLoginLogoutRestore.ts b/src/hooks/auth/useLoginLogoutRestore.ts index ea4c7618..671aeef2 100644 --- a/src/hooks/auth/useLoginLogoutRestore.ts +++ b/src/hooks/auth/useLoginLogoutRestore.ts @@ -1,16 +1,23 @@ import { useAuthStore } from '~/store/auth/useAuthStore'; import { useCallback } from 'react'; import { apiUserLogin } from '~/api/auth'; +import { showErrorToast } from '~/utils/errors/showToast'; +import { getRandomPhrase } from '~/constants/phrases'; +import { showToastInfo, showToastSuccess } from '~/utils/toast'; export const useLoginLogoutRestore = () => { const auth = useAuthStore(); - const logout = useCallback(() => auth.logout(), [auth]); + const logout = useCallback(() => { + auth.logout(); + showToastInfo(getRandomPhrase('GOODBYE')); + }, [auth]); const login = useCallback( async (username: string, password: string) => { const result = await apiUserLogin({ username, password }); auth.setToken(result.token); + showToastInfo(getRandomPhrase('WELCOME')); return result.user; }, [auth] diff --git a/src/utils/toast/styles.module.scss b/src/utils/toast/styles.module.scss index e0738133..2b0c3f8e 100644 --- a/src/utils/toast/styles.module.scss +++ b/src/utils/toast/styles.module.scss @@ -2,6 +2,7 @@ .toast { @include outer_shadow; + cursor: pointer; font: $font_14_semibold; user-select: none;