Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: gorkang/jsPsychRmanual
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.2.0
Choose a base ref
...
head repository: gorkang/jsPsychRmanual
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 16 commits
  • 59 files changed
  • 1 contributor

Commits on Aug 29, 2023

  1. Update README.md

    Add zenodo DOI tag
    gorkang authored Aug 29, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    727d7eb View commit details
  2. Copy the full SHA
    934f93d View commit details

Commits on Aug 30, 2023

  1. small updates

    gorkang committed Aug 30, 2023
    Copy the full SHA
    0787ab7 View commit details

Commits on Sep 11, 2023

  1. update

    gorkang committed Sep 11, 2023
    Copy the full SHA
    8db4df3 View commit details

Commits on Sep 24, 2023

  1. Copy the full SHA
    26529cd View commit details

Commits on Sep 25, 2023

  1. update

    gorkang committed Sep 25, 2023
    Copy the full SHA
    deb627d View commit details

Commits on Oct 1, 2023

  1. Add google analytics

    gorkang committed Oct 1, 2023
    Copy the full SHA
    60bec4e View commit details
  2. Add google analytics

    gorkang committed Oct 1, 2023
    Copy the full SHA
    4371e7f View commit details
  3. Add google analytics

    gorkang committed Oct 1, 2023
    Copy the full SHA
    1412a9f View commit details

Commits on Oct 2, 2023

  1. Copy the full SHA
    551e777 View commit details

Commits on Oct 12, 2023

  1. Add multilingual info

    gorkang committed Oct 12, 2023
    Copy the full SHA
    0a370ee View commit details

Commits on Oct 26, 2023

  1. add video

    gorkang committed Oct 26, 2023
    Copy the full SHA
    4f57e8d View commit details

Commits on Oct 28, 2023

  1. update youtube video

    gorkang committed Oct 28, 2023
    Copy the full SHA
    caad3d5 View commit details

Commits on Dec 4, 2023

  1. updates

    gorkang committed Dec 4, 2023
    Copy the full SHA
    042b0d5 View commit details

Commits on May 7, 2024

  1. update version.

    gorkang committed May 7, 2024
    Copy the full SHA
    a464032 View commit details

Commits on Nov 13, 2024

  1. Improve docker installation instructions

    gorkang committed Nov 13, 2024
    Copy the full SHA
    e5815ee View commit details
