ok
This commit is contained in:
@@ -36,7 +36,7 @@ body {
|
|||||||
height: 100%;
|
height: 100%;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
background-image: url(https://i.ibb.co.com/F4FMw1jz/testuseonly.png);
|
background-image: url(https://i.ibb.co.com/F4FMw1jz/testuseonly.png);
|
||||||
z-index: 1000;
|
z-index: 0; /* align with item lister */
|
||||||
filter: opacity(0.04);
|
filter: opacity(0.04);
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
}
|
}
|
||||||
@@ -67,7 +67,7 @@ body {
|
|||||||
|
|
||||||
/* Ensure sticky cart bar stays above item overlays */
|
/* Ensure sticky cart bar stays above item overlays */
|
||||||
.StickyCartBar {
|
.StickyCartBar {
|
||||||
z-index: 100 !important; /* Menurunkan z-index agar tidak menutupi material list */
|
z-index: 0 !important; /* align with item lister */
|
||||||
position: fixed;
|
position: fixed;
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
left: 0;
|
left: 0;
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ const HeaderBar = styled.div`
|
|||||||
padding: 12px 14px;
|
padding: 12px 14px;
|
||||||
color: black;
|
color: black;
|
||||||
background-color: #ffffff;
|
background-color: #ffffff;
|
||||||
z-index: 200;
|
z-index: ${(props) => (props.zIndexLevel !== undefined ? props.zIndexLevel : 200)};
|
||||||
border: 1px solid #00000000;
|
border: 1px solid #00000000;
|
||||||
margin: 20px 12px;
|
margin: 20px 12px;
|
||||||
border-radius: 13px;
|
border-radius: 13px;
|
||||||
@@ -148,7 +148,7 @@ const Rectangle = styled.div`
|
|||||||
width: 240px;
|
width: 240px;
|
||||||
max-height: 75vh;
|
max-height: 75vh;
|
||||||
background-color: white;
|
background-color: white;
|
||||||
z-index: 198;
|
z-index: ${(props) => (props.baseZIndex !== undefined ? props.baseZIndex : 198)};
|
||||||
box-shadow: 0 8px 24px rgba(0, 0, 0, 0.12);
|
box-shadow: 0 8px 24px rgba(0, 0, 0, 0.12);
|
||||||
border: 1px solid #f0f0f0;
|
border: 1px solid #f0f0f0;
|
||||||
border-radius: 12px;
|
border-radius: 12px;
|
||||||
@@ -276,7 +276,9 @@ const Header = ({
|
|||||||
removeConnectedGuestSides,
|
removeConnectedGuestSides,
|
||||||
setIsEditMode,
|
setIsEditMode,
|
||||||
isEditMode,
|
isEditMode,
|
||||||
HeaderMargin = '25px'
|
HeaderMargin = '25px',
|
||||||
|
zIndexLevel,
|
||||||
|
rectZIndex
|
||||||
}) => {
|
}) => {
|
||||||
const { goToLogin, goToGuestSideLogin, goToAdminCafes } =
|
const { goToLogin, goToGuestSideLogin, goToAdminCafes } =
|
||||||
useNavigationHelpers(shopId, tableCode);
|
useNavigationHelpers(shopId, tableCode);
|
||||||
@@ -354,7 +356,7 @@ const Header = ({
|
|||||||
};
|
};
|
||||||
return (
|
return (
|
||||||
<HeaderBarbackground shopName={shopName}>
|
<HeaderBarbackground shopName={shopName}>
|
||||||
<HeaderBar HeaderMargin={HeaderMargin} shopName={shopName}>
|
<HeaderBar HeaderMargin={HeaderMargin} shopName={shopName} zIndexLevel={zIndexLevel}>
|
||||||
<LeftGroup>
|
<LeftGroup>
|
||||||
<CafeAvatar
|
<CafeAvatar
|
||||||
src={shopImage && !shopImage.includes('undefined') ? shopImage : "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcS-DjX_bGBax4NL14ULvkAdU4FP3FKoWXWu5w&s"}
|
src={shopImage && !shopImage.includes('undefined') ? shopImage : "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcS-DjX_bGBax4NL14ULvkAdU4FP3FKoWXWu5w&s"}
|
||||||
@@ -378,7 +380,7 @@ const Header = ({
|
|||||||
<HamburgerIcon />
|
<HamburgerIcon />
|
||||||
</HamburgerButton>
|
</HamburgerButton>
|
||||||
{showRectangle && (
|
{showRectangle && (
|
||||||
<Rectangle ref={rectangleRef} animate={animate}>
|
<Rectangle ref={rectangleRef} animate={animate} baseZIndex={rectZIndex !== undefined ? rectZIndex : zIndexLevel}>
|
||||||
<ChildContainer>
|
<ChildContainer>
|
||||||
{guestSideOfClerk && guestSideOfClerk.clerkUsername && (
|
{guestSideOfClerk && guestSideOfClerk.clerkUsername && (
|
||||||
<Child hasChildren>
|
<Child hasChildren>
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import React, { useState, useEffect, useRef } from "react";
|
import React, { useState, useEffect, useRef } from "react";
|
||||||
|
import { createPortal } from "react-dom";
|
||||||
import styles from "./Modal.module.css";
|
import styles from "./Modal.module.css";
|
||||||
import { getImageUrl } from "../helpers/itemHelper.js";
|
import { getImageUrl } from "../helpers/itemHelper.js";
|
||||||
|
|
||||||
@@ -106,7 +107,7 @@ const ItemConfig = ({
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return createPortal(
|
||||||
<div onClick={handleOverlayClick} className={styles.modalOverlay}>
|
<div onClick={handleOverlayClick} className={styles.modalOverlay}>
|
||||||
<div onClick={handleContentClick} className={styles.modalContent}>
|
<div onClick={handleContentClick} className={styles.modalContent}>
|
||||||
<div className={styles.imageSection}>
|
<div className={styles.imageSection}>
|
||||||
@@ -208,7 +209,8 @@ const ItemConfig = ({
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>,
|
||||||
|
document.body
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -97,7 +97,7 @@
|
|||||||
top: 0;
|
top: 0;
|
||||||
right: 0;
|
right: 0;
|
||||||
background-color: white;
|
background-color: white;
|
||||||
z-index: 300;
|
z-index: 0; /* align with item lister */
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import React, {useState, useEffect} from "react";
|
import React, {useState, useEffect} from "react";
|
||||||
|
import { createPortal } from "react-dom";
|
||||||
import styles from "./Modal.module.css";
|
import styles from "./Modal.module.css";
|
||||||
|
|
||||||
import AccountUpdatePage from "../components/AccountUpdatePage.js";
|
import AccountUpdatePage from "../components/AccountUpdatePage.js";
|
||||||
@@ -75,7 +76,7 @@ const Modal = ({ user, shop, isOpen, onClose, modalContent, deviceType, setModal
|
|||||||
event.stopPropagation();
|
event.stopPropagation();
|
||||||
};
|
};
|
||||||
if(modalContent == '') handleOverlayClick();
|
if(modalContent == '') handleOverlayClick();
|
||||||
return (
|
return createPortal(
|
||||||
<div key={updateKey} onClick={handleOverlayClick} className={styles.modalOverlay}>
|
<div key={updateKey} onClick={handleOverlayClick} className={styles.modalOverlay}>
|
||||||
<div className={`${styles.modalContent} ${(modalContent === 'edit_tables' || modalContent === 'payment_option' || modalContent === 'create_clerk') ? styles.modalContentWide : ''}`} onClick={handleContentClick}>
|
<div className={`${styles.modalContent} ${(modalContent === 'edit_tables' || modalContent === 'payment_option' || modalContent === 'create_clerk') ? styles.modalContentWide : ''}`} onClick={handleContentClick}>
|
||||||
|
|
||||||
@@ -132,7 +133,8 @@ const Modal = ({ user, shop, isOpen, onClose, modalContent, deviceType, setModal
|
|||||||
{modalContent === "message" && <Message handleYes={onModalYesFunction} handleNo={handleNo}/>}
|
{modalContent === "message" && <Message handleYes={onModalYesFunction} handleNo={handleNo}/>}
|
||||||
{modalContent === "player-prompt" && <PlayerPrompt cafeId={shop.cafeId} setModal={setModal} handleClose={handleOverlayClick} welcomePageConfig={shop.welcomePageConfig}/>}
|
{modalContent === "player-prompt" && <PlayerPrompt cafeId={shop.cafeId} setModal={setModal} handleClose={handleOverlayClick} welcomePageConfig={shop.welcomePageConfig}/>}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>,
|
||||||
|
document.body
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -31,14 +31,14 @@
|
|||||||
text-shadow: 2px 2px 4px rgba(0, 0, 0, 0.7);
|
text-shadow: 2px 2px 4px rgba(0, 0, 0, 0.7);
|
||||||
|
|
||||||
border-radius: 0 0 15px 15px;
|
border-radius: 0 0 15px 15px;
|
||||||
z-index: 1;
|
z-index: 0; /* align with item lister */
|
||||||
}
|
}
|
||||||
|
|
||||||
.current-name {
|
.current-name {
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
position: relative;
|
position: relative;
|
||||||
z-index: 2;
|
z-index: 1;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
margin: 35px 30px;
|
margin: 35px 30px;
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
@@ -70,7 +70,7 @@
|
|||||||
.current-artist {
|
.current-artist {
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
position: relative;
|
position: relative;
|
||||||
z-index: 2;
|
z-index: 1;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
margin: -32px 30px;
|
margin: -32px 30px;
|
||||||
font-size: 18px;
|
font-size: 18px;
|
||||||
@@ -83,7 +83,7 @@
|
|||||||
.progress-container {
|
.progress-container {
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
position: relative;
|
position: relative;
|
||||||
z-index: 2;
|
z-index: 1;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
margin: 12px 30px;
|
margin: 12px 30px;
|
||||||
}
|
}
|
||||||
@@ -318,4 +318,3 @@
|
|||||||
.search-button.clicked {
|
.search-button.clicked {
|
||||||
background-color: #d0c7b3; /* The color when clicked */
|
background-color: #d0c7b3; /* The color when clicked */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
.watermark {
|
.watermark {
|
||||||
z-index: 5;
|
z-index: 0; /* align with item lister */
|
||||||
margin-top: 30px;
|
margin-top: 30px;
|
||||||
background-color: rgb(222, 237, 100);
|
background-color: rgb(222, 237, 100);
|
||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
@@ -28,7 +28,7 @@
|
|||||||
/* Media query for desktop */
|
/* Media query for desktop */
|
||||||
@media (min-width: 768px) { /* Adjust the min-width as needed */
|
@media (min-width: 768px) { /* Adjust the min-width as needed */
|
||||||
.watermark {
|
.watermark {
|
||||||
z-index: 5;
|
z-index: 0; /* align with item lister */
|
||||||
margin-top: 30px;
|
margin-top: 30px;
|
||||||
background-color: rgb(222, 237, 100);
|
background-color: rgb(222, 237, 100);
|
||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
|
|||||||
@@ -246,6 +246,8 @@ function CafePage({
|
|||||||
removeConnectedGuestSides={removeConnectedGuestSides}
|
removeConnectedGuestSides={removeConnectedGuestSides}
|
||||||
setIsEditMode={(e) => setIsEditMode(e)}
|
setIsEditMode={(e) => setIsEditMode(e)}
|
||||||
isEditMode={isEditMode}
|
isEditMode={isEditMode}
|
||||||
|
zIndexLevel={9000}
|
||||||
|
rectZIndex={9000}
|
||||||
/>
|
/>
|
||||||
<MusicPlayer
|
<MusicPlayer
|
||||||
socket={socket}
|
socket={socket}
|
||||||
|
|||||||
Reference in New Issue
Block a user