Merge pull request #75 from FINAL-TEAM4/common

데일리, 이벤트 페이지 리팩토링
FINAL-TEAM4 · Sep 18, 2023 · 0a759e5 · 0a759e5
2 parents f7e4f20 + 77bf9a6
commit 0a759e5
Show file tree

Hide file tree

Showing 20 changed files with 457 additions and 190 deletions.
diff --git a/public/Chamyo.json b/public/Chamyo.json
@@ -0,0 +1,20 @@
+{
+  "joinList": [
+    {
+      "images": "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQRp0xN4URcOq2KtcxwNAd8cbjNaSc0KnT2OqyeEPiEs4zMffxomu4zP4ihz-lOJcnpCGc&usqp=CAU",
+      "nickName": "꿍이집사"
+    },{
+      "images": "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQRp0xN4URcOq2KtcxwNAd8cbjNaSc0KnT2OqyeEPiEs4zMffxomu4zP4ihz-lOJcnpCGc&usqp=CAU",
+      "nickName": "꿍이집사"
+    },{
+      "images": "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQRp0xN4URcOq2KtcxwNAd8cbjNaSc0KnT2OqyeEPiEs4zMffxomu4zP4ihz-lOJcnpCGc&usqp=CAU",
+      "nickName": "꿍이집사"
+    },{
+      "images": "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQRp0xN4URcOq2KtcxwNAd8cbjNaSc0KnT2OqyeEPiEs4zMffxomu4zP4ihz-lOJcnpCGc&usqp=CAU",
+      "nickName": "꿍이집사"
+    },{
+      "images": "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQRp0xN4URcOq2KtcxwNAd8cbjNaSc0KnT2OqyeEPiEs4zMffxomu4zP4ihz-lOJcnpCGc&usqp=CAU",
+      "nickName": "꿍이집사"
+    }
+  ]
+}
diff --git a/public/Cheonha.json b/public/Cheonha.json
@@ -1,19 +1,23 @@
 {
-  "title": "천하제일 집사대회",
-  "thumbnail": "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQRp0xN4URcOq2KtcxwNAd8cbjNaSc0KnT2OqyeEPiEs4zMffxomu4zP4ihz-lOJcnpCGc&usqp=CAU",
-  "images": [
-    "url",
-    "url"
-  ],
-  "kit_start_date":"2023-09-01",
-  "kit_end_date":"2023-09-01",
-  "reward_start_date":"2023-09-01",
-  "reward_end_date":"2023-09-01",
-  "rewardList":[
+  "data": [
     {
-      "itemId":1,
-      "name":"집사안심세트A"
+      "title": "천하제일 집사대회",
+      "thumbnail": "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQRp0xN4URcOq2KtcxwNAd8cbjNaSc0KnT2OqyeEPiEs4zMffxomu4zP4ihz-lOJcnpCGc&usqp=CAU",
+      "images": [
+        "url",
+        "url"
+      ],
+      "kit_start_date":"2023-09-01",
+      "kit_end_date":"2023-09-01",
+      "reward_start_date":"2023-09-01",
+      "reward_end_date":"2023-09-01",
+      "rewardList":[
+        {
+          "itemId":1,
+          "name":"집사안심세트A"
+        }
+      ],
+      "process": "unprocessed" 
     }
-  ],
-  "process": "unprocessed" 
+  ]
 }
diff --git a/public/Daily.json b/public/Daily.json
@@ -1,11 +1,47 @@
-[
-  {
-    "challengeId": 1,
-    "challengeName": "간식 바치기", 
-    "challengeReview": "반려동물에게 간식주는 사진 인증하기",
-    "thumbnail": "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQRp0xN4URcOq2KtcxwNAd8cbjNaSc0KnT2OqyeEPiEs4zMffxomu4zP4ihz-lOJcnpCGc&usqp=CAU",
-    "userId": 1, 
-    "review": [ 
+{
+  "data":[
+    {
+      "challengeId": 1,
+      "challengeName": "간식 바치기", 
+      "challengeReview": "반려동물에게 간식주는 사진 인증하기",
+      "thumbnail": "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQRp0xN4URcOq2KtcxwNAd8cbjNaSc0KnT2OqyeEPiEs4zMffxomu4zP4ihz-lOJcnpCGc&usqp=CAU",
+      "userId": 1, 
+      "review": [ 
+          {
+            "reviewUserId": 2,
+            "reviewUserNickname": "홍길동",
+            "reviewImgUrl": "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQRp0xN4URcOq2KtcxwNAd8cbjNaSc0KnT2OqyeEPiEs4zMffxomu4zP4ihz-lOJcnpCGc&usqp=CAU"
+          },
+          {
+            "reviewUserId": 3,
+            "reviewUserNickname": "고길동",
+            "reviewImgUrl": "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQRp0xN4URcOq2KtcxwNAd8cbjNaSc0KnT2OqyeEPiEs4zMffxomu4zP4ihz-lOJcnpCGc&usqp=CAU"
+          },
+          {
+            "reviewUserId": 4,
+            "reviewUserNickname": "도우너",
+            "reviewImgUrl": "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQRp0xN4URcOq2KtcxwNAd8cbjNaSc0KnT2OqyeEPiEs4zMffxomu4zP4ihz-lOJcnpCGc&usqp=CAU"
+          },
+          {
+            "reviewUserId": 5,
+            "reviewUserNickname": "둘리",
+            "reviewImgUrl": "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQRp0xN4URcOq2KtcxwNAd8cbjNaSc0KnT2OqyeEPiEs4zMffxomu4zP4ihz-lOJcnpCGc&usqp=CAU"
+          },
+          {
+            "reviewUserId": 6,
+            "reviewUserNickname": "희동이",
+            "reviewImgUrl": "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQRp0xN4URcOq2KtcxwNAd8cbjNaSc0KnT2OqyeEPiEs4zMffxomu4zP4ihz-lOJcnpCGc&usqp=CAU"
+          }
+      ],
+      "status": true
+    },
+    {
+      "challengeId": 2,
+      "challengeName": "산책 시키기", 
+      "challengeReview": "반려동물과 산책하는 사진 인증하기",
+      "thumbnail": "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQRp0xN4URcOq2KtcxwNAd8cbjNaSc0KnT2OqyeEPiEs4zMffxomu4zP4ihz-lOJcnpCGc&usqp=CAU",
+      "userId": 1, 
+      "review": [ 
         {
           "reviewUserId": 2,
           "reviewUserNickname": "홍길동",
@@ -15,37 +51,32 @@
           "reviewUserId": 3,
           "reviewUserNickname": "고길동",
           "reviewImgUrl": "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQRp0xN4URcOq2KtcxwNAd8cbjNaSc0KnT2OqyeEPiEs4zMffxomu4zP4ihz-lOJcnpCGc&usqp=CAU"
-        }
-    ],
-    "status": true
-  },
-  {
-    "challengeId": 2,
-    "challengeName": "산책 시키기", 
-    "challengeReview": "반려동물과 산책하는 사진 인증하기",
-    "thumbnail": "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQRp0xN4URcOq2KtcxwNAd8cbjNaSc0KnT2OqyeEPiEs4zMffxomu4zP4ihz-lOJcnpCGc&usqp=CAU",
-    "userId": 1, 
-    "review": [ 
+        },
         {
-          "reviewUserId": 2,
-          "reviewUserNickname": "홍길동",
+          "reviewUserId": 4,
+          "reviewUserNickname": "도우너",
           "reviewImgUrl": "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQRp0xN4URcOq2KtcxwNAd8cbjNaSc0KnT2OqyeEPiEs4zMffxomu4zP4ihz-lOJcnpCGc&usqp=CAU"
         },
         {
-          "reviewUserId": 3,
-          "reviewUserNickname": "고길동",
+          "reviewUserId": 5,
+          "reviewUserNickname": "둘리",
+          "reviewImgUrl": "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQRp0xN4URcOq2KtcxwNAd8cbjNaSc0KnT2OqyeEPiEs4zMffxomu4zP4ihz-lOJcnpCGc&usqp=CAU"
+        },
+        {
+          "reviewUserId": 6,
+          "reviewUserNickname": "희동이",
           "reviewImgUrl": "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQRp0xN4URcOq2KtcxwNAd8cbjNaSc0KnT2OqyeEPiEs4zMffxomu4zP4ihz-lOJcnpCGc&usqp=CAU"
         }
-    ],
-    "status": true
-  },
-  {
-    "challengeId": 3,
-    "challengeName": "위생 관리", 
-    "challengeReview": "청소하는 사진 인증하기",
-    "thumbnail": "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQRp0xN4URcOq2KtcxwNAd8cbjNaSc0KnT2OqyeEPiEs4zMffxomu4zP4ihz-lOJcnpCGc&usqp=CAU",
-    "userId": 1, 
-    "review": [ 
+      ],
+      "status": true
+    },
+    {
+      "challengeId": 3,
+      "challengeName": "위생 관리", 
+      "challengeReview": "청소하는 사진 인증하기",
+      "thumbnail": "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQRp0xN4URcOq2KtcxwNAd8cbjNaSc0KnT2OqyeEPiEs4zMffxomu4zP4ihz-lOJcnpCGc&usqp=CAU",
+      "userId": 1, 
+      "review": [ 
         {
           "reviewUserId": 2,
           "reviewUserNickname": "홍길동",
@@ -55,8 +86,25 @@
           "reviewUserId": 3,
           "reviewUserNickname": "고길동",
           "reviewImgUrl": "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQRp0xN4URcOq2KtcxwNAd8cbjNaSc0KnT2OqyeEPiEs4zMffxomu4zP4ihz-lOJcnpCGc&usqp=CAU"
+        },
+        {
+          "reviewUserId": 4,
+          "reviewUserNickname": "도우너",
+          "reviewImgUrl": "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQRp0xN4URcOq2KtcxwNAd8cbjNaSc0KnT2OqyeEPiEs4zMffxomu4zP4ihz-lOJcnpCGc&usqp=CAU"
+        },
+        {
+          "reviewUserId": 5,
+          "reviewUserNickname": "둘리",
+          "reviewImgUrl": "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQRp0xN4URcOq2KtcxwNAd8cbjNaSc0KnT2OqyeEPiEs4zMffxomu4zP4ihz-lOJcnpCGc&usqp=CAU"
+        },
+        {
+          "reviewUserId": 6,
+          "reviewUserNickname": "희동이",
+          "reviewImgUrl": "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQRp0xN4URcOq2KtcxwNAd8cbjNaSc0KnT2OqyeEPiEs4zMffxomu4zP4ihz-lOJcnpCGc&usqp=CAU"
         }
-    ],
-    "status": true
-  }
-]
+      ],
+      "status": true
+    }  
+  ]
+}
+
diff --git a/public/Nayegi.json b/public/Nayegi.json
@@ -1,20 +1,24 @@
 {
-  "title": "나 여기 가봤네",
-  "thumbnail": "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQRp0xN4URcOq2KtcxwNAd8cbjNaSc0KnT2OqyeEPiEs4zMffxomu4zP4ihz-lOJcnpCGc&usqp=CAU",
-  "images": [
-    "url",
-    "url"
-  ],
-  "kitStartDate":"2023-09-01",
-  "kitEndDate":"2023-09-01",
-  "rewardStartDate":"2023-09-01",
-  "rewardEndDate":"2023-09-01",
-  "rewardList":[
+  "data": [
     {
-      "itemId":1,
-      "name":"동물병원A"
+      "title": "나 여기 가봤네",
+      "thumbnail": "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQRp0xN4URcOq2KtcxwNAd8cbjNaSc0KnT2OqyeEPiEs4zMffxomu4zP4ihz-lOJcnpCGc&usqp=CAU",
+      "images": [
+        "url",
+        "url"
+      ],
+      "kitStartDate":"2023-09-01",
+      "kitEndDate":"2023-09-01",
+      "rewardStartDate":"2023-09-01",
+      "rewardEndDate":"2023-09-01",
+      "rewardList":[
+        {
+          "itemId":1,
+          "name":"동물병원A"
+        }
+      ],
+      "process": "unprocessed"
+
     }
-  ],
-  "process": "unprocessed"
-
+  ]
 }
diff --git a/public/Yanado.json b/public/Yanado.json
@@ -1,19 +1,23 @@
 {
-  "title": "야너도? 야나도!",
-  "thumbnail": "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQRp0xN4URcOq2KtcxwNAd8cbjNaSc0KnT2OqyeEPiEs4zMffxomu4zP4ihz-lOJcnpCGc&usqp=CAU",
-  "images": [
-    "url",
-    "url"
-  ],
-  "rewardStartDate":"2023-09-01",
-  "rewardEndDate":"2023-09-13",
-  "rewardList":[
+  "data":[
     {
-      "eventId":1,
-      "itemId":1,
-      "name":"14일중 원하는 날에 반려일기 10회작성"
+      "title": "야너도? 야나도!",
+      "thumbnail": "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQRp0xN4URcOq2KtcxwNAd8cbjNaSc0KnT2OqyeEPiEs4zMffxomu4zP4ihz-lOJcnpCGc&usqp=CAU",
+      "images": [
+        "url",
+        "url"
+      ],
+      "rewardStartDate":"2023-09-01",
+      "rewardEndDate":"2023-09-13",
+      "rewardList":[
+        {
+          "eventId":1,
+          "itemId":1,
+          "name":"14일중 원하는 날에 반려일기 10회작성"
+        }
+      ],
+      "process": "unprocessed"
+
     }
-  ],
-  "process": "unprocessed"
-
+  ]
 }
