Skip to content

Commit

Permalink
Merge branch 'main' into remove-data-env-vars
Browse files Browse the repository at this point in the history
  • Loading branch information
becky-gilbert committed Oct 25, 2024
2 parents aefa71f + 9114f0a commit 8952e42
Show file tree
Hide file tree
Showing 32 changed files with 963 additions and 290 deletions.
5 changes: 5 additions & 0 deletions .changeset/cold-chairs-confess.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@lookit/style": patch
---

Update consent trial style
6 changes: 6 additions & 0 deletions .changeset/large-rabbits-matter.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@lookit/templates": patch
"@lookit/record": patch
---

Add ability to select specific video consent template.
6 changes: 6 additions & 0 deletions .changeset/strange-bottles-invent.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@lookit/templates": patch
"@lookit/record": patch
---

Add Garden's consent template
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ Procfile
.env
site
.DS_Store
packages/style/**/*.js
packages/style/**/*.js
.python-version
23 changes: 23 additions & 0 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Read the Docs configuration file for MkDocs projects
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

# Required
version: 2

# Set the version of Python and other tools you might need
build:
os: "ubuntu-22.04"
tools:
python: "3.12"
jobs:
post_create_environment:
# Install poetry
# https://python-poetry.org/docs/#installing-manually
- pip install poetry
post_install:
# VIRTUAL_ENV needs to be set manually for now.
# See https://github.com/readthedocs/readthedocs.org/pull/11152/
- VIRTUAL_ENV=$READTHEDOCS_VIRTUALENV_PATH poetry install --no-root --sync

mkdocs:
configuration: mkdocs.yml
7 changes: 5 additions & 2 deletions makefile
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
serve: poetry
poetry run mkdocs serve -a localhost:8888
poetry run mkdocs serve --strict -a localhost:8888

build: poetry
poetry run mkdocs build --strict

poetry:
poetry install --no-root --sync
poetry check
poetry self update
poetry env use 3.12
poetry update --sync

clean:
rm -rf ./site $(shell poetry env info -p)
Expand Down
24 changes: 18 additions & 6 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,34 @@ repo_url: https://github.com/lookit/lookit-jspsych

nav:
- Home: index.md
- CHS's initJsPsych: lookit-initjspsych/README.md
- Data: data/README.md
- Record: record/README.md
- Surveys: surveys/README.md
- Related projects:
- Lookit API: https://lookit.readthedocs.io
- Ember Lookit Frameplayer: https://lookit.readthedocs.io/projects/frameplayer
- Plugins and Extensions:
- Record: record/README.md
- Surveys: surveys/README.md
- Developers:
- Data: data/README.md
- CHS's initJsPsych: lookit-initjspsych/README.md
- Templates: templates/README.md

validation:
omitted_files: warn
absolute_links: warn
unrecognized_links: warn
anchors: warn

exclude_docs: |
node_modules
lookit-initjspsych/CHANGELOG.md
CHANGELOG.md
!templates
theme:
name: readthedocs

plugins:
- search
- macros

extra:
jsPsych: https://www.jspsych.org/7.3/
jsPsych: https://www.jspsych.org/v8/
3 changes: 3 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 8952e42

Please sign in to comment.