PPOB/ppob-frontend
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: stiching API profile and last history

Browse Source
This commit is contained in:
caturbgs 2021-12-16 11:12:32 +07:00
parent 28c42b3453
commit 2cc6dc53c0
3 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/pages/Profile/Profile.js
View File

@ -57,32 +57,32 @@ export const Profile = observer(() => {
<Col span={24}> <Col span={24}>
<div> <div>
<Title strong>Profile</Title> <Title strong>Profile</Title>
{/*<Row>*/} <Row>
{/* <Col span={10}>*/} <Col span={10}>
{/* <Text strong>Name</Text>*/} <Text strong>Name</Text>
{/* </Col>*/} </Col>
{/* <Col span={14}>*/} <Col span={14}>
{/* <Text>{store.authentication.profileData.username}</Text>*/} <Text>{store.authentication.profileData?.username}</Text>
{/* </Col>*/} </Col>
{/* <Col span={10}>*/} <Col span={10}>
{/* <Text strong>Role</Text>*/} <Text strong>Role</Text>
{/* </Col>*/} </Col>
{/* <Col span={14}>*/} <Col span={14}>
{/* <Text>{store.authentication.profileData.roles.name}</Text>*/} <Text>{store.authentication.profileData.roles?.name}</Text>
{/* </Col>*/} </Col>
{/* <Col span={10}>*/} <Col span={10}>
{/* <Text strong>Superior</Text>*/} <Text strong>Superior</Text>
{/* </Col>*/} </Col>
{/* <Col span={14}>*/} <Col span={14}>
{/* <Text>{store.authentication.profileData.superior.username}</Text>*/} <Text>{store.authentication.profileData.superior?.username}</Text>
{/* </Col>*/} </Col>
{/* <Col span={10}>*/} <Col span={10}>
{/* <Text strong>Wallet</Text>*/} <Text strong>Wallet</Text>
{/* </Col>*/} </Col>
{/* <Col span={14}>*/} <Col span={14}>
{/* <Text>{store.authentication.profileData.wallet}</Text>*/} <Text>{store.authentication.profileData.wallet}</Text>
{/* </Col>*/} </Col>
{/*</Row>*/} </Row>
</div> </div>
</Col> </Col>
</Row> </Row>

2
src/store/authentication.js
View File

@ -53,7 +53,7 @@ export class Authentication {
async getProfile() { async getProfile() {
try { try {
const response = await http.get('/auth/profile'); const response = await http.get('/auth/profile');
this.profileData = response.body.data; this.profileData = response.body;
} catch (e) { } catch (e) {
console.error(e); console.error(e);
throw e; throw e;

4
src/store/transaction.js
View File

@ -20,7 +20,7 @@ export class Transaction {
total_dataSubCategories = 0; total_dataSubCategories = 0;
pageHistoryTransaction = 0; pageHistoryTransaction = 0;
pageSizeHistoryTransaction = 10 // pageSizeHistoryTransaction = 10
dataHistoryTransaction = []; dataHistoryTransaction = [];
total_dataHistoryTransaction = 0; total_dataHistoryTransaction = 0;
@ -53,7 +53,7 @@ export class Transaction {
} }
async getDataHistoryTransaction() { async getDataHistoryTransaction() {
const response = await http.get(`/transaction/history?page=${this.pageHistoryTransaction}&pageSize=${this.pageSizeHistoryTransaction}`); const response = await http.get(`/transaction/history?page=${this.pageHistoryTransaction}`);
this.dataHistoryTransaction = response.body.data ?? [] this.dataHistoryTransaction = response.body.data ?? []
this.total_dataHistoryTransaction = response.body.total_data ?? 0 this.total_dataHistoryTransaction = response.body.total_data ?? 0