Merge branch 'release/2.1.0'

.github/workflows/firebase-hosting-merge.yml

@@ -0,0 +1,20 @@
+# This file was auto-generated by the Firebase CLI
+# https://github.com/firebase/firebase-tools
+
+name: Deploy to Firebase Hosting on merge
+'on':
+  push:
+    branches:
+      - main
+jobs:
+  build_and_deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: npm ci && npm run build
+      - uses: FirebaseExtended/action-hosting-deploy@v0
+        with:
+          repoToken: '${{ secrets.GITHUB_TOKEN }}'
+          firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_MYSITE_1383 }}'
+          channelId: live
+          projectId: mysite-1383

.github/workflows/firebase-hosting-pull-request.yml

@@ -0,0 +1,17 @@
+# This file was auto-generated by the Firebase CLI
+# https://github.com/firebase/firebase-tools
+
+name: Deploy to Firebase Hosting on PR
+'on': pull_request
+jobs:
+  build_and_preview:
+    if: '${{ github.event.pull_request.head.repo.full_name == github.repository }}'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: npm ci && npm run build
+      - uses: FirebaseExtended/action-hosting-deploy@v0
+        with:
+          repoToken: '${{ secrets.GITHUB_TOKEN }}'
+          firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_MYSITE_1383 }}'
+          projectId: mysite-1383

firebase.json

@@ -7,12 +7,22 @@
       "**/node_modules/**"
     ]
   },
+  "firestore": {
+    "rules": ".firebase/firestore.rules"
+  },
   "emulators": {
     "hosting": {
       "port": 5000
     },
     "ui": {
       "enabled": true
+    },
+    "auth": {
+      "port": 9099
+    },
+    "firestore": {
+      "port": 8080,
+      "host": "127.0.0.1"
     }
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mysite",
-  "version": "2.0.3",
+  "version": "2.1.0",
   "private": true,
   "scripts": {
     "serve": "npm run build:dev && (npm run build:watch & npm run serve:firebase)",

src/App.vue

@@ -175,6 +175,9 @@ import ContactForm from "./components/ContactForm.vue";
 
 import { auth, analytics } from "./firebaseConfig.js";
 import { logEvent } from "firebase/analytics";
+import { signInAnonymously } from "firebase/auth";
+
+signInAnonymously(auth);
 
 var tag = document.URL.split("#")[1];
 if (tag == null) {

src/firebaseConfig.js

@@ -23,6 +23,17 @@ const firebaseConfig = {
 const app = initializeApp(firebaseConfig);
 const analytics = getAnalytics(app);
 
+const auth = getAuth(app);
+const db = getFirestore(app);
+
+if (process.env.NODE_ENV === "development") {
+  const emulators = require("./firebaseEmulators.js");
+
+  emulators.connectFirestoreEmulator(db, "localhost", 8080);
+  emulators.connectAuthEmulator(auth, "http://localhost:9099");
+  self.FIREBASE_APPCHECK_DEBUG_TOKEN = process.env.VUE_APP_CHECK;
+}
+
 const appCheck = initializeAppCheck(app, {
   provider: new ReCaptchaV3Provider("6LcOyLQdAAAAAML71Vv35GBYNIoXtrQnAAQudkvK"),
 
@@ -31,7 +42,4 @@ const appCheck = initializeAppCheck(app, {
   isTokenAutoRefreshEnabled: true,
 });
 
-const auth = getAuth(app);
-const db = getFirestore(app);
-
 export { analytics, appCheck, auth, db };

src/firebaseEmulators.js

@@ -0,0 +1,4 @@
+import { connectFirestoreEmulator } from "firebase/firestore";
+import { connectAuthEmulator } from "firebase/auth";
+
+export { connectFirestoreEmulator, connectAuthEmulator };

src/main.js

@@ -4,13 +4,8 @@ import App from "./App.vue";
 import "bootstrap";
 import "bootswatch/dist/sandstone/bootstrap.min.css";
 
-import { auth } from "./firebaseConfig.js";
-import { signInAnonymously } from "firebase/auth";
-
 Vue.config.productionTip = false;
 
-signInAnonymously(auth);
-
 new Vue({
   render: (h) => h(App),
 }).$mount("#app");