-

+

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',