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

feat: add roles in Membership

Browse Source
This commit is contained in:
caturbgs 2021-12-10 14:33:55 +07:00
parent 0da2118bec
commit bd6a8b7c54
6 changed files with 91 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/pages/App/MenuList.js
View File

@ -1,7 +1,7 @@
import React, {useEffect, useState} from "react";
import {Menu} from "antd";
import {Link} from "react-router-dom";
import {CalendarOutlined, HomeOutlined,} from "@ant-design/icons";
import {HomeOutlined,} from "@ant-design/icons";
import {observer} from "mobx-react-lite";
import {useStore} from "../../utils/useStore";
@ -39,30 +39,30 @@ export const MenuList = observer((props) => {
<span>Home</span>
</Link>
</Menu.Item>
<Menu.Item key="membership">
{store.authentication.userData.role !== 'Retail' && <Menu.Item key="membership">
<Link to={'/app/membership'}>
<HomeOutlined/>
<span>Membership</span>
</Link>
</Menu.Item>
<Menu.Item key="product">
</Menu.Item>}
{store.authentication.userData.role !== 'Retail' && <Menu.Item key="product">
<Link to={'/app/product'}>
<HomeOutlined/>
<span>Product</span>
</Link>
</Menu.Item>
<Menu.Item key="transaction">
</Menu.Item>}
{store.authentication.userData.role === 'Retail' && <Menu.Item key="transaction">
<Link to={'/app/transaction'}>
<HomeOutlined/>
<span>Transaction</span>
</Link>
</Menu.Item>
<Menu.Item key="about">
<Link to={'/app/about'}>
<CalendarOutlined/>
<span>About</span>
</Link>
</Menu.Item>
</Menu.Item>}
{/*<Menu.Item key="about">*/}
{/* <Link to={'/app/about'}>*/}
{/* <CalendarOutlined/>*/}
{/* <span>About</span>*/}
{/* </Link>*/}
{/*</Menu.Item>*/}
<Menu.Divider style={{background: "transparent", paddingTop: 15}}/>
</Menu>
);

56
src/pages/Membership/Membership.js
View File

@ -1,30 +1,12 @@
import React, { useEffect, useState } from "react";
import {
Button,
Card,
Col,
Divider,
Input,
List,
message,
Modal,
Row,
Space,
Table,
Tag,
} from "antd";
import { useStore } from "../../utils/useStore";
import { observer } from "mobx-react-lite";
import {
ExclamationCircleOutlined,
FilterOutlined,
PlusSquareOutlined,
} from "@ant-design/icons";
import { MembershipModal } from "./MembershipModal";
import { BreadcumbComponent } from "../../component/BreadcumbComponent";
import { format } from "date-fns";
import React, {useEffect, useState} from "react";
import {Button, Card, Col, Divider, Input, List, message, Modal, Row, Space, Table, Tag,} from "antd";
import {useStore} from "../../utils/useStore";
import {observer} from "mobx-react-lite";
import {ExclamationCircleOutlined, FilterOutlined, PlusSquareOutlined,} from "@ant-design/icons";
import {MembershipModal} from "./MembershipModal";
import {BreadcumbComponent} from "../../component/BreadcumbComponent";
const { Search } = Input;
const {Search} = Input;
export const Membership = observer(() => {
const store = useStore();
@ -33,16 +15,18 @@ export const Membership = observer(() => {
const [confirmLoading, setConfirmLoading] = useState(false);
const [isLoading, setIsLoading] = useState(false);
useEffect(() => {
const init = async () => {
try {
setIsLoading(true);
await store.membership.getData();
await store.role.getData();
setIsLoading(false);
} catch (e) {
setIsLoading(false);
}
};
useEffect(() => {
init();
}, []);
@ -78,7 +62,10 @@ export const Membership = observer(() => {
<Button
onClick={() => {
setVisibleModal(true);
setInitialData(record);
setInitialData({
...record,
roleId: record.roles.id,
});
}}
>
Edit
@ -164,17 +151,20 @@ export const Membership = observer(() => {
<Row style={{ marginBottom: 20 }}>
<Col span={12}>
<Button>
<FilterOutlined />
<FilterOutlined/>
Filter
</Button>
</Col>
<Col span={12} style={{ textAlign: "right" }}>
<Col span={12} style={{textAlign: "right"}}>
<Search
placeholder="input search text"
style={{ width: 200, marginRight: 10 }}
style={{width: 200, marginRight: 10}}
/>
<Button onClick={() => setVisibleModal(true)}>
<PlusSquareOutlined /> New
<Button onClick={() => {
setInitialData({});
setVisibleModal(true);
}}>
<PlusSquareOutlined/> New
</Button>
</Col>
</Row>

13
src/pages/Membership/MembershipModal.js
View File

@ -1,5 +1,7 @@
import React from 'react';
import {Form, Input, Modal, Select,} from 'antd';
import {capitalize} from "lodash";
import {useStore} from "../../utils/useStore";
export const MembershipModal = ({
visible,
@ -10,6 +12,7 @@ export const MembershipModal = ({
const [form] = Form.useForm();
const {Option} = Select;
const dataStatus = ["true", "false"]
const store = useStore();
return (
@ -57,10 +60,14 @@ export const MembershipModal = ({
</Form.Item>
<Form.Item
name="roleId"
label="Role Id"
label="Role"
rules={[{required: true, message: 'Please input role id!'}]}
>
<Input/>
<Select>
{store.role.data.map(item => (
<Option key={item.id} value={item.id}>{item.name}</Option>
))}
</Select>
</Form.Item>
<Form.Item
name="superior"
@ -79,7 +86,7 @@ export const MembershipModal = ({
}
>
{dataStatus.map(it => {
return <Option value={it}>{it}</Option>
return <Option value={it}>{capitalize(it)}</Option>
})}
</Select>
</Form.Item>

2
src/store/index.js
View File

@ -4,6 +4,7 @@ import {User} from "./user";
import {Membership} from "./membership";
import {Product} from "./product";
import {TokenUtil} from "../utils/token";
import {Role} from "./role";
export class Store {
ui = new UI(this);
@ -11,6 +12,7 @@ export class Store {
user = new User(this);
membership = new Membership(this);
product = new Product(this);
role = new Role(this);
constructor() {
TokenUtil.loadToken();

2
src/store/membership.js
View File

@ -15,8 +15,6 @@ export class Membership {
@action
async getData() {
const response = await http.get(`/users/find-by-supperior?page=${this.page}&pageSize=${this.pageSize}`);
// console.log(response, 'Data user')
// console.log(JSON.stringify(response.body.data), 'Data')
this.data = response.body.data ?? []
this.total_data = response.body.total_data ?? 0
}

34
src/store/role.js Normal file
View File

@ -0,0 +1,34 @@
import {makeAutoObservable} from "mobx";
import {http} from "../utils/http";
export class Role {
page = null;
pageSize = null;
data = [];
total_data = 0
constructor(ctx) {
this.ctx = ctx;
makeAutoObservable(this);
}
async getData() {
const response = await http.get(`/config/roles?page=${this.page}&pageSize=${this.pageSize}`);
this.data = response.body.data ?? []
this.total_data = response.body.total_data ?? 0
}
async create(data) {
return await http.post('/users').send(data)
}
async update(id, data) {
return await http.put('/users/' + id).send(data);
}
async delete(id) {
return await http.del('/users/' + id);
}
}