Merge remote-tracking branch 'origin/woojiweon2' into byoungyun1

server/models/room.model.js

@@ -17,11 +17,10 @@ const RoomModel = (sequelize) => {
       },
       member: {
         type: DataTypes.ARRAY(DataTypes.STRING),
-        //type: DataTypes.STRING,
       },
       profileimg: {
         type: DataTypes.STRING,
-        defaultValue: "defaultimg"
+        // defaultValue: "defaultimg"
       },
       channel: {
         type: DataTypes.ARRAY(DataTypes.JSON),

server/routes/room.route.js

@@ -8,5 +8,9 @@ router.route("/create").post(roomCrtl.roomImgUpload, roomCrtl.createRoom);
 router.route("/join").put(roomCrtl.joinRoom);
 router.route("/changename").put(roomCrtl.changename);
 router.route("/profileimg").put(roomCrtl.roomImgUpload, roomCrtl.update)
+router.route("/joinChannel").post(roomCrtl.joinChannel);
+router.route("/doubleJoin").post(roomCrtl.doubleJoin);
+router.route("/makeChannel").put(roomCrtl.makeChannel);
+router.route("/channelDelete").put(roomCrtl.channelDelete);
 
 export default router;
\ No newline at end of file