review : 리뷰 사항 적용

layout-SY · layout-SY · commit e2c113d9a431 · 2025-06-02T15:44:24.000+09:00
diff --git a/src/api/alarm.api.ts b/src/api/alarm.api.ts
@@ -50,6 +50,6 @@ export const testLiveAlarm = async () => {
       throw e;
     }
   } else {
-    return;
+    throw new Error('인증 토큰이 없습니다.');
   }
 };
diff --git a/src/components/admin/previewComponent/allUserPreview/AllUserPreview.styled.ts b/src/components/admin/previewComponent/allUserPreview/AllUserPreview.styled.ts
@@ -39,6 +39,6 @@ export const Text = styled.p`
 `;
 
 export const Arrow = styled.img`
-  width: 10px;
-  height: 10px;
+  width: 11px;
+  height: 11px;
 `;
diff --git a/src/components/admin/previewComponent/allUserPreview/AllUserPreview.tsx b/src/components/admin/previewComponent/allUserPreview/AllUserPreview.tsx
@@ -4,9 +4,18 @@ import { useGetAllUsers } from '../../../../hooks/admin/useGetAllUsers';
 import Avatar from '../../../common/avatar/Avatar';
 import { ADMIN_ROUTE } from '../../../../constants/routes';
 import arrow_right from '../../../../assets/ArrowRight.svg';
