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
ab3ee0d6
Commit
ab3ee0d6
authored
Jul 26, 2021
by
seoyeon
Browse files
0726
parent
ba4a4338
Changes
7
Show whitespace changes
Inline
Side-by-side
client/src/components/Profile/InfoUpdate.js
View file @
ab3ee0d6
...
...
@@ -35,7 +35,7 @@ const InfoUpdate = () => {
type
=
"
button
"
className
=
"
btn btn-outline-white
"
style
=
{{
background
:
"
#
E8B7FF
"
,
background
:
"
#
d4cafb
"
,
fontSize
:
"
13px
"
,
fontWeight
:
"
bold
"
,
}}
...
...
@@ -95,7 +95,7 @@ const InfoUpdate = () => {
borderRight
:
"
0
"
,
borderLeft
:
"
0
"
,
borderBottom
:
"
1
"
,
borderColor
:
"
#
E8B7FF
"
,
borderColor
:
"
#
d4cafb
"
,
height
:
"
38px
"
,
width
:
"
130px
"
,
}}
...
...
@@ -128,7 +128,7 @@ const InfoUpdate = () => {
type
=
"
button
"
className
=
"
btn btn-outline-white ms-2
"
style
=
{{
background
:
"
#
E8B7FF
"
,
background
:
"
#
d4cafb
"
,
fontSize
:
"
13px
"
,
fontWeight
:
"
bold
"
,
}}
...
...
client/src/components/Profile/Profile.js
View file @
ab3ee0d6
...
...
@@ -18,7 +18,7 @@ const Profile = () => {
type
=
"
button
"
className
=
"
btn btn-outline-white
"
style
=
{{
background
:
"
#
E8B7FF
"
,
background
:
"
#
d4cafb
"
,
fontSize
:
"
13px
"
,
fontWeight
:
"
bold
"
,
}}
...
...
client/src/components/Room/RightHamburger.js
View file @
ab3ee0d6
...
...
@@ -62,9 +62,9 @@ const RightHamberger = () => {
style
=
{{
height
:
'
30px
'
,
fontWeight
:
'
bold
'
,
backgroundColor
:
'
#
D64D61
'
,
backgroundColor
:
'
#
d86da6
'
,
color
:
'
black
'
,
border
:
'
1px #
D64D61
'
,
border
:
'
1px #
d86da6
'
,
}}
>
퇴장
...
...
client/src/components/Room/User.js
View file @
ab3ee0d6
...
...
@@ -2,7 +2,7 @@ const User = () => {
return
(
<
div
className
=
"
container
"
>
<
div
className
=
"
row
"
>
<
div
className
=
"
col
"
style
=
{{
backgroundColor
:
"
#
DEC7F5
"
,
position
:
'
absolute
'
,
bottom
:
'
58px
'
,
width
:
'
414px
'
}}
>
<
div
className
=
"
col
"
style
=
{{
backgroundColor
:
"
#
ded0fa
"
,
position
:
'
absolute
'
,
bottom
:
'
58px
'
,
width
:
'
414px
'
}}
>
<
p
className
=
"
m-2
"
style
=
{{
fontWeight
:
"
bold
"
,
color
:
"
#4A4251
"
,
fontSize
:
"
20px
"
}}
...
...
client/src/scss/custom.scss
View file @
ab3ee0d6
$primary
:
#
e8b7ff
;
$primary
:
#
f5cfe3
;
$secondary
:
#df99ff
;
$info
:
#fcf4ff
;
$warning
:
#ff0000
;
...
...
controllers/user.controller.js
View file @
ab3ee0d6
...
...
@@ -73,6 +73,7 @@ const signup = async (req, res) => {
}
}
export
default
{
login
,
signup
,
...
...
models/user.model.js
View file @
ab3ee0d6
...
...
@@ -24,9 +24,10 @@ const UserModel = (sequelize) => {
phone
:
{
type
:
DataTypes
.
INTEGER
,
},
// img: {
// type: DataTypes.STRING,
// },
img
:
{
type
:
DataTypes
.
STRING
,
defaultValue
:
"
/user.png
"
},
// roomNumber: {
// type: DataTypes.ARRAY(DataTypes.STRING),
// },
...
...
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