From d7cf782669d934348314b55a4ffd4463c44c5487 Mon Sep 17 00:00:00 2001
From: jaeyeon <wodus2854@korea.ac.kr>
Date: Wed, 4 Aug 2021 15:30:40 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A7=84=EC=A7=9C=20=EB=A8=B8=EC=A7=80=20?=
 =?UTF-8?q?=EB=81=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/components/Home/RoomSingle.js     |   3 +-
 client/src/components/Room/InitRoom.js       |   1 +
 client/src/components/Room/RightHamburger.js | 348 +++++++++----------
 server/app.js                                |   4 +
 server/models/room.model.js                  |   2 +-
 5 files changed, 181 insertions(+), 177 deletions(-)

diff --git a/client/src/components/Home/RoomSingle.js b/client/src/components/Home/RoomSingle.js
index d5d03cb..abb6885 100644
--- a/client/src/components/Home/RoomSingle.js
+++ b/client/src/components/Home/RoomSingle.js
@@ -38,7 +38,6 @@ const RoomSingle = () => {
   useEffect(() => {
     getJoinRoom(id);
   }, [id]);
-  console.log(room)
 
   const { profileimg } = room;
   return (
@@ -46,7 +45,7 @@ const RoomSingle = () => {
       {room &&
         room.map((el) => (
           <div>
-            {room === INIT_ROOM ? (<div></div>): (
+            {room[0] === INIT_ROOM ? (<div></div>): (
             <Link
               to={`/room/${el.roomId}/${channelId}`}
               className="text-decoration-none text-dark"
diff --git a/client/src/components/Room/InitRoom.js b/client/src/components/Room/InitRoom.js
index a7f420f..65ffa88 100644
--- a/client/src/components/Room/InitRoom.js
+++ b/client/src/components/Room/InitRoom.js
@@ -19,6 +19,7 @@ const InitRoom = () => {
       const data = await roomApi.getRoom([roomId]);
       console.log(data)
       setRoom({...room, id:data[0].id, name:data[0].name, profileimg: data[0].profileimg})
+      console.log(room.profileimg)
     } catch (error) {
       catchErrors(error, setError);
     }
diff --git a/client/src/components/Room/RightHamburger.js b/client/src/components/Room/RightHamburger.js
index ced5a7c..707203e 100644
--- a/client/src/components/Room/RightHamburger.js
+++ b/client/src/components/Room/RightHamburger.js
@@ -5,70 +5,69 @@ import RoomApi from "../../apis/room.api";
 import catchErrors from "../../context/catchError";
 
 const INIT_ROOM = {
-    name: "",
-  };
+  name: "",
+};
 
 const INIT_CHANNEL = {
-    channelName: "",
-    joinName: [],
+  channelName: "",
+  joinName: [],
 };
 const RightHamburger = () => {
-    const [channel, setChannel] = useState([INIT_CHANNEL]);
-    const [room, setRoom] = useState([INIT_ROOM])
-    const { roomId } = useParams();
-    const [error, setError] = useState("");
-    const id = localStorage.getItem('user');
-
-    async function getRoom(roomId) {
-        try {
-          const data = await RoomApi.getRoom([roomId]);
-          setRoom({...room, name:data[0].name});
-        } catch (error) {
-          catchErrors(error, setError);
-        }
-      }
-
-    async function exitRoom() {
-        console.log('id, roomid정보', id, roomId)
-        try {
-            const data = await RoomApi.exitRoom({ id, roomId })
-            console.log(data)
-        } catch (error) {
-            catchErrors(error, setError);
-        }
+  const [channel, setChannel] = useState([INIT_CHANNEL]);
+  const [room, setRoom] = useState([INIT_ROOM]);
+  const { roomId } = useParams();
+  const [error, setError] = useState("");
+  const id = localStorage.getItem("user");
 
+  async function getRoom(roomId) {
+    try {
+      const data = await RoomApi.getRoom([roomId]);
+      setRoom({ ...room, name: data[0].name });
+    } catch (error) {
+      catchErrors(error, setError);
+    }
+  }
 
+  async function exitRoom() {
+    console.log("id, roomid정보", id, roomId);
+    try {
+      const data = await RoomApi.exitRoom({ id, roomId });
+      console.log(data);
+    } catch (error) {
+      catchErrors(error, setError);
     }
+  }
 
-    async function getChannel(roomId) {
-        const ID = roomId
-        try {
-            const data = await RoomApi.getRoom([ID]);
-            const Channel = data[0].channel
-            console.log('방데이터:', Channel)
-            const channelList = [];
-            for (const prop in Channel) { // Channel의 항목(prop)으로 작업을 실행합니다
-                for (const key in Channel[prop]) {
-                    console.log(key)
-                    console.log(prop)
-                    console.log(Channel[prop][key])
-                    channelList.push({
-                        channelName: key,
-                        joinName: Channel[prop][key]
-                    });
-                }
-            }
-            setChannel(channelList);
-        } catch (error) {
-            catchErrors(error, setError);
+  async function getChannel(roomId) {
+    const ID = roomId;
+    try {
+      const data = await RoomApi.getRoom([ID]);
+      const Channel = data[0].channel;
+      console.log("방데이터:", Channel);
+      const channelList = [];
+      for (const prop in Channel) {
+        // Channel의 항목(prop)으로 작업을 실행합니다
+        for (const key in Channel[prop]) {
+          console.log(key);
+          console.log(prop);
+          console.log(Channel[prop][key]);
+          channelList.push({
+            channelName: key,
+            joinName: Channel[prop][key],
+          });
         }
+      }
+      setChannel(channelList);
+    } catch (error) {
+      catchErrors(error, setError);
     }
-  
+  }
+
   // console.log(channel)
 
   useEffect(() => {
     getChannel(roomId);
-    getRoom(roomId)
+    getRoom(roomId);
   }, [roomId]);
 
   function roomIdCopy() {
@@ -127,86 +126,83 @@ const RightHamburger = () => {
           ></button>
         </div>
         <div>
-                <ChannelSingle channel={channel} />
-                <div className="d-flex flex-row-reverse">
-                        <button
-                            type="button"
-                            className="m-3 rounded"
-                            data-bs-toggle="modal"
-                            data-bs-target="#inviteRoom"
-                            style={{
-                                height: "30px",
-                                fontWeight: "bold",
-                                backgroundColor: "#E0CEE8",
-                                color: "black",
-                                border: "1px #D64D61",
-                            }}
-                        >
-                            초대
-                        </button>
-                        <div
-                            className="modal fade"
-                            id="inviteRoom"
-                            tabIndex="-1"
-                            aria-labelledby="exitRoomLabel"
-                            aria-hidden="true"
-                        >
-                            <div className="modal-dialog">
-                                <div className="modal-content">
-                                    <div className="modal-header">
-                                        <button
-                                            type="button"
-                                            className="btn-close"
-                                            data-bs-dismiss="modal"
-                                            aria-label="Close"
-                                        ></button>
-                                    </div>
-                                    <div className="modal-body d-flex justify-content-center">
-                                        어떤 방식으로 초대하시겠습니까?
-                                    </div>
-                                    <div className="row mb-3">
-                                        <div className="d-flex justify-content-evenly">
-                                            <button
-                                                type="submit"
-                                                className="col-2 p-1 btn btn-primary"
-                                                style={{ width: "120px" }}
-                                            >
-                                                카카오로 초대
-                                            </button>
-                                            <button
-                                                type="submit"
-                                                className="col-2 p-1 btn btn-primary"
-                                                data-bs-dismiss="modal"
-                                                style={{ width: "120px" }}
-                                                onClick={roomIdCopy}
-                                            >
-                                                방 Id 복사
-                                            </button>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
+          <ChannelSingle channel={channel} />
+          <div className="d-flex flex-row-reverse">
+            <button
+              type="button"
+              className="m-3 rounded"
+              data-bs-toggle="modal"
+              data-bs-target="#inviteRoom"
+              style={{
+                height: "30px",
+                fontWeight: "bold",
+                backgroundColor: "#E0CEE8",
+                color: "black",
+                border: "1px #D64D61",
+              }}
+            >
+              초대
+            </button>
+            <div
+              className="modal fade"
+              id="inviteRoom"
+              tabIndex="-1"
+              aria-labelledby="exitRoomLabel"
+              aria-hidden="true"
+            >
+              <div className="modal-dialog">
+                <div className="modal-content">
+                  <div className="modal-header">
+                    <button
+                      type="button"
+                      className="btn-close"
+                      data-bs-dismiss="modal"
+                      aria-label="Close"
+                    ></button>
+                  </div>
+                  <div className="modal-body d-flex justify-content-center">
+                    어떤 방식으로 초대하시겠습니까?
+                  </div>
+                  <div className="row mb-3">
+                    <div className="d-flex justify-content-evenly">
+                      <button
+                        type="submit"
+                        className="col-2 p-1 btn btn-primary"
+                        style={{ width: "120px" }}
+                      >
+                        카카오로 초대
+                      </button>
+                      <button
+                        type="submit"
+                        className="col-2 p-1 btn btn-primary"
+                        data-bs-dismiss="modal"
+                        style={{ width: "120px" }}
+                        onClick={roomIdCopy}
+                      >
+                        방 Id 복사
+                      </button>
                     </div>
+                  </div>
                 </div>
-                <div>
-                    <div className="d-flex flex-row-reverse">
-                        <button
-                            type="button"
-                            className="m-3 rounded text-white"
-                            data-bs-toggle="modal"
-                            data-bs-target="#exitRoom"
-                            style={{
-                                height: "30px",
-                                fontWeight: "bold",
-                                backgroundColor: "#d86da6",
-                                color: "black",
-                                border: "1px #d86da6",
-                            }}
-                        >
-                            퇴장
-                        </button>
-                        {/* {admin ? (
+              </div>
+            </div>
+            <div className="d-flex flex-row-reverse">
+              <button
+                type="button"
+                className="m-3 rounded text-white"
+                data-bs-toggle="modal"
+                data-bs-target="#exitRoom"
+                style={{
+                  height: "30px",
+                  fontWeight: "bold",
+                  backgroundColor: "#d86da6",
+                  color: "black",
+                  border: "1px #d86da6",
+                }}
+              >
+                퇴장
+              </button>
+              {/* {admin ? (
               <button
                 type="button"
                 className="m-3 rounded"
@@ -222,55 +218,59 @@ const RightHamburger = () => {
               </button>
             ) : null} */}
 
-                        <div
-                            className="modal fade"
-                            id="exitRoom"
-                            tabIndex="-1"
-                            aria-labelledby="exitRoomLabel"
-                            aria-hidden="true"
+              <div
+                className="modal fade"
+                id="exitRoom"
+                tabIndex="-1"
+                aria-labelledby="exitRoomLabel"
+                aria-hidden="true"
+              >
+                <div className="modal-dialog">
+                  <div className="modal-content">
+                    <div className="modal-header">
+                      <button
+                        type="button"
+                        className="btn-close"
+                        data-bs-dismiss="modal"
+                        aria-label="Close"
+                      ></button>
+                    </div>
+                    <div className="modal-body d-flex justify-content-center">
+                      이방에서 퇴장하시겠습니까?
+                    </div>
+                    <div className="row mb-3">
+                      <div className="d-flex justify-content-evenly">
+                        <Link
+                          to={`/user/${id}`}
+                          className="col-2 p-1 btn btn-primary"
+                        >
+                          <button
+                            type="button"
+                            onClick={exitRoom}
+                            className="btn btn-primary"
+                            data-bs-dismiss="modal"
+                          >
+                            예
+                          </button>
+                        </Link>
+                        <button
+                          type="submit"
+                          className="btn btn-primary"
+                          data-bs-dismiss="modal"
                         >
-                            <div className="modal-dialog">
-                                <div className="modal-content">
-                                    <div className="modal-header">
-                                        <button
-                                            type="button"
-                                            className="btn-close"
-                                            data-bs-dismiss="modal"
-                                            aria-label="Close"
-                                        ></button>
-                                    </div>
-                                    <div className="modal-body d-flex justify-content-center">
-                                        이방에서 퇴장하시겠습니까?
-                                    </div>
-                                    <div className="row mb-3">
-                                        <div className="d-flex justify-content-evenly">
-                                            <Link to={`/user/${id}`} className="col-2 p-1 btn btn-primary">
-                                            <button
-                                                type="button"
-                                                onClick={exitRoom}
-                                                className="btn btn-primary"
-                                                data-bs-dismiss="modal"
-                                            >
-                                                예
-                                            </button>
-                                            </Link>
-                                            <button
-                                                type="submit"
-                                                className="btn btn-primary"
-                                                data-bs-dismiss="modal"
-                                            >
-                                                아니요
-                                            </button>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
+                          아니요
+                        </button>
+                      </div>
                     </div>
+                  </div>
                 </div>
+              </div>
             </div>
+          </div>
         </div>
-    );
-                        };
+      </div>
+    </div>
+  );
+};
 
-export default RightHamburger;
\ No newline at end of file
+export default RightHamburger;
diff --git a/server/app.js b/server/app.js
index 2156265..72cd05a 100644
--- a/server/app.js
+++ b/server/app.js
@@ -19,6 +19,10 @@ const io = new Server(server, {
 app.use(express.json());
 app.use(express.urlencoded({ extended: true }));
 app.use(cookieParser());
+app.use('/uploads', express.static('uploads'))
+app.use('/roomUploads', express.static('roomUploads'))
+
+
 
 app.use("/api", mainRouter);
 
diff --git a/server/models/room.model.js b/server/models/room.model.js
index a41f847..d1fd094 100644
--- a/server/models/room.model.js
+++ b/server/models/room.model.js
@@ -16,7 +16,7 @@ const RoomModel = (sequelize) => {
         type: DataTypes.INTEGER,
       },
       member: {
-        type: DataTypes.ARRAY(DataTypes.INTEGER),
+        type: DataTypes.ARRAY(DataTypes.STRING),
         //type: DataTypes.STRING,
       },
       profileimg: {
-- 
GitLab