diff --git a/frontend/src/components/DashBoard/DashboardDiscussion/DiscussionItem.tsx b/frontend/src/components/DashBoard/DashboardDiscussion/DiscussionItem.tsx index b11db9bb..9ca1a752 100644 --- a/frontend/src/components/DashBoard/DashboardDiscussion/DiscussionItem.tsx +++ b/frontend/src/components/DashBoard/DashboardDiscussion/DiscussionItem.tsx @@ -6,7 +6,7 @@ import { formatDateString } from '@/utils/formatDateString'; interface DiscussionItemProps { id: number; mission: string; - hashTags: HashTag[]; + hashTags?: HashTag[]; title: string; imageUrl: string; commentCount: number; @@ -27,9 +27,10 @@ export default function DiscussionItem({ {mission && {mission}} - {hashTags.map((hashTag) => { - return {hashTag.name}; - })} + {hashTags && + hashTags.map((hashTag) => { + return {hashTag.name}; + })} {title} {formatDateString(createdAt)} diff --git a/frontend/src/components/DashBoard/DashboardDiscussion/index.tsx b/frontend/src/components/DashBoard/DashboardDiscussion/index.tsx index 9683ce31..4d6a73e8 100644 --- a/frontend/src/components/DashBoard/DashboardDiscussion/index.tsx +++ b/frontend/src/components/DashBoard/DashboardDiscussion/index.tsx @@ -30,16 +30,16 @@ export default function DashBoardDiscussionList() { return ( <> - {!discussionList.length ? ( + {!discussionList?.length ? ( ) : ( - {discussionList.map((discussion) => { + {discussionList?.map((discussion) => { return ( - 🚀 DEVEL UP + + DEVEL UP + diff --git a/frontend/src/hooks/useSubmitSolutionMutation.ts b/frontend/src/hooks/useSubmitSolutionMutation.ts index 78ee2dea..731837f1 100644 --- a/frontend/src/hooks/useSubmitSolutionMutation.ts +++ b/frontend/src/hooks/useSubmitSolutionMutation.ts @@ -18,7 +18,11 @@ const useSubmitSolutionMutation = ({ }: UseSubmissionMutationParams) => { const navigate = useNavigate(); - const { mutate: submitSolutionMutation, isPending } = useSingleRequestMutation({ + const { + mutate: submitSolutionMutation, + isPending, + isError: isSubmitSolutionError, + } = useSingleRequestMutation({ mutationFn: postSolutionSubmit, onSuccess: ({ id }) => { onSuccessCallback(); diff --git a/frontend/src/index.tsx b/frontend/src/index.tsx index b7d5ec0c..f75de0ff 100644 --- a/frontend/src/index.tsx +++ b/frontend/src/index.tsx @@ -296,28 +296,28 @@ export const router = createBrowserRouter(routes, { // return worker.start(); // } -enableMocking().then(() => { - root.render( - - - - - - - - - , - ); -}); +// enableMocking().then(() => { +// root.render( +// +// +// +// +// +// +// +// +// , +// ); +// }); -// root.render( -// -// -// -// -// -// -// -// -// , -// ); +root.render( + + + + + + + + + , +); diff --git a/frontend/src/pages/DashboardPage/DashBoardPageLayout/DashBoardPageLayout.styled.ts b/frontend/src/pages/DashboardPage/DashBoardPageLayout/DashBoardPageLayout.styled.ts index d7767620..34fcb089 100644 --- a/frontend/src/pages/DashboardPage/DashBoardPageLayout/DashBoardPageLayout.styled.ts +++ b/frontend/src/pages/DashboardPage/DashBoardPageLayout/DashBoardPageLayout.styled.ts @@ -10,7 +10,6 @@ export const Container = styled.div` width: 100rem; ${media.large` - width: 80rem; padding: 3rem 0; gap: 3rem; `} diff --git a/frontend/src/pages/DashboardPage/Discussion/index.tsx b/frontend/src/pages/DashboardPage/Discussion/index.tsx index ba29d3a3..1356788e 100644 --- a/frontend/src/pages/DashboardPage/Discussion/index.tsx +++ b/frontend/src/pages/DashboardPage/Discussion/index.tsx @@ -1,5 +1,10 @@ import DashBoardDiscussionList from '@/components/DashBoard/DashboardDiscussion'; +import SpinnerSuspense from '@/components/common/SpinnerSuspense'; export default function DashboardDiscussionPage() { - return ; + return ( + + + + ); } diff --git a/frontend/src/pages/DashboardPage/DiscussionComment/index.tsx b/frontend/src/pages/DashboardPage/DiscussionComment/index.tsx index 8373c8eb..d9ed44a2 100644 --- a/frontend/src/pages/DashboardPage/DiscussionComment/index.tsx +++ b/frontend/src/pages/DashboardPage/DiscussionComment/index.tsx @@ -1,5 +1,10 @@ import DiscussionCommentList from '@/components/DashBoard/DiscussionComment'; +import SpinnerSuspense from '@/components/common/SpinnerSuspense'; export default function DashboardDiscussionCommentPage() { - return ; + return ( + + + + ); }