Merge branch 'develop' into feature/#3

src/components/Main/CreateGameModal/index.tsx

@@ -1,12 +1,14 @@
 import { Button, Input } from "@chakra-ui/react";
+import { serverTimestamp } from "firebase/firestore";
 import { ChangeEvent, useEffect, useState } from "react";
+import { useNavigate } from "react-router-dom";
 import { io } from "socket.io-client";
 import styled from "styled-components";
 import useFetch from "../../../hooks/useFetch";
+import useFireFetch from "../../../hooks/useFireFetch";
 import useInput from "../../../hooks/useInput";
 import UserCard from "../../common/UserCard";
-import useFireFetch from "../../../hooks/useFireFetch";
-import { useNavigate } from "react-router-dom";
+
 const Container = styled.div`
   position: absolute;
   top: 0;
@@ -201,6 +203,7 @@ const CreateGameModal = ({ setModal }: Props) => {
         ...roomData,
         id: createGame.result.id,
         host: token.id,
+        createdAt: serverTimestamp(),
       };
 
       fireFetch.usePostData("game", createGame.result.id, {
@@ -328,7 +331,7 @@ const CreateGameModal = ({ setModal }: Props) => {
           </div>
         </Section>
         <Section>
-          <div>
+          <div style={{ overflow: "auto" }}>
             <Input
               border="1px solid #c6c6c6"
               placeholder="검색"

src/components/common/UserCard/index.tsx

@@ -1,6 +1,6 @@
-import styled from "styled-components";
 import { Button } from "@chakra-ui/react";
 import { useState } from "react";
+import styled from "styled-components";
 
 const Profile = styled.div`
   border: 1px solid #c6c6c6;
@@ -74,6 +74,7 @@ const UserCard = ({ id, name, picture, roomData, setRoomData }: Props) => {
           height="1.3rem"
           fontSize=".8rem"
           onClick={handleInvite}
+          colorScheme="red"
         >
           취소
         </Button>

src/pages/Game/index.tsx

@@ -1,4 +1,15 @@
+import useFireFetch from "../../hooks/useFireFetch";
+
 const Game = () => {
+  const queryString = window.location.search;
+  const searchParams = new URLSearchParams(queryString);
+  const gameId = searchParams.get("gameId");
+
+  const fireFetch = useFireFetch();
+
+  const gameData = fireFetch.useGetSome("game", "id", gameId as string);
+
+  console.log(gameData.data);
   return <div>game page</div>;
 };