diff --git a/.gitignore b/.gitignore index 44686f6f..f2cdba4d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ Thumbs.db /.settings/ /.project /.tern-project +site/ diff --git a/docs/CNAME b/docs/CNAME new file mode 100644 index 00000000..cd73634f --- /dev/null +++ b/docs/CNAME @@ -0,0 +1 @@ +www.jspsych.org diff --git a/docs/markdown_docs/about/about.md b/docs/about/about.md similarity index 96% rename from docs/markdown_docs/about/about.md rename to docs/about/about.md index f9d05482..61bf260b 100644 --- a/docs/markdown_docs/about/about.md +++ b/docs/about/about.md @@ -16,7 +16,3 @@ Wondering if jsPsych can be used for research that depends on accurate response * [Hilbig, B. E. (2016). Reaction time effects in lab- versus web-based research: Experimental evidence. *Behavior Research Methods*, *48*(4), 1718-1724.](http://dx.doi.org/10.3758/s13428-015-0678-9) * [Pinet, S., Zielinski, C., Mathôt, S. et al. (in press). Measuring sequences of keystrokes with jsPsych: Reliability of response times and interkeystroke intervals. *Behavior Research Methods*.](http://link.springer.com/article/10.3758/s13428-016-0776-3) * [Reimers, S., & Stewart, N. (2015). Presentation and response time accuracy in Adobe Flash and HTML5/JavaScript Web experiments. *Behavior Research Methods*, *47*(2), 309-327.](http://link.springer.com/article/10.3758%2Fs13428-014-0471-1) - ---- - -Documentation generated with [mkdocs](http://www.mkdocs.org) diff --git a/docs/markdown_docs/about/contributing.md b/docs/about/contributing.md similarity index 100% rename from docs/markdown_docs/about/contributing.md rename to docs/about/contributing.md diff --git a/docs/markdown_docs/about/license.md b/docs/about/license.md similarity index 100% rename from docs/markdown_docs/about/license.md rename to docs/about/license.md diff --git a/docs/markdown_docs/about/support.md b/docs/about/support.md similarity index 100% rename from docs/markdown_docs/about/support.md rename to docs/about/support.md diff --git a/docs/markdown_docs/core_library/jspsych-core.md b/docs/core_library/jspsych-core.md similarity index 100% rename from docs/markdown_docs/core_library/jspsych-core.md rename to docs/core_library/jspsych-core.md diff --git a/docs/markdown_docs/core_library/jspsych-data.md b/docs/core_library/jspsych-data.md similarity index 100% rename from docs/markdown_docs/core_library/jspsych-data.md rename to docs/core_library/jspsych-data.md diff --git a/docs/markdown_docs/core_library/jspsych-pluginAPI.md b/docs/core_library/jspsych-pluginAPI.md similarity index 100% rename from docs/markdown_docs/core_library/jspsych-pluginAPI.md rename to docs/core_library/jspsych-pluginAPI.md diff --git a/docs/markdown_docs/core_library/jspsych-randomization.md b/docs/core_library/jspsych-randomization.md similarity index 100% rename from docs/markdown_docs/core_library/jspsych-randomization.md rename to docs/core_library/jspsych-randomization.md diff --git a/docs/markdown_docs/core_library/jspsych-turk.md b/docs/core_library/jspsych-turk.md similarity index 100% rename from docs/markdown_docs/core_library/jspsych-turk.md rename to docs/core_library/jspsych-turk.md diff --git a/docs/markdown_docs/features/callbacks.md b/docs/features/callbacks.md similarity index 100% rename from docs/markdown_docs/features/callbacks.md rename to docs/features/callbacks.md diff --git a/docs/markdown_docs/features/data.md b/docs/features/data.md similarity index 100% rename from docs/markdown_docs/features/data.md rename to docs/features/data.md diff --git a/docs/markdown_docs/features/exclude-browser.md b/docs/features/exclude-browser.md similarity index 100% rename from docs/markdown_docs/features/exclude-browser.md rename to docs/features/exclude-browser.md diff --git a/docs/markdown_docs/features/fullscreen.md b/docs/features/fullscreen.md similarity index 100% rename from docs/markdown_docs/features/fullscreen.md rename to docs/features/fullscreen.md diff --git a/docs/markdown_docs/features/media-preloading.md b/docs/features/media-preloading.md similarity index 100% rename from docs/markdown_docs/features/media-preloading.md rename to docs/features/media-preloading.md diff --git a/docs/markdown_docs/features/mturk.md b/docs/features/mturk.md similarity index 100% rename from docs/markdown_docs/features/mturk.md rename to docs/features/mturk.md diff --git a/docs/markdown_docs/features/progress-bar.md b/docs/features/progress-bar.md similarity index 100% rename from docs/markdown_docs/features/progress-bar.md rename to docs/features/progress-bar.md diff --git a/docs/markdown_docs/features/record-browser-interactions.md b/docs/features/record-browser-interactions.md similarity index 100% rename from docs/markdown_docs/features/record-browser-interactions.md rename to docs/features/record-browser-interactions.md diff --git a/docs/markdown_docs/features/timeline.md b/docs/features/timeline.md similarity index 100% rename from docs/markdown_docs/features/timeline.md rename to docs/features/timeline.md diff --git a/docs/markdown_docs/features/trial.md b/docs/features/trial.md similarity index 100% rename from docs/markdown_docs/features/trial.md rename to docs/features/trial.md diff --git a/docs/markdown_docs/img/blue.png b/docs/img/blue.png similarity index 100% rename from docs/markdown_docs/img/blue.png rename to docs/img/blue.png diff --git a/docs/markdown_docs/img/folder-setup.png b/docs/img/folder-setup.png similarity index 100% rename from docs/markdown_docs/img/folder-setup.png rename to docs/img/folder-setup.png diff --git a/docs/markdown_docs/img/folder-with-html.png b/docs/img/folder-with-html.png similarity index 100% rename from docs/markdown_docs/img/folder-with-html.png rename to docs/img/folder-with-html.png diff --git a/docs/markdown_docs/img/githubreleases.jpg b/docs/img/githubreleases.jpg similarity index 100% rename from docs/markdown_docs/img/githubreleases.jpg rename to docs/img/githubreleases.jpg diff --git a/docs/markdown_docs/img/jspsych-logo-no-text-mono.svg b/docs/img/jspsych-logo-no-text-mono.svg similarity index 100% rename from docs/markdown_docs/img/jspsych-logo-no-text-mono.svg rename to docs/img/jspsych-logo-no-text-mono.svg diff --git a/docs/markdown_docs/img/jspsych-logo.jpg b/docs/img/jspsych-logo.jpg similarity index 100% rename from docs/markdown_docs/img/jspsych-logo.jpg rename to docs/img/jspsych-logo.jpg diff --git a/docs/markdown_docs/img/orange.png b/docs/img/orange.png similarity index 100% rename from docs/markdown_docs/img/orange.png rename to docs/img/orange.png diff --git a/docs/markdown_docs/img/palmer_stim.png b/docs/img/palmer_stim.png similarity index 100% rename from docs/markdown_docs/img/palmer_stim.png rename to docs/img/palmer_stim.png diff --git a/docs/markdown_docs/img/progress_bar.png b/docs/img/progress_bar.png similarity index 100% rename from docs/markdown_docs/img/progress_bar.png rename to docs/img/progress_bar.png diff --git a/docs/markdown_docs/img/visual_search_example.jpg b/docs/img/visual_search_example.jpg similarity index 100% rename from docs/markdown_docs/img/visual_search_example.jpg rename to docs/img/visual_search_example.jpg diff --git a/docs/markdown_docs/index.md b/docs/index.md similarity index 99% rename from docs/markdown_docs/index.md rename to docs/index.md index fa21547f..2b3b9df9 100644 --- a/docs/markdown_docs/index.md +++ b/docs/index.md @@ -1,3 +1,5 @@ +# + ![jsPsych](img/jspsych-logo.jpg) jsPsych is a JavaScript library for running behavioral experiments in a web browser. The library provides a flexible framework for building a wide range of laboratory-like experiments that can be run online. diff --git a/docs/markdown_docs/plugins/creating-a-plugin.md b/docs/plugins/creating-a-plugin.md similarity index 100% rename from docs/markdown_docs/plugins/creating-a-plugin.md rename to docs/plugins/creating-a-plugin.md diff --git a/docs/markdown_docs/plugins/jspsych-animation.md b/docs/plugins/jspsych-animation.md similarity index 100% rename from docs/markdown_docs/plugins/jspsych-animation.md rename to docs/plugins/jspsych-animation.md diff --git a/docs/markdown_docs/plugins/jspsych-audio-button-response.md b/docs/plugins/jspsych-audio-button-response.md similarity index 100% rename from docs/markdown_docs/plugins/jspsych-audio-button-response.md rename to docs/plugins/jspsych-audio-button-response.md diff --git a/docs/markdown_docs/plugins/jspsych-audio-keyboard-response.md b/docs/plugins/jspsych-audio-keyboard-response.md similarity index 100% rename from docs/markdown_docs/plugins/jspsych-audio-keyboard-response.md rename to docs/plugins/jspsych-audio-keyboard-response.md diff --git a/docs/markdown_docs/plugins/jspsych-audio-slider-response.md b/docs/plugins/jspsych-audio-slider-response.md similarity index 100% rename from docs/markdown_docs/plugins/jspsych-audio-slider-response.md rename to docs/plugins/jspsych-audio-slider-response.md diff --git a/docs/markdown_docs/plugins/jspsych-call-function.md b/docs/plugins/jspsych-call-function.md similarity index 100% rename from docs/markdown_docs/plugins/jspsych-call-function.md rename to docs/plugins/jspsych-call-function.md diff --git a/docs/markdown_docs/plugins/jspsych-categorize-animation.md b/docs/plugins/jspsych-categorize-animation.md similarity index 100% rename from docs/markdown_docs/plugins/jspsych-categorize-animation.md rename to docs/plugins/jspsych-categorize-animation.md diff --git a/docs/markdown_docs/plugins/jspsych-categorize-html.md b/docs/plugins/jspsych-categorize-html.md similarity index 100% rename from docs/markdown_docs/plugins/jspsych-categorize-html.md rename to docs/plugins/jspsych-categorize-html.md diff --git a/docs/markdown_docs/plugins/jspsych-categorize-image.md b/docs/plugins/jspsych-categorize-image.md similarity index 100% rename from docs/markdown_docs/plugins/jspsych-categorize-image.md rename to docs/plugins/jspsych-categorize-image.md diff --git a/docs/markdown_docs/plugins/jspsych-external-html.md b/docs/plugins/jspsych-external-html.md similarity index 100% rename from docs/markdown_docs/plugins/jspsych-external-html.md rename to docs/plugins/jspsych-external-html.md diff --git a/docs/markdown_docs/plugins/jspsych-form.md b/docs/plugins/jspsych-form.md similarity index 100% rename from docs/markdown_docs/plugins/jspsych-form.md rename to docs/plugins/jspsych-form.md diff --git a/docs/markdown_docs/plugins/jspsych-free-sort.md b/docs/plugins/jspsych-free-sort.md similarity index 100% rename from docs/markdown_docs/plugins/jspsych-free-sort.md rename to docs/plugins/jspsych-free-sort.md diff --git a/docs/markdown_docs/plugins/jspsych-fullscreen.md b/docs/plugins/jspsych-fullscreen.md similarity index 100% rename from docs/markdown_docs/plugins/jspsych-fullscreen.md rename to docs/plugins/jspsych-fullscreen.md diff --git a/docs/markdown_docs/plugins/jspsych-html-button-response.md b/docs/plugins/jspsych-html-button-response.md similarity index 100% rename from docs/markdown_docs/plugins/jspsych-html-button-response.md rename to docs/plugins/jspsych-html-button-response.md diff --git a/docs/markdown_docs/plugins/jspsych-html-keyboard-response.md b/docs/plugins/jspsych-html-keyboard-response.md similarity index 100% rename from docs/markdown_docs/plugins/jspsych-html-keyboard-response.md rename to docs/plugins/jspsych-html-keyboard-response.md diff --git a/docs/markdown_docs/plugins/jspsych-html-slider-response.md b/docs/plugins/jspsych-html-slider-response.md similarity index 100% rename from docs/markdown_docs/plugins/jspsych-html-slider-response.md rename to docs/plugins/jspsych-html-slider-response.md diff --git a/docs/markdown_docs/plugins/jspsych-iat-html.md b/docs/plugins/jspsych-iat-html.md similarity index 100% rename from docs/markdown_docs/plugins/jspsych-iat-html.md rename to docs/plugins/jspsych-iat-html.md diff --git a/docs/markdown_docs/plugins/jspsych-iat-image.md b/docs/plugins/jspsych-iat-image.md similarity index 100% rename from docs/markdown_docs/plugins/jspsych-iat-image.md rename to docs/plugins/jspsych-iat-image.md diff --git a/docs/markdown_docs/plugins/jspsych-image-button-response.md b/docs/plugins/jspsych-image-button-response.md similarity index 100% rename from docs/markdown_docs/plugins/jspsych-image-button-response.md rename to docs/plugins/jspsych-image-button-response.md diff --git a/docs/markdown_docs/plugins/jspsych-image-keyboard-response.md b/docs/plugins/jspsych-image-keyboard-response.md similarity index 100% rename from docs/markdown_docs/plugins/jspsych-image-keyboard-response.md rename to docs/plugins/jspsych-image-keyboard-response.md diff --git a/docs/markdown_docs/plugins/jspsych-image-slider-response.md b/docs/plugins/jspsych-image-slider-response.md similarity index 100% rename from docs/markdown_docs/plugins/jspsych-image-slider-response.md rename to docs/plugins/jspsych-image-slider-response.md diff --git a/docs/markdown_docs/plugins/jspsych-instructions.md b/docs/plugins/jspsych-instructions.md similarity index 100% rename from docs/markdown_docs/plugins/jspsych-instructions.md rename to docs/plugins/jspsych-instructions.md diff --git a/docs/markdown_docs/plugins/jspsych-reconstruction.md b/docs/plugins/jspsych-reconstruction.md similarity index 100% rename from docs/markdown_docs/plugins/jspsych-reconstruction.md rename to docs/plugins/jspsych-reconstruction.md diff --git a/docs/markdown_docs/plugins/jspsych-resize.md b/docs/plugins/jspsych-resize.md similarity index 100% rename from docs/markdown_docs/plugins/jspsych-resize.md rename to docs/plugins/jspsych-resize.md diff --git a/docs/markdown_docs/plugins/jspsych-same-different-html.md b/docs/plugins/jspsych-same-different-html.md similarity index 100% rename from docs/markdown_docs/plugins/jspsych-same-different-html.md rename to docs/plugins/jspsych-same-different-html.md diff --git a/docs/markdown_docs/plugins/jspsych-same-different-image.md b/docs/plugins/jspsych-same-different-image.md similarity index 100% rename from docs/markdown_docs/plugins/jspsych-same-different-image.md rename to docs/plugins/jspsych-same-different-image.md diff --git a/docs/markdown_docs/plugins/jspsych-serial-reaction-time-mouse.md b/docs/plugins/jspsych-serial-reaction-time-mouse.md similarity index 100% rename from docs/markdown_docs/plugins/jspsych-serial-reaction-time-mouse.md rename to docs/plugins/jspsych-serial-reaction-time-mouse.md diff --git a/docs/markdown_docs/plugins/jspsych-serial-reaction-time.md b/docs/plugins/jspsych-serial-reaction-time.md similarity index 100% rename from docs/markdown_docs/plugins/jspsych-serial-reaction-time.md rename to docs/plugins/jspsych-serial-reaction-time.md diff --git a/docs/markdown_docs/plugins/jspsych-survey-likert.md b/docs/plugins/jspsych-survey-likert.md similarity index 100% rename from docs/markdown_docs/plugins/jspsych-survey-likert.md rename to docs/plugins/jspsych-survey-likert.md diff --git a/docs/markdown_docs/plugins/jspsych-survey-multi-choice.md b/docs/plugins/jspsych-survey-multi-choice.md similarity index 100% rename from docs/markdown_docs/plugins/jspsych-survey-multi-choice.md rename to docs/plugins/jspsych-survey-multi-choice.md diff --git a/docs/markdown_docs/plugins/jspsych-survey-multi-select.md b/docs/plugins/jspsych-survey-multi-select.md similarity index 100% rename from docs/markdown_docs/plugins/jspsych-survey-multi-select.md rename to docs/plugins/jspsych-survey-multi-select.md diff --git a/docs/markdown_docs/plugins/jspsych-survey-text.md b/docs/plugins/jspsych-survey-text.md similarity index 100% rename from docs/markdown_docs/plugins/jspsych-survey-text.md rename to docs/plugins/jspsych-survey-text.md diff --git a/docs/markdown_docs/plugins/jspsych-video.md b/docs/plugins/jspsych-video.md similarity index 100% rename from docs/markdown_docs/plugins/jspsych-video.md rename to docs/plugins/jspsych-video.md diff --git a/docs/markdown_docs/plugins/jspsych-visual-search-circle.md b/docs/plugins/jspsych-visual-search-circle.md similarity index 100% rename from docs/markdown_docs/plugins/jspsych-visual-search-circle.md rename to docs/plugins/jspsych-visual-search-circle.md diff --git a/docs/markdown_docs/plugins/jspsych-vsl-animate-occlusion.md b/docs/plugins/jspsych-vsl-animate-occlusion.md similarity index 100% rename from docs/markdown_docs/plugins/jspsych-vsl-animate-occlusion.md rename to docs/plugins/jspsych-vsl-animate-occlusion.md diff --git a/docs/markdown_docs/plugins/jspsych-vsl-grid-scene.md b/docs/plugins/jspsych-vsl-grid-scene.md similarity index 100% rename from docs/markdown_docs/plugins/jspsych-vsl-grid-scene.md rename to docs/plugins/jspsych-vsl-grid-scene.md diff --git a/docs/markdown_docs/plugins/overview.md b/docs/plugins/overview.md similarity index 100% rename from docs/markdown_docs/plugins/overview.md rename to docs/plugins/overview.md diff --git a/docs/markdown_docs/tutorials/hello-world.md b/docs/tutorials/hello-world.md similarity index 100% rename from docs/markdown_docs/tutorials/hello-world.md rename to docs/tutorials/hello-world.md diff --git a/docs/markdown_docs/tutorials/rt-task.md b/docs/tutorials/rt-task.md similarity index 100% rename from docs/markdown_docs/tutorials/rt-task.md rename to docs/tutorials/rt-task.md diff --git a/docs/mkdocs.yml b/mkdocs.yml similarity index 99% rename from docs/mkdocs.yml rename to mkdocs.yml index 018ece6d..f6fc4b50 100644 --- a/docs/mkdocs.yml +++ b/mkdocs.yml @@ -16,7 +16,7 @@ markdown_extensions: permalink: true repo_url: 'https://github.com/jspsych/jsPsych' repo_name: 'jspsych/jspsych' -docs_dir: markdown_docs +docs_dir: docs pages: - Introduction: 'index.md' - Tutorials: