diff --git a/src/pages/Membership/Membership.js b/src/pages/Membership/Membership.js
index 653b1c3..9e43b81 100644
--- a/src/pages/Membership/Membership.js
+++ b/src/pages/Membership/Membership.js
@@ -16,16 +16,17 @@ 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();
- setIsLoading(false)
- } catch (e) {
- setIsLoading(false)
- }
+ const init = async () => {
+ try {
+ setIsLoading(true)
+ await store.membership.getData();
+ setIsLoading(false)
+ } catch (e) {
+ setIsLoading(false)
}
+ }
+ useEffect(() => {
+
init()
@@ -34,26 +35,26 @@ export const Membership = observer(() => {
const columns = [
{
title: "Name",
- dataIndex: "name",
- key: "name",
+ dataIndex: "username",
+ key: "username",
},
{
title: "Username",
- dataIndex: "name",
- key: "name",
+ dataIndex: "username",
+ key: "username",
},
{
title: "Status",
dataIndex: "status",
key: "status",
render: (text, record) => (
- <>
-
- Inactive
-
- Active
- >
- )
+
+ {record?.status}
+
+ )
},
{
title: "Action",
@@ -163,21 +164,21 @@ export const Membership = observer(() => {
hasEmpty
size={"small"}
columns={columns}
- dataSource={store.membership.data}
+ dataSource={store.membership.data[0]}
bordered
- pagination={{
- total: store.membership.total_data,
- current: store.membership.page,
- pageSize: store.membership.pageSize,
- simple: true
- }}
- onChange={(page) => {
- store.membership.pageSize = page.pageSize;
- store.membership.page = page.current;
- store.membership.getData();
- }}
- current={store.membership.page}
- loading={store.membership.pageSize}
+ // pagination={{
+ // total: store.membership.total_data,
+ // current: store.membership.page,
+ // pageSize: store.membership.pageSize,
+ // simple: true
+ // }}
+ // onChange={(page) => {
+ // store.membership.pageSize = page.pageSize;
+ // store.membership.page = page.current;
+ // store.membership.getData();
+ // }}
+ // current={store.membership.page}
+ // loading={store.membership.pageSize}
/>)}
{store.ui.mediaQuery.isMobile && (
diff --git a/src/pages/Product/PulsaModal.js b/src/pages/Product/PulsaModal.js
index 0f3db10..53c4736 100644
--- a/src/pages/Product/PulsaModal.js
+++ b/src/pages/Product/PulsaModal.js
@@ -28,7 +28,7 @@ export const PulsaModal = ({visible, onCreate, onCancel}) => {
return (
{
diff --git a/src/store/membership.js b/src/store/membership.js
index 558dee2..50280bd 100644
--- a/src/store/membership.js
+++ b/src/store/membership.js
@@ -2,7 +2,7 @@ import {action, makeAutoObservable} from "mobx";
import {http} from "../utils/http";
export class Membership {
- page = 1;
+ page = 0;
pageSize = 10
data = [];
total_data = 0
@@ -14,7 +14,9 @@ export class Membership {
@action
async getData() {
- const response = await http.get(`/user?page=${this.page}&pageSize=${this.pageSize}`);
+ 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
}