Skip to content

Commit 2478892

Browse files
authored
Merge pull request #78 from Goorm-Synergy/hotfix/QA
fix: 디자인 QA 수정사항 반영
2 parents 632be99 + aebe812 commit 2478892

11 files changed

Lines changed: 8 additions & 8 deletions

File tree

-1.31 MB
Binary file not shown.

src/assets/default-booth-image.png

-5.77 KB
Binary file not shown.

src/assets/default-profile-img.png

-775 KB
Binary file not shown.
1.53 KB
Loading

src/components/AdminHeader.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { useLogoutMutation } from '@stores/server/auth';
77

88
const Header = () => {
99
const theme = useTheme();
10-
const navigate = useNavigate();
1110
const { mutate } = useLogoutMutation();
1211
const handleLogout = () => {
1312
mutate();

src/components/BoothPage/BoothColumn.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { css, styled, useTheme } from '@mui/material';
22
import { BoothContent } from '@routes/pages/BoothPage';
33
import { useNavigate } from 'react-router-dom';
4-
import DefaultImage from '@assets/default-booth-image.png';
4+
import DefaultImage from '@assets/defaultImg_boothsession.png';
55

66
const BoothColumn = ({
77
id,

src/components/MyInfoPage/BasicInformation.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Box, Typography, useTheme } from '@mui/material';
2-
import images from '@assets/default-profile-img.png';
2+
import images from '@assets/profile-rectangle/useDefault.png';
33

44
interface Props {
55
name: string;

src/components/SessionPage/Information.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
22
import { css, styled, Typography, useTheme } from '@mui/material';
33
import { formatToHourMinute, getTimeDifferenceText } from '@utils/time';
4-
import DefaultImage from '@assets/deafult-session-image.png';
4+
import DefaultImage from '@assets/defaultImg_boothsession.png';
55

66
interface Props {
77
id: number;

src/components/SessionPage/SessionColumn.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { css, styled, useTheme } from '@mui/material';
22
import { SessionContent } from '@routes/pages/SessionPage';
33
import { getTimeDifferenceText } from '@utils/time';
44
import { useNavigate } from 'react-router-dom';
5-
import DefaultImage from '@assets/deafult-session-image.png';
5+
import DefaultImage from '@assets/defaultImg_boothsession.png';
66
import dayjs from 'dayjs';
77

88
const SessionColumn = ({

src/components/headers/AdminHeader.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@ import { Box, Typography, Button } from '@mui/material';
33
import { css, useTheme } from '@mui/material/styles';
44
import LogoutOutlinedIcon from '@mui/icons-material/LogoutOutlined';
55
import { typography } from '@styles/foundation';
6+
import { useLogoutMutation } from '@stores/server/auth';
67

78
const Header = () => {
89
const theme = useTheme();
910
const navigate = useNavigate();
11+
const { mutate } = useLogoutMutation();
1012

1113
const handleLogout = () => {
12-
// TODO: 로그아웃 로직
13-
navigate('/role-selection');
14+
mutate();
1415
};
1516

1617
const headerWrapperStyle = css`

0 commit comments

Comments
 (0)