Commit f913ff54 authored by Peiling Jiang's avatar Peiling Jiang

chore

parent 5c12ed89
---
name: Bug report
about: Create a report to help us improve
title: '[BUG]'
title: "[BUG]"
labels: bug
assignees: ''
assignees: ""
---
**Describe the bug**
......
---
name: Feature request
about: Suggest an idea for this project
title: '[FEATURE]'
title: "[FEATURE]"
labels: enhancement
assignees: ''
assignees: ""
---
**Is your feature request related to a problem? Please describe.**
......
node_modules
data/
conditions/
*_lastrun.py
......
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"
npx lint-staged
.cache
package.json
package-lock.json
lib/*.js
lib/*.js.map
*.psyexp
psychojs
control-panel
......@@ -5,11 +5,13 @@
A PsychoJS-based experiment generator for the measuring various psychometric thresholds, e.g., crowding.
## UPDATE
What's below is out of date in some ways. It mentions that we replaced the Python preprocessor.py by javascript code,
but the instructions still use the Python version. Instructions below explain how to put files on a server and run them.
This will soon be done for us by the https://easyeyes.app/threshold web page, which also allows uploading of fonts and consent forms directly to the Fonts and ConsentForms folders in EasyEyesResources/ on the scientist's Pavlovia account.
but the instructions still use the Python version. Instructions below explain how to put files on a server and run them.
This will soon be done for us by the https://easyeyes.app/threshold web page, which also allows uploading of fonts and consent forms directly to the Fonts and ConsentForms folders in EasyEyesResources/ on the scientist's Pavlovia account.
The manual is up to date.
https://docs.google.com/spreadsheets/d/1x65NjykMm-XUOz98Eu_oo6ON2xspm_h0Q0M2u6UGtug/edit#gid=2021552264
- Denis, Sept 23, 2021.
## Installation Instructions
......
export function calculateBlockWithTrialIndex(totalBlockTrialList, totalTrialIndex) {
export function calculateBlockWithTrialIndex(
totalBlockTrialList,
totalTrialIndex
) {
let cumulativeTrialCount = 0;
for (let i = 0; i < totalBlockTrialList.length; i++) {
cumulativeTrialCount += totalBlockTrialList[i];
......
This diff is collapsed.
......@@ -8,7 +8,11 @@
"lib": "lib"
},
"scripts": {
"setup": "pip install -r lib/legacy/requirements.txt && python lib/legacy/preprocessor.py experiment.csv && cd psychojs && git checkout threshold-prod && npm i && npm run build:css && npm run build:js"
"setup": "npm run setup:preprocessor && npm run setup:psychojs",
"setup:preprocessor": "pip install -r lib/legacy/requirements.txt && python lib/legacy/preprocessor.py experiment.csv",
"setup:psychojs": "cd psychojs && git checkout threshold-prod && npm i && npm run build:css && npm run build:js",
"format": "prettier --write \"**/*.{js,css,html,md}\"",
"prepare": "husky install"
},
"repository": {
"type": "git",
......@@ -22,5 +26,13 @@
"bugs": {
"url": "https://github.com/EasyEyes/threshold/issues"
},
"homepage": "https://github.com/EasyEyes/threshold#readme"
"homepage": "https://github.com/EasyEyes/threshold#readme",
"devDependencies": {
"husky": "^7.0.2",
"lint-staged": "^11.1.2",
"prettier": "^2.4.1"
},
"lint-staged": {
"*.{js,css,html,md}": "prettier --write"
}
}
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment