diff --git a/front-end/timepay-user/src/components/Menu/BaseMenu.tsx b/front-end/timepay-user/src/components/Menu/BaseMenu.tsx index 4600595..d501d45 100644 --- a/front-end/timepay-user/src/components/Menu/BaseMenu.tsx +++ b/front-end/timepay-user/src/components/Menu/BaseMenu.tsx @@ -7,11 +7,11 @@ import { Link } from 'react-router-dom'; const items = [ { - label: 문의하기, + label: 문의하기, key: 'inquiry', }, { - label: 문의내역, + label: 문의내역, key: 'inquiry-details', }, { diff --git a/front-end/timepay-user/src/pages/MainPage/ProfileEdit.tsx b/front-end/timepay-user/src/pages/MainPage/ProfileEdit.tsx index 967189e..3acfe4f 100644 --- a/front-end/timepay-user/src/pages/MainPage/ProfileEdit.tsx +++ b/front-end/timepay-user/src/pages/MainPage/ProfileEdit.tsx @@ -2,6 +2,7 @@ import { useEffect, useCallback, useState } from 'react'; import { useNavigate } from 'react-router-dom'; import { useSetRecoilState } from 'recoil'; import { headerTitleState } from '../../states/uiState'; +import { PATH } from '../../utils/paths'; import Profile from '../../assets/images/profile.svg'; import BackBtn from '../../assets/images/BackBtn.svg'; import { BottomSheet } from 'react-spring-bottom-sheet' @@ -31,7 +32,7 @@ const ProfileEdit = () => { <>
- + handleOnClickLinkBtn(PATH.MAIN)} /> 내정보 수정
@@ -63,7 +64,7 @@ const ProfileEdit = () => {
- +
diff --git a/front-end/timepay-user/src/pages/MainPage/Unregistal.tsx b/front-end/timepay-user/src/pages/MainPage/Unregistal.tsx index 329a678..2427aaa 100644 --- a/front-end/timepay-user/src/pages/MainPage/Unregistal.tsx +++ b/front-end/timepay-user/src/pages/MainPage/Unregistal.tsx @@ -32,7 +32,7 @@ const Unregistal = () => { <>
- + handleOnClickLinkBtn(PATH.MAIN)} /> 탈퇴하기
diff --git a/front-end/timepay-user/src/pages/MainPage/UserMainPage.tsx b/front-end/timepay-user/src/pages/MainPage/UserMainPage.tsx index 90e93dc..0a00ead 100644 --- a/front-end/timepay-user/src/pages/MainPage/UserMainPage.tsx +++ b/front-end/timepay-user/src/pages/MainPage/UserMainPage.tsx @@ -8,7 +8,7 @@ import Fav from '../../assets/images/fav.svg'; import { PATH } from '../../utils/paths'; import BaseMenu from '../../components/Menu/BaseMenu'; import { Tooltip } from 'antd'; - +import axios from 'axios'; import { Dropdown } from 'antd'; import type { MenuProps } from 'antd'; @@ -18,8 +18,11 @@ import type { MenuProps } from 'antd'; const UserMainPage = () => { const navigate = useNavigate(); const [title, setTitle] = useState("정릉지점"); - const [accountNum, setAccountNum] = useState("계좌번호 000-000-000000"); - const [amount, setAmount] = useState("000,000"); + const [accountNum, setAccountNum] = useState("123456"); + const [amount, setAmount] = useState("520"); + const accessToken = 1; + + const sampleData = { "items": [ @@ -58,12 +61,12 @@ const UserMainPage = () => { "status": "Success" } - - const setHeaderTitle = useSetRecoilState(headerTitleState); useEffect(() => { + setHeaderTitle(null); - }); + } + ); const handleOnClickLinkBtn = useCallback( (path: string) => { @@ -90,7 +93,7 @@ const UserMainPage = () => { {title}
- {accountNum} + 계좌번호 {accountNum}
{amount}TP diff --git a/front-end/timepay-user/src/pages/Qna/QnaLogDetail.tsx b/front-end/timepay-user/src/pages/Qna/QnaLogDetail.tsx index ff4c65b..2d238d6 100644 --- a/front-end/timepay-user/src/pages/Qna/QnaLogDetail.tsx +++ b/front-end/timepay-user/src/pages/Qna/QnaLogDetail.tsx @@ -30,7 +30,7 @@ function QnaLogDetail() { const [qnaDetail, setQnaDetail] = useState([]); const [openModal, setOpenModal] = useState(false); const [comment, setComment] = useState(""); - const userid = 1; + const userid = "1"; const accessToken = 1; const handleModal = () => { @@ -64,7 +64,7 @@ function QnaLogDetail() { 'Authorization':`Bearer ${accessToken}` } }).then(response => { - //console.log(response.data); + //console.log(typeof response.data[userid]); setQnaDetail(response.data); }).catch(function(error){ console.log(error) @@ -85,7 +85,7 @@ function QnaLogDetail() { {content} {qnaDetail.map((answer) => ( - {answer.userId===id ? "byUSER" : "관리자"}} extra={answer.commentDate} key={answer.commentid} className="detailBox"> + {answer.userId===userid ? "byUSER" : "관리자"}} extra={answer.commentDate} key={answer.commentid} className="detailBox">

{"content : " + answer.content}

diff --git a/front-end/timepay-user/src/pages/Qna/qna_register.css b/front-end/timepay-user/src/pages/Qna/qna_register.css index 2b7708b..d2542a1 100644 --- a/front-end/timepay-user/src/pages/Qna/qna_register.css +++ b/front-end/timepay-user/src/pages/Qna/qna_register.css @@ -6,6 +6,10 @@ width:92%; + font-family: 'Lato'; + font-style: normal; + font-weight : 600; + } .inputContent{ @@ -14,6 +18,10 @@ margin:4%; width:92%; min-height:300px; + + font-family: 'Lato'; + font-style: normal; + font-weight : 600; } .registerButton { diff --git a/front-end/timepay-user/src/pages/Transfer/TransferAmount.tsx b/front-end/timepay-user/src/pages/Transfer/TransferAmount.tsx index 337d8c2..54e6b30 100644 --- a/front-end/timepay-user/src/pages/Transfer/TransferAmount.tsx +++ b/front-end/timepay-user/src/pages/Transfer/TransferAmount.tsx @@ -61,7 +61,8 @@ function TransferAmt() {
- ) => setAmount(+e.target.value)} placeholder="금액 입력" value={amount===0 ? "" : amount} className="inputBox"> + ) => setAmount(+e.target.value)} placeholder="금액 입력" + style={amount===0 ? {color:"black"} : {color:"C7C7C7"}} value={amount===0 ? "" : amount} className="inputBox"> TP
diff --git a/front-end/timepay-user/src/pages/Transfer/transfer_amount.css b/front-end/timepay-user/src/pages/Transfer/transfer_amount.css index b73cba8..0579286 100644 --- a/front-end/timepay-user/src/pages/Transfer/transfer_amount.css +++ b/front-end/timepay-user/src/pages/Transfer/transfer_amount.css @@ -46,7 +46,7 @@ /* font */ font-family: 'Lato'; font-style: normal; - font-weight: 400; + font-weight: 600; font-size: 18px; line-height: 100%; text-align: center; diff --git a/front-end/timepay-user/src/utils/paths.ts b/front-end/timepay-user/src/utils/paths.ts index 7976c71..3d1d254 100644 --- a/front-end/timepay-user/src/utils/paths.ts +++ b/front-end/timepay-user/src/utils/paths.ts @@ -5,8 +5,8 @@ export const PATH = { SIGN_UP: '/signup', PASSWORD: '/password', MAIN: '/main', - UNREGIST: '/unregist', - PROFILE: '/profile', + UNREGISTAL: '/unregistal', + PROFILEEDIT: '/profile', TRANSFER: '/transfer/account', TRANSFERAMOUNT: '/transfer/amount', TRANSFERPASSWORD: '/transfer/password',