From 258dd4af34e4679b7f885484f94a59f14cdaebc7 Mon Sep 17 00:00:00 2001
From: caturbgs <savemeplease11>
Date: Thu, 23 Dec 2021 23:21:12 +0700
Subject: [PATCH 1/3] feat: link detail url

---
 src/pages/Product/ProductDetail.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Product/ProductDetail.js b/src/pages/Product/ProductDetail.js
index a62d047..e30aa91 100644
--- a/src/pages/Product/ProductDetail.js
+++ b/src/pages/Product/ProductDetail.js
@@ -25,8 +25,8 @@ export const ProductDetail = observer(() => {
       name: <span style={{ fontWeight: "bold" }}>Produk</span>,
     },
     {
-      route: LINKS.PRODUCT_DETAIL,
-      name: <span style={{ fontWeight: "bold" }}>Detail Produk</span>,
+      route: LINKS.PRODUCT_DETAIL.replace(':id', `${id}`),
+      name: <span style={{fontWeight: "bold"}}>Detail Produk</span>,
     },
   ];
 

From 7c38f65ba973772583fb86524d8766450191e0a6 Mon Sep 17 00:00:00 2001
From: caturbgs <savemeplease11>
Date: Fri, 24 Dec 2021 00:54:29 +0700
Subject: [PATCH 2/3] feat: ajust detail user

---
 src/pages/Membership/DetailUser.js | 108 +++++++++++++----------------
 1 file changed, 47 insertions(+), 61 deletions(-)

diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js
index c0afcee..a7b5249 100644
--- a/src/pages/Membership/DetailUser.js
+++ b/src/pages/Membership/DetailUser.js
@@ -1,5 +1,5 @@
 import React, {useContext, useEffect, useState} from "react";
-import {Button, Card, Col, message, Row, Space, Table, Tag, Typography,} from "antd";
+import {Button, Card, Col, message, Row, Space, Table, Typography,} from "antd";
 import {BreadcumbComponent} from "../../component/BreadcumbComponent";
 import {LINKS} from "../../routes/app";
 import {useStore} from "../../utils/useStore";
