diff --git a/src/components/Comment/MyCommentList/MyCommentList.module.scss b/src/components/Comment/MyCommentList/MyCommentList.module.scss index 0798ec7..dfe9275 100644 --- a/src/components/Comment/MyCommentList/MyCommentList.module.scss +++ b/src/components/Comment/MyCommentList/MyCommentList.module.scss @@ -5,4 +5,9 @@ margin-bottom: 20px; width: 100%; } + + .myCommentTypography { + @include flex_row(); + padding: 70px 0px; + } } diff --git a/src/components/Comment/MyCommentList/index.tsx b/src/components/Comment/MyCommentList/index.tsx index 145ea09..9b63c9d 100644 --- a/src/components/Comment/MyCommentList/index.tsx +++ b/src/components/Comment/MyCommentList/index.tsx @@ -2,15 +2,28 @@ import React from 'react'; import styles from './MyCommentList.module.scss'; import MyCommentContainer from '@src/components/Comment/MyCommentContainer'; import { useReadMyComment } from '@src/hooks/useMyPageQuery'; +import Typography from '@src/components/common/Typography'; const MyCommentList = () => { const { data } = useReadMyComment(); return (
- {data?.map((each) => ( - - ))} + {(data || []).length > 0 ? ( + <> + {data?.map((each) => ( + + ))} + + ) : ( + + 아직 작성된 글이 없습니다. + + )}
); }; diff --git a/src/components/Idea/MyIdeaList/MyIdeaList.module.scss b/src/components/Idea/MyIdeaList/MyIdeaList.module.scss index 2a32d4c..3ade043 100644 --- a/src/components/Idea/MyIdeaList/MyIdeaList.module.scss +++ b/src/components/Idea/MyIdeaList/MyIdeaList.module.scss @@ -1,19 +1,21 @@ .MyIdeaList { - @include flex_col(flex-start); + @include flex_col(flex-start); + width: 100%; + + .grid { + @include flex_row(flex-start, flex-start); + width: 100%; - - .grid { - @include flex_row(flex-start, flex-start); - - width: 100%; - - .gridColumn { - @include flex_col(flex-start); - background-clip: padding-box; - > div { - margin-bottom: 30px; - } + + .gridColumn { + @include flex_col(flex-start); + background-clip: padding-box; + > div { + margin-bottom: 30px; } } } - \ No newline at end of file + .myIdeaTypography { + padding: 70px 0px; + } +} diff --git a/src/components/Idea/MyIdeaList/index.tsx b/src/components/Idea/MyIdeaList/index.tsx index df42933..5173bca 100644 --- a/src/components/Idea/MyIdeaList/index.tsx +++ b/src/components/Idea/MyIdeaList/index.tsx @@ -5,6 +5,7 @@ import styles from './MyIdeaList.module.scss'; import Spinner from '@src/components/common/Spinner'; import IdeaMiniCardContainer from '@src/components/Idea/IdeaMiniCardContainer'; import { useReadMyIdea } from '@src/hooks/useMyPageQuery'; +import Typography from '@src/components/common/Typography'; const BREAKPOINT_COLS = { default: 4, @@ -19,16 +20,26 @@ const MyIdeaList = () => { return (
{isLoading && } - - {!isError && - data?.map((each) => ( - - ))} - + {(data || []).length > 0 ? ( + + {!isError && + data?.map((each) => ( + + ))} + + ) : ( + + 아직 작성된 글이 없습니다. + + )}
); }; diff --git a/src/components/MySideList/MySideList.module.scss b/src/components/MySideList/MySideList.module.scss index 372a2b1..79fa3a4 100644 --- a/src/components/MySideList/MySideList.module.scss +++ b/src/components/MySideList/MySideList.module.scss @@ -1,20 +1,23 @@ .MySideList { - @include flex_col(flex-start); + @include flex_col(flex-start); + width: 100%; + + .grid { + @include flex_row(flex-start, flex-start); + width: 100%; - - .grid { - @include flex_row(flex-start, flex-start); - - width: 100%; - padding-top: 22px; - - .gridColumn { - @include flex_col(flex-start); - background-clip: padding-box; - > div { - margin-bottom: 30px; - } + padding-top: 22px; + + .gridColumn { + @include flex_col(flex-start); + background-clip: padding-box; + > div { + margin-bottom: 30px; } } } - \ No newline at end of file + + .mySideTypography { + padding: 70px 0px; + } +} diff --git a/src/components/MySideList/index.tsx b/src/components/MySideList/index.tsx index 80991f3..2db6762 100644 --- a/src/components/MySideList/index.tsx +++ b/src/components/MySideList/index.tsx @@ -6,6 +6,7 @@ import { useMyReadSides } from '@src/hooks/useSideQuery'; import Spinner from '@src/components/common/Spinner'; import SideCard from '@src/components//SideCard'; import { useSideState } from '@src/store'; +import Typography from '@src/components/common/Typography'; const BREAKPOINT_COLS = { default: 4, @@ -21,13 +22,24 @@ const MySideList = () => { return (
{isLoading && } - - {!isError && data?.map((each) => )} - + {(data || []).length > 0 ? ( + + {!isError && + data?.map((each) => )} + + ) : ( + + 아직 작성된 글이 없습니다. + + )}
); }; diff --git a/src/pages/MyPage/MyPage.module.scss b/src/pages/MyPage/MyPage.module.scss index c7032c8..0d65faf 100644 --- a/src/pages/MyPage/MyPage.module.scss +++ b/src/pages/MyPage/MyPage.module.scss @@ -57,6 +57,11 @@ margin-bottom: 50px; overflow-x: auto; gap: 20px; + .myAlarmTypography { + @include flex_row(); + width: 100%; + padding: 70px 0px; + } } } diff --git a/src/pages/MyPage/index.tsx b/src/pages/MyPage/index.tsx index 969f76f..b535775 100644 --- a/src/pages/MyPage/index.tsx +++ b/src/pages/MyPage/index.tsx @@ -11,6 +11,8 @@ import { useReadAlarm } from '@src/hooks/useMyPageQuery'; import MyIdeaList from '@src/components/Idea/MyIdeaList'; import MyCommentList from '@src/components/Comment/MyCommentList'; import AlarmCardContainer from '@src/components/AlarmCardContainer'; +import useModalControl from '@src/hooks/useModalControl'; +import AlertModal from '@src/components/modals/AlertModal'; interface MyPageProps { handleToTop?: () => void; @@ -26,7 +28,14 @@ const MyPage = ({ handleToTop }: MyPageProps) => { const { data } = useGetUser(isAuth ?? false); - const { data: alarmData } = useReadAlarm(); + const { data: alarmData } = useReadAlarm(isAuth ?? false); + + const { + isModalVisible: isAlertVisible, + modalMessage: alertMessage, + showModal: showAlert, + hideModal: hideAlert, + } = useModalControl(); return (
@@ -44,23 +53,40 @@ const MyPage = ({ handleToTop }: MyPageProps) => { />
- +
- {(alarmData || [])?.length > 0 && ( -
-
- - 알람 - -
-
- {alarmData?.map((props) => ( +
+
+ + 알람 + +
+
+ {(alarmData || [])?.length > 0 ? ( + alarmData?.map((props) => ( - ))} -
+ )) + ) : ( + + 새로운 알람이 없습니다. + + )}
- )} +
); }; diff --git a/src/pages/SidePage/SidePage.module.scss b/src/pages/SidePage/SidePage.module.scss index 8c62a1b..6e82ce2 100644 --- a/src/pages/SidePage/SidePage.module.scss +++ b/src/pages/SidePage/SidePage.module.scss @@ -18,6 +18,10 @@ backdrop-filter: blur(30px); z-index: 100; + + &.isGithubVisible { + z-index: 0; + } .Typography { width: fit-content; diff --git a/src/pages/SidePage/index.tsx b/src/pages/SidePage/index.tsx index ad50d46..928a102 100644 --- a/src/pages/SidePage/index.tsx +++ b/src/pages/SidePage/index.tsx @@ -53,7 +53,7 @@ const SidePage = ({ handleToTop }: SidePageProps) => { } = useModalControl(); const { - isModalVisible: isIdeaFormVisible, + isModalVisible: isGithubVisible, showModal: showGithubModal, hideModal: hideGithubModal, } = useModalControl(); @@ -66,7 +66,12 @@ const SidePage = ({ handleToTop }: SidePageProps) => { return (
-
+
사이드 @@ -173,7 +178,7 @@ const SidePage = ({ handleToTop }: SidePageProps) => { iconName="add" /> )} - {isIdeaFormVisible && ( + {isGithubVisible && ( )} {isAlertVisible && (