Commit 2210462f authored by 한규민's avatar 한규민
Browse files

푸시

parent bd9ff2cc
...@@ -36,7 +36,6 @@ const BoxOffice = () => { ...@@ -36,7 +36,6 @@ const BoxOffice = () => {
return ( return (
<div className="container text-center my-3"> <div className="container text-center my-3">
{console.log(TMDB_TopRated_Data)}
<div className="container text-center my-3"> <div className="container text-center my-3">
<h2 className="font-weight-light">Bootstrap Multi Slide Carousel</h2> <h2 className="font-weight-light">Bootstrap Multi Slide Carousel</h2>
<div className="row mx-auto my-auto justify-content-center"> <div className="row mx-auto my-auto justify-content-center">
......
...@@ -5,7 +5,7 @@ import authApi from "../../apis/auth.api"; ...@@ -5,7 +5,7 @@ import authApi from "../../apis/auth.api";
const MyInfo = () => { const MyInfo = () => {
const { user } = useAuth(); const { user } = useAuth();
const [userNickName, setUserNickName] = useState(""); const [userNickName, setUserNickName] = useState(user.nickname);
const getNickName = async (id) => { const getNickName = async (id) => {
console.log(id); console.log(id);
......
...@@ -11,7 +11,6 @@ const SubNav = () => { ...@@ -11,7 +11,6 @@ const SubNav = () => {
</> </>
: <Link className="nav-link text-white" to="/admin">관리자페이지</Link>} : <Link className="nav-link text-white" to="/admin">관리자페이지</Link>}
<Link className="nav-link text-white" to="/" onClick={logout}>로그아웃 </Link> <Link className="nav-link text-white" to="/" onClick={logout}>로그아웃 </Link>
{/* <a className="nav-link text-white" href="/mypage" onClick={logout}>로그아웃</a> */}
</nav> : </nav> :
<nav className="nav justify-content-end py-1"> <nav className="nav justify-content-end py-1">
<Link className="nav-link text-white" to="/login">로그인</Link> <Link className="nav-link text-white" to="/login">로그인</Link>
......
...@@ -23,6 +23,7 @@ const login = async (req, res) => { ...@@ -23,6 +23,7 @@ const login = async (req, res) => {
const signData = { const signData = {
id: user.id, id: user.id,
nickName: user.nickname,
role: userRole.name, role: userRole.name,
}; };
console.log("signData : ", signData); console.log("signData : ", signData);
...@@ -40,6 +41,7 @@ const login = async (req, res) => { ...@@ -40,6 +41,7 @@ const login = async (req, res) => {
// 5) 사용자 반환 // 5) 사용자 반환
res.json({ res.json({
id: user.id, id: user.id,
nickName: user.nickname,
role: userRole.name, role: userRole.name,
}); });
} else { } else {
......
...@@ -29,9 +29,6 @@ const Cinema = CinemaModel(sequelize) ...@@ -29,9 +29,6 @@ const Cinema = CinemaModel(sequelize)
User.belongsTo(Role); User.belongsTo(Role);
Role.hasOne(User); Role.hasOne(User);
User.belongsTo(Role);
Role.hasOne(User);
export { export {
sequelize, sequelize,
User, User,
......
...@@ -24,7 +24,7 @@ router ...@@ -24,7 +24,7 @@ router
.get(userCtrl.confirmMbnum) .get(userCtrl.confirmMbnum)
router router
.route("/:iddd") .route("/:id")
.get(userCtrl.getNickName) .get(userCtrl.getNickName)
export default router; export default router;
\ No newline at end of file
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