Merge pull request #60 from KTB-Hackathon-GoLang/dev

Feat:결과페이지 최종 수정
KTB-Hackathon-GoLang · Sep 7, 2024 · 6e7b0b9 · 6e7b0b9
2 parents c13849d + 4acba36
commit 6e7b0b9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/src/pages/Evaluation/EvaluationPage.main.jsx b/src/pages/Evaluation/EvaluationPage.main.jsx
@@ -36,7 +36,7 @@ export const EvaluationPage = () => {
     const selectedData = mockData.find((data) => data.person === person) || {};
 
     const { pieData = {}, score = { positive: 0, neutral: 0, negative: 0 }, result = { message: "" }, date = "알 수 없음" } = selectedData;
-   console.log('전달할',pieData);
+   console.log('전달할',mockData);
     return (
         <style.Frame>
             <style.Wrapper>
@@ -51,10 +51,11 @@ export const EvaluationPage = () => {
 
 
                         <DoughnutChartComponent pieData={pieData}/>
+                    <style.SecondWrapper>
+                        <ProgressBar positive={score.positive} neutral={score.neutral} negative={score.negative} />
+                    </style.SecondWrapper>
 
 
-                    <ProgressBar positive={score.positive} neutral={score.neutral} negative={score.negative} />
-
                     <style.ThirdWrapper>
                         {result.message}
                     </style.ThirdWrapper>

diff --git a/src/pages/MyPage/MyPage.jsx b/src/pages/MyPage/MyPage.jsx
@@ -13,23 +13,23 @@ export const MyPage = () => {
     // 목업 데이터 생성
     const mockData = [
         {
-            person: 'A',
-            date: '2024.08.09',
-            pieData: { 'A': 10, 'B': 9, 'C': 8, 'D': 7 },
+            person: '홍창기',
+            date: '2024.09.07',
+            pieData: { '응': 10, '그래': 9, '가보자고': 8, '싫어': 7 ,'먹자': 4},
             score: { positive: 50, neutral: 20, negative: 30 },
             result: { message: "이번 채팅은 누가 고집이 더 셌어요 그만 좀 부리세요." }
         },
         {
-            person: 'B',
-            date: '2024.08.20',
-            pieData: { 'A': 7, 'B': 10, 'C': 6, 'D': 9 },
+            person: '문보경',
+            date: '2024.09.07',
+            pieData: { '좋다': 7, '사랑해': 10, '잘자': 6, '안녕': 9, '할것이다': 8 },
             score: { positive: 60, neutral: 25, negative: 15 },
             result: { message: "긍정적인 대화가 많았습니다!" }
         },
         {
-            person: 'C',
-            date: '2024.08.23',
-            pieData: { 'A': 9, 'B': 8, 'C': 7, 'D': 6 },
+            person: '김현수',
+            date: '2024.09.07',
+            pieData: { '꺼져': 9, '새끼': 8, '싫어': 7, '그만해': 6 ,'개':2},
             score: { positive: 40, neutral: 30, negative: 30 },
             result: { message: "대화가 약간 부정적이었습니다." }
         }