Merge branch 'develop' of gitlab.com:empatnusabangsa/ppob/ppob-frontend into develop

.gitignore

@@ -24,3 +24,4 @@ yarn-error.log*
 
 /.idea
 /package-lock.json
+/yarn.lock

src/component/ProductComponent.js

@@ -177,9 +177,25 @@ export const ProductComponent = observer((props) => {
             <Table
                 style={{textAlign: "center"}}
                 columns={columns}
-                dataSource={props.data}
+                dataSource={store.product.data}
                 bordered
+                pagination={{
+                    pageSize: store.product.pageSize,
+                    total: store.product.total_data,
+                    current: store.product.page + 1,
+                    showSizeChanger: true,
+                    simple: false
+                }}
+                onChange={async (page) => {
+                    let pageNumber = page.current;
+                    store.product.pageSize = page.pageSize;
+                    store.product.page = pageNumber - 1;
+                    // store.membership.isLoading = true;
+                    await store.product.getData();
+                    // store.membership.isLoading = false;
+                }}
             />
+
             <Modal
                 visible={store.product.visibleModalProduct}
                 title={idData ? "Edit Product" : "Create a new Product"}

src/pages/Membership/Membership.js

@@ -132,8 +132,6 @@ export const Membership = observer(() => {
       cancelText: "Cancel",
       onOk() {
         try {
-          //TODO: minta apinya ke ka ilham ya, jangan di uncomment kalo pake api reconcile, nanti beneran ke apus datanya
-          // await store.membership.delete(record.id)
           message.success("Success Delete Data");
         } catch (e) {
           message.error("Failed Delete Data");
@@ -171,25 +169,26 @@ export const Membership = observer(() => {
           </Row>
           {store.ui.mediaQuery.isDesktop && (
             <Table
-              key="1"
+                key="1"
-              hasEmpty
+                hasEmpty
-              size={"small"}
+                columns={columns}
-              columns={columns}
+                dataSource={store.membership.data}
-              dataSource={store.membership.data}
+                bordered
-              bordered
+                pagination={{
-              // pagination={{
+                  pageSize: store.membership.pageSize,
-              //   total: store.membership.total_data,
+                  total: store.membership.total_data,
-              //   current: store.membership.page,
+                  current: store.membership.page + 1,
-              //   pageSize: store.membership.pageSize,
+                  showSizeChanger: true,
-              //   simple: true
+                  simple: false
-              // }}
+                }}
-              // onChange={(page) => {
+                onChange={async (page) => {
-              //   store.membership.pageSize = page.pageSize;
+                  let pageNumber = page.current;
-              //   store.membership.page = page.current;
+                  store.membership.pageSize = page.pageSize;
-              //   store.membership.getData();
+                  store.membership.page = pageNumber - 1;
-              // }}
+                  // store.membership.isLoading = true;
-              // current={store.membership.page}
+                  await store.membership.getData();
-              // loading={store.membership.pageSize}
+                  // store.membership.isLoading = false;
+                }}
             />
           )}
 

src/pages/Product/Product.js

@@ -76,9 +76,7 @@ export const Product = observer(() => {
                             tab={item.name}
                             key={item.id}
                         >
-                            <ProductComponent
+                            <ProductComponent/>
-                                data={store.product.data}
-                            />
                         </TabPane>
                     ))}
                 </Tabs>

src/pages/Profile/Profile.js

@@ -1,24 +1,48 @@
 import React from "react";
-import {PageHeader} from "antd";
+import {Button, Card, Col, Input, Row} from "antd";
+import {BreadcumbComponent} from "../../component/BreadcumbComponent";
+import {FilterOutlined, PlusSquareOutlined} from "@ant-design/icons";
+import {LINKS} from "../../routes/app";
+
+const {Search} = Input;
 
 export const Profile = () => {
+    const routeData = [
+        {
+            route: LINKS.HOME,
+            name: "Home",
+        },
+        {
+            route: LINKS.PROFILE,
+            name: <span style={{fontWeight: 'bold'}}>Profile</span>,
+        },
+    ];
+
     return (
         <div className={["ppob-container"].join(" ")}>
-            <PageHeader
+            <BreadcumbComponent data={routeData}/>
-                style={{
+            <Card>
-                    padding: 0,
+                <Row style={{marginBottom: 20}}>
-                    margin: 0,
+                    <Col span={12}>
-                    height: 40,
+                        <Button>
-                    backgroundColor: "transparent",
+                            <FilterOutlined/>
-                }}
+                            Filter
-                title={"Profile"}
+                        </Button>
-            >
+                    </Col>
-            </PageHeader>
+                    <Col span={12} style={{textAlign: "right"}}>
-            Lorem ipsum dolor sit amet, consectetur adipisicing elit. Accusamus aut recusandae velit! Consequatur
+                        <Search
-            corporis,
+                            placeholder="input search text"
-            eum fuga, harum incidunt laboriosam minus necessitatibus neque non nostrum pariatur tempore. Dignissimos
+                            style={{width: 200, marginRight: 10}}
-            impedit
+                        />
-            rem tempora!
+                        <Button onClick={() => {
+                        }}>
+                            <PlusSquareOutlined/> New
+                        </Button>
+                    </Col>
+                </Row>
+                <div></div>
+            </Card>
+
         </div>
     )
 };

src/routes/app.js

@@ -4,6 +4,7 @@ import {About} from "../pages/About/About";
 import {Membership} from "../pages/Membership/Membership";
 import {Product} from "../pages/Product/Product";
 import {Transaction} from "../pages/Transaction/Transaction";
+import {Profile} from "../pages/Profile/Profile";
 
 export const LINKS = {
     HOME: "/app/home",
@@ -32,7 +33,7 @@ export const AppRoute = () => {
             <About/>
         </Route>
         <Route path={LINKS.PROFILE}>
-            <About/>
+            <Profile/>
         </Route>
         <Route path="/app" exact>
             <Redirect to={LINKS.HOME}/>