Skip to content

Commit 243a254

Browse files
committed
Merge branch 'develop' of https://github.com/modern-agile-team/dongurami-front-v2 into feat/woo/QYOG-162
2 parents 1cd2255 + 7d4a05e commit 243a254

File tree

4 files changed

+54
-13
lines changed

4 files changed

+54
-13
lines changed

src/assets/woni/woni_happy.png

8.15 KB
Loading

src/components/UI/Header/Header.tsx

+4-13
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ import { accessTokenAtom } from "@/globalState";
1616
import { authSocialAPI } from "@/apis";
1717

1818
import Logo from "@/assets/main/logo.png";
19-
import { Row } from "@/components/Layouts";
19+
import { Column, Row } from "@/components/Layouts";
2020
import { Button } from "@/components/Design";
2121
import { WhatIF } from "@/components/Utilities";
22-
import { LoginButton } from "./private";
22+
import { LoginButton, LoggedIn } from "./private";
2323

2424
export default function Header({}: {}) {
25-
const { isLoggedIn, logout } = useAuth();
25+
const { isLoggedIn } = useAuth();
2626
const router = useRouter();
2727

2828
const [accessToken, setAccessToken] = useAtom(accessTokenAtom);
@@ -170,16 +170,7 @@ export default function Header({}: {}) {
170170
</Row.li>
171171
}
172172
>
173-
<Row.li>
174-
<Button.Text
175-
onClick={logout}
176-
typoSize="Head5"
177-
typoColor="neutral_60"
178-
hoverTypoColor="neutral_90"
179-
>
180-
로그아웃
181-
</Button.Text>
182-
</Row.li>
173+
<LoggedIn />
183174
</WhatIF>
184175
</Row.ul>
185176
</S.Container>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
/*
2+
* Created on Sun Jun 02 2024
3+
*
4+
* Copyright (c) 2024 Your Company
5+
*/
6+
7+
import styled from "@emotion/styled";
8+
import Image from "next/image";
9+
10+
import { Column, Row } from "@/components/Layouts";
11+
import { useAuth } from "@/hooks";
12+
import { Button } from "@/components/Design";
13+
14+
import woni_happy from "@/assets/woni/woni_happy.png";
15+
16+
export default function LoggedIn() {
17+
const { logout } = useAuth();
18+
19+
return (
20+
<Wrapper gap={12}>
21+
<Column gap={6}>
22+
<Button.Text
23+
typoSize="Head12"
24+
typoColor="neutral_50"
25+
hoverTypoColor="neutral_70"
26+
>
27+
내 정보
28+
</Button.Text>
29+
<Button.Text
30+
typoSize="Head12"
31+
typoColor="neutral_50"
32+
onClick={logout}
33+
hoverTypoColor="neutral_70"
34+
>
35+
로그아웃
36+
</Button.Text>
37+
</Column>
38+
<div css={{ position: "relative", minWidth: "32px", minHeight: "32px" }}>
39+
<Image src={woni_happy} alt="woni_happy" fill quality={30} />
40+
</div>
41+
</Wrapper>
42+
);
43+
}
44+
45+
const Wrapper = styled(Row.li)`
46+
border-radius: 20px;
47+
border: 2px solid ${({ theme }) => theme.color.primary_60};
48+
padding: 9px 14px;
49+
`;

src/components/UI/Header/private/index.ts

+1
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@
55
*/
66

77
export { default as LoginButton } from "./LoginButton";
8+
export { default as LoggedIn } from "./LoggedIn";

0 commit comments

Comments
 (0)