Showing with 7,422 additions and 1,150 deletions.
  1. +2 −0 .Rbuildignore
  2. +2 −1 .Rprofile
  3. +38 −0 DESCRIPTION
  4. +1 −1 LICENSE.md
  5. +10 −3 README.md
  6. +5 −2 _quarto.yml
  7. +263 −32 docs/index.html
  8. BIN docs/jsPsychR-manual.pdf
  9. +272 −38 docs/qmd/01-intro.html
  10. +245 −42 docs/qmd/02-QuickGuide.html
  11. +515 −141 docs/qmd/03-jsPsychMaker.html
  12. +251 −35 docs/qmd/04-jsPsychMonkeys.html
  13. +277 −56 docs/qmd/05-jsPsychHelpeR.html
  14. +479 −193 docs/qmd/06-jsPsychRadmins.html
  15. +323 −71 docs/qmd/07-NEWtasks.html
  16. +238 −32 docs/qmd/08-CreateSimulatePrepare.html
  17. +403 −153 docs/qmd/09-CommonTasks.html
  18. +1,028 −38 docs/qmd/10-references.html
  19. +280 −67 docs/search.json
  20. +104 −44 docs/site_libs/bootstrap/bootstrap-icons.css
  21. BIN docs/site_libs/bootstrap/bootstrap-icons.woff
  22. +7 −5 docs/site_libs/bootstrap/bootstrap.min.css
  23. +3 −3 docs/site_libs/bootstrap/bootstrap.min.js
  24. 0 docs/site_libs/{crosstalk-1.2.0 → crosstalk-1.2.1}/css/crosstalk.min.css
  25. 0 docs/site_libs/{crosstalk-1.2.0 → crosstalk-1.2.1}/js/crosstalk.js
  26. 0 docs/site_libs/{crosstalk-1.2.0 → crosstalk-1.2.1}/js/crosstalk.js.map
  27. 0 docs/site_libs/{crosstalk-1.2.0 → crosstalk-1.2.1}/js/crosstalk.min.js
  28. 0 docs/site_libs/{crosstalk-1.2.0 → crosstalk-1.2.1}/js/crosstalk.min.js.map
  29. 0 docs/site_libs/{crosstalk-1.2.0 → crosstalk-1.2.1}/scss/crosstalk.scss
  30. +54 −30 docs/site_libs/{datatables-binding-0.28 → datatables-binding-0.33}/datatables.js
  31. +0 −1 docs/site_libs/dt-core-1.13.4/css/jquery.dataTables.min.css
  32. +0 −4 docs/site_libs/dt-core-1.13.4/js/jquery.dataTables.min.js
  33. 0 docs/site_libs/{dt-core-1.13.4 → dt-core-1.13.6}/css/jquery.dataTables.extra.css
  34. +1 −0 docs/site_libs/dt-core-1.13.6/css/jquery.dataTables.min.css
  35. +4 −0 docs/site_libs/dt-core-1.13.6/js/jquery.dataTables.min.js
  36. +21 −0 docs/site_libs/htmltools-fill-0.5.8.1/fill.css
  37. 0 docs/site_libs/{htmlwidgets-1.6.2 → htmlwidgets-1.6.4}/htmlwidgets.js
  38. +3 −3 docs/site_libs/quarto-html/anchor.min.js
  39. +2 −2 docs/site_libs/quarto-html/popper.min.js
  40. +2 −0 docs/site_libs/quarto-html/quarto-syntax-highlighting.css
  41. +25 −19 docs/site_libs/quarto-html/quarto.js
  42. +53 −5 docs/site_libs/quarto-nav/quarto-nav.js
  43. +2 −2 docs/site_libs/quarto-search/autocomplete.umd.js
  44. +190 −40 docs/site_libs/quarto-search/quarto-search.js
  45. +606 −0 grateful-refs.bib
  46. +24 −2 index.qmd
  47. +10 −0 inst/CITATION
  48. +4 −0 jsPsychR-manual.Rproj → jsPsychRmanual.Rproj
  49. +6 −6 qmd/01-intro.qmd
  50. +7 −9 qmd/02-QuickGuide.qmd
  51. +108 −15 qmd/03-jsPsychMaker.qmd
  52. +11 −2 qmd/04-jsPsychMonkeys.qmd
  53. +15 −2 qmd/05-jsPsychHelpeR.qmd
  54. +105 −11 qmd/06-jsPsychRadmins.qmd
  55. +12 −12 qmd/07-NEWtasks.qmd
  56. +79 −26 qmd/09-CommonTasks.qmd
  57. +42 −2 qmd/10-references.qmd
  58. +52 −0 references.bib
  59. +1,238 −0 tasks.bib
2 changes: 2 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
^LICENSE\.md$
^.*\.Rproj$
^\.Rproj\.user$
3 changes: 2 additions & 1 deletion .Rprofile
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
options(repos = c(CRAN = "https://packagemanager.posit.co/all/__linux__/jammy/latest"))
# Sys.getenv("R_LIBS_USER")

# .libPaths(c( Sys.getenv("R_LIBS_USER") , .libPaths()))
# .libPaths(Sys.getenv("R_LIBS_USER"))
R_LIBS_SITE=Sys.getenv("R_LIBS_USER") # Install packages on local user library
options(repos = c(CRAN = "https://packagemanager.rstudio.com/all/__linux__/jammy/latest"))
options(repos = c(CRAN = "https://packagemanager.posit.co/all/__linux__/jammy/latest"))

