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

Merge branch 'develop' into 'devops-staging'

Browse Source 
Bug Fixing

See merge request empatnusabangsa/ppob/ppob-frontend!80
This commit is contained in:
ajat sudrajat 2022-01-21 09:34:12 +00:00
commit 762127ab71
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,8 @@ import {
AppstoreOutlined, AppstoreOutlined,
DollarCircleOutlined, DollarCircleOutlined,
UsergroupAddOutlined, UsergroupAddOutlined,
UnorderedListOutlined UnorderedListOutlined,
FormOutlined
} from "@ant-design/icons"; } from "@ant-design/icons";
import { AppRoute, LINKS } from "../../routes/app"; import { AppRoute, LINKS } from "../../routes/app";
import { useStore } from "../../utils/useStore"; import { useStore } from "../../utils/useStore";
@ -158,7 +159,7 @@ export const DesktopLayout = observer(() => {
</Menu.Item> </Menu.Item>
<Menu.Item key="konfirmasi"> <Menu.Item key="konfirmasi">
<Link to={LINKS.KONFIRMASI}> <Link to={LINKS.KONFIRMASI}>
<IdcardOutlined /> <FormOutlined />
<span>Konfirmasi Retail</span> <span>Konfirmasi Retail</span>
</Link> </Link>
</Menu.Item> </Menu.Item>

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

@ -23,6 +23,7 @@ import {
PieChartOutlined, PieChartOutlined,
UsergroupAddOutlined, UsergroupAddOutlined,
UnorderedListOutlined, UnorderedListOutlined,
FormOutlined,
} from "@ant-design/icons"; } from "@ant-design/icons";
import { observer } from "mobx-react-lite"; import { observer } from "mobx-react-lite";
import { useStore } from "../../utils/useStore"; import { useStore } from "../../utils/useStore";
@ -85,7 +86,7 @@ export const MenuList = observer((props) => {
</Menu.Item> </Menu.Item>
<Menu.Item key="konfirmasi"> <Menu.Item key="konfirmasi">
<Link to={LINKS.KONFIRMASI}> <Link to={LINKS.KONFIRMASI}>
<IdcardOutlined /> <FormOutlined />
<span>Konfirm Retail</span> <span>Konfirm Retail</span>
</Link> </Link>
</Menu.Item> </Menu.Item>

8
src/pages/Membership/Konfirmasi.js
View File

@ -110,8 +110,8 @@ export const Konfirmasi = observer(() => {
setToko(record); setToko(record);
setVisibleModalToko(true); setVisibleModalToko(true);
}} }}
// style={{backgroundColor:"cyan",color:"white"}} style={{backgroundColor:"#7c3ea3",color:"white"}}
type="primary" // type="primary"
> >
Lihat Foto Lihat Foto
</Button> </Button>
@ -630,7 +630,7 @@ export const Konfirmasi = observer(() => {
style={ style={
store.ui.mediaQuery.isDesktop store.ui.mediaQuery.isDesktop
? { ? {
width: "29vw", width: "22vw",
borderColor: "salmon", borderColor: "salmon",
marginLeft: "10px", marginLeft: "10px",
} }
@ -641,7 +641,7 @@ export const Konfirmasi = observer(() => {
} }
} }
> >
<Image src={`${gmbr.mobil}`} alt={idx} /> <Image src={`${gmbr.mobil}`} alt={idx} preview={false}/>
</Card> </Card>
))} ))}
</Row> </Row>