Merge pull request #272 from Moon-GD/dev

hotfix:마이페이지 템플릿 수정
gyuturn · Feb 22, 2023 · 44f510d · 44f510d
2 parents 6d8c2c1 + 6878ee3
commit 44f510d
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 17 deletions.
diff --git a/frontEnd/public/js/main/template.js b/frontEnd/public/js/main/template.js
@@ -17,7 +17,7 @@ const chatTexts = [
 const getMainViewContentTemplate = () => `
     <section class="main">
         <section class="searchBar">
-            <a href=${isLogin ? "/userDetail" : "/login"} data-link>
+            <a href=${isLogin ? "/comparison" : "/login"} data-link>
                 <div class="searchBar__left">
                     <svg xmlns="http://www.w3.org/2000/svg" width="40" height="60" viewBox="0 0 120 120" fill="#fff">
                         <path xmlns="http://www.w3.org/2000/svg" d="M32.0993 0.386597V17.3706H20.2353C9.47856 17.3706 0.461898 27.0515 0.461898 38.6007V47.0927C0.461898 58.6419 7.42213 68.1529 17.7043 71.0402L58.2002 82.2497C60.4148 82.929 63.5785 87.175 63.5785 89.7227V98.2147C63.5785 100.592 61.8385 102.461 59.6238 102.461H20.0771C18.1788 102.461 16.7552 101.781 16.1224 101.442V85.4766H0.303711V102.461C0.303711 108.235 3.46745 113.161 7.26394 115.708C10.9022 118.426 15.4897 119.445 20.0771 119.445H31.9411V136.429H47.7598V119.445H59.6238C70.5387 119.445 79.3972 109.934 79.3972 98.2147V89.7227C79.3972 78.1735 72.437 68.6624 62.1548 65.7752L21.659 54.5657C19.4443 53.8863 16.2806 49.6403 16.2806 47.0927V38.6007C16.2806 36.2229 18.0207 34.3547 20.2353 34.3547H59.782C61.5221 34.3547 63.104 35.034 63.7367 35.3737V51.3387H79.5554V34.3547C79.5554 28.5801 76.3917 23.6547 72.5952 21.1071C68.9569 18.3897 64.3695 17.3706 59.782 17.3706H47.918V0.386597L32.0993 0.386597Z" fill="#fff"/>

diff --git a/frontEnd/public/js/myPage/chart/helperFunction.js b/frontEnd/public/js/myPage/chart/helperFunction.js
@@ -24,10 +24,8 @@ const makeChart = ($container, userOilArray, commonOilArray, monthArray) => {
         userPercent = userPercent >= 1 ? 100 : userPercent * 100;
         averagePercent = averagePercent >= 1 ? 100 : averagePercent * 100;
 
-        setTimeout(() => {
-            changeCSS($userPrice, "height", `${userPercent}%`);
-            changeCSS($averagePrice, "height", `${averagePercent}%`);
-        }, 50 * index);
+        changeCSS($userPrice, "height", `${userPercent}%`);
+        changeCSS($averagePrice, "height", `${averagePercent}%`);
     })
 }
 

diff --git a/frontEnd/public/js/myPage/chart/template.js b/frontEnd/public/js/myPage/chart/template.js
@@ -1,8 +1,8 @@
 const tabObjArray = [
     {choosed: false, text: "프로필 수정", path: "/userDetail"},
-    {choosed: false, text: "주유 기록 입력", path: "/inputOilInfo"},
+    {choosed: false, text: "주유 입력", path: "/inputOilInfo"},
     {choosed: false, text: "이번 달 분석", path: "/comparison"},
-    {choosed: true, text: "월별 비교", path: "/chart"},
+    {choosed: true, text: "평균 유가 비교", path: "/chart"},
     {choosed: false, text: "주유 기록 열람", path: "/history"}
 ];
 
@@ -30,7 +30,7 @@ const getChartTemplate = () => `
                         <div class="oilInfoArea__oilChartInfo">
                             <div class="oilInfoArea__oilChartInfo--common">
                                 <div class="oilInfoArea__legend--common">&nbsp;</div>
-                                <span>평균 주유 금액</span>
+                                <span>유가 평균 기준</span>
                             </div>
                             <div class="oilInfoArea__oilChartInfo--user">
                                 <div class="oilInfoArea__legend--user">&nbsp;</div>
@@ -50,6 +50,9 @@ const getChartTemplate = () => `
                         <div class="oilInfoArea__monthZone">
                             ${monthNumbers.map((monthNumber) => `<span>${monthNumber}월</span>`).join("")}
                         </div>
+                        <div class="oilinfoArea__chartInfoText">
+                            ※ 주유 당시 전국 유가 평균 기준
+                        </div>
                     </div>
                 </div>
             </div>

diff --git a/frontEnd/public/js/myPage/comparison/template.js b/frontEnd/public/js/myPage/comparison/template.js
@@ -1,8 +1,8 @@
 const tabObjArray = [
     {choosed: false, text: "프로필 수정", path: "/userDetail"},
-    {choosed: false, text: "주유 기록 입력", path: "/inputOilInfo"},
+    {choosed: false, text: "주유 입력", path: "/inputOilInfo"},
     {choosed: true, text: "이번 달 분석", path: "/comparison"},
-    {choosed: false, text: "월별 비교", path: "/chart"},
+    {choosed: false, text: "평균 유가 비교", path: "/chart"},
     {choosed: false, text: "주유 기록 열람", path: "/history"}
 ];
 

diff --git a/frontEnd/public/js/myPage/history/template.js b/frontEnd/public/js/myPage/history/template.js
@@ -1,8 +1,8 @@
 const tabObjArray = [
     {choosed: false, text: "프로필 수정", path: "/userDetail"},
-    {choosed: false, text: "주유 기록 입력", path: "/inputOilInfo"},
+    {choosed: false, text: "주유 입력", path: "/inputOilInfo"},
     {choosed: false, text: "이번 달 분석", path: "/comparison"},
-    {choosed: false, text: "월별 비교", path: "/chart"},
+    {choosed: false, text: "평균 유가 비교", path: "/chart"},
     {choosed: true, text: "주유 기록 열람", path: "/history"}
 ];
 

diff --git a/frontEnd/public/js/myPage/inputOilInfo/template.js b/frontEnd/public/js/myPage/inputOilInfo/template.js
@@ -1,8 +1,8 @@
 const tabObjArray = [
     {choosed: false, text: "프로필 수정", path: "/userDetail"},
-    {choosed: true, text: "주유 기록 입력", path: "/inputOilInfo"},
+    {choosed: true, text: "주유 입력", path: "/inputOilInfo"},
     {choosed: false, text: "이번 달 분석", path: "/comparison"},
-    {choosed: false, text: "월별 비교", path: "/chart"},
+    {choosed: false, text: "평균 유가 비교", path: "/chart"},
     {choosed: false, text: "주유 기록 열람", path: "/history"}
 ];
 

diff --git a/frontEnd/public/js/myPage/userDetail/template.js b/frontEnd/public/js/myPage/userDetail/template.js
@@ -2,9 +2,9 @@ import { userId, userAge, userGender } from "../../login/fetch";
 
 const tabObjArray = [
     {choosed: true, text: "프로필 수정", path: "/userDetail"},
-    {choosed: false, text: "주유 기록 입력", path: "/inputOilInfo"},
+    {choosed: false, text: "주유 입력", path: "/inputOilInfo"},
     {choosed: false, text: "이번 달 분석", path: "/comparison"},
-    {choosed: false, text: "월별 비교", path: "/chart"},
+    {choosed: false, text: "평균 유가 비교", path: "/chart"},
     {choosed: false, text: "주유 기록 열람", path: "/history"}
 ];
 

diff --git a/frontEnd/public/styles/index.css b/frontEnd/public/styles/index.css
@@ -7530,6 +7530,7 @@ a {
     width: 95%;
     height: 100%;
     margin: 0 auto;
+    position: relative;
   }
   .oilInfoArea .oilInfoArea__background .oilInfoArea__contentArea .oilInfoArea__oilChartContainer .oilInfoArea__oilCharttitle {
     width: 100%;
@@ -7675,6 +7676,14 @@ a {
     font-size: 1rem;
     width: 10%;
   }
+  .oilInfoArea .oilInfoArea__background .oilInfoArea__contentArea .oilInfoArea__oilChartContainer .oilinfoArea__chartInfoText {
+    color: rgb(170, 170, 170);
+    font-weight: 700;
+    font-size: 0.9rem;
+    position: absolute;
+    bottom: 0.2vw;
+    right: 0.2vw;
+  }
   .oilInfoArea .oilInfoArea__background .oilInfoArea__buttonArea {
     padding: 1vw 0;
     height: 10%;

diff --git a/frontEnd/public/styles/index.css.map b/frontEnd/public/styles/index.css.map
diff --git a/frontEnd/public/styles/index.scss b/frontEnd/public/styles/index.scss
@@ -8224,6 +8224,7 @@ a {
                     width: 95%;
                     height: 100%;
                     margin: 0 auto;
+                    position: relative;
 
                     & .oilInfoArea__oilCharttitle {
                         width: 100%;
@@ -8393,6 +8394,15 @@ a {
                             }
                         }
                     }
+
+                    & .oilinfoArea__chartInfoText {
+                        color: rgb(170, 170, 170);
+                        font-weight: 700;
+                        font-size: 0.9rem;
+                        position: absolute;
+                        bottom: 0.2vw;
+                        right: 0.2vw;
+                    }
                 }
             }