diff --git a/.gitignore b/.gitignore index 31ab68d..a55f589 100644 --- a/.gitignore +++ b/.gitignore @@ -119,3 +119,4 @@ scripts/refresh-dev-token.mjs coworkers-swagger.json .gitignore GEMINI.md +src/app/api/dev/inject-session/route.ts diff --git a/src/app/[teamid]/_domain/apis/group.ts b/src/app/(root)/[teamid]/_domain/apis/group.ts similarity index 100% rename from src/app/[teamid]/_domain/apis/group.ts rename to src/app/(root)/[teamid]/_domain/apis/group.ts diff --git a/src/app/[teamid]/_domain/apis/task.ts b/src/app/(root)/[teamid]/_domain/apis/task.ts similarity index 100% rename from src/app/[teamid]/_domain/apis/task.ts rename to src/app/(root)/[teamid]/_domain/apis/task.ts diff --git a/src/app/[teamid]/_domain/apis/taskList.ts b/src/app/(root)/[teamid]/_domain/apis/taskList.ts similarity index 100% rename from src/app/[teamid]/_domain/apis/taskList.ts rename to src/app/(root)/[teamid]/_domain/apis/taskList.ts diff --git a/src/app/[teamid]/_domain/apis/types.ts b/src/app/(root)/[teamid]/_domain/apis/types.ts similarity index 100% rename from src/app/[teamid]/_domain/apis/types.ts rename to src/app/(root)/[teamid]/_domain/apis/types.ts diff --git a/src/app/[teamid]/_domain/components/Kanban/KanbanBoard.module.css b/src/app/(root)/[teamid]/_domain/components/Kanban/KanbanBoard.module.css similarity index 100% rename from src/app/[teamid]/_domain/components/Kanban/KanbanBoard.module.css rename to src/app/(root)/[teamid]/_domain/components/Kanban/KanbanBoard.module.css diff --git a/src/app/[teamid]/_domain/components/Kanban/KanbanBoard.tsx b/src/app/(root)/[teamid]/_domain/components/Kanban/KanbanBoard.tsx similarity index 100% rename from src/app/[teamid]/_domain/components/Kanban/KanbanBoard.tsx rename to src/app/(root)/[teamid]/_domain/components/Kanban/KanbanBoard.tsx diff --git a/src/app/[teamid]/_domain/components/Kanban/KanbanColumn.module.css b/src/app/(root)/[teamid]/_domain/components/Kanban/KanbanColumn.module.css similarity index 100% rename from src/app/[teamid]/_domain/components/Kanban/KanbanColumn.module.css rename to src/app/(root)/[teamid]/_domain/components/Kanban/KanbanColumn.module.css diff --git a/src/app/[teamid]/_domain/components/Kanban/KanbanColumn.tsx b/src/app/(root)/[teamid]/_domain/components/Kanban/KanbanColumn.tsx similarity index 100% rename from src/app/[teamid]/_domain/components/Kanban/KanbanColumn.tsx rename to src/app/(root)/[teamid]/_domain/components/Kanban/KanbanColumn.tsx diff --git a/src/app/[teamid]/_domain/components/Kanban/KanbanItem.module.css b/src/app/(root)/[teamid]/_domain/components/Kanban/KanbanItem.module.css similarity index 98% rename from src/app/[teamid]/_domain/components/Kanban/KanbanItem.module.css rename to src/app/(root)/[teamid]/_domain/components/Kanban/KanbanItem.module.css index be5e960..b13f7cb 100644 --- a/src/app/[teamid]/_domain/components/Kanban/KanbanItem.module.css +++ b/src/app/(root)/[teamid]/_domain/components/Kanban/KanbanItem.module.css @@ -27,6 +27,8 @@ /* 접힘/펼침 전환 시 타이틀 수평 시프팅 방지: folded 상태와 패딩·보더 두께 통일 */ padding-left: 20px !important; border: 1px solid transparent !important; + font-size: 12px; + font-weight: 400; } /* 피그마 fold=True 상태: 54px 높이, 좌측 패딩 20px, 테두리만 표시 */ diff --git a/src/app/[teamid]/_domain/components/Kanban/KanbanItem.tsx b/src/app/(root)/[teamid]/_domain/components/Kanban/KanbanItem.tsx similarity index 100% rename from src/app/[teamid]/_domain/components/Kanban/KanbanItem.tsx rename to src/app/(root)/[teamid]/_domain/components/Kanban/KanbanItem.tsx diff --git a/src/app/[teamid]/_domain/components/Member/MemberCard.module.css b/src/app/(root)/[teamid]/_domain/components/Member/MemberCard.module.css similarity index 100% rename from src/app/[teamid]/_domain/components/Member/MemberCard.module.css rename to src/app/(root)/[teamid]/_domain/components/Member/MemberCard.module.css diff --git a/src/app/[teamid]/_domain/components/Member/MemberCard.tsx b/src/app/(root)/[teamid]/_domain/components/Member/MemberCard.tsx similarity index 100% rename from src/app/[teamid]/_domain/components/Member/MemberCard.tsx rename to src/app/(root)/[teamid]/_domain/components/Member/MemberCard.tsx diff --git a/src/app/[teamid]/_domain/components/Member/MemberKebabMenu.module.css b/src/app/(root)/[teamid]/_domain/components/Member/MemberKebabMenu.module.css similarity index 100% rename from src/app/[teamid]/_domain/components/Member/MemberKebabMenu.module.css rename to src/app/(root)/[teamid]/_domain/components/Member/MemberKebabMenu.module.css diff --git a/src/app/[teamid]/_domain/components/Member/MemberKebabMenu.tsx b/src/app/(root)/[teamid]/_domain/components/Member/MemberKebabMenu.tsx similarity index 100% rename from src/app/[teamid]/_domain/components/Member/MemberKebabMenu.tsx rename to src/app/(root)/[teamid]/_domain/components/Member/MemberKebabMenu.tsx diff --git a/src/app/[teamid]/_domain/components/Member/MemberSection.module.css b/src/app/(root)/[teamid]/_domain/components/Member/MemberSection.module.css similarity index 100% rename from src/app/[teamid]/_domain/components/Member/MemberSection.module.css rename to src/app/(root)/[teamid]/_domain/components/Member/MemberSection.module.css diff --git a/src/app/[teamid]/_domain/components/Member/MemberSection.tsx b/src/app/(root)/[teamid]/_domain/components/Member/MemberSection.tsx similarity index 100% rename from src/app/[teamid]/_domain/components/Member/MemberSection.tsx rename to src/app/(root)/[teamid]/_domain/components/Member/MemberSection.tsx diff --git a/src/app/[teamid]/_domain/components/Team/SidebarWrapper.tsx b/src/app/(root)/[teamid]/_domain/components/Team/SidebarWrapper.tsx similarity index 85% rename from src/app/[teamid]/_domain/components/Team/SidebarWrapper.tsx rename to src/app/(root)/[teamid]/_domain/components/Team/SidebarWrapper.tsx index 36098c6..0156e21 100644 --- a/src/app/[teamid]/_domain/components/Team/SidebarWrapper.tsx +++ b/src/app/(root)/[teamid]/_domain/components/Team/SidebarWrapper.tsx @@ -1,5 +1,6 @@ 'use client'; +import { useRouter } from 'next/navigation'; import { Sidebar } from '@/components/sidebar'; import ProfileImage from '@/components/profile-img/ProfileImage'; import { useCurrentUserQuery } from '@/shared/queries/user/useCurrentUserQuery'; @@ -7,6 +8,7 @@ import TeamSidebarDropdown from './TeamSidebarDropdown'; export default function SidebarWrapper() { const { data: currentUser } = useCurrentUserQuery(); + const router = useRouter(); return ( router.push('/mypage')} /> ); } diff --git a/src/app/[teamid]/_domain/components/Team/TeamDashboard.module.css b/src/app/(root)/[teamid]/_domain/components/Team/TeamDashboard.module.css similarity index 100% rename from src/app/[teamid]/_domain/components/Team/TeamDashboard.module.css rename to src/app/(root)/[teamid]/_domain/components/Team/TeamDashboard.module.css diff --git a/src/app/[teamid]/_domain/components/Team/TeamDashboard.tsx b/src/app/(root)/[teamid]/_domain/components/Team/TeamDashboard.tsx similarity index 100% rename from src/app/[teamid]/_domain/components/Team/TeamDashboard.tsx rename to src/app/(root)/[teamid]/_domain/components/Team/TeamDashboard.tsx diff --git a/src/app/[teamid]/_domain/components/Team/TeamNavClient.module.css b/src/app/(root)/[teamid]/_domain/components/Team/TeamNavClient.module.css similarity index 100% rename from src/app/[teamid]/_domain/components/Team/TeamNavClient.module.css rename to src/app/(root)/[teamid]/_domain/components/Team/TeamNavClient.module.css diff --git a/src/app/[teamid]/_domain/components/Team/TeamNavClient.tsx b/src/app/(root)/[teamid]/_domain/components/Team/TeamNavClient.tsx similarity index 100% rename from src/app/[teamid]/_domain/components/Team/TeamNavClient.tsx rename to src/app/(root)/[teamid]/_domain/components/Team/TeamNavClient.tsx diff --git a/src/app/[teamid]/_domain/components/Team/TeamSidebarDropdown.module.css b/src/app/(root)/[teamid]/_domain/components/Team/TeamSidebarDropdown.module.css similarity index 100% rename from src/app/[teamid]/_domain/components/Team/TeamSidebarDropdown.module.css rename to src/app/(root)/[teamid]/_domain/components/Team/TeamSidebarDropdown.module.css diff --git a/src/app/[teamid]/_domain/components/Team/TeamSidebarDropdown.tsx b/src/app/(root)/[teamid]/_domain/components/Team/TeamSidebarDropdown.tsx similarity index 100% rename from src/app/[teamid]/_domain/components/Team/TeamSidebarDropdown.tsx rename to src/app/(root)/[teamid]/_domain/components/Team/TeamSidebarDropdown.tsx diff --git a/src/app/[teamid]/_domain/components/Team/TeamTabletHeader.module.css b/src/app/(root)/[teamid]/_domain/components/Team/TeamTabletHeader.module.css similarity index 100% rename from src/app/[teamid]/_domain/components/Team/TeamTabletHeader.module.css rename to src/app/(root)/[teamid]/_domain/components/Team/TeamTabletHeader.module.css diff --git a/src/app/[teamid]/_domain/components/Team/TeamTabletHeader.tsx b/src/app/(root)/[teamid]/_domain/components/Team/TeamTabletHeader.tsx similarity index 100% rename from src/app/[teamid]/_domain/components/Team/TeamTabletHeader.tsx rename to src/app/(root)/[teamid]/_domain/components/Team/TeamTabletHeader.tsx diff --git a/src/app/[teamid]/_domain/components/TodayReport/TodayReport.module.css b/src/app/(root)/[teamid]/_domain/components/TodayReport/TodayReport.module.css similarity index 100% rename from src/app/[teamid]/_domain/components/TodayReport/TodayReport.module.css rename to src/app/(root)/[teamid]/_domain/components/TodayReport/TodayReport.module.css diff --git a/src/app/[teamid]/_domain/components/TodayReport/TodayReport.tsx b/src/app/(root)/[teamid]/_domain/components/TodayReport/TodayReport.tsx similarity index 100% rename from src/app/[teamid]/_domain/components/TodayReport/TodayReport.tsx rename to src/app/(root)/[teamid]/_domain/components/TodayReport/TodayReport.tsx diff --git a/src/app/[teamid]/_domain/constants/mockData.ts b/src/app/(root)/[teamid]/_domain/constants/mockData.ts similarity index 100% rename from src/app/[teamid]/_domain/constants/mockData.ts rename to src/app/(root)/[teamid]/_domain/constants/mockData.ts diff --git a/src/app/[teamid]/_domain/hooks/useKanbanDnd.ts b/src/app/(root)/[teamid]/_domain/hooks/useKanbanDnd.ts similarity index 82% rename from src/app/[teamid]/_domain/hooks/useKanbanDnd.ts rename to src/app/(root)/[teamid]/_domain/hooks/useKanbanDnd.ts index 84a9914..8d699a8 100644 --- a/src/app/[teamid]/_domain/hooks/useKanbanDnd.ts +++ b/src/app/(root)/[teamid]/_domain/hooks/useKanbanDnd.ts @@ -1,4 +1,5 @@ import { useState } from 'react'; +import type React from 'react'; import { PointerSensor, useSensor, @@ -12,6 +13,21 @@ import type { KanbanTask, KanbanStatus } from '../interfaces/team'; // 드래그 시작으로 인식하는 최소 이동 거리(px) const DRAG_ACTIVATION_DISTANCE = 8; +// input, label 등 인터랙티브 요소 클릭 시 드래그를 시작하지 않는 커스텀 센서 +class SmartPointerSensor extends PointerSensor { + static activators = [ + { + eventName: 'onPointerDown' as const, + handler: ({ nativeEvent: event }: React.PointerEvent): boolean => { + if (!event.isPrimary || event.button !== 0) return false; + const target = event.target as Element; + if (target.closest('input, button, a, label, textarea, select')) return false; + return true; + }, + }, + ]; +} + export function useKanbanDnd( tasks: KanbanTask[], setTasks: React.Dispatch>, @@ -21,7 +37,7 @@ export function useKanbanDnd( const [activeTask, setActiveTask] = useState(null); const sensors = useSensors( - useSensor(PointerSensor, { + useSensor(SmartPointerSensor, { activationConstraint: { distance: DRAG_ACTIVATION_DISTANCE }, }), ); diff --git a/src/app/[teamid]/_domain/hooks/useKanbanTasks.ts b/src/app/(root)/[teamid]/_domain/hooks/useKanbanTasks.ts similarity index 76% rename from src/app/[teamid]/_domain/hooks/useKanbanTasks.ts rename to src/app/(root)/[teamid]/_domain/hooks/useKanbanTasks.ts index e8460f1..6ec06b6 100644 --- a/src/app/[teamid]/_domain/hooks/useKanbanTasks.ts +++ b/src/app/(root)/[teamid]/_domain/hooks/useKanbanTasks.ts @@ -108,8 +108,38 @@ export function useKanbanTasks( [deleteTaskListMutation], ); - // 태스크 아이템 체크 상태 변경은 할 일 목록 상세 페이지에서 처리하므로 빈 함수 - const handleItemCheckedChange = useCallback(() => {}, []); + // 체크박스 클릭 시 낙관적 업데이트 후 서버에 완료 상태 반영 + // 컬럼 이동은 발생하지 않음 (드래그앤 드롭으로만 이동 가능) + const handleItemCheckedChange = useCallback( + async (taskId: string, itemId: string, checked: boolean) => { + const taskListId = Number(taskId); + const queryKey = taskListKeys.detail(groupId, taskListId, today); + + // 진행 중인 백그라운드 리패치 취소 (낙관적 업데이트가 덮어씌워지는 것을 방지) + await queryClient.cancelQueries({ queryKey }); + + // 낙관적 업데이트: items만 변경하고 status(컬럼 위치)는 유지 + setTasks((prev) => + prev.map((task) => { + if (task.id !== taskId) return task; + const updatedItems = task.items.map((item) => + item.id === itemId ? { ...item, checked } : item, + ); + // 현재 컬럼 위치를 localStorage에 고정 (deriveStatus 재계산으로 인한 이동 방지) + setStoredStatus(groupId, taskListId, task.status); + return { ...task, items: updatedItems }; + }), + ); + + try { + await updateTask(groupId, taskListId, Number(itemId), { done: checked }); + } finally { + // 성공/실패 관계없이 서버 상태와 동기화 + await queryClient.invalidateQueries({ queryKey }); + } + }, + [groupId, today, queryClient], + ); // 할 일 목록 추가 모달 열기 const handleAddTask = useCallback((status: KanbanStatus) => { @@ -140,44 +170,13 @@ export function useKanbanTasks( // 수정 기능은 할 일 목록 상세 페이지에서 처리 const handleUpdateTask = useCallback(() => {}, []); - // 드래그로 컬럼 이동 시 컬럼 위치를 저장하고, 완료/할 일 이동 시 API로 완료 상태 동기화 + // 드래그로 컬럼 이동 시 컬럼 위치만 localStorage에 저장 (체크박스 상태는 변경하지 않음) const handleStatusChange = useCallback( - async (taskId: string, fromStatus: KanbanStatus, toStatus: KanbanStatus) => { + (taskId: string, fromStatus: KanbanStatus, toStatus: KanbanStatus) => { if (fromStatus === toStatus) return; - - const task = tasks.find((t) => t.id === taskId); - const taskListId = Number(taskId); - - // 항목 유무와 관계없이 컬럼 위치를 localStorage에 저장 - setStoredStatus(groupId, taskListId, toStatus); - - // 진행중으로 이동하거나 항목이 없으면 API 호출 없이 종료 (위치는 이미 저장됨) - if (!task || task.items.length === 0 || toStatus === 'inProgress') return; - - try { - if (toStatus === 'done') { - // 모든 항목 완료 처리 - await Promise.all( - task.items.map((item) => - updateTask(groupId, taskListId, Number(item.id), { done: true }), - ), - ); - } else if (toStatus === 'todo') { - // 모든 항목 미완료 처리 - await Promise.all( - task.items.map((item) => - updateTask(groupId, taskListId, Number(item.id), { done: false }), - ), - ); - } - } finally { - // 성공/실패 관계없이 쿼리를 무효화하여 실제 서버 상태로 동기화 - await queryClient.invalidateQueries({ - queryKey: taskListKeys.detail(groupId, taskListId, today), - }); - } + setStoredStatus(groupId, Number(taskId), toStatus); }, - [tasks, groupId, today, queryClient], + [groupId], ); return { diff --git a/src/app/[teamid]/_domain/interfaces/team.ts b/src/app/(root)/[teamid]/_domain/interfaces/team.ts similarity index 100% rename from src/app/[teamid]/_domain/interfaces/team.ts rename to src/app/(root)/[teamid]/_domain/interfaces/team.ts diff --git a/src/app/[teamid]/_domain/queries/queryKeys.ts b/src/app/(root)/[teamid]/_domain/queries/queryKeys.ts similarity index 100% rename from src/app/[teamid]/_domain/queries/queryKeys.ts rename to src/app/(root)/[teamid]/_domain/queries/queryKeys.ts diff --git a/src/app/[teamid]/_domain/queries/useCreateTaskListMutation.ts b/src/app/(root)/[teamid]/_domain/queries/useCreateTaskListMutation.ts similarity index 100% rename from src/app/[teamid]/_domain/queries/useCreateTaskListMutation.ts rename to src/app/(root)/[teamid]/_domain/queries/useCreateTaskListMutation.ts diff --git a/src/app/[teamid]/_domain/queries/useDeleteGroupMutation.ts b/src/app/(root)/[teamid]/_domain/queries/useDeleteGroupMutation.ts similarity index 100% rename from src/app/[teamid]/_domain/queries/useDeleteGroupMutation.ts rename to src/app/(root)/[teamid]/_domain/queries/useDeleteGroupMutation.ts diff --git a/src/app/[teamid]/_domain/queries/useDeleteTaskListMutation.ts b/src/app/(root)/[teamid]/_domain/queries/useDeleteTaskListMutation.ts similarity index 100% rename from src/app/[teamid]/_domain/queries/useDeleteTaskListMutation.ts rename to src/app/(root)/[teamid]/_domain/queries/useDeleteTaskListMutation.ts diff --git a/src/app/[teamid]/_domain/queries/useGroupInvitationQuery.ts b/src/app/(root)/[teamid]/_domain/queries/useGroupInvitationQuery.ts similarity index 100% rename from src/app/[teamid]/_domain/queries/useGroupInvitationQuery.ts rename to src/app/(root)/[teamid]/_domain/queries/useGroupInvitationQuery.ts diff --git a/src/app/[teamid]/_domain/queries/useGroupQuery.ts b/src/app/(root)/[teamid]/_domain/queries/useGroupQuery.ts similarity index 100% rename from src/app/[teamid]/_domain/queries/useGroupQuery.ts rename to src/app/(root)/[teamid]/_domain/queries/useGroupQuery.ts diff --git a/src/app/[teamid]/_domain/queries/useGroupTasksQuery.ts b/src/app/(root)/[teamid]/_domain/queries/useGroupTasksQuery.ts similarity index 100% rename from src/app/[teamid]/_domain/queries/useGroupTasksQuery.ts rename to src/app/(root)/[teamid]/_domain/queries/useGroupTasksQuery.ts diff --git a/src/app/[teamid]/_domain/queries/useRemoveMemberMutation.ts b/src/app/(root)/[teamid]/_domain/queries/useRemoveMemberMutation.ts similarity index 100% rename from src/app/[teamid]/_domain/queries/useRemoveMemberMutation.ts rename to src/app/(root)/[teamid]/_domain/queries/useRemoveMemberMutation.ts diff --git a/src/app/[teamid]/_domain/queries/useTaskListQuery.ts b/src/app/(root)/[teamid]/_domain/queries/useTaskListQuery.ts similarity index 100% rename from src/app/[teamid]/_domain/queries/useTaskListQuery.ts rename to src/app/(root)/[teamid]/_domain/queries/useTaskListQuery.ts diff --git a/src/app/[teamid]/_domain/queries/useUpdateGroupMutation.ts b/src/app/(root)/[teamid]/_domain/queries/useUpdateGroupMutation.ts similarity index 100% rename from src/app/[teamid]/_domain/queries/useUpdateGroupMutation.ts rename to src/app/(root)/[teamid]/_domain/queries/useUpdateGroupMutation.ts diff --git a/src/app/[teamid]/_domain/styles/common.module.css b/src/app/(root)/[teamid]/_domain/styles/common.module.css similarity index 100% rename from src/app/[teamid]/_domain/styles/common.module.css rename to src/app/(root)/[teamid]/_domain/styles/common.module.css diff --git a/src/app/[teamid]/layout.tsx b/src/app/(root)/[teamid]/layout.tsx similarity index 100% rename from src/app/[teamid]/layout.tsx rename to src/app/(root)/[teamid]/layout.tsx diff --git a/src/app/[teamid]/page.module.css b/src/app/(root)/[teamid]/page.module.css similarity index 100% rename from src/app/[teamid]/page.module.css rename to src/app/(root)/[teamid]/page.module.css diff --git a/src/app/[teamid]/page.tsx b/src/app/(root)/[teamid]/page.tsx similarity index 100% rename from src/app/[teamid]/page.tsx rename to src/app/(root)/[teamid]/page.tsx diff --git a/src/app/addteam/_domain/apis/image.ts b/src/app/(root)/addteam/_domain/apis/image.ts similarity index 100% rename from src/app/addteam/_domain/apis/image.ts rename to src/app/(root)/addteam/_domain/apis/image.ts diff --git a/src/app/(root)/addteam/_domain/components/AddTeamSidebarWrapper.tsx b/src/app/(root)/addteam/_domain/components/AddTeamSidebarWrapper.tsx new file mode 100644 index 0000000..ffa80de --- /dev/null +++ b/src/app/(root)/addteam/_domain/components/AddTeamSidebarWrapper.tsx @@ -0,0 +1,10 @@ +'use client'; + +import { useRouter } from 'next/navigation'; +import { Sidebar } from '@/components/sidebar'; + +export default function AddTeamSidebarWrapper() { + const router = useRouter(); + + return router.push('/mypage')} />; +} diff --git a/src/app/addteam/_domain/components/CreateTeamCard.module.css b/src/app/(root)/addteam/_domain/components/CreateTeamCard.module.css similarity index 100% rename from src/app/addteam/_domain/components/CreateTeamCard.module.css rename to src/app/(root)/addteam/_domain/components/CreateTeamCard.module.css diff --git a/src/app/addteam/_domain/components/CreateTeamCard.tsx b/src/app/(root)/addteam/_domain/components/CreateTeamCard.tsx similarity index 100% rename from src/app/addteam/_domain/components/CreateTeamCard.tsx rename to src/app/(root)/addteam/_domain/components/CreateTeamCard.tsx diff --git a/src/app/addteam/_domain/components/FeedbackMessage.module.css b/src/app/(root)/addteam/_domain/components/FeedbackMessage.module.css similarity index 100% rename from src/app/addteam/_domain/components/FeedbackMessage.module.css rename to src/app/(root)/addteam/_domain/components/FeedbackMessage.module.css diff --git a/src/app/addteam/_domain/components/FeedbackMessage.tsx b/src/app/(root)/addteam/_domain/components/FeedbackMessage.tsx similarity index 100% rename from src/app/addteam/_domain/components/FeedbackMessage.tsx rename to src/app/(root)/addteam/_domain/components/FeedbackMessage.tsx diff --git a/src/app/addteam/_domain/components/JoinTeamCard.module.css b/src/app/(root)/addteam/_domain/components/JoinTeamCard.module.css similarity index 100% rename from src/app/addteam/_domain/components/JoinTeamCard.module.css rename to src/app/(root)/addteam/_domain/components/JoinTeamCard.module.css diff --git a/src/app/addteam/_domain/components/JoinTeamCard.tsx b/src/app/(root)/addteam/_domain/components/JoinTeamCard.tsx similarity index 100% rename from src/app/addteam/_domain/components/JoinTeamCard.tsx rename to src/app/(root)/addteam/_domain/components/JoinTeamCard.tsx diff --git a/src/app/addteam/_domain/components/NoTeamState.module.css b/src/app/(root)/addteam/_domain/components/NoTeamState.module.css similarity index 100% rename from src/app/addteam/_domain/components/NoTeamState.module.css rename to src/app/(root)/addteam/_domain/components/NoTeamState.module.css diff --git a/src/app/addteam/_domain/components/NoTeamState.tsx b/src/app/(root)/addteam/_domain/components/NoTeamState.tsx similarity index 100% rename from src/app/addteam/_domain/components/NoTeamState.tsx rename to src/app/(root)/addteam/_domain/components/NoTeamState.tsx diff --git a/src/app/addteam/_domain/constants/createTeam.ts b/src/app/(root)/addteam/_domain/constants/createTeam.ts similarity index 100% rename from src/app/addteam/_domain/constants/createTeam.ts rename to src/app/(root)/addteam/_domain/constants/createTeam.ts diff --git a/src/app/addteam/_domain/hooks/useCreateTeam.ts b/src/app/(root)/addteam/_domain/hooks/useCreateTeam.ts similarity index 100% rename from src/app/addteam/_domain/hooks/useCreateTeam.ts rename to src/app/(root)/addteam/_domain/hooks/useCreateTeam.ts diff --git a/src/app/addteam/_domain/hooks/useJoinTeam.ts b/src/app/(root)/addteam/_domain/hooks/useJoinTeam.ts similarity index 100% rename from src/app/addteam/_domain/hooks/useJoinTeam.ts rename to src/app/(root)/addteam/_domain/hooks/useJoinTeam.ts diff --git a/src/app/addteam/_domain/interfaces/feedback.ts b/src/app/(root)/addteam/_domain/interfaces/feedback.ts similarity index 100% rename from src/app/addteam/_domain/interfaces/feedback.ts rename to src/app/(root)/addteam/_domain/interfaces/feedback.ts diff --git a/src/app/addteam/_domain/queries/useUploadImageMutation.ts b/src/app/(root)/addteam/_domain/queries/useUploadImageMutation.ts similarity index 100% rename from src/app/addteam/_domain/queries/useUploadImageMutation.ts rename to src/app/(root)/addteam/_domain/queries/useUploadImageMutation.ts diff --git a/src/app/addteam/_domain/styles/common.module.css b/src/app/(root)/addteam/_domain/styles/common.module.css similarity index 100% rename from src/app/addteam/_domain/styles/common.module.css rename to src/app/(root)/addteam/_domain/styles/common.module.css diff --git a/src/app/addteam/_domain/svg/noTeamImg.svg b/src/app/(root)/addteam/_domain/svg/noTeamImg.svg similarity index 100% rename from src/app/addteam/_domain/svg/noTeamImg.svg rename to src/app/(root)/addteam/_domain/svg/noTeamImg.svg diff --git a/src/app/addteam/_domain/utils/duplicationCalculator.ts b/src/app/(root)/addteam/_domain/utils/duplicationCalculator.ts similarity index 100% rename from src/app/addteam/_domain/utils/duplicationCalculator.ts rename to src/app/(root)/addteam/_domain/utils/duplicationCalculator.ts diff --git a/src/app/addteam/_domain/utils/getCreateTeamFailureMessage.ts b/src/app/(root)/addteam/_domain/utils/getCreateTeamFailureMessage.ts similarity index 100% rename from src/app/addteam/_domain/utils/getCreateTeamFailureMessage.ts rename to src/app/(root)/addteam/_domain/utils/getCreateTeamFailureMessage.ts diff --git a/src/app/addteam/create/page.tsx b/src/app/(root)/addteam/create/page.tsx similarity index 100% rename from src/app/addteam/create/page.tsx rename to src/app/(root)/addteam/create/page.tsx diff --git a/src/app/addteam/join/page.tsx b/src/app/(root)/addteam/join/page.tsx similarity index 100% rename from src/app/addteam/join/page.tsx rename to src/app/(root)/addteam/join/page.tsx diff --git a/src/app/addteam/layout.tsx b/src/app/(root)/addteam/layout.tsx similarity index 67% rename from src/app/addteam/layout.tsx rename to src/app/(root)/addteam/layout.tsx index 5167758..c1ab4d8 100644 --- a/src/app/addteam/layout.tsx +++ b/src/app/(root)/addteam/layout.tsx @@ -1,10 +1,11 @@ -import { MobileHeader, Sidebar } from '@/components/sidebar'; +import { MobileHeader } from '@/components/sidebar'; +import AddTeamSidebarWrapper from './_domain/components/AddTeamSidebarWrapper'; import styles from './page.module.css'; export default function AddTeamLayout({ children }: { children: React.ReactNode }) { return (
- +
diff --git a/src/app/addteam/page.module.css b/src/app/(root)/addteam/page.module.css similarity index 100% rename from src/app/addteam/page.module.css rename to src/app/(root)/addteam/page.module.css diff --git a/src/app/addteam/page.tsx b/src/app/(root)/addteam/page.tsx similarity index 100% rename from src/app/addteam/page.tsx rename to src/app/(root)/addteam/page.tsx