diff --git a/src/components/challenge/ChallengeJoin.tsx b/src/components/challenge/ChallengeJoin.tsx
@@ -5,15 +5,16 @@ interface joinProps {
 }
 
 const ChallengeJoin: React.FC<joinProps> = ({ join }) => {
+
   return (
     <>
-      <div className={styles.participants}>
-        <span className={styles.title}>{join.participantsTitle}</span>
-        <div className={styles.info}>
-          <div className={styles.img}>{join.participantsImg}</div>
-          <div className={styles.name}>
-            <span>{join.participantsName}</span>
-          </div>
+      <div className={styles.info}>
+        <img 
+          src={join.participantsImg} 
+          alt="Review" 
+          className={styles.img}/>
+        <div className={styles.name}>
+          <span>{join.participantsName}</span>
         </div>
       </div>
     </>

diff --git a/src/pages/admin/CheonhaGet.tsx b/src/pages/admin/CheonhaGet.tsx
@@ -23,7 +23,7 @@ const CheonhaGet = () => {
       try {
         const response = await fetch('/Cheonha.json');
         const data = await response.json();
-        setRewardData(data);
+        setRewardData(data.data[0]);
       } catch (error) {
         console.error('CheonhaGet Error:', error);
       }

diff --git a/src/pages/admin/DailyGet.tsx b/src/pages/admin/DailyGet.tsx
@@ -8,7 +8,7 @@ const DailyGet = () => {
       try {
         const response = await fetch('/Daily.json');
         const data = await response.json();
-        setChallenges(data);
+        setChallenges(data.data);
       } catch (error) {
         console.error('Error:', error);
       }

diff --git a/src/pages/admin/NayegiGet.tsx b/src/pages/admin/NayegiGet.tsx
@@ -23,7 +23,7 @@ const NayegiGet = () => {
       try {
         const response = await fetch('/Nayegi.json');
         const data = await response.json();
-        setRewardData(data);
+        setRewardData(data.data[0]);
       } catch (error) {
         console.error('NayegiGet Error:', error);
       }

diff --git a/src/pages/admin/YanadoGet.tsx b/src/pages/admin/YanadoGet.tsx
@@ -15,7 +15,7 @@ const YanadoGet = () => {
       try {
         const response = await fetch('/Yanado.json');
         const data = await response.json();
-        setRewardData(data);
+        setRewardData(data.data[0]);
       } catch (error) {
         console.error('YanadoGet Error:', error);
       }