refactor: 수정사항 반영

woowacourse-teams · Oct 24, 2024 · 0e1eb5e · 0e1eb5e
1 parent e34c503
commit 0e1eb5e
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 36 deletions.
diff --git 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({
       <S.TextWrapper>
         <S.HashTagWrapper>
           {mission && <S.HashTag $isTitle>{mission}</S.HashTag>}
-          {hashTags.map((hashTag) => {
-            return <S.HashTag key={hashTag.id}>{hashTag.name}</S.HashTag>;
-          })}
+          {hashTags &&
+            hashTags.map((hashTag) => {
+              return <S.HashTag key={hashTag.id}>{hashTag.name}</S.HashTag>;
+            })}
         </S.HashTagWrapper>
         <S.CommentText>{title}</S.CommentText>
         <S.SubText>{formatDateString(createdAt)}</S.SubText>

diff --git 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 ? (
         <NoContent type="dashboardDiscussion" />
       ) : (
         <S.Container>
-          {discussionList.map((discussion) => {
+          {discussionList?.map((discussion) => {
             return (
               <DiscussionItem
                 key={discussion.id}
                 id={discussion.id}
-                hashTags={discussion.hashTags}
+                hashTags={discussion?.hashTags || []}
                 title={discussion.title}
                 mission={discussion.mission}
                 imageUrl={discussion.member?.imageUrl}

diff --git a/frontend/src/components/common/Error/ErrorLogo.tsx b/frontend/src/components/common/Error/ErrorLogo.tsx
@@ -1,12 +1,15 @@
 import * as S from '@/components/Header/Header.styled';
+import LogoImg from '@/assets/images/logo.svg';
 
 export default function ErrorLogo() {
   return (
     <>
       <S.Container>
         <S.Wrapper>
           <S.LeftPart>
-            <S.Logo>🚀 DEVEL UP</S.Logo>
+            <S.Logo>
+              <LogoImg width={30} height={30} /> DEVEL UP
+            </S.Logo>
           </S.LeftPart>
         </S.Wrapper>
       </S.Container>

diff --git 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
@@ -296,28 +296,28 @@ export const router = createBrowserRouter(routes, {
 //   return worker.start();
 // }
 
-enableMocking().then(() => {
-  root.render(
-    <React.StrictMode>
-      <QueryClientProvider client={queryClient}>
-        <ThemeProvider theme={theme}>
-          <ReactQueryDevtools initialIsOpen={false} />
-          <GlobalStyle />
-          <RouterProvider router={router} />
-        </ThemeProvider>
-      </QueryClientProvider>
-    </React.StrictMode>,
-  );
-});
+// enableMocking().then(() => {
+//   root.render(
+//     <React.StrictMode>
+//       <QueryClientProvider client={queryClient}>
+//         <ThemeProvider theme={theme}>
+//           <ReactQueryDevtools initialIsOpen={false} />
+//           <GlobalStyle />
+//           <RouterProvider router={router} />
+//         </ThemeProvider>
+//       </QueryClientProvider>
+//     </React.StrictMode>,
+//   );
+// });
 
-// root.render(
-//   <React.StrictMode>
-//     <QueryClientProvider client={queryClient}>
-//       <ReactQueryDevtools />
-//       <ThemeProvider theme={theme}>
-//         <GlobalStyle />
-//         <RouterProvider router={router} />
-//       </ThemeProvider>
-//     </QueryClientProvider>
-//   </React.StrictMode>,
-// );
+root.render(
+  <React.StrictMode>
+    <QueryClientProvider client={queryClient}>
+      <ReactQueryDevtools />
+      <ThemeProvider theme={theme}>
+        <GlobalStyle />
+        <RouterProvider router={router} />
+      </ThemeProvider>
+    </QueryClientProvider>
+  </React.StrictMode>,
+);
diff --git 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
@@ -1,5 +1,10 @@
 import DashBoardDiscussionList from '@/components/DashBoard/DashboardDiscussion';
+import SpinnerSuspense from '@/components/common/SpinnerSuspense';
 
 export default function DashboardDiscussionPage() {
-  return <DashBoardDiscussionList />;
+  return (
+    <SpinnerSuspense>
+      <DashBoardDiscussionList />
+    </SpinnerSuspense>
+  );
 }
diff --git 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 <DiscussionCommentList />;
+  return (
+    <SpinnerSuspense>
+      <DiscussionCommentList />
+    </SpinnerSuspense>
+  );
 }