Forced merge: merge ai-dev into master

synced from github
Merge pull request #8 from lora322/master
2025-09-11 15:32:55 +00:00 · 2025-09-11 15:32:13 +00:00 · 2025-09-11 11:19:59 -04:00 · 2025-09-11 11:17:59 -04:00 · 2025-09-11 11:17:27 -04:00 · 2025-09-11 11:16:07 -04:00
4 changed files with 18 additions and 1 deletions
--- a/app-shell/src/_schema.json
+++ b/app-shell/src/_schema.json
--- a/docker/.docker-compose.yml.swp
+++ b/docker/.docker-compose.yml.swp
--- a/docker/.env:
+++ b/docker/.env:
@ -0,0 +1,15 @@
+# Database (Postgres container)
+DB_USER=postgres
+DB_PASSWORD=postgres
+DB_HOST=db
+DB_PORT=5432
+DB_NAME=postgres
+
+# Backend server
+BACKEND_PORT=4000
+JWT_SECRET=e33c3a546ba48074fbb8fcf04cfea1db9665f3211959a8825bdbdda174ff4b3b
+GOOGLE_CLIENT_ID=
+GOOGLE_CLIENT_SECRET=
+
+# Frontend
+FRONT_PORT=3000
--- a/frontend/json/runtimeError.json
+++ b/frontend/json/runtimeError.json
@ -0,0 +1 @@
+{}
Author	SHA1	Message	Date
Flatlogic Bot	9441166571	Forced merge: merge ai-dev into master	2025-09-11 15:32:55 +00:00
Flatlogic Bot	07c7c345d8	synced from github	2025-09-11 15:32:13 +00:00
lora322	f15b698f2a	Merge pull request #8 from lora322/master Merge pull request #7 from lora322/ai-dev	2025-09-11 11:19:59 -04:00
lora322	8da61c1157	Merge pull request #7 from lora322/ai-dev Merge pull request #6 from lora322/master	2025-09-11 11:17:59 -04:00
lora322	4c39fa000a	Merge pull request #6 from lora322/master Merge pull request #5 from lora322/ai-dev	2025-09-11 11:17:27 -04:00
lora322	b9ca4c3466	Merge pull request #5 from lora322/ai-dev Commit - 20250911-151447909	2025-09-11 11:16:07 -04:00
Flatlogic Bot	5d6f382b4f	Commit - 20250911-151447909	2025-09-11 15:14:49 +00:00
lora322	673f690745	Merge pull request #4 from lora322/ai-dev Ai dev update	2025-09-10 16:19:12 -04:00
lora322	98257c17a2	Merge remote-tracking branch 'origin/master' into ai-dev	2025-09-10 20:07:47 +00:00
lora322	588ffefe5e	updated browserslist	2025-09-06 16:54:39 +00:00
lora322	4e819878ce	Merge branch 'ai-dev' of https://github.com/lora322/VRESapp into ai-dev	2025-09-06 16:49:25 +00:00
lora322	6c3f282935	Set up working backend/frontend, fixed API calls, Docker, and config	2025-09-06 16:47:09 +00:00