Merge branch 'main' into feat/fix-and-update-csv

Signed-off-by: Steve Cassidy <steve.cassidy@mq.edu.au>
FAIMS · Oct 10, 2024 · f9a93ca · f9a93ca
2 parents cc282fc + cc72471
commit f9a93ca
Show file tree

Hide file tree

Showing 96 changed files with 22,082 additions and 7,180 deletions.
diff --git a/.github/workflows/nightly-android-testbuild.yml b/.github/workflows/nightly-android-testbuild.yml
@@ -1,10 +1,6 @@
 name: Nightly Android builds
 
 on:
-  push:
-    branches:
-      - main
-
   workflow_dispatch:
 
   schedule:
@@ -128,11 +124,13 @@ jobs:
           export VITE_COMMIT_VERSION=${{env.version_string}}
           export VITE_SHOW_WIPE=true
           export VITE_SHOW_MINIFAUXTON=true
-          export VITE_CONDUCTOR_URL=${{env.NIGHTLY_CONDUCTOR_URL}}
+          export VITE_CONDUCTOR_URL=${{vars.NIGHTLY_CONDUCTOR_URL}}
           export VITE_PRODUCTION_BUILD=true          
-          export VITE_SERVICES=FAIMSTEXT
+          export VITE_SERVICES=FAIMSTEXT  
           export VITE_PROD_BUILD=true 
-          export VITE_TAG=prodAndroid       
+          export VITE_TAG=prodAndroid
+          VITE_NOTEBOOK_LIST_TYPE=tabs
+          VITE_THEME=default   
           export VITE_BUGSNAG_KEY=${{secrets.BUGSNAG_KEY}}
           git clean -xfd
           npm ci

diff --git a/api/api_testing/.env.dist b/api/api_testing/.env.dist
@@ -0,0 +1,2 @@
+API_TOKEN=<your API token here>
+BASE_URL=http://localhost:8000
diff --git a/api/api_testing/.gitignore b/api/api_testing/.gitignore
@@ -0,0 +1 @@
+.env
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		API_TOKEN=<your API token here>
		BASE_URL=http://localhost:8000