Commit ab3ee0d6 authored by seoyeon's avatar seoyeon
Browse files

0726

parent ba4a4338
...@@ -35,7 +35,7 @@ const InfoUpdate = () => { ...@@ -35,7 +35,7 @@ const InfoUpdate = () => {
type="button" type="button"
className="btn btn-outline-white " className="btn btn-outline-white "
style={{ style={{
background: "#E8B7FF", background: "#d4cafb",
fontSize: "13px", fontSize: "13px",
fontWeight: "bold", fontWeight: "bold",
}} }}
...@@ -95,7 +95,7 @@ const InfoUpdate = () => { ...@@ -95,7 +95,7 @@ const InfoUpdate = () => {
borderRight: "0", borderRight: "0",
borderLeft: "0", borderLeft: "0",
borderBottom: "1", borderBottom: "1",
borderColor: "#E8B7FF", borderColor: "#d4cafb",
height: "38px", height: "38px",
width: "130px", width: "130px",
}} }}
...@@ -128,7 +128,7 @@ const InfoUpdate = () => { ...@@ -128,7 +128,7 @@ const InfoUpdate = () => {
type="button" type="button"
className="btn btn-outline-white ms-2" className="btn btn-outline-white ms-2"
style={{ style={{
background: "#E8B7FF", background: "#d4cafb",
fontSize: "13px", fontSize: "13px",
fontWeight: "bold", fontWeight: "bold",
}} }}
......
...@@ -18,7 +18,7 @@ const Profile = () => { ...@@ -18,7 +18,7 @@ const Profile = () => {
type="button" type="button"
className="btn btn-outline-white " className="btn btn-outline-white "
style={{ style={{
background: "#E8B7FF", background: "#d4cafb",
fontSize: "13px", fontSize: "13px",
fontWeight: "bold", fontWeight: "bold",
}} }}
......
...@@ -62,12 +62,12 @@ const RightHamberger = () => { ...@@ -62,12 +62,12 @@ const RightHamberger = () => {
style={{ style={{
height: '30px', height: '30px',
fontWeight: 'bold', fontWeight: 'bold',
backgroundColor: '#D64D61', backgroundColor: '#d86da6',
color: 'black', color: 'black',
border: '1px #D64D61', border: '1px #d86da6',
}} }}
> >
퇴장 퇴장
</button> </button>
{admin ? <button {admin ? <button
type="button" type="button"
......
...@@ -2,7 +2,7 @@ const User = () => { ...@@ -2,7 +2,7 @@ const User = () => {
return ( return (
<div className="container"> <div className="container">
<div className="row"> <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 <p
className="m-2" className="m-2"
style={{ fontWeight: "bold", color: "#4A4251", fontSize: "20px" }} style={{ fontWeight: "bold", color: "#4A4251", fontSize: "20px" }}
......
$primary: #e8b7ff; $primary: #f5cfe3;
$secondary: #df99ff; $secondary: #df99ff;
$info: #fcf4ff; $info: #fcf4ff;
$warning: #ff0000; $warning: #ff0000;
......
...@@ -73,6 +73,7 @@ const signup = async (req, res) => { ...@@ -73,6 +73,7 @@ const signup = async (req, res) => {
} }
} }
export default { export default {
login, login,
signup, signup,
......
...@@ -24,9 +24,10 @@ const UserModel = (sequelize) => { ...@@ -24,9 +24,10 @@ const UserModel = (sequelize) => {
phone: { phone: {
type: DataTypes.INTEGER, type: DataTypes.INTEGER,
}, },
// img: { img: {
// type: DataTypes.STRING, type: DataTypes.STRING,
// }, defaultValue: "/user.png"
},
// roomNumber: { // roomNumber: {
// type: DataTypes.ARRAY(DataTypes.STRING), // type: DataTypes.ARRAY(DataTypes.STRING),
// }, // },
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment