[#95]Chore: apply markAccount lib

ITisYourLife-3rd-JJAN · May 30, 2023 · 32c6659 · 32c6659
1 parent c390904
commit 32c6659
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 29 deletions.
diff --git a/src/components/MissionBanner/missionBanner.css b/src/components/MissionBanner/missionBanner.css
@@ -32,7 +32,7 @@
     border-radius: 20px;
     box-sizing: border-box;
     padding: 1.5rem;
-    font-weight: 700;
+    font-weight: 600;
     font-size: 1.5rem;
 }
 
@@ -46,7 +46,7 @@
     border-radius: 20px;
     box-sizing: border-box;
     padding: 1.5rem;
-    font-weight: 700;
+    font-weight: 600;
     font-size: 1.5rem;
 }
 
@@ -60,6 +60,6 @@
     border-radius: 20px;
     box-sizing: border-box;
     padding: 1.5rem;
-    font-weight: 700;
+    font-weight: 600;
     font-size: 1.5rem;
 }
diff --git a/src/components/debitBanner/debitBanner.css b/src/components/debitBanner/debitBanner.css
@@ -17,7 +17,7 @@
 .seldiv{
     display: flex;
     align-items: center;
-    justify-content: space-between;
+    justify-content: space-around;
     width: 210px;
     padding-right: 1rem;
 }
@@ -31,9 +31,9 @@
     height: 75%;
     border-radius: 20px;
     box-sizing: border-box;
-    padding: 1.5rem;
-    font-weight: 700;
-    font-size: 1.5rem;
+    margin: 1.5rem;
+    font-weight: 600;
+    font-size: 1.3rem;
 }
 
 .kidBalance{
@@ -46,7 +46,7 @@
     border-radius: 20px;
     box-sizing: border-box;
     padding: 1.5rem;
-    font-weight: 700;
+    font-weight: 600;
     font-size: 1.5rem;
 }
 
@@ -60,7 +60,7 @@
     border-radius: 20px;
     box-sizing: border-box;
     padding: 1.5rem;
-    font-weight: 700;
+    font-weight: 600;
     font-size: 1.5rem;
 }
 

diff --git a/src/components/debitForm/DebitForm.jsx b/src/components/debitForm/DebitForm.jsx
@@ -4,14 +4,15 @@ import { useNavigate } from 'react-router';
 import axios from 'axios';
 import Loading from '../../lib/Loading';
 import { markThousand } from '../../lib/markThousand';