+import LoadingSpinner from '../../../common/loadingSpinner/LoadingSpinner';
 
 const AllUserPreview = () => {
-  const { allUserData, isLoading } = useGetAllUsers();
+  const { allUserData, isLoading, isFetching } = useGetAllUsers();
+
+  if (isLoading || isFetching) {
+    return <LoadingSpinner />;
+  }
+
+  if (!allUserData || allUserData.length === 0) {
+    return <S.Container>가입된 회원이 없습니다.</S.Container>;
+  }
 
   const previewList = allUserData
     ? allUserData.length > 6
@@ -19,7 +28,7 @@ const AllUserPreview = () => {
       {previewList?.map((user) => (
         <S.Wrapper key={user.id}>
           <S.UserArea>
-            <Avatar image={undefined} size='40px' />
+            <Avatar image={user.user.img} size='40px' />
             <S.ContentArea to={`${ADMIN_ROUTE.allUser}/${user.id}`}>
               <S.NickName>{user.user.nickname}</S.NickName>
               <S.Email>{user.email}</S.Email>
diff --git a/src/components/admin/previewComponent/inquiresPreview/InquiresPreview.styled.ts b/src/components/admin/previewComponent/inquiresPreview/InquiresPreview.styled.ts
@@ -23,7 +23,7 @@ export const Inquiry = styled(Link)`
 
 export const Category = styled.p`
   font-size: 9px;
-  opacity: 50%;
+  opacity: 0.5;
 `;
 
 export const Title = styled.p`
@@ -37,14 +37,14 @@ export const StateArea = styled.div`
   display: flex;
 `;
 
-export const Date = styled.p`
+export const InquiriesDate = styled.p`
   font-size: 9px;
-  opacity: 50%;
+  opacity: 0.5;
 `;
 
 export const Divider = styled.p`
   font-size: 9px;
-  opacity: 20%;
+  opacity: 0.2;
   margin-left: 3px;
   margin-right: 3px;
 `;
diff --git a/src/components/admin/previewComponent/inquiresPreview/InquiresPreview.tsx b/src/components/admin/previewComponent/inquiresPreview/InquiresPreview.tsx
@@ -3,9 +3,18 @@ import { useGetAllInquiries } from '../../../../hooks/admin/useGetAllInquiries';
 import Avatar from '../../../common/avatar/Avatar';
 import { ADMIN_ROUTE } from '../../../../constants/routes';
 import arrow_right from '../../../../assets/ArrowRight.svg';
+import LoadingSpinner from '../../../common/loadingSpinner/LoadingSpinner';
 
 const InquiresPreview = () => {
-  const { allInquiriesData } = useGetAllInquiries();
+  const { allInquiriesData, isLoading, isFetching } = useGetAllInquiries();
+
+  if (isLoading || isFetching) {
+    return <LoadingSpinner />;
+  }
+
+  if (!allInquiriesData || allInquiriesData.length === 0) {
+    return <S.Container>등록된 공지사항이 없습니다.</S.Container>;
+  }
 
   const previewList = allInquiriesData
     ? allInquiriesData.length > 6
@@ -24,7 +33,7 @@ const InquiresPreview = () => {
               <S.Category>{inquiry.category}</S.Category>
               <S.Title>{inquiry.title}</S.Title>
               <S.StateArea>
-                <S.Date>{inquiry.createdAt}</S.Date>
+                <S.InquiriesDate>{inquiry.createdAt}</S.InquiriesDate>
                 <S.Divider>|</S.Divider>
                 <S.InquiryState $isCompleted={inquiry.state}>
                   {inquiry.state ? '답변 완료' : '답변 대기 중'}
diff --git a/src/components/admin/previewComponent/noticePreview/NoticePreview.tsx b/src/components/admin/previewComponent/noticePreview/NoticePreview.tsx
@@ -2,13 +2,25 @@ import React from 'react';
 import * as S from './NoticePreview.styled';
 import { useGetNotice } from '../../../../hooks/user/useGetNotice';
 import line from '../../../../assets/line.svg';
+import LoadingSpinner from '../../../common/loadingSpinner/LoadingSpinner';
 
 const NoticePreview = () => {
-  const { noticeData } = useGetNotice({ keyword: '', page: 1 });
+  const { noticeData, isLoading, isFetching } = useGetNotice({
+    keyword: '',
+    page: 1,
+  });
+
+  if (isLoading || isFetching) {
+    return <LoadingSpinner />;
+  }
+
+  if (!noticeData?.notices || noticeData.notices.length === 0) {
+    return <S.Container>공지사힝이 없습니다.</S.Container>;
+  }
 
   return (
     <S.Container>
-      {noticeData?.notices.map((notice) => (
+      {noticeData.notices.map((notice) => (
         <S.Wrapper key={notice.id}>
           <S.Dot src={line} />
           <S.NoticeTitle>{notice.title}</S.NoticeTitle>
diff --git a/src/components/admin/previewComponent/reportsPreview/ReportsPreview.styled.ts b/src/components/admin/previewComponent/reportsPreview/ReportsPreview.styled.ts
@@ -23,7 +23,7 @@ export const ContentArea = styled.div`
 
 export const ImposedCount = styled.div`
   font-size: 9px;
-  opacity: 50%;
+  opacity: 0.5;
 `;
 
 export const Category = styled.p`
@@ -37,14 +37,14 @@ export const StateArea = styled.div`
   display: flex;
 `;
 
-export const Date = styled.p`
+export const ReportDate = styled.p`
   font-size: 9px;
-  opacity: 50%;
+  opacity: 0.5;
 `;
 
 export const Divider = styled.p`
   font-size: 9px;
-  opacity: 20%;
+  opacity: 0.2;
   margin-left: 3px;
   margin-right: 3px;
 `;
diff --git a/src/components/admin/previewComponent/reportsPreview/ReportsPreview.tsx b/src/components/admin/previewComponent/reportsPreview/ReportsPreview.tsx
@@ -16,17 +16,17 @@ const ReportsPreview = () => {
   return (
     <S.Container>
       {previewList?.map((report) => (
-        <S.Wrapper>
+        <S.Wrapper key={report.id}>
           <S.ReportArea to={`${ADMIN_ROUTE.reports}/${report.id}`}>
             <Avatar image={report.user.img} size='40px' />
             <S.ContentArea>
               <S.ImposedCount>{report.imposedCount} 번</S.ImposedCount>
               <S.Category>{report.category}</S.Category>
               <S.StateArea>
-                <S.Date>{report.createdAt}</S.Date>
+                <S.ReportDate>{report.createdAt}</S.ReportDate>
                 <S.Divider>|</S.Divider>
-                <S.IsImposed $isImposed={report.IsImposed}>
-                  {report.IsImposed ? '검토 완료' : '검토 미완료'}
+                <S.IsImposed $isImposed={report.isImposed}>
+                  {report.isImposed ? '검토 완료' : '검토 미완료'}
                 </S.IsImposed>
               </S.StateArea>
             </S.ContentArea>
diff --git a/src/constants/admin/mainItems.ts b/src/constants/admin/mainItems.ts
@@ -20,7 +20,7 @@ export const cardList: CardItem[] = [
     Component: AllUserPreview,
   },
   {
-    key: 'inquires',
+    key: 'inquiries',
     title: '문의 확인',
     link: `${ADMIN_ROUTE.inquiries}`,
     Component: InquiresPreview,
diff --git a/src/hooks/admin/useGetAllInquiries.ts b/src/hooks/admin/useGetAllInquiries.ts
@@ -3,10 +3,14 @@ import { getAllInquiries } from '../../api/activityLog.api';
 import { ActivityLog } from '../queries/user/keys';
 
 export const useGetAllInquiries = () => {
-  const { data: allInquiriesData, isLoading } = useQuery({
+  const {
+    data: allInquiriesData,
+    isLoading,
+    isFetching,
+  } = useQuery({
     queryKey: [ActivityLog.allInquiries],
     queryFn: () => getAllInquiries(),
   });
 
-  return { allInquiriesData, isLoading };
+  return { allInquiriesData, isLoading, isFetching };
 };
diff --git a/src/hooks/admin/useGetAllUsers.ts b/src/hooks/admin/useGetAllUsers.ts
@@ -1,12 +1,16 @@
 import { useQuery } from '@tanstack/react-query';
-import { ReportData } from '../queries/user/keys';
+import { UserData } from '../queries/user/keys';
 import { getAllUsers } from '../../api/auth.api';
 
 export const useGetAllUsers = () => {
-  const { data: allUserData, isLoading } = useQuery({
-    queryKey: [ReportData.allReports],
+  const {
+    data: allUserData,
+    isLoading,
+    isFetching,
+  } = useQuery({
+    queryKey: [UserData.allUser],
     queryFn: () => getAllUsers(),
   });
 
-  return { allUserData, isLoading };
+  return { allUserData, isLoading, isFetching };
 };
diff --git a/src/hooks/queries/user/keys.ts b/src/hooks/queries/user/keys.ts
@@ -59,3 +59,7 @@ export const CustomerService = {
 export const ReportData = {
   allReports: ['AllReports'],
 };
+
+export const UserData = {
+  allUser: ['AllUser'],
+};
diff --git a/src/hooks/user/useGetNotice.ts b/src/hooks/user/useGetNotice.ts
@@ -6,12 +6,16 @@ import { CustomerService } from '../queries/user/keys';
 export const useGetNotice = (searchProperty: NoticeSearch) => {
   const { keyword, page } = searchProperty;
 
-  const { data: noticeData, isLoading } = useQuery({
+  const {
+    data: noticeData,
+    isLoading,
+    isFetching,
+  } = useQuery({
     queryKey: [CustomerService.notice, keyword, page],
     queryFn: () => getNotice(searchProperty),
     staleTime: Infinity,
     gcTime: Infinity,
   });
 
-  return { noticeData, isLoading };
+  return { noticeData, isLoading, isFetching };
 };
diff --git a/src/mock/mockReports.json b/src/mock/mockReports.json
@@ -11,7 +11,7 @@
         "nickname": "alice",
         "img": "https://example.com/images/alice.png"
       },
-      "IsImposed": false,
+      "isImposed": false,
       "createdAt": "2025-05-01"
     },
     {
@@ -23,7 +23,7 @@
         "nickname": "charlie",
         "img": "https://example.com/images/charlie.jpeg"
       },
-      "IsImposed": true,
+      "isImposed": true,
       "createdAt": "2025-05-03"
     },
     {
@@ -35,7 +35,7 @@
         "nickname": "daisy",
         "img": "https://example.com/images/daisy.png"
       },
-      "IsImposed": false,
+      "isImposed": false,
       "createdAt": "2025-05-05"
     },
     {
@@ -47,7 +47,7 @@
         "nickname": "eve",
         "img": "https://example.com/images/eve.jpg"
       },
-      "IsImposed": true,
+      "isImposed": true,
       "createdAt": "2025-05-07"
     },
     {
@@ -60,7 +60,7 @@
         "img": "https://example.com/images/frank.png"
       },
 
-      "IsImposed": false,
+      "isImposed": false,
       "createdAt": "2025-05-09"
     },
     {
@@ -72,7 +72,7 @@
         "nickname": "henry",
         "img": "https://example.com/images/henry.jpg"
       },
-      "IsImposed": true,
+      "isImposed": true,
       "createdAt": "2025-05-11"
     },
     {
@@ -85,7 +85,7 @@
         "img": "https://example.com/images/iris.png"
       },
 
-      "IsImposed": false,
+      "isImposed": false,
       "createdAt": "2025-05-13"
     },
     {
@@ -97,7 +97,7 @@
         "nickname": "kate",
         "img": "https://example.com/images/kate.jpeg"
       },
-      "IsImposed": true,
+      "isImposed": true,
       "createdAt": "2025-05-15"
     },
     {
@@ -109,7 +109,7 @@
         "nickname": "leo",
         "img": "https://example.com/images/leo.png"
       },
-      "IsImposed": true,
+      "isImposed": true,
       "createdAt": "2025-05-17"
     },
     {
@@ -121,7 +121,7 @@
         "nickname": "nate",
         "img": "https://example.com/images/nate.png"
       },
-      "IsImposed": false,
+      "isImposed": false,
       "createdAt": "2025-05-19"
     }
   ]
diff --git a/src/models/auth.ts b/src/models/auth.ts
@@ -35,7 +35,6 @@ export interface ApiGetAllUsers extends ApiCommonType {
 export interface AllUser {
   id: number;
   email: string;
-  name: string;
   user: User;
   createdAt: string;
 }
diff --git a/src/models/report.ts b/src/models/report.ts
@@ -16,6 +16,6 @@ export interface AllReports {
   imposedCount: number;
   category: string;
   user: User;
-  IsImposed: boolean;
+  isImposed: boolean;
   createdAt: string;
 }

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,6 @@ export const testLiveAlarm = async () => {`
`50`	`50`	`throw e;`
`51`	`51`	`}`
`52`	`52`	`} else {`
`53`		`- return;`
	`53`	`+ throw new Error('인증 토큰이 없습니다.');`
`54`	`54`	`}`
`55`	`55`	`};`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ export const cardList: CardItem[] = [`
`20`	`20`	`Component: AllUserPreview,`
`21`	`21`	`},`
`22`	`22`	`{`
`23`		`- key: 'inquires',`
	`23`	`+ key: 'inquiries',`
`24`	`24`	`title: '문의 확인',`
`25`	`25`	link: `${ADMIN_ROUTE.inquiries}`,
`26`	`26`	`Component: InquiresPreview,`