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
4 changes: 2 additions & 2 deletions src/Router.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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([
{
Expand Down
Original file line number Diff line number Diff line change
@@ -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();
Expand Down
Original file line number Diff line number Diff line change
@@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/components/meeting/Meeting.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion src/components/meeting/MeetingCreate.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 }) {
Expand Down
10 changes: 0 additions & 10 deletions src/components/project/ProjectCard.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -151,16 +151,6 @@ function ProjectCard({ project, onAction }) {
>
편집
</button>
{/* <button
onClick={(e) => {
e.stopPropagation();
onAction("clone", project);
setIsMenuOpen(false);
}}
className="w-full text-left px-3 py-1.5 text-sm text-gray-700 hover:bg-white/50"
>
복제
</button> */}
<div className="border-t border-white/20 my-1"></div>
<button
onClick={(e) => {
Expand Down
10 changes: 0 additions & 10 deletions src/components/trouble/Trouble.jsx

This file was deleted.

2 changes: 1 addition & 1 deletion src/hooks/useMeetingQueries.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export function useMeetings(projectId = 1, page = 1, size = 10) {
queryKey: ['meetings', projectId, page, size],
queryFn: () => getMeetings(projectId, page, size),
staleTime: 2 * 60 * 1000, // 2분간 신선한 데이터
cacheTime: 10 * 60 * 1000, // 10분간 캐시 유지
cacheTime: 1 * 60 * 1000, // 10분간 캐시 유지
refetchOnWindowFocus: true,
select: (response) => {
if (response.statusCode === 200) {
Expand Down
6 changes: 1 addition & 5 deletions src/pages/ProjectDetail.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import Kanban from "../components/kanban/Kanban";
import GanttChart from "../components/ganttchart/GanttChart";
import Meeting from "../components/meeting/Meeting";
import TeamManagement from "../components/teammanage/TeamManagement";
import Trouble from "../components/trouble/Trouble";
import SettingsTab from "../components/setting/Settings";

function ProjectDetail() {
Expand Down Expand Up @@ -46,7 +45,6 @@ function ProjectDetail() {
{ id: "timeline", label: "간트차트", icon: Timeline },
{ id: "meeting", label: "회의록", icon: MeetingRoom },
{ id: "team", label: "팀 관리", icon: PeopleAlt },
// { id: "trouble", label: "장애 관리", icon: BugReport },
];

const getStatusColor = (status) => {
Expand Down Expand Up @@ -102,8 +100,6 @@ function ProjectDetail() {
return <Meeting />;
case "team":
return <TeamManagement project={project} />;
case "trouble":
return <Trouble />;
case "settings":
return <SettingsTab />;
default:
Expand All @@ -122,7 +118,7 @@ function ProjectDetail() {
onClick={() => navigate("/projects")}
className="p-2 hover:bg-white/50 transition-colors"
>
<ArrowBack className="w-5 h-5" />
<ArrowBack/>
</button>

<div>
Expand Down