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

fix: menus

Browse Source
This commit is contained in:
rarsyansyahr
2021-12-16 17:45:00 +07:00
parent 06eb607c7a
commit a8a8330941
4 changed files with 342 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/pages/App/DesktopLayout.js
View File

@@ -10,6 +10,8 @@ import {
DatabaseOutlined,
FileAddOutlined,
FileSyncOutlined,
FileProtectOutlined,
ShoppingCartOutlined,
} from "@ant-design/icons";
import { AppRoute, LINKS } from "../../routes/app";
import { useStore } from "../../utils/useStore";
@@ -122,12 +124,12 @@ export const DesktopLayout = observer(() => {
{store.authentication.userData.role !== "Retail" && (
<Menu.Item key="membership">
<Link to={LINKS.MEMBERSHIP}>
<HomeOutlined />
<FileProtectOutlined />
<span>Membership</span>
</Link>
</Menu.Item>
)}
{store.authentication.userData.role !== "Retail" && (
{store.authentication.userData.role === "Admin" && (
<SubMenu
key="config"
icon={<HomeOutlined />}
@@ -154,10 +156,10 @@ export const DesktopLayout = observer(() => {
</Menu.Item>
</SubMenu>
)}
{store.authentication.userData.role !== "Retail" && (
{store.authentication.userData.role === "Admin" && (
<SubMenu
key="product-main"
icon={<ProfileOutlined />}
icon={<DatabaseOutlined />}
title="Product"
>
<Menu.Item key="product">
@@ -180,28 +182,28 @@ export const DesktopLayout = observer(() => {
</Menu.Item>
</SubMenu>
)}
{store.authentication.userData.role !== "Retail" && (
{store.authentication.userData.role !== "Admin" && (
<Menu.Item key="product">
<Link to={LINKS.PRODUCT}>
<HomeOutlined />
<DatabaseOutlined />
<span>Product</span>
</Link>
</Menu.Item>
)}
{store.authentication.userData.role === "Retail" && (
<Menu.Item key="transaction">
<Link to={LINKS.TRANSACTION}>
<ShoppingCartOutlined />
<span>Transaction</span>
</Link>
</Menu.Item>
)}
<Menu.Item key="payback">
<Link to={LINKS.PAYBACK}>
<HomeOutlined />
<DatabaseOutlined />
<span>Payback</span>
</Link>
</Menu.Item>
{store.authentication.userData.role === "Retail" && (
<Menu.Item key="transaction">
<Link to={LINKS.TRANSACTION}>
<HomeOutlined />
<span>Transaction</span>
</Link>
</Menu.Item>
)}
<Menu.Item key="profile">
<Link to={LINKS.PROFILE}>
<UserOutlined />

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

@@ -12,6 +12,7 @@ import {
MoneyCollectOutlined,
ProfileOutlined,
ProjectOutlined,
ShoppingCartOutlined,
UserOutlined,
} from "@ant-design/icons";
import { observer } from "mobx-react-lite";
@@ -59,7 +60,7 @@ export const MenuList = observer((props) => {
</Link>
</Menu.Item>
)}
{store.authentication.userData.role !== "Retail" && (
{store.authentication.userData.role === "Admin" && (
<SubMenu key="config" icon={<MenuUnfoldOutlined />} title="Config">
<Menu.Item key="partner">
<Link to={LINKS.PARTNER}>
@@ -81,7 +82,7 @@ export const MenuList = observer((props) => {
</Menu.Item>
</SubMenu>
)}
{store.authentication.userData.role !== "Retail" && (
{store.authentication.userData.role === "Admin" && (
<SubMenu key="product-main" icon={<ProfileOutlined />} title="Product">
<Menu.Item key="product">
<Link to={LINKS.PRODUCT}>
@@ -103,10 +104,18 @@ export const MenuList = observer((props) => {
</Menu.Item>
</SubMenu>
)}
{store.authentication.userData.role === ("Retail" || "Admin") && (
{store.authentication.userData.role !== "Admin" && (
<Menu.Item key="retail">
<Link to={LINKS.PRODUCT}>
<DatabaseOutlined />
<span>Product</span>
</Link>
</Menu.Item>
)}
{store.authentication.userData.role === "Retail" && (
<Menu.Item key="transaction">
<Link to={LINKS.TRANSACTION}>
<HomeOutlined />
<ShoppingCartOutlined />
<span>Transaction</span>
</Link>
</Menu.Item>
@@ -117,14 +126,6 @@ export const MenuList = observer((props) => {
<span>Payback</span>
</Link>
</Menu.Item>
{store.authentication.userData.role === ("Retail" || "Admin") && (
<Menu.Item key="transaction">
<Link to={LINKS.TRANSACTION}>
<HomeOutlined />
<span>Transaction</span>
</Link>
</Menu.Item>
)}
<Menu.Item key="profile">
<Link to={LINKS.PROFILE}>
<UserOutlined />