Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
students
bora-it
Commits
7ad5341d
Commit
7ad5341d
authored
Aug 09, 2021
by
권병윤
Browse files
Merge remote-tracking branch 'origin/woojiweon2' into byoungyun1
parents
2ddaecff
0e228dad
Changes
22
Hide whitespace changes
Inline
Side-by-side
server/models/room.model.js
View file @
7ad5341d
...
@@ -17,11 +17,10 @@ const RoomModel = (sequelize) => {
...
@@ -17,11 +17,10 @@ const RoomModel = (sequelize) => {
},
},
member
:
{
member
:
{
type
:
DataTypes
.
ARRAY
(
DataTypes
.
STRING
),
type
:
DataTypes
.
ARRAY
(
DataTypes
.
STRING
),
//type: DataTypes.STRING,
},
},
profileimg
:
{
profileimg
:
{
type
:
DataTypes
.
STRING
,
type
:
DataTypes
.
STRING
,
defaultValue
:
"
defaultimg
"
//
defaultValue: "defaultimg"
},
},
channel
:
{
channel
:
{
type
:
DataTypes
.
ARRAY
(
DataTypes
.
JSON
),
type
:
DataTypes
.
ARRAY
(
DataTypes
.
JSON
),
...
...
server/routes/room.route.js
View file @
7ad5341d
...
@@ -8,5 +8,9 @@ router.route("/create").post(roomCrtl.roomImgUpload, roomCrtl.createRoom);
...
@@ -8,5 +8,9 @@ router.route("/create").post(roomCrtl.roomImgUpload, roomCrtl.createRoom);
router
.
route
(
"
/join
"
).
put
(
roomCrtl
.
joinRoom
);
router
.
route
(
"
/join
"
).
put
(
roomCrtl
.
joinRoom
);
router
.
route
(
"
/changename
"
).
put
(
roomCrtl
.
changename
);
router
.
route
(
"
/changename
"
).
put
(
roomCrtl
.
changename
);
router
.
route
(
"
/profileimg
"
).
put
(
roomCrtl
.
roomImgUpload
,
roomCrtl
.
update
)
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
;
export
default
router
;
\ No newline at end of file
Prev
1
2
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment