Merge branch 'ref-photodiode_spot' into ref-fixation

.eslintignore

@@ -21,8 +21,6 @@ psiturkit/*_turk
 /.vscode
 /.env
 .env
-/.pnp
-.pnp.js
-.gitignore
 .DS_Store
+.gitignore
 **/firebase-service-account.json

.eslintrc.js

@@ -18,8 +18,8 @@ module.exports = {
   },
   plugins: ["react"],
   rules: {
-    "react/prop-types": "off", // TODO: These should be added so the rule can be removed
     "no-unused-vars": "warn",
+    "react/prop-types": "off", // TODO #223: These should be added so the rule can be removed
     "import/order": "warn",
   },
   settings: {

env/.env.clinic

@@ -1,4 +1,5 @@
 IMAGE_INLINE_SIZE_LIMIT=0
 REACT_APP_USE_EEG="true"
 REACT_APP_USE_PHOTODIODE="true"
-REACT_APP_VOLUME="true"
+REACT_APP_VOLUME="true"
+REACT_APP_VIDEO="true"

firestore.rules

@@ -1,20 +1,24 @@
 rules_version = '2';
 service cloud.firestore {
   match /databases/{database}/documents {
-      // participantID must be in the registered_participants array in the registered_studies/{studyID} document
-      match /participant_responses/{studyID}/participants/{participantID} {
-        allow create, read: 
-        if participantID in get(/databases/$(database)/documents/registered_studies/$(studyID)).data.registered_participants;
+    // participantID must be in the registered_participants array in the registered_studies/{studyID} document
+    match /participant_responses/{studyID}/participants/{participantID} {
+      allow create, read: 
+      // Allows any combination of studyID and participantID to be created in Firebase
+      if true
+      // Forces participantID and studyID to already be in Firebase to log in
+      // if participantID in get(/databases/$(database)/documents/registered_studies/$(studyID)).data.registered_participants;
+      // TODO: Discusssion post about use cases for the different rules
 
-        // experimentID must be in the data subcollection
-        match /data/{experimentID} {
-          allow create, read: if true
+      // experimentID must be in the data subcollection
+      match /data/{experimentID} {
+        allow create, read: if true
 
-          // trialID must be in the trials subcollection
-          match /trials/{trialID} {
-            allow create, read: if true
-          }
+        // trialID must be in the trials subcollection
+        match /trials/{trialID} {
+          allow create, read: if true
         }
       }
     }
+    }
 }

forge.config.js

@@ -0,0 +1,50 @@
+/**
+ * Configuration file for Electron Forge
+ */
+module.exports = {
+  packagerConfig: {
+    asar: true,
+    icon: "assets/icons/icon",
+  },
+  makers: [
+    {
+      // zip files
+      name: "@electron-forge/maker-zip",
+    },
+    {
+      // Linux Distribution
+      name: "@electron-forge/maker-deb",
+      config: {
+        options: {
+          icon: "assets/icons/icon.png",
+        },
+      },
+    },
+    {
+      // Mac Distribution
+      name: "@electron-forge/maker-dmg",
+      config: {
+        icon: "assets/icons/icon.icns",
+        overwrite: true,
+      },
+    },
+    {
+      // Windows Distribution
+      name: "@electron-forge/maker-squirrel",
+      config: {
+        iconUrl: "https://raw.githubusercontent.com/brown-ccv/honeycomb/main/assets/icons/icon.ico",
+        setupIcon: "assets/icons/icon.ico",
+        // TODO #282: Certificates on mac and windows will prefect antivirus issues
+        // certificateFile: "./cert.pfx",
+        // certificatePassword: process.env.CERTIFICATE_PASSWORD,
+      },
+    },
+  ],
+  plugins: [
+    {
+      // https://www.electronforge.io/config/plugins/auto-unpack-natives
+      name: "@electron-forge/plugin-auto-unpack-natives",
+      config: {},
+    },
+  ],
+};