From 45b958642b9a5e087246777533370c1d46de996b Mon Sep 17 00:00:00 2001
From: zadit <75159257+insvrgent@users.noreply.github.com>
Date: Thu, 17 Oct 2024 03:54:32 +0700
Subject: [PATCH] ok

---
 src/components/Header.js             |  3 ++-
 src/components/Item.module.css       |  3 +++
 src/components/ItemLister.module.css |  2 --
 src/components/MusicPlayer.js        | 19 ++++++++++---------
 src/pages/CafePage.js                |  3 ++-
 5 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/components/Header.js b/src/components/Header.js
index f62b26d..0468191 100644
--- a/src/components/Header.js
+++ b/src/components/Header.js
@@ -215,6 +215,7 @@ const Header = ({
   HeaderText,
   shopId,
   shopName,
+  shopImage,
   shopOwnerId,
   shopClerks,
   tableCode,
@@ -307,7 +308,7 @@ const Header = ({
       </Title>
       <div style={{ visibility: showProfile ? "visible" : "hidden" }}>
         <ProfileImage
-          src="https://i.ibb.co.com/fpg1v8J/profile-major-icon-1024x1024-9rtgyx30.png"
+          src={shopImage}
           alt="Profile"
           onClick={handleImageClick}
           animate={showRectangle && animate}
diff --git a/src/components/Item.module.css b/src/components/Item.module.css
index bb14c24..c285cf4 100644
--- a/src/components/Item.module.css
+++ b/src/components/Item.module.css
@@ -5,6 +5,7 @@
 }
 
 .item {
+  border-top: 2px solid #00000017;
   display: flex;
   align-items: stretch;
   justify-content: space-between;
@@ -16,6 +17,8 @@
   box-sizing: border-box; /* Include padding and border in the element's total width */
   width: 100%; /* Ensure the item does not exceed the parent's width */
   overflow: hidden; /* Prevent internal overflow */
+  padding-top: 10px;
+  margin-bottom: -3px;
 }
 
 .itemInvoice {
diff --git a/src/components/ItemLister.module.css b/src/components/ItemLister.module.css
index 9003e6d..baf7e43 100644
--- a/src/components/ItemLister.module.css
+++ b/src/components/ItemLister.module.css
@@ -1,7 +1,6 @@
 /* ItemLister.module.css */
 
 .item-lister {
-  border-top: 1px solid #888;
   width: 100%;
   padding: 10px; /* Adjust padding as needed */
   box-sizing: border-box; /* Ensure padding doesn't affect width */
@@ -28,7 +27,6 @@
   height: calc(49vw - 20px);
 }
 
-
 .title-container {
   display: flex;
   align-items: center;
diff --git a/src/components/MusicPlayer.js b/src/components/MusicPlayer.js
index 01cf6fa..c04742c 100644
--- a/src/components/MusicPlayer.js
+++ b/src/components/MusicPlayer.js
@@ -25,6 +25,7 @@ export function MusicPlayer({ socket, shopId, user, isSpotifyNeedLogin }) {
   const [lyric_progress_ms, setLyricProgressMs] = useState(0);
 
   const [subtitleColor, setSubtitleColor] = useState("black");
+  const [subtitleBG, setSubtitleBG] = useState("white");
   const [backgroundImage, setBackgroundImage] = useState("");
 
   useEffect(() => {
@@ -89,8 +90,10 @@ export function MusicPlayer({ socket, shopId, user, isSpotifyNeedLogin }) {
             255;
           if (luminance > 0.5) {
             setSubtitleColor("black");
+            setSubtitleBG("white");
           } else {
             setSubtitleColor("white");
+            setSubtitleBG("black");
           }
           setBackgroundImage(imageUrl);
         } catch (error) {
@@ -312,17 +315,20 @@ export function MusicPlayer({ socket, shopId, user, isSpotifyNeedLogin }) {
         style={{ backgroundImage: `url(${backgroundImage})` }}
       >
         {currentLines.past.map((line, index) => (
-          <div className="past" style={{ color: subtitleColor }} key={index}>
+          <div className="past" style={{ color: subtitleColor, 
+            textShadow: `2px 2px 2px ${subtitleBG}`, }} key={index}>
             <p>{line.words}</p>
           </div>
         ))}
         {currentLines.present.map((line, index) => (
-          <div className="present" style={{ color: subtitleColor }} key={index}>
+          <div className="present"  style={{ color: subtitleColor, 
+            textShadow: `2px 2px 2px ${subtitleBG}`, }} key={index}>
             <p>{line.words}</p>
           </div>
         ))}
         {currentLines.future.map((line, index) => (
-          <div className="future" style={{ color: subtitleColor }} key={index}>
+          <div className="future"  style={{ color: subtitleColor, 
+            textShadow: `2px 2px 2px ${subtitleBG}`, }} key={index}>
             <p>{line.words}</p>
           </div>
         ))}
@@ -439,12 +445,7 @@ export function MusicPlayer({ socket, shopId, user, isSpotifyNeedLogin }) {
         <h5>
           {expanded
             ? "︿"
-            : currentSong.item &&
-              currentSong.item.album &&
-              currentSong.item.album.images[0] &&
-              currentSong.item.artists[0]
-              ? "expand"
-              : "request your song"}
+            : "request your song"}
         </h5>
       </div></>
 }
diff --git a/src/pages/CafePage.js b/src/pages/CafePage.js
index 9a9cc20..c081595 100644
--- a/src/pages/CafePage.js
+++ b/src/pages/CafePage.js
@@ -71,7 +71,6 @@ function CafePage({
         setIsStarted(true);
       }
     }
-    setLoading(false);
   };
 
   useEffect(() => {
@@ -118,6 +117,7 @@ function CafePage({
       socket.on("joined-room", (response) => {
         const { isSpotifyNeedLogin } = response;
         setNeedSpotifyLogin(isSpotifyNeedLogin);
+        setLoading(false);
       });
     }
 
@@ -162,6 +162,7 @@ function CafePage({
                   isLogout={handleLogout}
                   shopId={shopId}
                   shopName={shopName}
+                  shopImage={config.image}
                   shopOwnerId={shopOwnerId}
                   shopClerks={shopClerks}
                   tableCode={table.tableCode}