Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
c603106
Merge remote-tracking branch 'origin/main' into james/track-subscript…
JamesPHoughton Oct 25, 2025
92054d8
add test files
JamesPHoughton Oct 27, 2025
d404d16
Merge branch 'main' into james/track-subscriptions
JamesPHoughton Oct 27, 2025
d944cf5
layout working ish
JamesPHoughton Oct 29, 2025
e509183
restructure
JamesPHoughton Oct 29, 2025
8a553f5
fix call
JamesPHoughton Oct 29, 2025
7c66d6f
Layout Working
JamesPHoughton Oct 29, 2025
68879bf
maybe track subscriptions working?
JamesPHoughton Oct 30, 2025
c101bba
A bit of organizing
JamesPHoughton Oct 30, 2025
d3930a6
Added rooms syntax
JamesPHoughton Oct 31, 2025
02c35f6
Fix layout calculation
JamesPHoughton Oct 31, 2025
38610ea
comments
JamesPHoughton Oct 31, 2025
9779695
hardening call code
JamesPHoughton Nov 7, 2025
82dfbc5
fixed zero-height call object when page-width was smaller than md
JamesPHoughton Nov 7, 2025
1af95a4
Allow videocall to stretch to fill volume of its container
JamesPHoughton Nov 7, 2025
5837a0f
fix component widths
JamesPHoughton Nov 7, 2025
e75afa4
showSelfView option
JamesPHoughton Nov 7, 2025
0e788b9
Add vitest unit tests for layout code
JamesPHoughton Nov 8, 2025
098b843
add cypress test for call layout code
JamesPHoughton Nov 8, 2025
11e2f83
clean up test
JamesPHoughton Nov 8, 2025
6c92cb7
update docs to reflect new layout info
JamesPHoughton Nov 8, 2025
144a53b
Update validateTreatmentFile.test.js
JamesPHoughton Nov 8, 2025
1c8a089
Merge remote-tracking branch 'origin/main' into james/track-subscript…
JamesPHoughton Nov 8, 2025
73b7510
update to main
JamesPHoughton Nov 8, 2025
7177162
comments, device error handling
JamesPHoughton Nov 8, 2025
96475a6
Move the start recording signal out of the logging code.
JamesPHoughton Nov 8, 2025
4be3390
bump daily
JamesPHoughton Nov 8, 2025
ae71e6f
docs
JamesPHoughton Nov 8, 2025
ca21e18
update cypress tests of layout
JamesPHoughton Nov 9, 2025
949f56f
added icon for participant left
JamesPHoughton Nov 9, 2025
1deb370
Update participant left icon
JamesPHoughton Nov 9, 2025
42511bd
Update Icons.jsx
JamesPHoughton Nov 9, 2025
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
24 changes: 24 additions & 0 deletions .github/workflows/client_vitest.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Run Client Vitest

on:
push:

jobs:
run-vitest-client:
timeout-minutes: 5
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v2

- name: Setup Node.js
uses: actions/setup-node@v2
with:
node-version: "18"

- name: Install dependencies
run: cd client && npm ci

- name: Run vitest
run: cd client && npm test
2 changes: 1 addition & 1 deletion .github/workflows/server_vitest.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Run Vitest
name: Run Server Vitest

on:
push:
Expand Down
13 changes: 12 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,25 @@ The root folder contains a few loose files associated with the project as a whol
- **package.json** installs the packages needed for the style checkers, and provides some helpful shortcut commands.

## Installing local dependencies

`deliberation-empirica` assumes certain dependencies prior to local development. These are:

- Node.js (https://nodejs.org/en/download)
- Docker (https://www.docker.com/)
- Empirica (https://docs.empirica.ly/getting-started/setup); the top of the setup page contains a one-line command for installing Empirica.

Running `npm run build` without these dependencies leads to an error (e.g, `docker: command not found`; `empirica: command not found`).

[For Mac users] One easy way of installing Docker is via homebrew (https://docs.brew.sh/Installation). Once homebrew is installed, simply run:

```
brew install docker --cask
```

## Setting up the local environment

At the root folder of `deliberation-empirica`, the system expects an `.env` file with the following structure:

```
DAILY_APIKEY=
QUALTRICS_API_TOKEN=
Expand All @@ -58,6 +63,7 @@ GITHUB_PRIVATE_DATA_BRANCH=
GITHUB_PUBLIC_DATA_REPO=
GITHUB_PUBLIC_DATA_BRANCH=
```

Starting the server without the `.env` file will work, but experiments will fail without the proper API keys, GitHub repos, etc.

After installing these dependencies and setting up the local environment, you can proceed to running on dev.
Expand Down Expand Up @@ -225,7 +231,12 @@ treatments:
url: https://youtu.be/QC8iQqtG0hg
- name: Discussion
duration: 10
chatType: video
discussion:
chatType: video
# show discussion only to player positions 0 and 1 (optional)
showToPositions:
- 0
- 1
elements:
- type: prompt
file: projects/example/multipleChoiceColors.md
Expand Down
Loading
Loading