Merge branch 'develop' of gitlab.com:empatnusabangsa/ppob/ppob-frontend into develop
This commit is contained in:
@@ -1,9 +1,10 @@
|
||||
import React, {useEffect} from "react";
|
||||
import {Card, Col, Row, Table, Typography} from "antd";
|
||||
import {Button, Card, Col, Row, Table, Typography} from "antd";
|
||||
import {BreadcumbComponent} from "../../component/BreadcumbComponent";
|
||||
import {LINKS} from "../../routes/app";
|
||||
import {useStore} from "../../utils/useStore";
|
||||
import {observer} from "mobx-react-lite";
|
||||
import {FilterOutlined} from "@ant-design/icons";
|
||||
|
||||
const {Title, Text} = Typography;
|
||||
|
||||
@@ -53,36 +54,34 @@ export const Profile = observer(() => {
|
||||
<div className={["ppob-container"].join(" ")}>
|
||||
<BreadcumbComponent data={routeData}/>
|
||||
<Card>
|
||||
<Title strong>Profile</Title>
|
||||
<Row style={{marginBottom: 20}}>
|
||||
<Col span={24}>
|
||||
<div>
|
||||
<Title strong>Profile</Title>
|
||||
{/*<Row>*/}
|
||||
{/* <Col span={10}>*/}
|
||||
{/* <Text strong>Name</Text>*/}
|
||||
{/* </Col>*/}
|
||||
{/* <Col span={14}>*/}
|
||||
{/* <Text>{store.authentication.profileData.username}</Text>*/}
|
||||
{/* </Col>*/}
|
||||
{/* <Col span={10}>*/}
|
||||
{/* <Text strong>Role</Text>*/}
|
||||
{/* </Col>*/}
|
||||
{/* <Col span={14}>*/}
|
||||
{/* <Text>{store.authentication.profileData.roles.name}</Text>*/}
|
||||
{/* </Col>*/}
|
||||
{/* <Col span={10}>*/}
|
||||
{/* <Text strong>Superior</Text>*/}
|
||||
{/* </Col>*/}
|
||||
{/* <Col span={14}>*/}
|
||||
{/* <Text>{store.authentication.profileData.superior.username}</Text>*/}
|
||||
{/* </Col>*/}
|
||||
{/* <Col span={10}>*/}
|
||||
{/* <Text strong>Wallet</Text>*/}
|
||||
{/* </Col>*/}
|
||||
{/* <Col span={14}>*/}
|
||||
{/* <Text>{store.authentication.profileData.wallet}</Text>*/}
|
||||
{/* </Col>*/}
|
||||
{/*</Row>*/}
|
||||
<Col span={12}>
|
||||
<Row>
|
||||
<Col span={12}>
|
||||
<Text strong>Name</Text>
|
||||
</Col>
|
||||
<Col span={12}>
|
||||
<Text>{store.authentication.profileData?.username}</Text>
|
||||
</Col>
|
||||
<Col span={12}>
|
||||
<Text strong>Role</Text>
|
||||
</Col>
|
||||
<Col span={12}>
|
||||
<Text>{store.authentication.profileData.roles?.name}</Text>
|
||||
</Col>
|
||||
<Col span={12}>
|
||||
<Text strong>Superior</Text>
|
||||
</Col>
|
||||
<Col span={12}>
|
||||
<Text>{store.authentication.profileData.superior?.username}</Text>
|
||||
</Col>
|
||||
</Row>
|
||||
</Col>
|
||||
<Col span={12}>
|
||||
<div style={{display: 'flex', flexDirection: 'column', alignItems: 'center'}}>
|
||||
<Title strong level={3}>Saldo</Title>
|
||||
<Text style={{fontSize: '1.25rem'}}>{store.authentication.profileData?.wallet}</Text>
|
||||
</div>
|
||||
</Col>
|
||||
</Row>
|
||||
@@ -90,6 +89,13 @@ export const Profile = observer(() => {
|
||||
<Col span={24}>
|
||||
<div>
|
||||
<Title strong level={3}>History User Transaction</Title>
|
||||
|
||||
<Button style={{marginBottom: '1rem'}} onClick={() => {
|
||||
console.log('clicked filter')
|
||||
}}>
|
||||
<FilterOutlined/>
|
||||
Filter
|
||||
</Button>
|
||||
<Table
|
||||
columns={columns}
|
||||
dataSource={store.transaction.dataHistoryTransaction}
|
||||
|
Reference in New Issue
Block a user