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
22 changes: 22 additions & 0 deletions apps/client/public/firebase-messaging-sw.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
self.addEventListener('install', function () {
self.skipWaiting();
});

self.addEventListener('activate', function () {
console.log('fcm sw activate..');
});

self.addEventListener('push', function (e) {
if (!e.data.json()) return;
const resultData = e.data.json().notification;
const notificationTitle = resultData.title;
const notificationOptions = {
body: resultData.body,
};
console.log(resultData.title, {
body: resultData.body,
});
e.waitUntil(
self.registration.showNotification(notificationTitle, notificationOptions)
);
});
52 changes: 25 additions & 27 deletions apps/client/src/pages/onBoarding/components/funnel/MainCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import { usePostSignUp } from '@shared/apis/queries';
const stepProgress = [{ progress: 30 }, { progress: 60 }, { progress: 100 }];
import { AlarmsType } from '@constants/alarms';
import { normalizeTime } from '@pages/onBoarding/utils/formatRemindTime';
import { firebaseConfig } from '../../../../firebase-config';
import { firebaseConfig } from '../../../../firebase-config';
import { initializeApp } from 'firebase/app';
import { getMessaging, getToken } from 'firebase/messaging';

import { registerServiceWorker } from '@pages/onBoarding/utils/registerServiceWorker';

const variants = {
slideIn: (direction: number) => ({
Expand Down Expand Up @@ -44,28 +44,28 @@ const MainCard = () => {
const [alarmSelected, setAlarmSelected] = useState<1 | 2 | 3>(1);
const [isMac, setIsMac] = useState(false);
// api 구간
const {mutate:postSignData} = usePostSignUp();
const { mutate: postSignData } = usePostSignUp();

// 익스텐션에서부터 이메일 받아오는 구간!
const [userEmail, setUserEmail] = useState("");
const [userEmail, setUserEmail] = useState('');

useEffect(() => {
const params = new URLSearchParams(location.search);
const emailParam = params.get("email");
const emailParam = params.get('email');
if (emailParam) {
setUserEmail(emailParam);
}
}, [location.search]);


// FCM 구간
const [fcmToken, setFcmToken] = useState<string | null>(null);
const [fcmToken, setFcmToken] = useState<string | null>(null);
const app = initializeApp(firebaseConfig);
const messaging = getMessaging(app);

const requestFCMToken = async (): Promise<string | null> => {
try {
const permission = await Notification.requestPermission();
registerServiceWorker();
if (permission !== 'granted') {
alert('알림 권한 허용이 필요합니다!');
return null;
Expand All @@ -89,22 +89,22 @@ const MainCard = () => {
}
};



useEffect(() => {
const ua = navigator.userAgent.toLowerCase();
if (ua.includes('mac os') || ua.includes('iphone') || ua.includes('ipad')) {
setIsMac(true);
}
}, []);
const renderStep = () => {
const renderStep = () => {
switch (step) {
case 0:
case 1:
case 2:
return <StoryStep step={step as 0 | 1 | 2} />;
case 3:
return <AlarmStep selected={alarmSelected} setSelected={setAlarmSelected} />;
return (
<AlarmStep selected={alarmSelected} setSelected={setAlarmSelected} />
);
case 4:
if (isMac) return <MacStep />;
return <FinalStep />;
Expand All @@ -116,17 +116,16 @@ const MainCard = () => {
}
};

const [remindTime, setRemindTime] = useState('09:00');
const nextStep = async() => {
const [remindTime, setRemindTime] = useState('09:00');
const nextStep = async () => {
if (step === 3) {
const token = await requestFCMToken();
const token = await requestFCMToken();
if (token) {
setFcmToken(token);
setDirection(1);
setStep((prev) => prev + 1);
}
else{
alert('푸시 알람 설정 에러')
} else {
alert('푸시 알람 설정 에러');
}
return;
}
Expand All @@ -137,19 +136,18 @@ const [remindTime, setRemindTime] = useState('09:00');
const raw = AlarmsType[alarmSelected - 1].time;
setRemindTime(normalizeTime(raw));

postSignData({
"email": userEmail,
"remindDefault": remindTime,
"fcmToken": fcmToken,
postSignData(
{
email: userEmail,
remindDefault: remindTime,
fcmToken: fcmToken,
},
{
onSuccess:()=>{
onSuccess: () => {
window.location.href = '/';
}
},
}
)


);
}
};

Expand Down
12 changes: 12 additions & 0 deletions apps/client/src/pages/onBoarding/utils/registerServiceWorker.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
export const registerServiceWorker = () => {
navigator.serviceWorker
.register('firebase-messaging-sw.js')
.then(function (registration) {
console.log('Service Worker 등록 성공:', registration);
alert(`Service Worker 등록 성공:, ${registration}`);
})
.catch(function (error) {
console.log('Service Worker 등록 실패:', error);
alert(`Service Worker 등록 실패:, ${error}`);
});
};
Loading