Merge pull request #8 from OakLabsInc/staging

Staging

docker-compose.yml

@@ -14,4 +14,5 @@ services:
     environment:
       - API_KEY=X11DQgKGIZex0yd7QQVtLhDljL13
       - SCHEDULE_NAME=oakos_intro
-      - TZ=America/Los_Angeles
+      - TZ=America/Los_Angeles
+      - ELECTRON_DISABLE_SECURITY_WARNINGS=true

gulpfile.js

@@ -38,4 +38,4 @@ gulp.task('pug', function () {
     .pipe(gulp.dest(DIST_PATH))
 })
 
-gulp.task('default', ['stylus', 'pug'])
+gulp.task('default', gulp.parallel('stylus', 'pug'))

package.json

@@ -25,17 +25,19 @@
   },
   "homepage": "https://github.com/OakLabsInc/app-schedule#readme",
   "devDependencies": {
-    "gulp": "^3.9.1",
-    "gulp-pug": "^3.3.0",
-    "gulp-stylus": "^2.7.0",
-    "gulp-watch": "^4.3.11",
+    "gulp": "~4.0.2",
+    "gulp-pug": "~4.0.1",
+    "gulp-stylus": "~2.7.0",
+    "gulp-watch": "~5.0.1",
     "oak": "~5.0.9",
-    "standard": "^14.3.1"
+    "standard": "~14.3.1"
   },
   "dependencies": {
     "express": "~4.17.1",
-    "lodash": "^4.17.15",
-    "md-color-picker": "^0.2.6",
+    "firebase-admin": "~8.6.0",
+    "firebase-functions": "~3.2.0",
+    "lodash": "~4.17.15",
+    "md-color-picker": "~0.2.6",
     "nib": "~1.1.2",
     "pug-cli": "~1.0.0-alpha6",
     "stylus": "~0.54.7"

src/server.js

@@ -14,7 +14,7 @@ const stylus = require('stylus')
 const app = express()
 
 const port = process.env.PORT ? _.toNumber(process.env.PORT) : 9000
-
+process.env['ELECTRON_DISABLE_SECURITY_WARNINGS'] = true
 let publicPath = join(__dirname, 'public')
 let viewsPath = join(__dirname, 'views')
 

src/views/footer.pug

@@ -1,26 +1,4 @@
-script(src="/vendor/firebase.min.js")
 
-  script.
-    var app = firebase.initializeApp({
-      apiKey: "AIzaSyDr_LrNrgPwZXtSTXScZJ3DvMB-gmP2hec",
-      authDomain: "oak-schedule.firebaseapp.com",
-      databaseURL: "https://oak-schedule.firebaseio.com",
-      projectId: "oak-schedule",
-      storageBucket: "oak-schedule.appspot.com",
-      messagingSenderId: "1046369340167"
-    });
-    // Initialize Cloud Firestore through Firebase
-    var db = firebase.firestore()
-
-    db.enablePersistence({
-      experimentalTabSynchronization:true
-    }).catch(function(err) {
-      if (err.code == 'failed-precondition') {
-          console.error('Multiple tabs open, persistence can only be enabled in one tab at a a time.')
-      } else if (err.code == 'unimplemented') {
-          console.error('The current browser does not support all of the features required to enable persistence.')
-      }
-    });
 script(src="https://ajax.googleapis.com/ajax/libs/angularjs/1.7.6/angular.min.js")
 script(src="https://ajax.googleapis.com/ajax/libs/angularjs/1.7.6/angular-animate.min.js")
 script(src="https://ajax.googleapis.com/ajax/libs/angularjs/1.7.6/angular-aria.min.js")

src/views/head.pug

@@ -2,12 +2,12 @@ head
   meta(charset='utf-8')
   meta(name='viewport', content='width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0')
 
-
   link(href='/vendor/angular-material.min.css', rel='stylesheet', type='text/css')
   link(href='/index.css', rel='stylesheet', type='text/css')
   link(href='/vendor/demo.css', rel='stylesheet', type='text/css')
-  script(src="/vendor/firebase.min.js")
-
+
+  script(src="/vendor/firebase.app-6.6.2.min.js")
+  script(src="/vendor/firebase.firestore-6.6.2.min.js")
   script.
     var app = firebase.initializeApp({
       apiKey: "AIzaSyDr_LrNrgPwZXtSTXScZJ3DvMB-gmP2hec",