Merge pull request #4 from revisit-studies/main

release bump
visdesignlab · Jun 26, 2024 · 306e178 · 306e178
2 parents 1d7df21 + 6700a82
commit 306e178
Show file tree

Hide file tree

Showing 59 changed files with 1,524 additions and 1,130 deletions.
diff --git a/.env b/.env
@@ -11,5 +11,3 @@ VITE_FIREBASE_CONFIG='
 '
 VITE_STORAGE_ENGINE="localStorage" # "firebase" or "localStorage" or your own custom storage engine
 VITE_RECAPTCHAV3TOKEN="6LdjOd0lAAAAAASvFfDZFWgtbzFSS9Y3so8rHJth" # recaptcha SITE KEY
-
-VITE_REVISIT_MODE="public"
diff --git a/.github/workflows/deploy_website.yaml b/.github/workflows/deploy_website.yaml
@@ -21,7 +21,16 @@ jobs:
           cache: 'yarn'
 
       - run: yarn install --immutable
-      - run: yarn build
+
+      - name: Build with .env file
+        if: ${{ vars.VITE_STORAGE_ENGINE == '' }}
+        run: yarn build
+
+      - name: Build with github environment variables
+        if: ${{ vars.VITE_STORAGE_ENGINE != '' }}
+        run: VITE_STORAGE_ENGINE=$VITE_STORAGE_ENGINE yarn build
+        env:
+          VITE_STORAGE_ENGINE: ${{ vars.VITE_STORAGE_ENGINE }}
 
       - uses: peaceiris/actions-gh-pages@v3
         name: Deploy

diff --git a/index.html b/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/revisitAssets/revisitLogoSquare.svg" />
+    <link rel="icon" type="image/svg+xml" href="/revisitAssets/favicon.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>reVISit</title>
 

diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   "scripts": {
     "buildDocs": "yarn typedoc",
     "serve": "vite --host=0.0.0.0 --port=8080",
-    "build": "tsc && VITE_STORAGE_ENGINE=firebase vite build",
+    "build": "tsc && vite build",
     "lint": "eslint src",
     "postinstall": "husky",
     "generate-schema:StudyConfig": "ts-json-schema-generator --path src/parser/types.ts --out src/parser/StudyConfigSchema.json --type StudyConfig",
@@ -22,7 +22,7 @@
     "@mantine/core": "^7.10.1",
     "@mantine/dates": "^7.10.1",
     "@mantine/form": "^7.10.1",
-    "@mantine/hooks":"^7.10.1",
+    "@mantine/hooks": "^7.10.1",
     "@mantine/modals": "^7.10.1",
     "@quentinroy/latin-square": "^1.1.1",
     "@reduxjs/toolkit": "^2.2.5",
@@ -52,6 +52,7 @@
     "typedoc": "^0.25.13",
     "typedoc-plugin-frontmatter": "^1.0.0",
     "typedoc-plugin-markdown": "^4.0.3",
+    "use-deep-compare-effect": "^1.8.1",
     "uuid": "^10.0.0",
     "vega": "^5.28.0",
     "vega-lite": "^5.17.0"

diff --git a/public/demo-VLAT-full-randomized/config.json b/public/demo-VLAT-full-randomized/config.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "https://raw.githubusercontent.com/revisit-studies/study/v1.0.0-beta13/src/parser/StudyConfigSchema.json",
+    "$schema": "https://raw.githubusercontent.com/revisit-studies/study/v1.0.0/src/parser/StudyConfigSchema.json",
     "studyMetadata": {
         "title": "Randomized Full VLAT (Visualization Literacy Assessment Test)",
         "version": "pilot",

diff --git a/public/demo-VLAT-mini-randomized/config.json b/public/demo-VLAT-mini-randomized/config.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "https://raw.githubusercontent.com/revisit-studies/study/v1.0.0-beta13/src/parser/StudyConfigSchema.json",
+    "$schema": "https://raw.githubusercontent.com/revisit-studies/study/v1.0.0/src/parser/StudyConfigSchema.json",
     "studyMetadata": {
         "title": "Visualization understanding questionnaire",
         "version": "pilot",

diff --git a/public/demo-brush-interactions/config.json b/public/demo-brush-interactions/config.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "https://raw.githubusercontent.com/revisit-studies/study/v1.0.0-beta13/src/parser/StudyConfigSchema.json",
+    "$schema": "https://raw.githubusercontent.com/revisit-studies/study/v1.0.0/src/parser/StudyConfigSchema.json",
     "studyMetadata": {
         "title": "Interactive Selections in Scatterplots",
         "version": "pilot",

diff --git a/public/demo-cleveland/config.json b/public/demo-cleveland/config.json
@@ -1,13 +1,13 @@
 {
-    "$schema": "https://raw.githubusercontent.com/revisit-studies/study/v1.0.0-beta13/src/parser/StudyConfigSchema.json",
+    "$schema": "https://raw.githubusercontent.com/revisit-studies/study/v1.0.0/src/parser/StudyConfigSchema.json",
     "studyMetadata": {
         "title": "Dynamic React.js Stimuli: A Graphical Perception Experiment",
         "version": "pilot",
         "authors": [
             "The reVISit Team"
         ],
         "date": "2023-04-28",
-        "description": "A demo using dynamic React components as stimuli to replicate a Cleveland & McGill graphical perception task (doi:10.1080/01621459.1984.10478080), with a consent form, brief training, a post study survey. Data is collected via form elements in validated fields.",
+        "description": "A demo using dynamic React components as stimuli to replicate a Heer/Bostock perception study (doi:10.1145/1753326.1753357) that extends Cleveland & McGill graphical perception task (doi:10.1080/01621459.1984.10478080), with a consent form, brief training, a post study survey. Data is collected via form elements in validated fields.",
         "organizations": [
             "University of Utah",
             "WPI",

diff --git a/public/demo-click-accuracy-test/config.json b/public/demo-click-accuracy-test/config.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "https://raw.githubusercontent.com/revisit-studies/study/v1.0.0-beta13/src/parser/StudyConfigSchema.json",
+    "$schema": "https://raw.githubusercontent.com/revisit-studies/study/v1.0.0/src/parser/StudyConfigSchema.json",
     "studyMetadata": {
         "title": "Dynamic React Stimuli and Provenance Tracking",
         "version": "pilot",

diff --git a/public/demo-fairness-jnd/config.json b/public/demo-fairness-jnd/config.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/revisit-studies/study/v1.0.0-beta13/src/parser/StudyConfigSchema.json",
+  "$schema": "https://raw.githubusercontent.com/revisit-studies/study/v1.0.0/src/parser/StudyConfigSchema.json",
   "studyMetadata": {
     "title": "Fairness JND",
     "version": "pilot",

diff --git a/public/demo-html-input/config.json b/public/demo-html-input/config.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/revisit-studies/study/v1.0.0-beta13/src/parser/StudyConfigSchema.json",
+  "$schema": "https://raw.githubusercontent.com/revisit-studies/study/v1.0.0/src/parser/StudyConfigSchema.json",
   "studyMetadata": {
     "title": "Passing Data from reVISit to HTML and back",
     "version": "pilot",

diff --git a/public/demo-html-trrack/config.json b/public/demo-html-trrack/config.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "https://raw.githubusercontent.com/revisit-studies/study/v1.0.0-beta13/src/parser/StudyConfigSchema.json",
+    "$schema": "https://raw.githubusercontent.com/revisit-studies/study/v1.0.0/src/parser/StudyConfigSchema.json",
     "studyMetadata": {
         "title": "HTML with Trrack library",
         "version": "pilot",

diff --git a/public/demo-html/config.json b/public/demo-html/config.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "https://raw.githubusercontent.com/revisit-studies/study/v1.0.0-beta13/src/parser/StudyConfigSchema.json",
+    "$schema": "https://raw.githubusercontent.com/revisit-studies/study/v1.0.0/src/parser/StudyConfigSchema.json",
     "studyMetadata": {
         "title": "HTML as a Stimulus",
         "version": "pilot",

diff --git a/public/demo-image/config.json b/public/demo-image/config.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "https://raw.githubusercontent.com/revisit-studies/study/v1.0.0-beta13/src/parser/StudyConfigSchema.json",
+    "$schema": "https://raw.githubusercontent.com/revisit-studies/study/v1.0.0/src/parser/StudyConfigSchema.json",
     "studyMetadata": {
         "title": "Simple Images as Stimuli: Decision-Making with Uncertainty Visualizations",
         "version": "pilot",

diff --git a/public/demo-mvnv/config.json b/public/demo-mvnv/config.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "https://raw.githubusercontent.com/revisit-studies/study/v1.0.0-beta13/src/parser/StudyConfigSchema.json",
+    "$schema": "https://raw.githubusercontent.com/revisit-studies/study/v1.0.0/src/parser/StudyConfigSchema.json",
     "studyMetadata": {
         "title": "MVNV Study Replication",
         "version": "pilot",

diff --git a/public/demo-survey/config.json b/public/demo-survey/config.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "https://raw.githubusercontent.com/revisit-studies/study/v1.0.0-beta13/src/parser/StudyConfigSchema.json",
+    "$schema": "https://raw.githubusercontent.com/revisit-studies/study/v1.0.0/src/parser/StudyConfigSchema.json",
     "studyMetadata": {
         "title": "Question Types and Form Elements Demo",
         "version": "pilot",

diff --git a/public/global.json b/public/global.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "https://raw.githubusercontent.com/revisit-studies/study/v1.0.0-beta13/src/parser/GlobalConfigSchema.json",
+    "$schema": "https://raw.githubusercontent.com/revisit-studies/study/v1.0.0/src/parser/GlobalConfigSchema.json",
     "configsList": [
         "Upset-Alttext-User-Survey",
         "demo-html",
@@ -70,7 +70,5 @@
             "path": "test-parser-errors/config.json",
             "test": true
         }
-    },
-    "adminUsers": []
-
+    }
 }
diff --git a/public/revisitAssets/favicon.svg b/public/revisitAssets/favicon.svg