chore: 테스트용

SCBJ-7 · Jan 27, 2024 · 22cc194 · 22cc194
1 parent 7e3f680
commit 22cc194
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 18 deletions.
diff --git a/public/firebase-messaging-sw.js b/public/firebase-messaging-sw.js
@@ -16,9 +16,21 @@ self.importScripts(
   "https://www.gstatic.com/firebasejs/9.2.0/firebase-messaging-compat.js",
 );
 
+var firebaseConfig = {
+  apiKey: "AIzaSyAc4XrxZs2G1EVp-NbpCh5rw9rVgnUG284",
+  authDomain: "scbj-af2e3.firebaseapp.com",
+  projectId: "scbj-af2e3",
+  storageBucket: "scbj-af2e3.appspot.com",
+  messagingSenderId: "177564796245",
+  appId: "1:177564796245:web:6b27b878cbc2ccacf39bdc",
+  measurementId: "G-1YD7ZEM9HM",
+};
+
+firebase.initializeApp(firebaseConfig);
+
 // // Retrieve an instance of Firebase Messaging so that it can handle background
 // // messages.
-// const messaging = firebase.messaging();
+const messaging = firebase.messaging();
 
 self.addEventListener("install", function () {
   console.log("fcm sw install..");
@@ -33,13 +45,14 @@ self.addEventListener("push", function (e) {
   console.log("push: ", e.data.json());
   if (!e.data.json()) return;
 
-  const resultData = e.data.json().notification;
+  console.log("디버깅용", e.data.json().notification);
+
+  const resultData = e.data.json().data;
   const notificationTitle = resultData.title;
   const notificationOptions = {
-    body: resultData.body,
+    body: resultData.message,
     icon: resultData.image,
     tag: resultData.tag,
-    ...resultData,
   };
   console.log("push: ", { resultData, notificationTitle, notificationOptions });
 
@@ -53,17 +66,14 @@ self.addEventListener("notificationclick", function (event) {
   event.waitUntil(self.clients.openWindow(url));
 });
 
-// messaging.onBackgroundMessage(function (payload) {
-//   console.log(
-//     "[firebase-messaging-sw.js] Received background message ",
-//     payload,
-//   );
-//   // Customize notification here
-//   const notificationTitle = "Background Message Title";
-//   const notificationOptions = {
-//     body: "Background Message body.",
-//     icon: "/firebase-logo.png",
-//   };
+messaging.onBackgroundMessage(function (payload) {
+  console.log("Received background message", payload);
+  // Customize notification here
+  const notificationTitle = payload.notification.title;
+  const notificationOptions = {
+    body: payload.notification.body,
+    icon: "/icon-192.png",
+  };
 
-//   self.registration.showNotification(notificationTitle, notificationOptions);
-// });
+  self.registration.showNotification(notificationTitle, notificationOptions);
+});
diff --git a/src/components/A2HS/A2HS.style.ts b/src/components/A2HS/A2HS.style.ts
@@ -140,6 +140,5 @@ export const DismissButton = styled(Button)`
 
   &:hover {
     background-color: ${({ theme }) => theme.color.greyScale7};
-    border-radius: 50%;
   }
 `;
diff --git a/src/components/layout/Layout.tsx b/src/components/layout/Layout.tsx
@@ -3,19 +3,24 @@ import Header from "./header/HeaderTop";
 import * as S from "./Layout.style";
 import BottomNav from "./navBottom/NavBottom";
 import A2HS from "../A2HS/A2HS";
+import { useLocation } from "react-router-dom";
+import { PATH } from "@/constants/path";
 interface ChildrenProps {
   children: React.ReactNode;
   isHeaderOn: boolean;
   isBottomNavOn: boolean;
 }
 
 const Layout = ({ children, isHeaderOn, isBottomNavOn }: ChildrenProps) => {
+  const { pathname } = useLocation();
+
   return (
     <S.Container>
       <S.Wrapper>
         {isHeaderOn && <Header />}
         <A2HS />
         {children}
+        {pathname === PATH.ROOT && <A2HS />}
         {isBottomNavOn && <BottomNav />}
       </S.Wrapper>
     </S.Container>