Merge pull request #168 from COW-dev/fix/#163

COW-dev · Sep 12, 2024 · 38a03d4 · 38a03d4
2 parents 54225bb + d8c6d2a
commit 38a03d4
Show file tree

Hide file tree

Showing 36 changed files with 349 additions and 299 deletions.
diff --git a/src/apis/index.ts b/src/apis/index.ts
@@ -283,12 +283,12 @@ export async function deleteClub({ clubId, token }: DeleteClub) {
   });
 }
 export async function deleteFixComment({
-  fixZonId,
+  fixZoneId,
   commentId,
   token,
 }: DeleteFixComment) {
   return await api.delete(
-    `/admin/fix-zones/${fixZonId}/comments/${commentId}`,
+    `/admin/fix-zones/${fixZoneId}/comments/${commentId}`,
     {
       headers: {
         Authorization: 'Bearer ' + token,

diff --git a/src/assets/bin-black.svg b/src/assets/bin-black.svg
diff --git a/src/assets/bin.svg → src/assets/bin-red.svg b/src/assets/bin.svg → src/assets/bin-red.svg
diff --git a/src/assets/check_blue.svg → src/assets/check-blue.svg b/src/assets/check_blue.svg → src/assets/check-blue.svg
diff --git a/src/components/common/Dropdown.tsx b/src/components/common/Dropdown.tsx
diff --git a/src/components/common/ExelDropdown.tsx b/src/components/common/ExelDropdown.tsx
@@ -32,7 +32,7 @@ export default function ExcelDropdown() {
         id="dropdownHoverButton"
         data-dropdown-toggle="dropdownHover"
         data-dropdown-trigger="hover"
-        className="md:text-md inline-flex min-w-fit items-center rounded-lg bg-green-100 px-5 py-2.5 text-center text-sm font-bold text-green-500 hover:bg-green-200 focus:outline-none "
+        className="inline-flex w-20 items-center justify-center rounded-lg bg-green-100 py-2.5 text-center text-sm font-bold text-green-500 hover:bg-green-200 focus:outline-none md:w-32"
         type="button"
         onClick={handleClickExcel}
       >
@@ -56,21 +56,21 @@ export default function ExcelDropdown() {
       {isOpenMoal && (
         <div
           id="dropdownHover"
-          className="relative z-20 m-auto min-w-fit divide-y divide-gray-100 rounded-lg bg-green-200 shadow "
+          className="relative z-20 m-auto min-w-fit divide-y divide-gray-100 rounded-lg bg-green-200 shadow"
         >
           <ul
-            className="absolute -right-18 z-10 mt-2 w-44 rounded-xl border-[1px] bg-white py-2 text-sm text-gray-700 shadow-lg"
+            className="absolute right-0 z-10 mt-2 w-32 rounded-xl border-[1px] bg-white py-2 text-sm text-gray-700 shadow-lg"
             aria-labelledby="dropdownHoverButton"
           >
             <li
               onClick={handleClickDownload}
-              className="block cursor-pointer px-4 py-2 font-semibold hover:bg-gray-100"
+              className="block cursor-pointer px-3 py-2 font-semibold hover:bg-gray-100"
             >
               동아리원 다운받기
             </li>
             <li
               onClick={openModal}
-              className="block cursor-pointer px-4 py-2 font-semibold hover:bg-gray-100"
+              className="block cursor-pointer px-3 py-2 font-semibold hover:bg-gray-100"
             >
               동아리원 업로드
             </li>

diff --git a/src/components/common/Heading.tsx b/src/components/common/Heading.tsx
@@ -1,5 +1,5 @@
 type HeadingProps = {
-  children: string;
+  children: React.ReactNode;
 };
 
 export default function Heading({ children }: HeadingProps) {

diff --git a/src/components/common/UploadImage.tsx b/src/components/common/UploadImage.tsx
@@ -14,6 +14,7 @@ type UploadImageProps = {
     | Dispatch<SetStateAction<ClubDetail>>;
   urlsName?: string;
   setRemoveFile?: Dispatch<SetStateAction<boolean>>;
+  id?: number;
 };
 
 export default function UploadImage({
@@ -23,6 +24,7 @@ export default function UploadImage({
   imageUrls,
   setNoticeData,
   setRemoveFile,
+  id,
 }: UploadImageProps) {
   const [previewImageUrl, setPreviewImageUrl] = useState<string>('');
   useEffect(() => {
@@ -80,7 +82,7 @@ export default function UploadImage({
         </>
       ) : (
         <label
-          htmlFor="dropzone-file"
+          htmlFor={`dropzone-file-${id}`}
           className=" dar flex h-64 w-full cursor-pointer flex-col items-center justify-center rounded-lg border-2 border-none border-gray-300 bg-gray-50 hover:bg-gray-100"
         >
           <div className="flex flex-col items-center justify-center pb-6 pt-5 text-gray-400">
@@ -91,7 +93,7 @@ export default function UploadImage({
             </p>
           </div>
           <input
-            id="dropzone-file"
+            id={`dropzone-file-${id}`}
             type="file"
             className="hidden"
             accept="image/*"

diff --git a/src/components/documents/DocumentList.tsx b/src/components/documents/DocumentList.tsx
@@ -1,7 +1,7 @@
 import { useEffect, useState } from 'react';
 import Image from 'next/image';
 import { useCookies } from 'react-cookie';
-import Bin from '@/assets/bin.svg';
+import Bin from '@/assets/bin-red.svg';
 import Download from '@/assets/download.svg';
 import { ROLE_TYPE } from '@/constants/text';
 import { useAllDocuments } from '@/hooks/api/document/useAllDocuments';
@@ -75,7 +75,7 @@ export default function DocumentList() {
               }`}
             >
               <Image
-                className=" mb-1 h-5 w-5 cursor-pointer hover:opacity-50 md:h-6 md:w-6 "
+                className="mb-1 h-5 w-5 cursor-pointer hover:opacity-50 md:h-6 md:w-6 "
                 src={Download}
                 alt={'다운로드 이미지'}
                 width={24}
@@ -84,7 +84,7 @@ export default function DocumentList() {
               />
               {role === ROLE_TYPE.ROLE_ADMIN && (
                 <Image
-                  className=" h-5 w-5 cursor-pointer hover:opacity-50 md:h-6 md:w-6"
+                  className="h-5 w-5 cursor-pointer hover:opacity-50 md:h-6 md:w-6"
                   src={Bin}
                   alt={'휴지통 이미지'}
                   width={24}

diff --git a/src/components/fix/FixAdminList.tsx b/src/components/fix/FixAdminList.tsx
@@ -1,6 +1,6 @@
 import { useCookies } from 'react-cookie';
 import { useAllFix } from '@/hooks/api/fixzone/useAllFix';
-import { sortFixZone } from '@/utils/sort';
+import { sortFixZone } from '@/utils/change';
 import FixItem from './FixItem';
 
 export default function FixAdminList() {

diff --git a/src/components/fix/FixClubList.tsx b/src/components/fix/FixClubList.tsx
@@ -1,6 +1,6 @@
 import { useCookies } from 'react-cookie';
 import { useMyFix } from '@/hooks/api/fixzone/useMyFix';
-import { sortFixZone } from '@/utils/sort';
+import { sortFixZone } from '@/utils/change';
 import FixItem from './FixItem';
 
 export default function FixClubList() {