Skip to content

fix(app): change logout trigger #486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
typeofweb merged 5 commits into from
Jan 5, 2023
Merged

fix(app): change logout trigger #486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
88eec09
fix(app): change logout trigger
grzegorzpokorski Jan 4, 2023
ef64239
fix(app): add accessible name to logout button
grzegorzpokorski Jan 4, 2023
07536f0
Update apps/app/src/components/Header/UserAvatar.tsx
grzegorzpokorski Jan 5, 2023
318e928
fix typo
grzegorzpokorski Jan 5, 2023
b85c41a
Merge branch 'develop' into fix-logout-button
grzegorzpokorski Jan 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions apps/app/src/components/Header/LoginNavigationLink.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,23 @@ export const LoginNavigationLink = ({
onClick?: MouseEventHandler<HTMLAnchorElement>;
}) => {
const pathname = usePathname();
const { userData, isLoading } = useUser();
const { userData, isLoading, logout } = useUser();

if (isLoading) {
return null;
}

if (userData) {
return <UserAvatar userData={userData} />;
return (
<button
type="button"
className="mx-auto flex transition-opacity hover:opacity-80"
onClick={() => logout.mutate({})}
>
<UserAvatar userData={userData} />
<span className="sr-only">wyloguj się</span>
</button>
);
}

return (
Expand Down
5 changes: 1 addition & 4 deletions apps/app/src/components/Header/UserAvatar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
"use client";

import { useUser } from "../../hooks/useUser";
import { UserData } from "../../types";
import { GitHubAvatar } from "../GitHubAvatar";

Expand All @@ -9,7 +8,6 @@ type UserAvatarProps = Readonly<{
}>;

export const UserAvatar = ({ userData }: UserAvatarProps) => {
const { logout } = useUser();
const { _user } = userData;

return (
Expand All @@ -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 rounded-full"
/>
);
};