Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

False memory import #9

Merged
merged 5 commits into from
Aug 6, 2024
Merged

False memory import #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6997f81
add false-memory-task
cherriechang Jun 19, 2023
6af0a04
first attempt at passing previously failed tests
cherriechang Jun 21, 2023
d2d5168
Merge branch 'main' into false_memory_import
jodeleeuw Jun 22, 2023
308a929
fix package-lock.json
jodeleeuw Jun 22, 2023
9c4ef13
override braces to 3.0.3
cherriechang Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.DS_Store

# Logs
logs
*.log
Expand Down
34,637 changes: 9,976 additions & 24,661 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 14 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,14 @@
"devDependencies": {
"@changesets/changelog-github": "^0.4.0",
"@changesets/cli": "^2.16.0",
"@jspsych/config": "^1.3.3",
"@jspsych/config": "^3.0.0",
"@types/jest": "^29.5.12",
"husky": "^7.0.1",
"import-sort-style-module": "^6.0.0",
"jest": "*",
"lint-staged": "^11.1.2",
"prettier": "^2.3.2",
"prettier-plugin-import-sort": "^0.0.7",
"jest": "*",
"ts-jest": "*"
},
"prettier": {
Expand All @@ -44,5 +45,16 @@
"projects": [
"<rootDir>/packages/*/jest.config.cjs"
]
},
"dependencies": {
"chokidar": "^3.6.0",
"gulp": "^5.0.0",
"gulp-cli": "^3.0.0",
"jspsych": "^8.0.1"
},

"overrides": {
"braces": "^3.0.3"
}

}
4 changes: 2 additions & 2 deletions packages/arrow-flanker/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
},
"homepage": "https://github.com/jspsych/jspsych-timelines/packages/arrow-flanker#readme",
"peerDependencies": {
"jspsych": "^7.3.3"
"jspsych": "^8.0.1"
},
"dependencies": {
"@jspsych/plugin-html-keyboard-response": "^1.1.2"
"@jspsych/plugin-html-keyboard-response": "^2.0.0"
},
"devDependencies": {
"tsup": "^6.7.0",
Expand Down
49 changes: 49 additions & 0 deletions packages/false-memory-task/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# false-memory-task

## Overview

A timeline for the generic DRM false memory task

## Loading

### In browser

```html
<script src="https://unpkg.com/@jspsych-timelines/false-memory-task">
```

### Via NPM

```
npm install @jspsych-timelines/false-memory-task
```

```js
import { createTimeline, timelineUnits, utils } from "@jspsych-timelines/false-memory-task"
```

## Compatibility

`@jspsych-timelines/false-memory-task` requires jsPsych v7.0.0 or later.

## Documentation

### createTimeline

#### jsPsychTimelineFalseMemoryTask.createTimeline(jsPsych, { _options_ }) ⇒ <code>timeline</code>

Description of the timeline that this plugin generates

The following parameters can be specified in the **options** parameter.

| Parameter | Type | Default | Description |
| --------- | ---- | ------- | ----------- |
| parameter | type | default | description |

### timelineUnits

### utils

## Author / Citation

Cherrie Chang
18 changes: 18 additions & 0 deletions packages/false-memory-task/example/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<!DOCTYPE html>
<html>
<head>
<script src="https://unpkg.com/jspsych"></script>
<script src="https://unpkg.com/@jspsych/plugin-html-keyboard-response"></script>
<script src="https://unpkg.com/@jspsych/plugin-survey-text"></script>
<script src="../dist/index.global.js"></script>
<link rel="stylesheet" type="text/css" href="https://unpkg.com/jspsych/css/jspsych.css" />
<link rel="stylesheet" type="text/css" href="../src/styles.css" />
</head>

<body></body>
<script>
const jsPsych = initJsPsych();
const falseMemoryTask = jsPsychTimelineFalseMemoryTask.createTimeline(jsPsych);
jsPsych.run([falseMemoryTask]);
</script>
</html>
1 change: 1 addition & 0 deletions packages/false-memory-task/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require("@jspsych/config/jest").makePackageConfig(__dirname);
36 changes: 36 additions & 0 deletions packages/false-memory-task/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"name": "@jspsych/timeline-template",
"version": "0.0.1",
"description": "A template for a shareable, configurable false memory jsPsych experiment",
"type": "module",
"main": "dist/index.mjs",
"types": "dist/index.d.ts",
"unpkg": "dist/index.global.js",
"scripts": {
"build": "tsup src/index.ts --format esm,iife --sourcemap --dts --treeshake --clean --global-name jsPsychTimelineFalseMemoryTask"
},
"repository": {
"type": "git",
"url": "git+https://github.com/open-cognition-lab/false-memory-module.git"
},
"keywords": [
"jsPsych"
],
"author": "Cherrie Chang",
"license": "MIT",
"bugs": {
"url": "https://github.com/open-cognition-lab/false-memory-module/issues"
},
"homepage": "https://github.com/open-cognition-lab/false-memory-module#readme",
"peerDependencies": {
"jspsych": "^8.0.1"
},
"dependencies": {
"@jspsych/plugin-html-keyboard-response": "^2.0.0",
"@jspsych/plugin-survey-text": "^2.0.0"
},
"devDependencies": {
"tsup": "^6.7.0",
"typescript": "^5.0.2"
}
}
Loading
Loading