From c59e3fc3777335620a97ad0cd6f2a29c502ea526 Mon Sep 17 00:00:00 2001 From: everythingonblack Date: Tue, 29 Apr 2025 19:59:51 +0700 Subject: [PATCH] ok --- package.json | 2 +- src/components/MusicPlayer.js | 2 +- src/components/Watermark.js | 17 +++++---- src/components/Watermark.module.css | 55 +++++++++++++++++++++++++++++ src/config.js | 2 +- src/pages/CreateCoupon.js | 2 +- src/pages/LinktreePage.module.css | 30 ++++++++++++++-- 7 files changed, 97 insertions(+), 13 deletions(-) create mode 100644 src/components/Watermark.module.css diff --git a/package.json b/package.json index 86552a3..96b454b 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "groovebrew-mockup", "version": "0.1.0", "private": true, - "homepage": "https://dev.kedaimaster.com", + "homepage": "https://test.kedaimaster.com", "dependencies": { "@emotion/react": "^11.13.3", "@emotion/styled": "^11.13.0", diff --git a/src/components/MusicPlayer.js b/src/components/MusicPlayer.js index c5bdd0a..b92e59d 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://dev.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/components/Watermark.js b/src/components/Watermark.js index 0eefe95..dd8272f 100644 --- a/src/components/Watermark.js +++ b/src/components/Watermark.js @@ -1,17 +1,20 @@ import React from 'react'; import StepByStep from './StepByStep'; +import styles from './Watermark.module.css'; -const Watermark = ({dontShowName}) => { +const Watermark = ({ dontShowName }) => { return ( -
- {!dontShowName &&
KEDAIMASTER.COM
} -
-
Gak perlu rasain antri panjang yang bikin bosen lagi. Tinggal scan QR yang ada di meja, eh tiba tiba kamu udah kenyang wkwkkw
+
+ {!dontShowName &&
KEDAIMASTER.COM
} +
+
+ Gak perlu rasain antri panjang yang bikin bosen lagi. Tinggal scan QR yang ada di meja, eh tiba tiba kamu udah kenyang wkwkkw +
-
© 2025 KEDIRITECHNOPARK.COM
+
© 2025 KEDIRITECHNOPARK.COM
); }; -export default Watermark; +export default Watermark; \ No newline at end of file diff --git a/src/components/Watermark.module.css b/src/components/Watermark.module.css new file mode 100644 index 0000000..a7d6f8e --- /dev/null +++ b/src/components/Watermark.module.css @@ -0,0 +1,55 @@ +.watermark { + z-index: 5; + margin-top: 30px; + background-color: rgb(222, 237, 100); + font-weight: 700; + font-size: 15px; + line-height: 1rem; + letter-spacing: -1px; + color: rgb(37, 79, 26); + padding: 10px; + } + + .watermarkName { + display: block; + } + + .watermarkContent { + display: flex; + } + + .watermarkText { + width: 45vw; + margin-top: 10px; + font-size: 5.5vw; + line-height: 33px; + } + +/* Media query for desktop */ +@media (min-width: 768px) { /* Adjust the min-width as needed */ + .watermark { + z-index: 5; + margin-top: 30px; + background-color: rgb(222, 237, 100); + font-weight: 700; + font-size: 15px; + line-height: 1rem; + letter-spacing: -1px; + color: rgb(37, 79, 26); + padding: 10px; + display: flex; + flex-direction: column; + justify-content: center; + } + + .watermarkText { + width: 25vw; + margin-top: 10px; + font-size: 3vw; + line-height: 34px; + } + } + + .watermarkFooter { + margin-top: 8px; + } \ No newline at end of file diff --git a/src/config.js b/src/config.js index 6cf67cc..ff08a5e 100644 --- a/src/config.js +++ b/src/config.js @@ -1,5 +1,5 @@ // src/config.js -const API_BASE_URL = 'https://dev.api.kedaimaster.com'; +const API_BASE_URL = 'https://test.api.kedaimaster.com'; export default API_BASE_URL; diff --git a/src/pages/CreateCoupon.js b/src/pages/CreateCoupon.js index 3833ee6..974c921 100644 --- a/src/pages/CreateCoupon.js +++ b/src/pages/CreateCoupon.js @@ -46,7 +46,7 @@ const CreateCouponPage = () => { let encodedCouponCode = encodeURIComponent(encryptedCouponCode); // Construct the URL with the encoded coupon code as a query parameter - const urlWithCoupon = `https://dev.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); diff --git a/src/pages/LinktreePage.module.css b/src/pages/LinktreePage.module.css index e2b68f3..c3bb68e 100644 --- a/src/pages/LinktreePage.module.css +++ b/src/pages/LinktreePage.module.css @@ -1,9 +1,9 @@ /* General container */ .centeredLinktreePage { display: flex; - flex-direction: column; + flex-direction: column; /* Default to column for mobile */ justify-content: center; - background-color: rgb(222 237 100); + background-color: rgb(222, 237, 100); } .dashboardLine { @@ -22,6 +22,32 @@ padding-top: 100px; margin-bottom: 30px; } +/* Media query for desktop */ +@media (min-width: 768px) { /* Adjust the min-width as needed */ + .centeredLinktreePage { + flex-direction: row; /* Change to row for desktop */ + padding: 20px; + } + + .dashboardContainer { + background-color: inherit; + z-index: 6; + padding: 0 1rem; + padding-top: 100px; + margin-bottom: 30px; + width: 40vw; + } + + .dashboardLine { + position: fixed; + left: 0px; + height: 100vh; + width: 30px; + border-right: 1px solid rgba(0, 0, 0, 0); + z-index: 5; + } +} + /* Main Heading */ .mainHeading {