fix: challenge get API에서 location, 태그 삭제

team-Ollie · Jul 2, 2024 · 03e8514 · 03e8514
1 parent bbfeed8
commit 03e8514
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 34 deletions.
diff --git a/apis/challenge.ts b/apis/challenge.ts
@@ -8,7 +8,6 @@ export interface Challenge {
   challengeIdx: number;
   name: string;
   participantsCount: number;
-  location: string;
   locatedPlace: string;
   schedule: string;
   myAttendanceRate: number;

diff --git a/components/home/adminChallenge.tsx b/components/home/adminChallenge.tsx
@@ -3,7 +3,6 @@ import FlexBox from "../Flexbox";
 import { useRouter } from "next/router";
 import { Challenge as ChallengeType } from "@/apis/challenge";
 import { usePostAttendanceCode } from "@/apis/hooks/admin";
-import Tag from "./tag";
 
 interface ChallengeProps {
   setIsModalVisible: React.Dispatch<React.SetStateAction<boolean>>;
@@ -22,18 +21,12 @@ const AdminChallenge: NextPage<ChallengeProps> = ({
   return (
     <FlexBox direction="col" className="p-4 w-full rounded-lg border gap-4">
       <FlexBox direction="col" className="w-full gap-1">
-        <FlexBox className="w-full items-center gap-2">
+        <FlexBox className="w-full items-start">
           <div className="h2">{challengeInfo.name}</div>
-          <FlexBox className="gap-1">
-            {challengeInfo.location !== null ? (
-              <Tag name={challengeInfo.location} />
-            ) : null}
-            <Tag name="예술(변경필)" />
-          </FlexBox>
         </FlexBox>
         <div className="h4 self-start">
-          {challengeInfo.locatedPlace ?? challengeInfo.location} |{" "}
-          {challengeInfo.schedule}
+          {challengeInfo.locatedPlace ? `${challengeInfo.locatedPlace} | ` : ""}
+          매주 {challengeInfo.schedule}요일
         </div>
       </FlexBox>
       <FlexBox direction="col" className="w-full gap-2">

diff --git a/components/home/challenge.tsx b/components/home/challenge.tsx
@@ -4,7 +4,6 @@ import { useRouter } from "next/router";
 import { Challenge as ChallengeType } from "@/apis/challenge";
 import { useAtom } from "jotai";
 import { challengeIdxAtom } from "@/utils/atom";
-import Tag from "./tag";
 
 interface ChallengeProps {
   setIsModalVisible: React.Dispatch<React.SetStateAction<boolean>>;
@@ -31,22 +30,14 @@ const Challenge: NextPage<ChallengeProps> = ({
         onClick={() => router.push("/challenge")}
       >
         <FlexBox className="w-full justify-between items-start">
-          <FlexBox className="gap-2">
-            <div className="h2">{challengeInfo.name}</div>
-            <FlexBox className="gap-1">
-              {challengeInfo.location !== null ? (
-                <Tag name={challengeInfo.location} />
-              ) : null}
-              <Tag name="예술(변경필)" />
-            </FlexBox>
-          </FlexBox>
+          <div className="h2">{challengeInfo.name}</div>
           <div className="h4 text-grey-500">
             {challengeInfo.participantsCount}명 참여 중
           </div>
         </FlexBox>
         <div className="h4 self-start">
-          {challengeInfo.locatedPlace ?? challengeInfo.location} | 매주{" "}
-          {challengeInfo.schedule}요일
+          {challengeInfo.locatedPlace ? `${challengeInfo.locatedPlace} | ` : ""}
+          매주 {challengeInfo.schedule}요일
         </div>
       </FlexBox>
       <FlexBox direction="col" className="w-full gap-1">

diff --git a/components/home/tag.tsx b/components/home/tag.tsx