From 88eec09f8d85e0f446591e5ffaabdf7cfb9bd186 Mon Sep 17 00:00:00 2001 From: Grzegorz Pokorski Date: Wed, 4 Jan 2023 21:12:18 +0100 Subject: [PATCH 1/4] fix(app): change logout trigger --- .../src/components/Header/LoginNavigationLink.tsx | 12 ++++++++++-- apps/app/src/components/Header/UserAvatar.tsx | 5 +---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/apps/app/src/components/Header/LoginNavigationLink.tsx b/apps/app/src/components/Header/LoginNavigationLink.tsx index 5590cab7..c2774f1f 100644 --- a/apps/app/src/components/Header/LoginNavigationLink.tsx +++ b/apps/app/src/components/Header/LoginNavigationLink.tsx @@ -12,14 +12,22 @@ export const LoginNavigationLink = ({ onClick?: MouseEventHandler; }) => { const pathname = usePathname(); - const { userData, isLoading } = useUser(); + const { userData, isLoading, logout } = useUser(); if (isLoading) { return null; } if (userData) { - return ; + return ( + + ); } return ( diff --git a/apps/app/src/components/Header/UserAvatar.tsx b/apps/app/src/components/Header/UserAvatar.tsx index a4087f21..11cc29cb 100644 --- a/apps/app/src/components/Header/UserAvatar.tsx +++ b/apps/app/src/components/Header/UserAvatar.tsx @@ -1,6 +1,5 @@ "use client"; -import { useUser } from "../../hooks/useUser"; import { UserData } from "../../types"; import { GitHubAvatar } from "../GitHubAvatar"; @@ -9,7 +8,6 @@ type UserAvatarProps = Readonly<{ }>; export const UserAvatar = ({ userData }: UserAvatarProps) => { - const { logout } = useUser(); const { _user } = userData; return ( @@ -18,8 +16,7 @@ export const UserAvatar = ({ userData }: UserAvatarProps) => { width={38} height={38} title="Kliknij, aby się wylogować" - onClick={() => logout.mutate({})} - className="mx-auto cursor-pointer rounded-full transition-opacity hover:opacity-80" + className="mx-auto cursor-pointer rounded-full" /> ); }; From ef64239c1fe9e9272f7b0675f6c93f31c8ac94c0 Mon Sep 17 00:00:00 2001 From: Grzegorz Pokorski Date: Wed, 4 Jan 2023 21:22:03 +0100 Subject: [PATCH 2/4] fix(app): add accessible name to logout button --- apps/app/src/components/Header/LoginNavigationLink.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/app/src/components/Header/LoginNavigationLink.tsx b/apps/app/src/components/Header/LoginNavigationLink.tsx index c2774f1f..956977b6 100644 --- a/apps/app/src/components/Header/LoginNavigationLink.tsx +++ b/apps/app/src/components/Header/LoginNavigationLink.tsx @@ -26,6 +26,7 @@ export const LoginNavigationLink = ({ onClick={() => logout.mutate({})} > + wyloguj się ); } From 07536f068dc0c2fc8625856557cd8bf2d92b08fc Mon Sep 17 00:00:00 2001 From: Grzegorz Pokorski Date: Thu, 5 Jan 2023 01:41:12 +0100 Subject: [PATCH 3/4] Update apps/app/src/components/Header/UserAvatar.tsx MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Michał Miszczyszyn --- apps/app/src/components/Header/UserAvatar.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/app/src/components/Header/UserAvatar.tsx b/apps/app/src/components/Header/UserAvatar.tsx index 11cc29cb..0f106b78 100644 --- a/apps/app/src/components/Header/UserAvatar.tsx +++ b/apps/app/src/components/Header/UserAvatar.tsx @@ -16,7 +16,7 @@ export const UserAvatar = ({ userData }: UserAvatarProps) => { width={38} height={38} title="Kliknij, aby się wylogować" - className="mx-auto cursor-pointer rounded-full" + className="mx-auto rounded-full" /> ); }; From 318e92876d1d35d975be854faa9e32800829497d Mon Sep 17 00:00:00 2001 From: Grzegorz Pokorski Date: Thu, 5 Jan 2023 01:42:51 +0100 Subject: [PATCH 4/4] fix typo --- apps/app/src/components/Header/LoginNavigationLink.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/app/src/components/Header/LoginNavigationLink.tsx b/apps/app/src/components/Header/LoginNavigationLink.tsx index 956977b6..ffc41170 100644 --- a/apps/app/src/components/Header/LoginNavigationLink.tsx +++ b/apps/app/src/components/Header/LoginNavigationLink.tsx @@ -26,7 +26,7 @@ export const LoginNavigationLink = ({ onClick={() => logout.mutate({})} > - wyloguj się + wyloguj się ); }