Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 65 additions & 34 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
import * as React from "react";
import { BrowserRouter, Routes, Route, useLocation } from "react-router-dom";
import {
BrowserRouter,
Routes,
Route,
useLocation,
Navigate,
} from "react-router-dom";
import Login from "./pages/user/social/Login";
import Home from "./pages/user/Home";
import Signup from "./pages/user/social/Signup";
Expand Down Expand Up @@ -30,43 +36,68 @@ const AppContent: React.FC = () => {
location.pathname === "/admin/report" ||
location.pathname === "/admin/member";

// authority 값 가져오기
const authority = localStorage.getItem("authority");

return (
<>
{!hideHeader && <Header />}
<Routes>
{/*User*/}
<Route path="/" element={<Home />} />
<Route path="/login" element={<Login />} />
<Route path="/signup" element={<Signup />} />
<Route path="/signup-kakao" element={<SignupKakao />} />
<Route path="/mypage" element={<MyPage />} />
<Route path="/mypage/liked-movie" element={<LikedMovie />} />
<Route
path="/mypage/watched-movie"
element={<WatchedMovie />}
/>
<Route path="/mypage/my-review" element={<MyReview />} />
<Route path="/search" element={<Search />} />
<Route path="/recommend" element={<RecommendMovie />} />
<Route path="/boxoffice" element={<BoxOfficeMovie />} />
<Route path="/weekmatch" element={<WeekMatch />} />
<Route
path="/movies/detail/:movieId"
element={<MovieDetail />}
/>
<Route
path="/review-write/:movieId"
element={<ReviewWrite />}
/>
<Route
path="/login/oauth2/code/kakao"
element={<KakaoRedirect />}
/>

{/*Admin*/}
<Route path="/admin" element={<Dashboard />} />
<Route path="/admin/report" element={<ReportPage />} />
<Route path="/admin/member" element={<MemberPage />} />
{/* Redirect Logic */}
{authority === "ROLE_ADMIN" ? (
<>
<Route path="/admin" element={<Dashboard />} />
<Route path="/admin/report" element={<ReportPage />} />
<Route path="/admin/member" element={<MemberPage />} />
{/* Admin이 유저 페이지 접근 시 리디렉션 */}
<Route
path="/*"
element={<Navigate to="/admin" replace />}
/>
</>
) : (
<>
{/*User or default fallback*/}
<Route path="/" element={<Home />} />
<Route path="/login" element={<Login />} />
<Route path="/signup" element={<Signup />} />
<Route path="/signup-kakao" element={<SignupKakao />} />
<Route path="/mypage" element={<MyPage />} />
<Route
path="/mypage/liked-movie"
element={<LikedMovie />}
/>
<Route
path="/mypage/watched-movie"
element={<WatchedMovie />}
/>
<Route
path="/mypage/my-review"
element={<MyReview />}
/>
<Route path="/search" element={<Search />} />
<Route path="/recommend" element={<RecommendMovie />} />
<Route path="/boxoffice" element={<BoxOfficeMovie />} />
<Route path="/weekmatch" element={<WeekMatch />} />
<Route
path="/movies/detail/:movieId"
element={<MovieDetail />}
/>
<Route
path="/review-write/:movieId"
element={<ReviewWrite />}
/>
<Route
path="/login/oauth2/code/kakao"
element={<KakaoRedirect />}
/>
{/* User 또는 권한 없는 사용자가 어드민 페이지 접근 시 리디렉션 */}
<Route
path="/admin/*"
element={<Navigate to="/" replace />}
/>
</>
)}
</Routes>
</>
);
Expand Down
1 change: 1 addition & 0 deletions src/components/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ const Header: React.FC = () => {
await memberApi().logout();
localStorage.removeItem("accessToken");
localStorage.removeItem("refreshToken");
localStorage.removeItem("authority");
setMenuOpen(false);
setLogoutDialogOpen(false);
navigate("/", { replace: true });
Expand Down
155 changes: 83 additions & 72 deletions src/pages/admin/components/OptionsMenu.tsx
Original file line number Diff line number Diff line change
@@ -1,78 +1,89 @@
import * as React from 'react';
import { styled } from '@mui/material/styles';
import Divider, { dividerClasses } from '@mui/material/Divider';
import Menu from '@mui/material/Menu';
import MuiMenuItem from '@mui/material/MenuItem';
import { paperClasses } from '@mui/material/Paper';
import { listClasses } from '@mui/material/List';
import ListItemText from '@mui/material/ListItemText';
import ListItemIcon, { listItemIconClasses } from '@mui/material/ListItemIcon';
import LogoutRoundedIcon from '@mui/icons-material/LogoutRounded';
import MoreVertRoundedIcon from '@mui/icons-material/MoreVertRounded';
import MenuButton from './MenuButton';
import * as React from "react";
import { styled } from "@mui/material/styles";
import { dividerClasses } from "@mui/material/Divider";
import Menu from "@mui/material/Menu";
import MuiMenuItem from "@mui/material/MenuItem";
import { paperClasses } from "@mui/material/Paper";
import { listClasses } from "@mui/material/List";
import ListItemText from "@mui/material/ListItemText";
import LogoutRoundedIcon from "@mui/icons-material/LogoutRounded";
import MoreVertRoundedIcon from "@mui/icons-material/MoreVertRounded";
import MenuButton from "./MenuButton";
import { memberApi } from "../../../api/memberApi";

const MenuItem = styled(MuiMenuItem)({
margin: '2px 0',
margin: "2px 0",
minWidth: "200px",
color: "red",
});

const ListItemIcon = styled(MuiMenuItem)({
color: "red",
});

export default function OptionsMenu() {
const [anchorEl, setAnchorEl] = React.useState<null | HTMLElement>(null);
const open = Boolean(anchorEl);
const handleClick = (event: React.MouseEvent<HTMLElement>) => {
setAnchorEl(event.currentTarget);
};
const handleClose = () => {
setAnchorEl(null);
};
return (
<React.Fragment>
<MenuButton
aria-label="Open menu"
onClick={handleClick}
sx={{ borderColor: 'transparent' }}
>
<MoreVertRoundedIcon />
</MenuButton>
<Menu
anchorEl={anchorEl}
id="menu"
open={open}
onClose={handleClose}
onClick={handleClose}
transformOrigin={{ horizontal: 'right', vertical: 'top' }}
anchorOrigin={{ horizontal: 'right', vertical: 'bottom' }}
sx={{
[`& .${listClasses.root}`]: {
padding: '4px',
},
[`& .${paperClasses.root}`]: {
padding: 0,
},
[`& .${dividerClasses.root}`]: {
margin: '4px -4px',
},
}}
>
<MenuItem onClick={handleClose}>Profile</MenuItem>
<MenuItem onClick={handleClose}>My account</MenuItem>
<Divider />
<MenuItem onClick={handleClose}>Add another account</MenuItem>
<Divider />
<MenuItem
onClick={handleClose}
sx={{
[`& .${listItemIconClasses.root}`]: {
ml: 'auto',
minWidth: 0,
},
}}
>
<ListItemText>Logout</ListItemText>
<ListItemIcon>
<LogoutRoundedIcon fontSize="small" />
</ListItemIcon>
</MenuItem>
</Menu>
</React.Fragment>
);
const [anchorEl, setAnchorEl] = React.useState<null | HTMLElement>(null);
const open = Boolean(anchorEl);
const handleClick = (event: React.MouseEvent<HTMLElement>) => {
setAnchorEl(event.currentTarget);
};
const handleClose = () => {
setAnchorEl(null);
};

const handleLogout = async () => {
try {
await memberApi().logout();
localStorage.removeItem("accessToken");
localStorage.removeItem("refreshToken");
localStorage.removeItem("authority");

window.location.replace("/");
} catch (err) {
console.error("Logout failed", err);
}
};
return (
<React.Fragment>
<MenuButton
aria-label="Open menu"
onClick={handleClick}
sx={{ borderColor: "transparent" }}
>
<MoreVertRoundedIcon />
</MenuButton>
<Menu
anchorEl={anchorEl}
id="menu"
open={open}
onClose={handleClose}
onClick={handleClose}
transformOrigin={{ horizontal: "right", vertical: "top" }}
anchorOrigin={{ horizontal: "right", vertical: "bottom" }}
sx={{
[`& .${listClasses.root}`]: {
padding: "4px",
},
[`& .${paperClasses.root}`]: {
padding: 0,
},
[`& .${dividerClasses.root}`]: {
margin: "4px -4px",
},
}}
>
{/*<MenuItem onClick={handleClose}>Profile</MenuItem>
<MenuItem onClick={handleClose}>My account</MenuItem>
<Divider />
<MenuItem onClick={handleClose}>Add another account</MenuItem>
<Divider />*/}
<MenuItem onClick={handleLogout}>
<ListItemText>로그아웃</ListItemText>
<ListItemIcon>
<LogoutRoundedIcon fontSize="small" />
</ListItemIcon>
</MenuItem>
</Menu>
</React.Fragment>
);
}
1 change: 1 addition & 0 deletions src/pages/user/social/KakaoRedirect.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ const KakaoRedirect: React.FC = () => {
if (accessToken && refreshToken) {
localStorage.setItem("accessToken", accessToken);
localStorage.setItem("refreshToken", refreshToken);
localStorage.setItem("authority", "ROLE_USER");

navigate("/", { replace: true });
window.location.replace("/");
Expand Down