deploy: 024645e

brown-ccv · Apr 5, 2024 · ebe1f2e · ebe1f2e
1 parent 851196e
commit ebe1f2e
Show file tree

Hide file tree

Showing 25 changed files with 38 additions and 49 deletions.
diff --git a/asset-manifest.json b/asset-manifest.json
@@ -1,21 +1,21 @@
 {
   "files": {
-    "main.css": "./static/css/main.bd756353.css",
-    "main.js": "./static/js/main.db570be7.js",
-    "static/media/fa-solid-900.ttf": "./static/media/fa-solid-900.45a265d0f07b31cde85f.ttf",
-    "static/media/fa-brands-400.ttf": "./static/media/fa-brands-400.6205fd00fb1b573e9f0f.ttf",
-    "static/media/fa-solid-900.woff2": "./static/media/fa-solid-900.fb8184add5a3101ad0a3.woff2",
-    "static/media/fa-brands-400.woff2": "./static/media/fa-brands-400.8d3cabfc66809162fb4d.woff2",
-    "static/media/fa-regular-400.ttf": "./static/media/fa-regular-400.adc51aab4d771ab65f81.ttf",
-    "static/media/fa-regular-400.woff2": "./static/media/fa-regular-400.e931bc0d14f5bbb1da22.woff2",
-    "static/media/fa-v4compatibility.ttf": "./static/media/fa-v4compatibility.2eb7b3ef25042305f3ff.ttf",
-    "static/media/fa-v4compatibility.woff2": "./static/media/fa-v4compatibility.b3049b13a93f07e026fc.woff2",
+    "main.css": "./static/css/main.1cfdca86.css",
+    "main.js": "./static/js/main.1bcc1652.js",
+    "static/media/fa-solid-900.ttf": "./static/media/fa-solid-900.bacd5de623fb563b961a.ttf",
+    "static/media/fa-brands-400.ttf": "./static/media/fa-brands-400.60127e352b7a11f7f1bc.ttf",
+    "static/media/fa-solid-900.woff2": "./static/media/fa-solid-900.4d986b00ff9ca3828fbd.woff2",
+    "static/media/fa-brands-400.woff2": "./static/media/fa-brands-400.455ea818179b4def0c43.woff2",
+    "static/media/fa-regular-400.ttf": "./static/media/fa-regular-400.eb91f7b948a42799f678.ttf",
+    "static/media/fa-regular-400.woff2": "./static/media/fa-regular-400.21cb8f55d8e0c5b89751.woff2",
+    "static/media/fa-v4compatibility.ttf": "./static/media/fa-v4compatibility.c8e090db312b0bea2aa2.ttf",
+    "static/media/fa-v4compatibility.woff2": "./static/media/fa-v4compatibility.cf7f5903d06b79ad60f1.woff2",
     "index.html": "./index.html",
-    "main.bd756353.css.map": "./static/css/main.bd756353.css.map",
-    "main.db570be7.js.map": "./static/js/main.db570be7.js.map"
+    "main.1cfdca86.css.map": "./static/css/main.1cfdca86.css.map",
+    "main.1bcc1652.js.map": "./static/js/main.1bcc1652.js.map"
   },
   "entrypoints": [
-    "static/css/main.bd756353.css",
-    "static/js/main.db570be7.js"
+    "static/css/main.1cfdca86.css",
+    "static/js/main.1bcc1652.js"
   ]
 }
diff --git a/electron/main.js b/electron/main.js
@@ -24,9 +24,12 @@ log.initialize({ preload: true });
 
 /************ GLOBALS ***********/
 
+const GIT_VERSION = JSON.parse(fs.readFileSync(path.resolve(__dirname, "../version.json")));
+// TODO @brown-ccv #436 : Use app.isPackaged() to determine if running in dev or prod
+const ELECTRON_START_URL = process.env.ELECTRON_START_URL;
+
 let CONFIG; // Honeycomb configuration object
-// TODO @brown-ccv #428: Rename, this is running in development AND user hit "Continue Anyway"
-let DEV_MODE; // Whether or not the application is running in dev mode
+let CONTINUE_ANYWAY; // Whether to continue the experiment with no hardware connected (option is only available in dev mode)
 
 let TEMP_FILE; // Path to the temporary output file
 let OUT_PATH; // Path to the final output folder (on the Desktop)
@@ -35,8 +38,6 @@ let OUT_FILE; // Name of the final output file
 let TRIGGER_CODES; // Trigger codes and IDs for the EEG machine
 let TRIGGER_PORT; // Port that the EEG machine is talking through
 
