Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/feat/#69'
Browse files Browse the repository at this point in the history
  • Loading branch information
kanguk01 committed Nov 13, 2024
2 parents 0ffa818 + 6a045f7 commit 7d9fb89
Show file tree
Hide file tree
Showing 79 changed files with 4,778 additions and 3,270 deletions.
12 changes: 11 additions & 1 deletion .env.development
Original file line number Diff line number Diff line change
@@ -1 +1,11 @@
VITE_API_URL = https://api.splanet.co.kr
VITE_API_URL = https://api.splanet.co.kr
VITE_LOGIN_URL = https://api.splanet.co.kr/oauth2/authorization/kakao

VITE_FIREBASE_API_KEY="AIzaSyAInigygScRLDilnWcnArBN8LMbQRpDZVk"
VITE_FIREBASE_AUTH_DOMAIN="splanet-cef14.firebaseapp.com"
VITE_FIREBASE_PROJECT_ID="splanet-cef14"
VITE_FIREBASE_STORAGE_BUCKET="splanet-cef14.appspot.com"
VITE_FIREBASE_MESSAGING_SENDER_ID="995362943401"
VITE_FIREBASE_APP_ID="1:995362943401:web:cef434d0e3f51d31a4d4b8"
VITE_FIREBASE_MEASUREMENT_ID="G-LZJKRYBSJV"
VITE_FIREBASE_VAPID_KEY="BHGMkWgFVGKfNFkDm81jQF0GdtehYhZMEeHeQ3kx4ViRmLaoqH2YFjxNdl7guYA4NKEFpxYlHhoXeLMyJtyJrmI"
1 change: 1 addition & 0 deletions .env.production
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VITE_API_URL = https://api.splanet.co.kr
4 changes: 2 additions & 2 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ module.exports = {
parserOptions: {
project: "./tsconfig.json",
},
ignorePatterns: ["dist", ".eslintrc.cjs"],
ignorePatterns: ["dist", ".eslintrc.cjs", "firebase-messaging-sw.js"],
parser: "@typescript-eslint/parser",
plugins: [
"react-refresh",
Expand All @@ -36,7 +36,7 @@ module.exports = {
"react/jsx-props-no-spreading": "off",
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/naming-convention": "off",
'@typescript-eslint/no-unused-vars': 'off',
"@typescript-eslint/no-unused-vars": "off",
"jsx-a11y/click-events-have-key-events": "off",
"no-underscore-dangle": "off",
"no-alert": "off",
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,6 @@ dist-ssr
*.sln
*.sw?

*storybook.log
*storybook.log

.env .development
27 changes: 27 additions & 0 deletions firebase-messaging-sw.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
importScripts(
"https://www.gstatic.com/firebasejs/9.6.1/firebase-messaging-compat.js",
);

firebase.initializeApp({
apiKey: "AIzaSyAInigygScRLDilnWcnArBN8LMbQRpDZVk",
authDomain: "splanet-cef14.firebaseapp.com",
projectId: "splanet-cef14",
storageBucket: "splanet-cef14.appspot.com",
messagingSenderId: "995362943401",
appId: "1:995362943401:web:cef434d0e3f51d31a4d4b8",
measurementId: "G-LZJKRYBSJV",
});

const messaging = firebase.messaging();

// 알림 수신 대기
messaging.onBackgroundMessage((payload) => {
console.log("Received background message ", payload);
// Customize notification
const notificationTitle = payload.notification.title;
const notificationOptions = {
body: payload.notification.body,
};

self.registration.showNotification(notificationTitle, notificationOptions);
});
3 changes: 3 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600&display=swap"
rel="stylesheet"
/>
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Noto+Sans+KR:[email protected]&family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap" rel="stylesheet">
</head>
<body>
<div id="root"></div>
Expand Down
Loading

0 comments on commit 7d9fb89

Please sign in to comment.