kediritechnopark/kedaimaster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ok

Browse Source
This commit is contained in:
everythingonblack
2025-05-05 18:42:04 +07:00
parent 70433dc6c6
commit f674b275b1
7 changed files with 51 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
src/components/Header.js
View File

@@ -66,19 +66,19 @@ const gg = keyframes`
height: 60px;
}
100% {
top: 34px;
right: 30px;
width: 200px; /* Adjust this value based on the length of the text */
height: 60px;
top: 45px;
right: 51px;
width: 200px;
height: 40px;
}
`;
const ss = keyframes`
0% {
top: 34px;
right: 30px;
width: 200px; /* Adjust this value based on the length of the text */
height: 60px;
top: 45px;
right: 51px;
width: 200px;
height: 40px;
}
100% {
top: 20px;
@@ -112,19 +112,19 @@ const g = keyframes`
height: 60px;
}
100% {
top: 10px;
right: 220px;
width: 60px;
height: 60px;
top: 28px;
right: 247px;
width: 40px;
height: 40px;
}
`;
const s = keyframes`
0% {
top: 10px;
right: 220px;
width: 60px;
height: 60px;
top: 28px;
right: 247px;
width: 40px;
height: 40px;
}
100% {
top: 0px;
@@ -143,9 +143,8 @@ const grow = keyframes`
}
100% {
width: 300px;
height: auto;
border-top-left-radius: 20px;
border-bottom-left-radius: 20px;
border-top-left-radius: 15px;
border-bottom-left-radius: 15px;
}
`;
@@ -176,6 +175,8 @@ const Rectangle = styled.div`
padding: 10px;
box-sizing: border-box;
overflow-x: hidden;
font-size: 14px;
color: #393939;
`;
const ChildContainer = styled.div`
@@ -193,27 +194,22 @@ const ChildWrapper = styled.div`
width: 100%;
`;
const Child = styled.div`
width: 100%;
height: 40px;
margin: 5px;
border-top-left-radius: 5px;
border-bottom-left-radius: 5px;
padding-left: 5px;
font-family: "Plus Jakarta Sans", sans-serif;
font-weight: 500;
font-style: normal;
width: 100%;
height: 36px;
font-family: "Plus Jakarta Sans", sans-serif;
font-weight: 500;
font-style: normal;
${(props) =>
props.hasChildren
? `
border: 1px solid #ababab;
margin-top: 14px;
border-top: 0.5px solid #a5a5a5;
height: auto;
padding-bottom: 10px;
`
: `
display: flex;
align-items: center;
background-color: rgb(223 223 223);
`}
`;
@@ -335,7 +331,7 @@ const Header = ({
)}
{user.username !== undefined && (
<Child onClick={() => setModal("edit_account")}>
Ubah profil
Kelola akun
</Child>
)}
{user.roleId == 0 && (
@@ -348,7 +344,9 @@ const Header = ({
user.roleId === 1 && (
<>
<Child hasChildren>
<Child>
{shopName}
</Child>
<Child>
Mode pengembangan &nbsp;
<Switch
@@ -363,7 +361,19 @@ const Header = ({
</Child>
<Child hasChildren>
Kasir
<Child>Konfigurasi</Child>
<Child onClick={() => setModal("welcome_config")}>
Desain kafe
</Child>
<Child onClick={() => setModal("edit_tables")}>
Identifikasi kedai
</Child>
<Child onClick={() => setModal("payment_option")}>
Metode pembayaran
</Child>
</Child>
<Child hasChildren>
<Child>Kasir</Child>
<Child onClick={() => setModal("create_clerk")}>
+ Tambah
</Child>
@@ -383,18 +393,6 @@ const Header = ({
</Child>
))}
</Child>
<Child hasChildren>
Konfigurasi
<Child onClick={() => setModal("welcome_config")}>
Desain kafe
</Child>
<Child onClick={() => setModal("edit_tables")}>
Identifikasi kedai
</Child>
<Child onClick={() => setModal("payment_option")}>
Metode pembayaran
</Child>
</Child>
</Child>
</>
)}
@@ -402,7 +400,7 @@ const Header = ({
user.cafeId == shopId &&
user.roleId === 2 && (
<Child hasChildren>
{shopName}
<Child>{shopName}</Child>
<Child>
Mode edit&nbsp;
@@ -445,7 +443,7 @@ const Header = ({
</Child>
)}
{user.username !== undefined && (
<Child onClick={isLogout}>Logout</Child>
<Child hasChildren ><Child onClick={isLogout}>Logout</Child></Child>
)}
</ChildContainer>
</Rectangle>

2
src/components/MusicPlayer.js
View File

@@ -108,7 +108,7 @@ export function MusicPlayer({ socket, shopId, user, shopOwnerId, isSpotifyNeedLo
// setSubtitleColor("white");
// setSubtitleBG("black");
// }
const proxiedUrl = `https://api.kedaimaster.com/image?url=${encodeURIComponent(modifyUrl(imageUrl))}`; // Use your proxy to fetch the image
const proxiedUrl = `https://test.api.kedaimaster.com/image?url=${encodeURIComponent(modifyUrl(imageUrl))}`; // Use your proxy to fetch the image
setBackgroundImage(proxiedUrl);
} catch (error) {