diff --git a/src/index.css b/src/index.css index e81bbc3..39746de 100644 --- a/src/index.css +++ b/src/index.css @@ -53,3 +53,7 @@ code { .ppob-container { padding: 14px 14px 14px 14px; } + +.shadow { + box-shadow: 0 7px 14px 0 rgba(60, 66, 87, 0.05), 0 3px 6px 0 rgba(0, 0, 0, 0.05); +} \ No newline at end of file diff --git a/src/pages/App/DesktopLayout.js b/src/pages/App/DesktopLayout.js index d41f7d7..7d1edf9 100644 --- a/src/pages/App/DesktopLayout.js +++ b/src/pages/App/DesktopLayout.js @@ -18,7 +18,7 @@ export const DesktopLayout = observer(() => { { theme={"light"} className={store.ui.mediaQuery.isMobile ? "shadow" : null} style={{ - height: store.ui.mediaQuery.isDesktop ? 54 : 35, + height: store.ui.mediaQuery.isDesktop ? 24 : 35, // width: 'calc(100vw - 200px)', width: "100%", position: store.ui.mediaQuery.isDesktop ? "fixed" : "fixed", @@ -158,7 +158,7 @@ export const DesktopLayout = observer(() => { backgroundColor: store.ui.mediaQuery.isMobile ? "#fff" : "transparent", - maxWidth: store.ui.mediaQuery.isDesktop ? 1920 : 768, + maxWidth: store.ui.mediaQuery.isDesktop ? 1024 : 768, // minWidth: store.ui.mediaQuery.isDesktop ? 768 : 0, top: store.ui.mediaQuery.isMobile ? 0 : 12, /**/ @@ -426,7 +426,7 @@ export const DesktopLayout = observer(() => { zIndex: 22, // height: `calc(100vh - ${store.ui.mediaQuery.isDesktop ? 78 : 71}px)`, height: `calc(100vh - ${ - store.ui.mediaQuery.isDesktop ? 78 : 71 + store.ui.mediaQuery.isDesktop ? 43 : 37 }px)`, // paddingLeft: 8, // paddingRight: 8 diff --git a/src/pages/Membership/Membership.js b/src/pages/Membership/Membership.js index 7add9f3..72276fa 100644 --- a/src/pages/Membership/Membership.js +++ b/src/pages/Membership/Membership.js @@ -1,5 +1,5 @@ import React, {useEffect, useState} from "react"; -import {Button, Card, Col, Input, List, message, Modal, PageHeader, Row, Space, Table, Tag} from "antd"; +import {Button, Card, Col, Input, 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"; @@ -137,132 +137,41 @@ export const Membership = observer(() => {
- {store.ui.mediaQuery.isDesktop && ( -
- - - - - - - - - - { - 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 && ( -
- - } - size={"small"} - style={{margin: 3}} - > - Filter - - } - subTitle="" - /> - - - { - return ( -
- - {item.name}} - description={ -
-

- Username : {item.username}
-

-

- {item.status} -

-
- } - /> - {/*
- - {item.updated_at ? moment(item.updated_at).format("DD MMM YY, H:mm:ss") : "There is not top up yet"} -

- } - prefix={"Rp"} - precision={0} - style={{ fontSize: 12, fontWeight: 300 }} - valueStyle={{ - color: "#5469d4", - fontSize: 12, - fontWeight: 600, - textAlign: "right", - }} - value={item.balances} - /> - -
*/} -
- {/* */} -
- ); - }} +
+ +
+ + + + - - )} + + + +
{ + store.membership.pageSize = page.pageSize; + store.membership.page = page.current; + store.membership.getData(); + }} current={store.membership.page} + loading={store.membership.pageSize}/> + { }, ]; return ( -
+