diff --git a/src/app/(after-login)/dashboard/[dashboardid]/edit/_components/DashboardEditSection.tsx b/src/app/(after-login)/dashboard/[dashboardid]/edit/_components/DashboardEditSection.tsx index 7e7897b..87d4c8a 100644 --- a/src/app/(after-login)/dashboard/[dashboardid]/edit/_components/DashboardEditSection.tsx +++ b/src/app/(after-login)/dashboard/[dashboardid]/edit/_components/DashboardEditSection.tsx @@ -25,6 +25,7 @@ export default function DashboardEditSection({ const setDashboardId = useDashboardStore((state) => state.setDashboardId); useEffect(() => { + if (loading) return; setLoading(true); try { @@ -83,7 +84,6 @@ export default function DashboardEditSection({ }; if (!data) return; - if (loading) return

Loading...

; return (
@@ -109,7 +109,7 @@ export default function DashboardEditSection({ onClick={editDashboard} disabled={!isFormValid} > - {!loading && "변경"} + 변경
diff --git a/src/app/(after-login)/dashboard/[dashboardid]/edit/_components/InvitationSection.tsx b/src/app/(after-login)/dashboard/[dashboardid]/edit/_components/InvitationSection.tsx index 3956117..ce0bd4f 100644 --- a/src/app/(after-login)/dashboard/[dashboardid]/edit/_components/InvitationSection.tsx +++ b/src/app/(after-login)/dashboard/[dashboardid]/edit/_components/InvitationSection.tsx @@ -23,6 +23,7 @@ export default function InvitationSection({ const totalPage = Math.ceil(totalCount / PAGE_SIZE); const handleLoad = async () => { + if (loading) return; setLoading(true); try { @@ -57,8 +58,6 @@ export default function InvitationSection({ } }; - if (loading) return

Loading...

; - return (
diff --git a/src/components/layout/navbar/UserMenu.tsx b/src/components/layout/navbar/UserMenu.tsx index bc9d828..1e0967f 100644 --- a/src/components/layout/navbar/UserMenu.tsx +++ b/src/components/layout/navbar/UserMenu.tsx @@ -22,7 +22,7 @@ export default function UserMenu() { useEffect(() => { const getData = async () => { - if (!accessToken) return; + if (!accessToken || loading) return; setLoading(true); try { @@ -40,7 +40,6 @@ export default function UserMenu() { getData(); }, [accessToken]); - if (loading) return

Loading...

; if (!data) return null; const { nickname, profileImageUrl } = data; diff --git a/src/components/modal/add-column/AddColumnModal.tsx b/src/components/modal/add-column/AddColumnModal.tsx index 0bd0b51..25fc155 100644 --- a/src/components/modal/add-column/AddColumnModal.tsx +++ b/src/components/modal/add-column/AddColumnModal.tsx @@ -22,7 +22,7 @@ export default function CreateDashboardModal() { const accessToken = localStorage.getItem("accessToken") ?? ""; useEffect(() => { - if (!dashboardId) return; + if (!dashboardId || loading) return; setLoading(true); try { @@ -77,7 +77,6 @@ export default function CreateDashboardModal() { }; if (!dashboardId) return; - if (loading) return

Loading...

; return ( { const getData = async () => { + if (loading) return; setLoading(true); try { @@ -46,8 +47,6 @@ export default function AssigneeDropdown({ getData(); }, []); - if (loading) return

Loading...

; - const selected = members.find((member) => member.userId === memberId); return ( diff --git a/src/components/modal/edit-task/ColumnDropdown.tsx b/src/components/modal/edit-task/ColumnDropdown.tsx index a4e8078..6b3be1e 100644 --- a/src/components/modal/edit-task/ColumnDropdown.tsx +++ b/src/components/modal/edit-task/ColumnDropdown.tsx @@ -22,6 +22,7 @@ export default function ColumnDropdown({ const [isOpen, setIsOpen] = useState(false); useEffect(() => { + if (loading) return; setLoading(true); try { @@ -42,7 +43,6 @@ export default function ColumnDropdown({ }, []); const selected = columns.find((col) => col.id === columnId); - if (loading) return

Loading...

; return (
diff --git a/src/components/modal/editColumn/EditColumnModal.tsx b/src/components/modal/editColumn/EditColumnModal.tsx index 931fbcd..75e99ea 100644 --- a/src/components/modal/editColumn/EditColumnModal.tsx +++ b/src/components/modal/editColumn/EditColumnModal.tsx @@ -12,7 +12,7 @@ export interface ColumnListResponse { data: DashboardColumn[]; } -export default function CreateDashboardModal() { +export default function EditColumnModal() { const { selectedColumnId, selectedColumnTitle } = useColumnStore(); const [columnList, setColumnList] = useState([]); const [loading, setLoading] = useState(false); @@ -24,7 +24,7 @@ export default function CreateDashboardModal() { const accessToken = localStorage.getItem("accessToken") ?? ""; useEffect(() => { - if (!dashboardId) return; + if (!dashboardId || loading) return; setLoading(true); try { @@ -81,7 +81,6 @@ export default function CreateDashboardModal() { }; if (!dashboardId) return; - if (loading) return

Loading...

; return ( { - if (!dashboardId) return; + if (!dashboardId || loading) return; setLoading(true); try { @@ -58,22 +58,16 @@ export default function InviteModal() { disabled: !isFormValid, }} > - {loading ? ( -

Loading...

- ) : ( -
- -
- )} +
+ +
); } diff --git a/src/components/modal/task-detail/TaskCommentSection.tsx b/src/components/modal/task-detail/TaskCommentSection.tsx index abc7efc..222783b 100644 --- a/src/components/modal/task-detail/TaskCommentSection.tsx +++ b/src/components/modal/task-detail/TaskCommentSection.tsx @@ -29,7 +29,7 @@ export default function TaskCommentSection({ }; const buttonClick = async () => { - if (!dashboardId) return; + if (!dashboardId || loading) return; setLoading(true); try { @@ -51,7 +51,6 @@ export default function TaskCommentSection({ }; if (!dashboardId) return; - if (loading) return

Loading...

; return (
diff --git a/src/components/modal/task-detail/TaskDetailModal.tsx b/src/components/modal/task-detail/TaskDetailModal.tsx index e0fdc57..dc969c4 100644 --- a/src/components/modal/task-detail/TaskDetailModal.tsx +++ b/src/components/modal/task-detail/TaskDetailModal.tsx @@ -14,8 +14,7 @@ export default function TaskDetailModal() { const accessToken = localStorage.getItem("accessToken") ?? ""; const handleLoad = async () => { - if (!selectedTaskId) return; - if (isLoading) return; + if (!selectedTaskId || isLoading) return; setIsLoading(true); try {