Merge pull request #420 from Game-as-a-Service/refactor/room

refactor: room page style and join room logic
Game-as-a-Service · Nov 10, 2024 · 9df70cb · 9df70cb
2 parents f566913 + 4aac061
commit 9df70cb
Show file tree

Hide file tree

Showing 74 changed files with 756 additions and 1,485 deletions.
diff --git a/assets/icons/host.svg b/assets/icons/host.svg
diff --git a/assets/icons/logo.svg b/assets/icons/logo.svg
diff --git a/assets/icons/user-host.svg b/assets/icons/user-host.svg
diff --git a/assets/icons/user.svg b/assets/icons/user.svg
diff --git a/assets/icons/user_host.svg b/assets/icons/user_host.svg
diff --git a/components/lobby/EnterPrivateRoomModal/EnterPrivateRoomModal.tsx b/components/lobby/EnterPrivateRoomModal/EnterPrivateRoomModal.tsx
diff --git a/components/lobby/EnterPrivateRoomModal/index.tsx b/components/lobby/EnterPrivateRoomModal/index.tsx
diff --git a/components/rooms/RoomBreadcrumb.tsx b/components/rooms/RoomBreadcrumb.tsx
diff --git a/components/rooms/RoomButtonGroup.tsx b/components/rooms/RoomButtonGroup.tsx
@@ -1,40 +1,31 @@
 import Button from "@/components/shared/Button/v2";
+import Icon from "../shared/Icon";
 
 type RoomButtonGroupProps = {
   isHost: boolean;
-  isReady: boolean;
-  onToggleReady: () => void;
   onClickLeave: () => void;
   onClickClose: () => void;
   onClickStart: () => void;
 };
 
 function RoomButtonGroup(props: RoomButtonGroupProps) {
-  const {
-    onToggleReady,
-    onClickLeave,
-    onClickClose,
-    onClickStart,
-    isHost,
-    isReady,
-  } = props;
+  const { onClickLeave, onClickClose, onClickStart, isHost } = props;
 
   return (
     <div className="flex items-center gap-4 m-4">
       <Button
         variant="secondary"
+        className="flex"
         onClick={isHost ? onClickClose : onClickLeave}
       >
+        <Icon name="LeaveGame" className="w-6 h-6" />
         離開房間
       </Button>
-      {isHost ? (
-        <Button variant="primary" onClick={onClickStart}>
+      {isHost && (
+        <Button variant="primary" className="flex" onClick={onClickStart}>
+          <Icon name="Play" className="w-6 h-6" />
           開始遊戲
         </Button>
-      ) : (
-        <Button variant="secondary" onClick={onToggleReady}>
-          {isReady ? "取消準備" : "準備"}
-        </Button>
       )}
     </div>
   );