From f00c69a4ecf5828fe387a5d8d52844ec5906e89a Mon Sep 17 00:00:00 2001 From: "gpt-engineer-app[bot]" <159125892+gpt-engineer-app[bot]@users.noreply.github.com> Date: Sat, 15 Mar 2025 12:14:15 +0000 Subject: [PATCH] Fix: Resolve syncAllData declaration conflict The `syncAllData` function was declared in both `src/utils/sync/syncSettings.ts` and `src/utils/syncUtils.ts`, causing a conflict. This commit removes the duplicate declaration from `src/utils/sync/syncSettings.ts` to resolve the TypeScript error. --- src/utils/sync/syncSettings.ts | 6 ++++-- src/utils/syncUtils.ts | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/utils/sync/syncSettings.ts b/src/utils/sync/syncSettings.ts index e976459..1af1d31 100644 --- a/src/utils/sync/syncSettings.ts +++ b/src/utils/sync/syncSettings.ts @@ -2,7 +2,7 @@ // 동기화 관련 모든 기능을 한 곳에서 내보내는 인덱스 파일 import { isSyncEnabled, setSyncEnabled, initSyncSettings } from './config'; import { getLastSyncTime, setLastSyncTime } from './time'; -import { syncAllData } from './data'; +import { syncAllData as syncData } from './data'; // 이름 충돌 방지를 위해 이름 변경 // 단일 진입점에서 모든 기능 내보내기 export { @@ -10,6 +10,8 @@ export { setSyncEnabled, getLastSyncTime, setLastSyncTime, - syncAllData, initSyncSettings }; + +// 이름 충돌 방지를 위해 다른 이름으로 내보내기 +export const syncAllData = syncData; diff --git a/src/utils/syncUtils.ts b/src/utils/syncUtils.ts index 862bd48..a6ffa76 100644 --- a/src/utils/syncUtils.ts +++ b/src/utils/syncUtils.ts @@ -1,5 +1,5 @@ -import { isSyncEnabled, setSyncEnabled, getLastSyncTime, setLastSyncTime, syncAllData, initSyncSettings } from './sync/syncSettings'; +import { isSyncEnabled, setSyncEnabled, getLastSyncTime, setLastSyncTime, syncAllData as syncDataFromSettings, initSyncSettings } from './sync/syncSettings'; import { uploadTransactions, downloadTransactions } from './sync/transactionSync'; import { uploadBudgets, downloadBudgets } from './sync/budgetSync';