From f8361d49aaba4ab9113cc8cde274e71c3afbf733 Mon Sep 17 00:00:00 2001 From: KIM_DEAHO <102588838+DHowor1d@users.noreply.github.com> Date: Fri, 12 Sep 2025 10:25:01 +0900 Subject: [PATCH 1/2] =?UTF-8?q?chore:=20=EB=A1=9C=EB=94=A9=20=ED=8F=B4?= =?UTF-8?q?=EB=8D=94=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Router.jsx | 4 ++-- .../{ => loading}/LoadingComponents.jsx | 0 .../{ => common/loading}/PrivateRoute.jsx | 2 +- .../loading}/RoleProtectedRoute.jsx | 2 +- src/components/meeting/Meeting.jsx | 2 +- src/components/meeting/MeetingCreate.jsx | 2 +- src/components/project/ProjectCard.jsx | 20 ------------------- src/hooks/useMeetingQueries.js | 2 +- 8 files changed, 7 insertions(+), 27 deletions(-) rename src/components/common/{ => loading}/LoadingComponents.jsx (100%) rename src/components/{ => common/loading}/PrivateRoute.jsx (89%) rename src/components/{ => common/loading}/RoleProtectedRoute.jsx (98%) diff --git a/src/Router.jsx b/src/Router.jsx index 688abe0..b747daa 100644 --- a/src/Router.jsx +++ b/src/Router.jsx @@ -6,8 +6,8 @@ import ProjectManager from "./pages/ProjectManager"; import ProjectDetail from "./pages/ProjectDetail"; import ShareCalendar from "./pages/ShareCalendar"; import HumanResources from "./pages/HumanResources"; -import PrivateRoute from "./components/PrivateRoute"; -import RoleProtectedRoute from "./components/RoleProtectedRoute"; +import PrivateRoute from "./components/common/loading/PrivateRoute"; +import RoleProtectedRoute from "./components/common/loading/RoleProtectedRoute"; const router = createBrowserRouter([ { diff --git a/src/components/common/LoadingComponents.jsx b/src/components/common/loading/LoadingComponents.jsx similarity index 100% rename from src/components/common/LoadingComponents.jsx rename to src/components/common/loading/LoadingComponents.jsx diff --git a/src/components/PrivateRoute.jsx b/src/components/common/loading/PrivateRoute.jsx similarity index 89% rename from src/components/PrivateRoute.jsx rename to src/components/common/loading/PrivateRoute.jsx index e895567..b16bf37 100644 --- a/src/components/PrivateRoute.jsx +++ b/src/components/common/loading/PrivateRoute.jsx @@ -1,5 +1,5 @@ import { Navigate } from 'react-router-dom'; -import { useAuth } from '../hooks/useAuth.jsx'; +import { useAuth } from '../../../hooks/useAuth.jsx'; function PrivateRoute({ children }) { const { isAuthenticated, loading } = useAuth(); diff --git a/src/components/RoleProtectedRoute.jsx b/src/components/common/loading/RoleProtectedRoute.jsx similarity index 98% rename from src/components/RoleProtectedRoute.jsx rename to src/components/common/loading/RoleProtectedRoute.jsx index f378eb7..b3e3c30 100644 --- a/src/components/RoleProtectedRoute.jsx +++ b/src/components/common/loading/RoleProtectedRoute.jsx @@ -1,5 +1,5 @@ import { Navigate } from 'react-router-dom'; -import { useAuth } from '../hooks/useAuth.jsx'; +import { useAuth } from '../../../hooks/useAuth.jsx'; function RoleProtectedRoute({ children, requiredRole, fallback = null }) { const { user, isAuthenticated, loading } = useAuth(); diff --git a/src/components/meeting/Meeting.jsx b/src/components/meeting/Meeting.jsx index aa1a732..7d42eed 100644 --- a/src/components/meeting/Meeting.jsx +++ b/src/components/meeting/Meeting.jsx @@ -4,7 +4,7 @@ import MeetingTable from "./MeetingTable"; import MeetingCreate from "./MeetingCreate"; import MeetingDetail from "./MeetingDetail"; import Dropdown from "../common/Dropdown"; -import { LoadingSpinner, ErrorFallback } from "../common/LoadingComponents"; +import { LoadingSpinner, ErrorFallback } from "../common/loading/LoadingComponents"; import useMeetingStore from "../../store/meetingStore"; function Meeting() { diff --git a/src/components/meeting/MeetingCreate.jsx b/src/components/meeting/MeetingCreate.jsx index 9dc5edd..dbd5482 100644 --- a/src/components/meeting/MeetingCreate.jsx +++ b/src/components/meeting/MeetingCreate.jsx @@ -2,7 +2,7 @@ import { useState, useRef } from "react"; import { ArrowBack, Mic, Stop, PlayArrow, Pause } from "@mui/icons-material"; import { employeesData } from "../../data/employees"; import Dropdown from '../common/Dropdown'; -import { LoadingSpinner } from '../common/LoadingComponents'; +import { LoadingSpinner } from '../common/loading/LoadingComponents'; import { useCreateMeeting, useUpdateMeeting } from '../../hooks/useMeetingQueries'; function MeetingCreate({ onBack, onSave, meeting = null, isEditing = false }) { diff --git a/src/components/project/ProjectCard.jsx b/src/components/project/ProjectCard.jsx index 2660b00..1b32e64 100644 --- a/src/components/project/ProjectCard.jsx +++ b/src/components/project/ProjectCard.jsx @@ -131,16 +131,6 @@ function ProjectCard({ project, onAction }) { {isMenuOpen && (