-const GIT_VERSION = JSON.parse(fs.readFileSync(path.resolve(__dirname, "../version.json")));
-
 /************ APP LIFECYCLE ***********/
 
 /**
@@ -269,11 +270,11 @@ function createWindow() {
   let mainWindow;
   let appURL;
 
-  if (process.env.ELECTRON_START_URL) {
+  if (ELECTRON_START_URL) {
     // Running in development
 
     // Load app from localhost (This allows hot-reloading)
-    appURL = process.env.ELECTRON_START_URL;
+    appURL = ELECTRON_START_URL;
 
     // Create a 1500x900 window with the dev tools open
     mainWindow = new BrowserWindow({
@@ -314,7 +315,6 @@ function createWindow() {
   mainWindow.loadURL(appURL);
 }
 
-
 /** SERIAL PORT SETUP & COMMUNICATION (EVENT MARKER) */
 
 /**
@@ -352,7 +352,7 @@ async function setUpPort() {
           buttons: [
             "OK",
             // Allow continuation when running in development mode
-            ...(process.env.ELECTRON_START_URL ? ["Continue Anyway"] : []),
+            ...(ELECTRON_START_URL ? ["Continue Anyway"] : []),
           ],
           defaultId: 0,
         })
@@ -362,8 +362,8 @@ async function setUpPort() {
             // Quit app when user selects "OK"
             app.exit();
           } else {
-            // User selected "Continue Anyway", we must be in dev mode
-            DEV_MODE = true;
+            // User selected "Continue Anyway", trigger port is not connected
+            CONTINUE_ANYWAY = true;
             TRIGGER_PORT = undefined;
           }
         });
@@ -383,7 +383,7 @@ function handleEventSend(code) {
   log.info(`Sending USB event ${code} to port ${TRIGGER_PORT}`);
 
   // Early return when running in development (no trigger port is expected)
-  if (DEV_MODE) return;
+  if (CONTINUE_ANYWAY) return;
 
   if (TRIGGER_PORT !== undefined) {
     sendToPort(TRIGGER_PORT, code);
@@ -399,7 +399,7 @@ function handleEventSend(code) {
         "Quit",
         "Retry",
         // Allow continuation when running in development mode
-        ...(process.env.ELECTRON_START_URL ? ["Continue Anyway"] : []),
+        ...(ELECTRON_START_URL ? ["Continue Anyway"] : []),
       ],
       detail: "heres some detail",
     });
@@ -415,7 +415,7 @@ function handleEventSend(code) {
         break;
       case 2:
         // User selects "Continue Anyway", we must be in dev mode
-        DEV_MODE = true;
+        CONTINUE_ANYWAY = true;
         break;
     }
   }

diff --git a/favicon.ico b/favicon.ico
diff --git a/index.html b/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="./favicon.ico"/><link rel="shortcut icon" href="./favicon.ico"/><link rel="apple-touch-icon" href="./afavicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; font-src http: data:"/><link rel="manifest" href="./manifest.json"/><script src="./static/lib/jquery-min.js" type="text/javascript"></script><script src="./static/lib/underscore-min.js" type="text/javascript"></script><script src="./static/lib/backbone-min.js" type="text/javascript"></script><script src="./static/lib/psiturk.js" type="text/javascript"></script><title>Honeycomb</title><script defer="defer" src="./static/js/main.db570be7.js"></script><link href="./static/css/main.bd756353.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="./favicon.ico"/><link rel="shortcut icon" href="./favicon.ico"/><link rel="apple-touch-icon" href="./afavicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; font-src http: data:"/><link rel="manifest" href="./manifest.json"/><script src="./static/lib/jquery-min.js" type="text/javascript"></script><script src="./static/lib/underscore-min.js" type="text/javascript"></script><script src="./static/lib/backbone-min.js" type="text/javascript"></script><script src="./static/lib/psiturk.js" type="text/javascript"></script><title>Honeycomb</title><script defer="defer" src="./static/js/main.1bcc1652.js"></script><link href="./static/css/main.1cfdca86.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
diff --git a/static/css/main.bd756353.css → static/css/main.1cfdca86.css b/static/css/main.bd756353.css → static/css/main.1cfdca86.css
diff --git a/static/css/main.1cfdca86.css.map b/static/css/main.1cfdca86.css.map
diff --git a/static/css/main.bd756353.css.map b/static/css/main.bd756353.css.map
diff --git a/static/js/main.1bcc1652.js b/static/js/main.1bcc1652.js
diff --git a/static/js/main.db570be7.js.LICENSE.txt → static/js/main.1bcc1652.js.LICENSE.txt b/static/js/main.db570be7.js.LICENSE.txt → static/js/main.1bcc1652.js.LICENSE.txt
@@ -10,17 +10,6 @@ object-assign
 	http://jedwatson.github.io/classnames
 */
 
