Fix firebase import bug

pull/1/head
Made Baruna 2021-04-05 00:49:18 +08:00
parent f51bbd5633
commit 70ced1dfa7
4 changed files with 8 additions and 5 deletions

View File

@ -473,6 +473,7 @@
"blocked": "Notification is blocked, the reminder notification will not work! Please enable it on your browser.", "blocked": "Notification is blocked, the reminder notification will not work! Please enable it on your browser.",
"desktop": "Desktop browser cannot receive notification if the browser is not running!", "desktop": "Desktop browser cannot receive notification if the browser is not running!",
"early": "The notification may arrive earlier (about 1-10 minutes) because of the way we send the notification", "early": "The notification may arrive earlier (about 1-10 minutes) because of the way we send the notification",
"allowNotification": "Please allow the notification prompt that shows up!",
"transformer": "Parametric Transformer Reminder", "transformer": "Parametric Transformer Reminder",
"last": "Enter when you last used the Parametric Transformer", "last": "Enter when you last used the Parametric Transformer",
"countdown": "Enter countdown time of the Parametric Transformer (If you don't remember the exact time, you need to approximate it)", "countdown": "Enter countdown time of the Parametric Transformer (If you don't remember the exact time, you need to approximate it)",

View File

@ -17,9 +17,9 @@
import { pushToast } from '../stores/toast'; import { pushToast } from '../stores/toast';
import { import {
loading,
firebaseToken, firebaseToken,
firstLoadNotification, firstLoadNotification,
loading,
loadingFirst, loadingFirst,
notificationAllowed, notificationAllowed,
notificationSupported, notificationSupported,
@ -198,6 +198,9 @@
{#if loadingSave}<Icon path={mdiLoading} size={0.8} spin className="mr-2" />{/if} {#if loadingSave}<Icon path={mdiLoading} size={0.8} spin className="mr-2" />{/if}
{$t('reminder.set')} {$t('reminder.set')}
</Button> </Button>
{#if $loading}
<p class="text-green-400 text-center mt-2">{$t('reminder.allowNotification')}</p>
{/if}
</div> </div>
</div> </div>
<div> <div>

View File

@ -15,7 +15,6 @@ const firebaseConfig = {
appId: __paimon.env.FIREBASE_APP_ID, appId: __paimon.env.FIREBASE_APP_ID,
}; };
let firebase;
let messaging; let messaging;
export async function firstLoadNotification() { export async function firstLoadNotification() {
@ -65,9 +64,6 @@ async function initFirebase() {
console.log('init firebase'); console.log('init firebase');
if (!messaging) { if (!messaging) {
firebase = (await import('firebase/app')).default;
await import('firebase/messaging');
firebase.initializeApp(firebaseConfig); firebase.initializeApp(firebaseConfig);
messaging = firebase.messaging(); messaging = firebase.messaging();
} }

View File

@ -21,6 +21,9 @@
<script src="https://js.sentry-cdn.com/446c4cef71a54aafb71b698555500b7d.min.js" crossorigin="anonymous"></script> <script src="https://js.sentry-cdn.com/446c4cef71a54aafb71b698555500b7d.min.js" crossorigin="anonymous"></script>
<script async defer data-domain="paimon.moe" src="https://plausible.paimon.moe/js/plausible.js"></script> <script async defer data-domain="paimon.moe" src="https://plausible.paimon.moe/js/plausible.js"></script>
<script src="https://www.gstatic.com/firebasejs/8.3.2/firebase-app.js"></script>
<script src="https://www.gstatic.com/firebasejs/8.3.2/firebase-messaging.js"></script>
<style> <style>
html { html {
height: 100%; height: 100%;