+import { markAccount } from '../../lib/markAccount';
 
 const DebitForm = ({kidUserId, kidUserName}) => {
     const [price, setPrice] = useState("");
     const [dealMsg, setDealMsg] = useState("");
     const navigate = useNavigate();
     const userId = sessionStorage.getItem("userId");
     const [userBalance, setUserBalance] = useState("");
-    const [kidAccount, setKidAccount] = useState();
+    const [kidAccount, setKidAccount] = useState("");
     const [kidBalance, setKidBalance] = useState();
     const [isLoading, setIsLoading] = useState(true);
 
@@ -42,7 +43,7 @@ const DebitForm = ({kidUserId, kidUserName}) => {
             .then((response) => {
                 console.log(response.data.data)
                 setKidBalance(response.data.data.balance)
-                setKidAccount(response.data.data.account)
+                setKidAccount(markAccount(response.data.data.account))
             })
             .catch((error) => {
                 console.log(error.response.data);
@@ -77,7 +78,7 @@ const DebitForm = ({kidUserId, kidUserName}) => {
             .then((response) => {
                 console.log(response.data.data)
                 setKidBalance(response.data.data.balance)
-                setKidAccount(response.data.data.account)
+                setKidAccount(markAccount(response.data.data.account))
             })
             .catch((error) => {
                 console.log(error.response.data);

diff --git a/src/components/debitForm/debitForm.css b/src/components/debitForm/debitForm.css
@@ -20,7 +20,7 @@
     width: 80%;
     height: 80%;
     border-radius: 30px;
-    font-weight: 600;
+    font-weight: 300;
 }
 
 .fstbox{
@@ -41,7 +41,7 @@
     border-bottom: 2px solid #CCC;
     margin-left: 3rem;
     margin-right: 3rem;
-    font-weight: 600;
+    font-weight: 300;
     font-size: 20px;
 }
 
@@ -57,15 +57,15 @@
 }
 
 .sendbtnin{
-    border: 3px solid #2D86E0;
+    border: 3px solid rgb(229,249,251);
     background-color: #FCFF5C;
     border-radius: 30px;display: flex;
     align-items: center;
     justify-content: center;
     width: 20%;
     height: 100%;
     color: #000;
-    font-weight: 600;
+    font-weight: 500;
     font-size: 24px;
     cursor: pointer;
 }
@@ -75,11 +75,11 @@
     border: none;
     border-bottom: 3px solid #000;
     font-size: 26px;
-    font-weight: 700;
+    font-weight: 300;
 }
 
 .dbtmsgbox{
     font-size: 26px;
-    font-weight: 700;
+    font-weight: 300;
     display: flex;
 }
diff --git a/src/components/debitHistory/DebitHistory.jsx b/src/components/debitHistory/DebitHistory.jsx
@@ -38,7 +38,7 @@ const DebitHistory = ({ kidUserId, kidUserName }) => {
         }
         setIsLoading(false);
       } catch (error) {
-        console.log(error.response.data);
+        // console.log(error.response.data);
         setIsLoading(false);
       }
     };

diff --git a/src/components/directDebitForm/directDebitForm.css b/src/components/directDebitForm/directDebitForm.css
@@ -20,7 +20,7 @@
     width: 80%;
     height: 80%;
     border-radius: 30px;
-    font-weight: 600;
+    font-weight: 300;
 }
 
 .dditbox{
@@ -31,7 +31,7 @@
 
 .ddittext, .ddtitle{
     font-size: 24px;
-    font-weight: 600;
+    font-weight: 400;
 
 }
 
@@ -49,7 +49,7 @@
     border-bottom: 2px solid #CCC;
 
     margin-right: 3rem;
-    font-weight: 600;
+    font-weight: 300;
     font-size: 20px;
 }
 
@@ -68,7 +68,7 @@
     border: none;
     border-bottom: 2px solid #CCC;
     font-size: 24px;
-    font-weight: 600;
+    font-weight: 300;
 }
 
 .dbmsgbox{

diff --git a/src/components/payBanner/payBanner.css b/src/components/payBanner/payBanner.css
@@ -19,7 +19,7 @@
     border-radius: 20px;
     box-sizing: border-box;
     padding: 1.5rem;
-    font-weight: 700;
+    font-weight: 600;
     font-size: 1.5rem;
 }
 
@@ -33,6 +33,6 @@
     border-radius: 20px;
     box-sizing: border-box;
     padding: 1.5rem;
-    font-weight: 700;
+    font-weight: 600;
     font-size: 1.5rem;
 }
diff --git a/src/components/profile/FamCard.jsx b/src/components/profile/FamCard.jsx
@@ -72,7 +72,7 @@ import Loading from '../../lib/Loading';
                 <img src={`${imgSrc}`} alt='' className='fam-profile' />
                 <div className='fam-info-box'>
                     <p id='fam-name'>{userName}</p>
-                    <p>계좌번호 : {userAccount}</p>
+                    <p>계좌번호 : {markAccount(userAccount)}</p>
                     {(!isParent) && 
                         <p>현재단계 : {checkLevel(userAchieve)}</p>
                     }

diff --git a/src/components/profile/MyBigCard.jsx b/src/components/profile/MyBigCard.jsx
@@ -157,7 +157,7 @@ const MyBigCard = ({ isParent }) => {
             <p id="my-balance">잔액 : {userBalance}원</p>
           </>
         )}
-        <p id="my-account">계좌번호 : {userAccount}</p>
+        <p id="my-account">계좌번호 : {markAccount(userAccount)}</p>
         <p>가족코드 : {famCode}</p>
       </div>
       <div className="my-edit-box">

diff --git a/src/pages/css/login.css b/src/pages/css/login.css
@@ -32,7 +32,7 @@
 
 .loginSlogan{
     text-align: center;
-    margin : 5rem;
+    margin : 5rem 2rem;
     color: #fff;
     font-weight: 500;
     font-size: 4rem;
@@ -52,7 +52,7 @@
 .loginInput{
     position: absolute;
     right: 12vw;
-    top: 6rem;
+    top: 5rem;
     width: 30vw;
     height: 80%;
     background: #FFFFFF;