diff --git a/.eslintrc.js b/.eslintrc.js index 30ab4bc..e221600 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,27 +1,32 @@ module.exports = { - 'env': { - 'browser': true, - 'es6': true + env: { + browser: true, + es2021: true }, - 'extends': [ - 'eslint:recommended', + extends: [ + 'standard', 'plugin:react/recommended' ], - 'globals': { - 'Atomics': 'readonly', - 'SharedArrayBuffer': 'readonly' - }, - 'parserOptions': { - 'ecmaFeatures': { - 'jsx': true - }, - 'ecmaVersion': 2018, - 'sourceType': 'module' + overrides: [ + { + env: { + node: true + }, + files: [ + '.eslintrc.{js,cjs}' + ], + parserOptions: { + sourceType: 'script' + } + } + ], + parserOptions: { + ecmaVersion: 'latest', + sourceType: 'module' }, - 'plugins': [ + plugins: [ 'react' ], - 'rules': { - 'react/prop-types': 'off' + rules: { } } diff --git a/env/.env.firebase-download b/env/.env.firebase-download index 66f13ce..70afbb5 100644 --- a/env/.env.firebase-download +++ b/env/.env.firebase-download @@ -1 +1 @@ -GOOGLE_APPLICATION_CREDENTIALS="/Users/lucyowen/Desktop/avoidance-learning-firebase-adminsdk-ak3lx-85ad138dcb.json" +GOOGLE_APPLICATION_CREDENTIALS="/Users/lowen/Desktop/avoidance-learning-firebase-adminsdk-ak3lx-9e17a7d760.json" diff --git a/package.json b/package.json index 6e62470..5d5b763 100644 --- a/package.json +++ b/package.json @@ -13,8 +13,15 @@ "homepage": ".", "repository": "https://github.com/lucywowen/avoidance_learning_task.git", "dependencies": { + "@adp-psych/jspsych-plugin-html": "^1.1.3", "@brown-ccv/behavioral-task-trials": "^2.0.0", "@fortawesome/fontawesome-free": "^5.9.0", + "@jspsych/plugin-call-function": "^1", + "@jspsych/plugin-external-html": "^1", + "@jspsych/plugin-fullscreen": "^1.1.1", + "@jspsych/plugin-html-keyboard-response": "^1.1.1", + "@jspsych/plugin-image-keyboard-response": "^1.1.1", + "@jspsych/plugin-instructions": "^1", "bootstrap": "^5.2.0-beta1", "electron-log": "^4.4.8", "electron-squirrel-startup": "^1.0.0", @@ -24,13 +31,6 @@ "fs-extra": "^8.1.0", "jquery": "^3.4.1", "jspsych": "^7.2.3", - "@jspsych/plugin-html-keyboard-response": "^1.1.1", - "@jspsych/plugin-image-keyboard-response": "^1.1.1", - "@jspsych/plugin-external-html": "^1", - "@jspsych/plugin-call-function": "^1", - "@jspsych/plugin-instructions": "^1", - "@jspsych/plugin-fullscreen": "^1.1.1", - "@adp-psych/jspsych-plugin-html": "^1.1.3", "lodash": "^4.17.19", "popper.js": "^1.16.0", "react": "^16.8.6", @@ -118,6 +118,10 @@ ] }, "devDependencies": { + "@electron-forge/cli": "^6.0.0-beta.64", + "@electron-forge/maker-deb": "^6.0.0-beta.64", + "@electron-forge/maker-dmg": "^6.0.0-beta.64", + "@electron-forge/maker-squirrel": "^6.0.0-beta.64", "babel-plugin-macros": "^2.6.1", "chai": "^4.2.0", "concurrently": "^4.1.2", @@ -125,14 +129,16 @@ "cz-conventional-changelog": "^3.2.0", "dotenv": "^8.2.0", "dotenv-cli": "^4.0.0", - "firebase-tools": "^11.0.1", + "electron": "19.0.8", + "eslint": "^8.46.0", + "eslint-config-standard": "^17.1.0", + "eslint-plugin-import": "^2.28.0", + "eslint-plugin-n": "^16.0.1", + "eslint-plugin-promise": "^6.1.1", + "eslint-plugin-react": "^7.33.1", "firebase-admin": "^11.0.1", - "require-context.macro": "^1.1.1", - "@electron-forge/cli": "^6.0.0-beta.64", - "@electron-forge/maker-deb": "^6.0.0-beta.64", - "@electron-forge/maker-dmg": "^6.0.0-beta.64", - "@electron-forge/maker-squirrel": "^6.0.0-beta.64", - "electron": "19.0.8" + "firebase-tools": "^11.0.1", + "require-context.macro": "^1.1.1" }, "babel": { "plugins": [ diff --git a/src/assets/images/forrest_2.jpg b/src/assets/images/forrest_2.jpg deleted file mode 100644 index 7be82d1..0000000 Binary files a/src/assets/images/forrest_2.jpg and /dev/null differ diff --git a/src/assets/images/keyboard_key_j.png b/src/assets/images/keyboard_key_j.png new file mode 100644 index 0000000..15ca2e8 Binary files /dev/null and b/src/assets/images/keyboard_key_j.png differ