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

Merge branch 'develop' into 'devops-production'

Browse Source 
Bug Fixing

See merge request empatnusabangsa/ppob/ppob-frontend!148
This commit is contained in:
ajat sudrajat 2022-02-06 05:11:05 +00:00
commit 2145c160b3
1 changed files with 55 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
import React, { useState } from "react";
import { Button, Drawer, Layout, Menu, Popover, Typography } from "antd";
import { Button, Drawer, Layout, Menu, Popover, Typography, Card } from "antd";
import { MenuList } from "./MenuList";
import { Link, useHistory } from "react-router-dom";
import {
@ -394,8 +394,8 @@ export const DesktopLayout = observer(() => {
width: "100%",
paddingLeft: store.ui.mediaQuery.isMobile ? 10 : 20,
paddingRight: store.ui.mediaQuery.isMobile ? 0 : 20,
paddingBottom: 4,
marginTop: -5,
marginTop: -20,
}}
>
<Button
@ -424,28 +424,29 @@ export const DesktopLayout = observer(() => {
paddingTop: 5,
}}
>
{/*<img*/}
{/* className={[classes.logoFull]}*/}
{/* style={{*/}
{/* maxHeight: 18,*/}
{/* maxWidth: 75,*/}
{/* }}*/}
{/* src={parkirLogoFull}*/}
{/*/>*/}
{/*<Paragraph*/}
{/* style={{*/}
{/* margin: "-5px 0px 0px 2px",*/}
{/* padding: 0,*/}
{/* lineHeight: "18px",*/}
{/* fontSize: 8,*/}
{/* fontWeight: 800,*/}
{/* color: "#8c8c8c",*/}
{/* textAlign: "center",*/}
{/* }}*/}
{/*>*/}
{/* {store.authentication.userData.role || "Apps"}*/}
{/*</Paragraph>*/}
{/* <img
className={[classes.logoFull]}
style={{
maxHeight: 18,
maxWidth: 75,
}}
src={parkirLogoFull}
/> */}
{/* <Paragraph
style={{
padding: 0,
lineHeight: "18px",
fontSize: 8,
fontWeight: 800,
color: "#8c8c8c",
}}
>
{store.authentication.userData.role || "Apps"}
</Paragraph> */}
</div>
<Popover
className={store.ui.mediaQuery.isDesktop ? "shadow" : null}
autoAdjustOverflow={true}
@ -496,9 +497,14 @@ export const DesktopLayout = observer(() => {
visible={clicked}
onVisibleChange={() => setClicked(!clicked)}
>
{new Intl.NumberFormat("id-ID", {
style: "currency",
currency: "IDR",
}).format(store.authentication.profileData?.wallet || 0)}
<Button
size={"default"}
type={store.ui.mediaQuery.isDesktop ? "" : "link"}
title="tes"
style={{
marginRight: store.ui.mediaQuery.isDesktop ? 20 : 10,
}}
@ -548,6 +554,28 @@ export const DesktopLayout = observer(() => {
width: "100%",
}}
></div>
<Card
size="small"
title={
<span
style={{
fontStyle: "bold",
textAlign: "center",
}}
>
Saldo :{" "}
{new Intl.NumberFormat("id-ID", {
style: "currency",
currency: "IDR",
}).format(store.authentication.profileData?.wallet || 0)}
</span>
}
style={{
marginRight: 10,
width: 210,
height: 31,
}}
></Card>
<Popover
className={store.ui.mediaQuery.isDesktop ? "shadow" : null}
autoAdjustOverflow={true}
@ -602,11 +630,12 @@ export const DesktopLayout = observer(() => {
size={"default"}
type={store.ui.mediaQuery.isDesktop ? "" : "link"}
style={{
marginRight: store.ui.mediaQuery.isDesktop ? 20 : 10,
marginRight: store.ui.mediaQuery.isDesktop ? 30 : 10,
width: 50,
}}
icon={
store.ui.mediaQuery.isDesktop ? (
<UserOutlined style={{ fontSize: "13px" }} />
<UserOutlined style={{ fontSize: "15px" }} />
) : (
<UserOutlined
style={{ fontSize: "13px", color: "#5b5b5b" }}