Deploy Beta

.firebaserc

@@ -1,7 +1,7 @@
 {
   "projects": {
-    "default": "parallel-cf800",
-    "prod": "parallel-cf800",
+    "default": "parallel-beta-31dc4",
+    "prod": "parallel-beta-31dc4",
     "beta": "parallel-beta-31dc4"
   }
 }

.github/workflows/beta.yml

@@ -0,0 +1,40 @@
+name: Deploy Beta
+
+on:
+  workflow_dispatch:
+  pull_request:
+    types: [edited]
+
+jobs:
+  deploy-beta:
+    name: Deploy
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Use Node.js version from .nvmrc
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: .nvmrc
+
+      - name: Write service account
+        run: |
+          mkdir private
+          echo "$BETA_FIREBASE_SERVICE_ACCOUNT" > ./private/service-account.json
+          echo '${{ secrets.BETA_FIREBASE_SERVICE_ACCOUNT }}' > gcloud.json
+        env:
+          BETA_FIREBASE_SERVICE_ACCOUNT: ${{ secrets.BETA_FIREBASE_SERVICE_ACCOUNT }}
+        shell: bash
+
+      - name: Install
+        run: |
+          npm install
+        shell: bash
+
+      - name: Deploy
+        env:
+          GOOGLE_APPLICATION_CREDENTIALS: gcloud.json
+        run: |
+          npm run deploy
+        shell: bash

functions/index.js

@@ -6,7 +6,7 @@
 const firebase = require('firebase-admin');
 firebase.initializeApp({
   credential: firebase.credential.cert(require('./build/service-account.json')),
-  databaseURL: `https://parallel-cf800.firebaseio.com`,
+  databaseURL: `https://parallel-beta-31dc4.firebaseio.com`,
 });
 
 const fs = require('fs');

functions/views/_layout.pug

@@ -36,6 +36,10 @@ html
 
   body
     #vue
+      .beta
+        div You are on our Beta Testing Site!
+        div The information & events on this page are for testing purposes and should not be followed. 
+        a(href="https://parallel.org.uk") Click here to return to the production site.
       .headerWrapper
         .header
           if !sidebarDisabled

package.json