# TO avoid error: Error: Input files not all in same directory, please supply
# explicit wd
38 changes: 38 additions & 0 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
Package: jsPsychR
Title: Create experimental paradigms with jsPsych, simulate participants and standardize the data preparation and analysis
Version: 0.3.5.900
Date: 2024-05-07
Authors@R:
c(person("Gorka", "Navarrete", email = "gorkang@gmail.com", role = c("aut", "cre"), comment = c(ORCID = "0000-0001-7678-8656")),
person("Herman", "Valencia", email = "herman.valencia.13@sansano.usm.cl", role = c("aut"), comment = c(ORCID = "")))
Description: With jsPsychMaker, jsPsychMonkeys and jsPsychHelper you can create new tasks and protocols using jsPsych, simulate participants and prepare data.
License: MIT + file LICENSE
URL: https://gorkang.github.io/jsPsychRmanual/
BugReports: https://github.com/gorkang/jsPsychRmanual/issues
Depends:
R (>= 4.1.0)
Imports:
callr,
cli,
dplyr,
here,
httr,
janitor,
purrr,
quarto,
readr,
readxl,
stringr,
tibble,
tidyr
Suggests:
covr,
knitr,
testthat (>= 3.0.0)
VignetteBuilder:
knitr
LazyData: FALSE
Encoding: UTF-8
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.2.3
Config/testthat/edition: 3
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MIT License

Copyright (c) 2021 jsPsychR-manual authors
Copyright (c) 2021 jsPsychRmanual authors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
13 changes: 10 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
[![DOI](https://zenodo.org/badge/413765764.svg)](https://zenodo.org/badge/latestdoi/413765764)

# What is jsPsychR?

`jsPsychR` is a group of **open source** tools to help create experimental paradigms with [jsPsych](https://www.jspsych.org/), simulate participants and standardize the data preparation and analysis. The final goal is to help you have the data preparation and analysis ready before collecting any real data, drastically reducing errors in your protocols, and making the move towards [registered reports](https://www.cos.io/initiatives/registered-reports) easier.

We have three main tools:

- [jsPsychMaker](#jsPsychMaker): Create experiments with [jsPsych](https://www.jspsych.org/), randomize participants, balance between conditions, reuse already existing tasks, etc.
- [jsPsychMaker](https://github.com/gorkang/jsPsychMaker): Create experiments with [jsPsych](https://www.jspsych.org/), randomize participants, balance between conditions, reuse already existing tasks, etc.

- [jsPsychMonkeys](#jsPsychMonkeys): Release monkeys to a [jsPsych](https://www.jspsych.org/) experiment with {[targets](https://books.ropensci.org/targets/)}, [docker](https://www.docker.com/) and {[RSelenium](https://docs.ropensci.org/RSelenium/)}
- [jsPsychMonkeys](https://github.com/gorkang/jsPsychMonkeys): Release monkeys to a [jsPsych](https://www.jspsych.org/) experiment with {[targets](https://books.ropensci.org/targets/)}, [docker](https://www.docker.com/) and {[RSelenium](https://docs.ropensci.org/RSelenium/)}

- [jsPsychHelpeR](#jsPsychHelpeR): Standardize and automatize data preparation, analysis and reporting of [jsPsych](https://www.jspsych.org/) experiments created with [jsPsychMaker](#jsPsychMaker)
- [jsPsychHelpeR](https://github.com/gorkang/jsPsychHelpeR): Standardize and automatize data preparation, analysis and reporting of [jsPsych](https://www.jspsych.org/) experiments created with [jsPsychMaker](#jsPsychMaker)

![](img/jsPsych-trinity.png)


## How to cite jsPsychR

Navarrete, G., & Valencia, H. (2023). Create experimental paradigms with jsPsych: Simulate Participants and Standardize the Data Preparation and Analysis, 1, 73. https://gorkang.github.io/jsPsychRmanual/, 10.5281/zenodo.8296995
7 changes: 5 additions & 2 deletions _quarto.yml
Original file line number Diff line number Diff line change
@@ -4,11 +4,14 @@ project:
# execute-dir: project

book:
google-analytics: "G-WTTG1W9SNG"
title: "jsPsychR manual"
author: "Gorka Navarrete"
date: today
search: true
repo-url: https://github.com/gorkang/jsPsychR-manual/
url: https://gorkang.github.io/jsPsychRmanual/
doi: 10.5281/zenodo.8296995
repo-url: https://github.com/gorkang/jsPsychRmanual/
downloads: [pdf]
chapters:
- index.qmd
@@ -23,7 +26,7 @@ book:
- qmd/09-CommonTasks.qmd
- qmd/10-references.qmd

bibliography: references.bib
bibliography: [references.bib, tasks.bib, grateful-refs.bib]

format:
html:
Loading