-/*!
- * jQuery JavaScript Library v3.7.1
- * https://jquery.com/
- *
- * Copyright OpenJS Foundation and other contributors
- * Released under the MIT license
- * https://jquery.org/license
- *
- * Date: 2023-08-28T13:37Z
- */
-
 /**
           * @license
           * Copyright 2017 Google LLC

diff --git a/static/js/main.1bcc1652.js.map b/static/js/main.1bcc1652.js.map
diff --git a/static/js/main.db570be7.js b/static/js/main.db570be7.js
diff --git a/static/js/main.db570be7.js.map b/static/js/main.db570be7.js.map
diff --git a/static/media/fa-brands-400.455ea818179b4def0c43.woff2 b/static/media/fa-brands-400.455ea818179b4def0c43.woff2
diff --git a/...ia/fa-brands-400.6205fd00fb1b573e9f0f.ttf → ...ia/fa-brands-400.60127e352b7a11f7f1bc.ttf b/...ia/fa-brands-400.6205fd00fb1b573e9f0f.ttf → ...ia/fa-brands-400.60127e352b7a11f7f1bc.ttf
diff --git a/static/media/fa-brands-400.8d3cabfc66809162fb4d.woff2 b/static/media/fa-brands-400.8d3cabfc66809162fb4d.woff2
diff --git a/static/media/fa-regular-400.21cb8f55d8e0c5b89751.woff2 b/static/media/fa-regular-400.21cb8f55d8e0c5b89751.woff2
diff --git a/static/media/fa-regular-400.e931bc0d14f5bbb1da22.woff2 b/static/media/fa-regular-400.e931bc0d14f5bbb1da22.woff2
diff --git a/...a/fa-regular-400.adc51aab4d771ab65f81.ttf → ...a/fa-regular-400.eb91f7b948a42799f678.ttf b/...a/fa-regular-400.adc51aab4d771ab65f81.ttf → ...a/fa-regular-400.eb91f7b948a42799f678.ttf
diff --git a/static/media/fa-solid-900.4d986b00ff9ca3828fbd.woff2 b/static/media/fa-solid-900.4d986b00ff9ca3828fbd.woff2
diff --git a/...dia/fa-solid-900.45a265d0f07b31cde85f.ttf → ...dia/fa-solid-900.bacd5de623fb563b961a.ttf b/...dia/fa-solid-900.45a265d0f07b31cde85f.ttf → ...dia/fa-solid-900.bacd5de623fb563b961a.ttf
diff --git a/static/media/fa-solid-900.fb8184add5a3101ad0a3.woff2 b/static/media/fa-solid-900.fb8184add5a3101ad0a3.woff2
diff --git a/static/media/fa-v4compatibility.b3049b13a93f07e026fc.woff2 b/static/media/fa-v4compatibility.b3049b13a93f07e026fc.woff2
diff --git a/...-v4compatibility.2eb7b3ef25042305f3ff.ttf → ...-v4compatibility.c8e090db312b0bea2aa2.ttf b/...-v4compatibility.2eb7b3ef25042305f3ff.ttf → ...-v4compatibility.c8e090db312b0bea2aa2.ttf
diff --git a/static/media/fa-v4compatibility.cf7f5903d06b79ad60f1.woff2 b/static/media/fa-v4compatibility.cf7f5903d06b79ad60f1.woff2
diff --git a/version.json b/version.json
@@ -1 +1 @@
-{"sha":"92b318758bcad829a188ad1ea1906ca293b120c2","ref":"refs/tags/v3.3.0"}
+{"sha":"024645e0f7444dfab5a3ec147dc0275a85396aea","ref":"refs/tags/v3.3.1"}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="./favicon.ico"/><link rel="shortcut icon" href="./favicon.ico"/><link rel="apple-touch-icon" href="./afavicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; font-src http: data:"/><link rel="manifest" href="./manifest.json"/><script src="./static/lib/jquery-min.js" type="text/javascript"></script><script src="./static/lib/underscore-min.js" type="text/javascript"></script><script src="./static/lib/backbone-min.js" type="text/javascript"></script><script src="./static/lib/psiturk.js" type="text/javascript"></script><title>Honeycomb</title><script defer="defer" src="./static/js/main.db570be7.js"></script><link href="./static/css/main.bd756353.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="./favicon.ico"/><link rel="shortcut icon" href="./favicon.ico"/><link rel="apple-touch-icon" href="./afavicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; font-src http: data:"/><link rel="manifest" href="./manifest.json"/><script src="./static/lib/jquery-min.js" type="text/javascript"></script><script src="./static/lib/underscore-min.js" type="text/javascript"></script><script src="./static/lib/backbone-min.js" type="text/javascript"></script><script src="./static/lib/psiturk.js" type="text/javascript"></script><title>Honeycomb</title><script defer="defer" src="./static/js/main.1bcc1652.js"></script><link href="./static/css/main.1cfdca86.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"sha":"92b318758bcad829a188ad1ea1906ca293b120c2","ref":"refs/tags/v3.3.0"}
		{"sha":"024645e0f7444dfab5a3ec147dc0275a85396aea","ref":"refs/tags/v3.3.1"}