Skip to content

fix: 새로고침 수정 #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
taerimiiii merged 2 commits into from
Aug 22, 2025
Merged

fix: 새로고침 수정 #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62fc019
fix: 새로고침 수정
taerimiiii Aug 22, 2025
ec653ce
fix: 충돌 수정
taerimiiii Aug 22, 2025
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
14 changes: 7 additions & 7 deletions Time-Up/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ import SetRemindAlarmPage from './src/pages/SetPage/SetRemindAlarmPage';
import SetScheduleRepeatPage from './src/pages/SetScheduleRepeatPage';
import ViewScheduleDetailPage from './src/pages/ViewScheduleDetailPage';

import { saveFCMPushToken } from './src/apis/pushToken';
import { getAccessToken } from './src/utils/storage';
import { requestWebPushToken } from './src/utils/webPush';

Expand Down Expand Up @@ -114,6 +113,7 @@ export default function App() {
// }, []);

useEffect(() => {
//debugger;
if (Platform.OS !== 'web') return;
if (webPushInitRef.current) return;
webPushInitRef.current = true;
Expand All @@ -128,12 +128,12 @@ export default function App() {
}
console.log('Web FCM Token:', token);

const res = await saveFCMPushToken(token);
if ((res as any)?.result === 'Error') {
console.warn('웹 push-token 저장 실패:', (res as any)?.error);
} else {
console.log('웹 push-token 저장 성공');
}
// const res = await saveFCMPushToken(token);
// if ((res as any)?.result === 'Error') {
// console.warn('웹 push-token 저장 실패:', (res as any)?.error);
// } else {
// console.log('웹 push-token 저장 성공');
// }
} catch (e) {
console.warn('웹 푸시 토큰 발급/저장 실패:', e);
}
Expand Down
36 changes: 14 additions & 22 deletions Time-Up/src/pages/Alarm/WakeUp/WakeUpAlarmPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,14 +103,6 @@ export default function WakeUpAlarmPage() {
}
};

// const handleToggleSwitchForDay = (day: Day) => {
// setWeekdaySwitchStates(prev => {
// const next = { ...prev, [day]: !prev[day] };
// console.log(`${day} 기상알람이 ${next[day] ? '켜졌습니다' : '꺼졌습니다'}.`);
// return next;
// });
// };

const handleMyPage = () => {
console.log('내 알람 페이지로 이동합니다.');
navigation.navigate('MyAlarmPage');
Expand Down Expand Up @@ -141,20 +133,20 @@ export default function WakeUpAlarmPage() {
const { refreshAlarms } = useAlarmContext();
const syncedOnceRef = useRef(false);

// useEffect(() => {
// // 알람 동기화
// if (!syncedOnceRef.current) {
// syncedOnceRef.current = true;
// (async () => {
// try {
// await refreshAlarms();
// console.log('알람 동기화 성공');
// } catch (e) {
// console.warn('초기 알람 동기화 실패(무시 가능):', e);
// }
// })();
// }
// }, [navigation, refreshAlarms]);
useEffect(() => {
// 알람 동기화
if (!syncedOnceRef.current) {
syncedOnceRef.current = true;
(async () => {
try {
await refreshAlarms();
console.log('알람 동기화 성공');
} catch (e) {
console.warn('초기 알람 동기화 실패(무시 가능):', e);
}
})();
}
}, [navigation, refreshAlarms]);


return (
Expand Down
21 changes: 11 additions & 10 deletions Time-Up/src/pages/Onboarding/OnboardingPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,18 +67,19 @@ export default function OnboardingPage() {
}

if (data.success?.isNew) {
// try {
// await refreshAlarms();
// } catch (e) {
// console.warn('초기 알람 동기화 실패(무시 가능):', e);
// }
debugger;
try {
await refreshAlarms();
} catch (e) {
console.warn('초기 알람 동기화 실패(무시 가능):', e);
}
navigation.navigate('ProfileSettingPage', {});
} else {
// try {
// await refreshAlarms();
// } catch (e) {
// console.warn('초기 알람 동기화 실패(무시 가능):', e);
// }
try {
await refreshAlarms();
} catch (e) {
console.warn('초기 알람 동기화 실패(무시 가능):', e);
}
navigation.navigate('CalendarPage');
}
} catch (error: any) {
Expand Down
Loading