diff --git a/package.json b/package.json
index 3576ac4..96b454b 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "groovebrew-mockup",
"version": "0.1.0",
"private": true,
- "homepage": "https://kedaimaster.com",
+ "homepage": "https://test.kedaimaster.com",
"dependencies": {
"@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0",
diff --git a/src/App.css b/src/App.css
index 4d5885c..2ec71d5 100644
--- a/src/App.css
+++ b/src/App.css
@@ -30,7 +30,7 @@ body {
width: 100%;
background-image: url(https://i.ibb.co.com/F4FMw1jz/testuseonly.png);
z-index: 1000;
- filter: opacity(0.05);
+ filter: opacity(0.04);
pointer-events: none;
}
diff --git a/src/components/Header.js b/src/components/Header.js
index c1fee89..3d8771c 100644
--- a/src/components/Header.js
+++ b/src/components/Header.js
@@ -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 && (
setModal("edit_account")}>
- Ubah profil
+ Kelola akun
)}
{user.roleId == 0 && (
@@ -348,7 +344,9 @@ const Header = ({
user.roleId === 1 && (
<>
+
{shopName}
+
Mode pengembangan
- Kasir
+ Konfigurasi
+ setModal("welcome_config")}>
+ Desain kafe
+
+ setModal("edit_tables")}>
+ Identifikasi kedai
+
+ setModal("payment_option")}>
+ Metode pembayaran
+
+
+
+ Kasir
setModal("create_clerk")}>
+ Tambah
@@ -383,18 +393,6 @@ const Header = ({
))}
-
- Konfigurasi
- setModal("welcome_config")}>
- Desain kafe
-
- setModal("edit_tables")}>
- Identifikasi kedai
-
- setModal("payment_option")}>
- Metode pembayaran
-
-
>
)}
@@ -402,7 +400,7 @@ const Header = ({
user.cafeId == shopId &&
user.roleId === 2 && (
- {shopName}
+ {shopName}
Mode edit
@@ -445,7 +443,7 @@ const Header = ({
)}
{user.username !== undefined && (
- Logout
+ Logout
)}
diff --git a/src/components/MusicPlayer.js b/src/components/MusicPlayer.js
index 754932f..3b3c5db 100644
--- a/src/components/MusicPlayer.js
+++ b/src/components/MusicPlayer.js
@@ -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) {
diff --git a/src/config.js b/src/config.js
index 967c5ce..ff08a5e 100644
--- a/src/config.js
+++ b/src/config.js
@@ -1,5 +1,5 @@
// src/config.js
-const API_BASE_URL = 'https://api.kedaimaster.com';
+const API_BASE_URL = 'https://test.api.kedaimaster.com';
export default API_BASE_URL;
diff --git a/src/pages/CafePage.js b/src/pages/CafePage.js
index b44ac8f..fd6c9e0 100644
--- a/src/pages/CafePage.js
+++ b/src/pages/CafePage.js
@@ -244,6 +244,7 @@ function CafePage({
queue={queue}
setModal={setModal}
/>
+
{
let encodedCouponCode = encodeURIComponent(encryptedCouponCode);
// Construct the URL with the encoded coupon code as a query parameter
- const urlWithCoupon = `https://coupon.kedaimaster.com/coupon?c=${encodedCouponCode}`;
+ const urlWithCoupon = `https://test.coupon.kedaimaster.com/coupon?c=${encodedCouponCode}`;
// Optionally, set the URL to use with the coupon
setCouponUrl(urlWithCoupon);