From 092d42746cb2bbd3b976f61fe75f2599f67aa473 Mon Sep 17 00:00:00 2001 From: namdaeun Date: Wed, 17 Jan 2024 17:12:37 +0900 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=EC=8A=A4=EC=BC=88=EB=A0=88?= =?UTF-8?q?=ED=86=A4=20=ED=8C=8C=EC=9D=BC=20=EC=83=9D=EC=84=B1=20=EB=B0=8F?= =?UTF-8?q?=20=ED=8B=80=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/components/CarouselSkeleton.tsx | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 src/pages/main/components/CarouselSkeleton.tsx diff --git a/src/pages/main/components/CarouselSkeleton.tsx b/src/pages/main/components/CarouselSkeleton.tsx new file mode 100644 index 00000000..558ab3b8 --- /dev/null +++ b/src/pages/main/components/CarouselSkeleton.tsx @@ -0,0 +1,45 @@ +import styled from '@emotion/styled/macro'; +import React from 'react'; +import 'react-loading-skeleton/dist/skeleton.css'; + +interface skeletonPropTypes { + width?: number; + height?: number; + circle?: boolean; + rounded?: boolean; + count?: number; + unit?: string; // 단위 + animation?: boolean; + color?: string; + style?: React.CSSProperties; +} + +const CarouselSkeleton = ({ + width, + height, + circle, + rounded, + count, + unit, + animation, + color, + style, +}: skeletonPropTypes) => { + return ( + + ); +}; + +export default CarouselSkeleton; + +const SkeletonWrapper = styled.div``; From 2bb91c110ff015bb528a1edb0368c2fcde69586e Mon Sep 17 00:00:00 2001 From: namdaeun Date: Wed, 17 Jan 2024 18:07:24 +0900 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=EB=A1=9C=EA=B7=B8=EC=95=84?= =?UTF-8?q?=EC=9B=83=20=ED=95=B8=EB=93=A4=EB=9F=AC=20=ED=95=A8=EC=88=98=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/main/components/MainHeader.tsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/pages/main/components/MainHeader.tsx b/src/pages/main/components/MainHeader.tsx index 7ab763cd..355b79b8 100644 --- a/src/pages/main/components/MainHeader.tsx +++ b/src/pages/main/components/MainHeader.tsx @@ -9,7 +9,11 @@ import MakeGroupBtn from '../../groupFeed/components/MakeGroupBtn'; import MyGroupBtn from '../../groupFeed/components/MyGroupBtn'; // 메인 페이지 헤더 -export const MainHeader = () => { +export const LogInHeader = () => { + const handleLogOut = () => { + logout(); + alert('로그아웃 되었습니다'); + }; return ( @@ -17,7 +21,7 @@ export const MainHeader = () => { - 로그아웃 + 로그아웃 From 7886c231c1732a8788012ac12f149d66d367535c Mon Sep 17 00:00:00 2001 From: namdaeun Date: Wed, 17 Jan 2024 18:07:47 +0900 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=ED=86=A0=ED=81=B0=20=EC=97=AC?= =?UTF-8?q?=EB=B6=80=EC=97=90=20=EB=94=B0=EB=9D=BC=20=ED=97=A4=EB=8D=94=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/main/Main.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/main/Main.tsx b/src/pages/main/Main.tsx index 05c556d2..f0d99d0f 100644 --- a/src/pages/main/Main.tsx +++ b/src/pages/main/Main.tsx @@ -5,7 +5,7 @@ import FaqDropdown from './components/FaqDropdown'; import FaqTitle from './components/FaqTitle'; import GroupCarouselTitle from './components/GroupCarouselTitle'; import Introduction from './components/Introduction'; -import { MainHeader } from './components/MainHeader'; +import { LogInHeader, UnAuthorizationHeader } from './components/MainHeader'; import Manual from './components/Manual'; import OnBoarding from './components/OnBoarding'; import Ruler from './components/Ruler'; @@ -17,7 +17,7 @@ import Spacing from './../../components/commons/Spacing'; const Main = () => { return ( - + {localStorage.getItem('accessToken') === null ? : } From 2fce7d6aca766e80183bf86e1cf5ee1f26cbc48b Mon Sep 17 00:00:00 2001 From: namdaeun Date: Wed, 17 Jan 2024 20:46:18 +0900 Subject: [PATCH 4/4] =?UTF-8?q?feat:=20=EB=A1=9C=EA=B7=B8=EC=95=84?= =?UTF-8?q?=EC=9B=83=EC=8B=9C=20=ED=99=94=EB=A9=B4=20=EB=A6=AC=EB=A1=9C?= =?UTF-8?q?=EB=93=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/main/components/MainHeader.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pages/main/components/MainHeader.tsx b/src/pages/main/components/MainHeader.tsx index 355b79b8..6268604c 100644 --- a/src/pages/main/components/MainHeader.tsx +++ b/src/pages/main/components/MainHeader.tsx @@ -13,7 +13,9 @@ export const LogInHeader = () => { const handleLogOut = () => { logout(); alert('로그아웃 되었습니다'); + location.reload(); }; + return (