@@ -8,9 +8,9 @@
   },
   "scripts": {
     "start": "grunt build && npm run serve",
-    "serve": "grunt concurrent & GOOGLE_APPLICATION_CREDENTIALS=private/service-account.json firebase serve --project prod",
-    "export-users": "cross-env GOOGLE_APPLICATION_CREDENTIALS=private/service-account.json firebase auth:export ./private/tmp-users.json --format=json --project prod",
-    "deploy": "grunt && GOOGLE_APPLICATION_CREDENTIALS=private/service-account.json firebase deploy --project prod",
+    "serve": "grunt concurrent & GOOGLE_APPLICATION_CREDENTIALS=private/service-account.json firebase serve --project beta",
+    "export-users": "cross-env GOOGLE_APPLICATION_CREDENTIALS=private/service-account.json firebase auth:export ./private/tmp-users.json --format=json --project beta",
+    "deploy": "grunt && GOOGLE_APPLICATION_CREDENTIALS=private/service-account.json firebase deploy --project beta",
     "convert-teachers": "node scripts/convert-teachers.js",
     "convert-students": "node scripts/convert-students.js",
     "get-users": "node scripts/get-users.js",
@@ -20,7 +20,7 @@
     "get-tts-results": "node scripts/get-tts-results.js",
     "update-results": "node scripts/update-results.js",
     "set-points": "node scripts/set-points.js",
-    "start-marsh": "grunt build && concurrently \"grunt concurrent\" \"GOOGLE_APPLICATION_CREDENTIALS=private/service-account.json firebase serve --project prod\""
+    "start-marsh": "grunt build && concurrently \"grunt concurrent\" \"GOOGLE_APPLICATION_CREDENTIALS=private/service-account.json firebase serve --project beta\""
   },
   "devDependencies": {
     "@babel/core": "^7.15.0",

pages/troubleshooting.md

@@ -4,8 +4,8 @@
 
 In order for pupils to receive the weekly email reminder to take part in the latest Parallelograms and successfully manage their account and password, you may need your school's IT department to whitelist the following addresses:
 
-* noreply@parallel-cf800.firebaseapp.com
-* https://parallel-cf800.firebaseapp.com
+* noreply@parallel-beta-31dc4.firebaseapp.com
+* https://parallel-beta-31dc4.firebaseapp.com
 * contact@parallel.org.uk
 * https://parallel.org.uk/
 

scripts/change-email.js

@@ -8,7 +8,7 @@ const to = 'lalanthi026@googlemail.com'
 
 fb.initializeApp({
   credential: fb.credential.cert(serviceAccount),
-  databaseURL: "https://parallel-cf800.firebaseio.com",
+  databaseURL: "https://parallel-beta-31dc4.firebaseio.com",
 });
 
 const run = () =>

scripts/convert-students.js

@@ -9,7 +9,7 @@ const STUDENTS = [
 
 fb.initializeApp({
   credential: fb.credential.cert(serviceAccount),
-  databaseURL: 'https://parallel-cf800.firebaseio.com'
+  databaseURL: 'https://parallel-beta-31dc4.firebaseio.com'
 });
 
 const file = path.join(__dirname, `../private/tmp-users.json`);

scripts/convert-teachers.js

@@ -10,7 +10,7 @@ const TEACHERS = [
 
 fb.initializeApp({
   credential: fb.credential.cert(serviceAccount),
-  databaseURL: 'https://parallel-cf800.firebaseio.com'
+  databaseURL: 'https://parallel-beta-31dc4.firebaseio.com'
 });
 
 const file = path.join(__dirname, `../private/tmp-users.json`);

scripts/delete-accounts.js

@@ -7,7 +7,7 @@ const USERS = [
 
 fb.initializeApp({
   credential: fb.credential.cert(serviceAccount),
-  databaseURL: 'https://parallel-cf800.firebaseio.com'
+  databaseURL: 'https://parallel-beta-31dc4.firebaseio.com'
 });
 
 async function deleteAccount(email) {

scripts/privacy-approve.js

@@ -20,7 +20,7 @@ const dryRun = true; // when true, will just log what it will write, but not sav
 
 fb.initializeApp({
     credential: fb.credential.cert(serviceAccount),
-    databaseURL: 'https://parallel-cf800.firebaseio.com'
+    databaseURL: 'https://parallel-beta-31dc4.firebaseio.com'
 });
 
 const userDb = fb.firestore().collection('users');

scripts/privacy-y8webinar.js

@@ -20,7 +20,7 @@ const dryRun = true; // when true, will just log what it will write, but not sav
 
 fb.initializeApp({
     credential: fb.credential.cert(serviceAccount),
-    databaseURL: 'https://parallel-cf800.firebaseio.com'
+    databaseURL: 'https://parallel-beta-31dc4.firebaseio.com'
 });
 
 const userDb = fb.firestore().collection('users');

scripts/recover-account.js

@@ -27,7 +27,7 @@ const makePassword = () => {
 
 fb.initializeApp({
   credential: fb.credential.cert(serviceAccount),
-  databaseURL: "https://parallel-cf800.firebaseio.com",
+  databaseURL: "https://parallel-beta-31dc4.firebaseio.com",
 });
 
 const updateUserPassword = (email) =>

scripts/set-account-level.js

@@ -12,7 +12,7 @@ const isEuclidAdmin = true;
 
 fb.initializeApp({
   credential: fb.credential.cert(serviceAccount),
-  databaseURL: "https://parallel-cf800.firebaseio.com",
+  databaseURL: "https://parallel-beta-31dc4.firebaseio.com",
 });
 
 const setAdmin = () => { 

scripts/switch-data.js

@@ -10,7 +10,7 @@ const TO_EMAIL = "jmanyoma20@gmail.com";
 
 fb.initializeApp({
   credential: fb.credential.cert(serviceAccount),
-  databaseURL: "https://parallel-cf800.firebaseio.com",
+  databaseURL: "https://parallel-beta-31dc4.firebaseio.com",
 });
 
 const getAnswerCount = (data) =>

scripts/temp-update-levels/fix-levels-run.js

@@ -8,7 +8,7 @@ const limit = promiseLimit(400);
 
 fb.initializeApp({
   credential: fb.credential.cert(serviceAccount),
-  databaseURL: 'https://parallel-cf800.firebaseio.com'
+  databaseURL: 'https://parallel-beta-31dc4.firebaseio.com'
 });
 
 const userDb = fb.firestore().collection('users');

scripts/update-euclid-data.js

@@ -16,7 +16,7 @@ const dryRun = true; // when true, will just log what it will write, but not sav
 
 fb.initializeApp({
     credential: fb.credential.cert(serviceAccount),
-    databaseURL: 'https://parallel-cf800.firebaseio.com'
+    databaseURL: 'https://parallel-beta-31dc4.firebaseio.com'
 });
 const userDb = fb.firestore().collection('users');
 

scripts/update-results.js

@@ -13,7 +13,7 @@ const ADD_POINTS = 2;
 
 fb.initializeApp({
   credential: fb.credential.cert(serviceAccount),
-  databaseURL: 'https://parallel-cf800.firebaseio.com'
+  databaseURL: 'https://parallel-beta-31dc4.firebaseio.com'
 });
 const userDb = fb.firestore().collection('users');
 

scripts/utils/downloadUsers.js

@@ -7,7 +7,7 @@ const serviceAccount = require('../../private/service-account.json');
 
 fb.initializeApp({
     credential: fb.credential.cert(serviceAccount),
-    databaseURL: 'https://parallel-cf800.firebaseio.com'
+    databaseURL: 'https://parallel-beta-31dc4.firebaseio.com'
 });
 
 const cacheFilePath = path.join(__dirname, `../../private/cache-users.json`);

scripts/yearly-updates/delete-old-users.js

@@ -5,7 +5,7 @@ const serviceAccount = require("../../private/service-account.json");
 
 fb.initializeApp({
   credential: fb.credential.cert(serviceAccount),
-  databaseURL: "https://parallel-cf800.firebaseio.com",
+  databaseURL: "https://parallel-beta-31dc4.firebaseio.com",
 });
 
 const keysToRemove = [

scripts/yearly-updates/update-users-upload.js

@@ -8,7 +8,7 @@ const limit = promiseLimit(400);
 
 fb.initializeApp({
   credential: fb.credential.cert(serviceAccount),
-  databaseURL: 'https://parallel-cf800.firebaseio.com'
+  databaseURL: 'https://parallel-beta-31dc4.firebaseio.com'
 });
 
 const userDb = fb.firestore().collection('users');

static/scripts/main.js

@@ -112,9 +112,9 @@ document.addEventListener("wheel", function(event){
 
 document.addEventListener('DOMContentLoaded', function() {
   firebase.initializeApp({
-    apiKey: "AIzaSyCrQ_PdH-05lcNWETGvGfiwO3MBXk_WeVU",
-    projectId: "parallel-cf800",
-    authDomain: "parallel-cf800.firebaseapp.com",
+    apiKey: "AIzaSyDk4_ME-Uy1D3Yjg94Af7Gzhg3I1xNYWp8",
+    projectId: "parallel-beta-31dc4",
+    authDomain: "parallel-beta-31dc4.firebaseapp.com",
   });
 
   const user = getUser();

static/styles/layout.less

@@ -23,6 +23,17 @@ html {
   line-height: 1.8;
 }
 
+.beta {
+  background-color: orange;
+  margin: 0px -1rem;
+  text-align: center;
+
+  a {
+    color: blue;
+    text-decoration: underline;
+  }
+}
+
 #logo {
   background: url('/images/logo.png');
   background-size: cover;