@@ -104,6 +104,11 @@ export const DetailUser = observer(() => {
       title: "Amount",
       dataIndex: "amount",
       key: "amount",
+      render: (text) =>
+          new Intl.NumberFormat("id-ID", {
+            style: "currency",
+            currency: "IDR",
+          }).format(text),
     },
     {
       title: "Transaction Date",
@@ -117,19 +122,6 @@ export const DetailUser = observer(() => {
         );
       },
     },
-    {
-      title: "Status",
-      dataIndex: "isActive",
-      key: "isActive",
-      render: (text, record) => (
-          <Tag
-              color={store.membership.dataDetail.isActive === true ? "processing" : "#E3E8EE"}
-              style={{color: "#4F566B"}}
-          >
-            {store.membership.dataDetail.isActive === true ? " ACTIVE" : "INACTIVE"}
-          </Tag>
-      ),
-    },
   ];
 
   const routeData = [
@@ -142,8 +134,8 @@ export const DetailUser = observer(() => {
       name: <span style={{ fontWeight: "bold" }}>Keanggotaan</span>,
     },
     {
-      route: LINKS.USER_DETAIL,
-      name: <span style={{ fontWeight: "bold" }}>Detail Anggota</span>,
+      route: LINKS.USER_DETAIL.replace(":id", id),
+      name: <span style={{fontWeight: "bold"}}>Detail User</span>,
     },
   ];
 
@@ -194,56 +186,50 @@ export const DetailUser = observer(() => {
             </Row>
           </Col>
           <Col lg={12} xs={24}>
-            <Title strong level={3}>Action User Detail</Title>
-            <Space
+            {store.authentication.userData.role === "Admin" && <Title strong level={3}>Action User Detail</Title>}
+            {store.authentication.userData.role === "Admin" && <Space
                 size="middle"
                 align={"center"}
                 wrap={true}
                 style={{textAlign: 'center'}}
             >
-              {store.authentication.userData.role === "Admin" &&
-                  <Button
-                      type={store.membership.dataDetail.isActive === true ? "danger" : "primary"}
-                      onClick={() => changeStatus(store.membership.dataDetail.id, store.membership.dataDetail.isActive)}
-                  >
-                    {store.membership.dataDetail.isActive === true ? "Inactive" : "Active"}
-                  </Button>
-              }
-              {store.authentication.userData.role === "Admin" &&
-                  <Button
-                      onClick={() => {
-                        setInitialData({
-                          id: store.membership.dataDetail.id,
-                          name: store.membership.dataDetail.userDetail.name,
-                          username: store.membership.dataDetail.username,
-                          phone_number: store.membership.dataDetail.userDetail.phone_number,
-                          roleId: store.membership.dataDetail.roles.id,
-                          isChangePassword: false,
-                        });
-                        setVisibleModal(true);
-                      }}
-                  >
-                    Edit
-                  </Button>
-              }
-              {store.authentication.userData.role === "Admin" &&
-                  <Button
-                      onClick={() => {
-                        setInitialData({
-                          id: store.membership.dataDetail.id,
-                          name: store.membership.dataDetail.userDetail.name,
-                          username: store.membership.dataDetail.username,
-                          phone_number: store.membership.dataDetail.userDetail.phone_number,
-                          roleId: store.membership.dataDetail.roles.id,
-                          isChangePassword: true,
-                        });
-                        setVisibleModal(true);
-                      }}
-                  >
-                    Ganti Password
-                  </Button>
-              }
-            </Space>
+              <Button
+                  type={store.membership.dataDetail.isActive === true ? "danger" : "primary"}
+                  onClick={() => changeStatus(store.membership.dataDetail.id, store.membership.dataDetail.isActive)}
+              >
+                {store.membership.dataDetail.isActive === true ? "Inactive" : "Active"}
+              </Button>
+              <Button
+                  onClick={() => {
+                    setInitialData({
+                      id: store.membership.dataDetail.id,
+                      name: store.membership.dataDetail.userDetail.name,
+                      username: store.membership.dataDetail.username,
+                      phone_number: store.membership.dataDetail.userDetail.phone_number,
+                      roleId: store.membership.dataDetail.roles.id,
+                      isChangePassword: false,
+                    });
+                    setVisibleModal(true);
+                  }}
+              >
+                Edit
+              </Button>
+              <Button
+                  onClick={() => {
+                    setInitialData({
+                      id: store.membership.dataDetail.id,
+                      name: store.membership.dataDetail.userDetail.name,
+                      username: store.membership.dataDetail.username,
+                      phone_number: store.membership.dataDetail.userDetail.phone_number,
+                      roleId: store.membership.dataDetail.roles.id,
+                      isChangePassword: true,
+                    });
+                    setVisibleModal(true);
+                  }}
+              >
+                Ganti Password
+              </Button>
+            </Space>}
           </Col>
         </Row>
         <Row>

From c68d8105e32709725eff85bb66d250c164ce4fbf Mon Sep 17 00:00:00 2001
From: caturbgs <savemeplease11>
Date: Fri, 24 Dec 2021 00:57:42 +0700
Subject: [PATCH 3/3] feat: remove extra whitespace

---
 src/pages/Membership/DetailUser.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js
index a7b5249..1301340 100644
--- a/src/pages/Membership/DetailUser.js
+++ b/src/pages/Membership/DetailUser.js
@@ -117,7 +117,7 @@ export const DetailUser = observer(() => {
       render: (text, record) => {
         return (
           <Text>
-            {format(parseISO(record.transaction_date), "dd MMMM yyyy ")}
+            {format(parseISO(record.transaction_date), "dd MMMM yyyy")}
           </Text>
         );
       },