Merge branch 'main' of https://github.com/TaskarCenterAtUW/workspaces-stack

jeffmaki · jeffmaki · commit a141b66da8a7 · 2025-09-23T08:54:53.000-04:00
diff --git a/README.md b/README.md
@@ -20,12 +20,13 @@ For stage or prod, tags *should* (must!) point to a commit in the main branch!
 
 The repos this process pulls from are:
 
-* TaskarCenterAtUW/workspaces-frontend
-* TaskarCenterAtUW/workspaces-cgimap
-* TaskarCenterAtUW/workspaces-openstreetmap-website
-* TaskarCenterAtUW/workspaces-pathways-editor
-* TaskarCenterAtUW/workspaces-rapid
-* TaskarCenterAtUW/workspaces-tasking-manager
+* [TaskarCenterAtUW/workspaces-frontend](https://github.com/TaskarCenterAtUW/workspaces-frontend)
+* [TaskarCenterAtUW/workspaces-cgimap](https://github.com/TaskarCenterAtUW/workspaces-cgimap)
+* [TaskarCenterAtUW/workspaces-openstreetmap-website](https://github.com/TaskarCenterAtUW/workspaces-openstreetmap-website)
+* [TaskarCenterAtUW/workspaces-pathways-editor](https://github.com/TaskarCenterAtUW/workspaces-pathways-editor)
+* [TaskarCenterAtUW/workspaces-rapid](https://github.com/TaskarCenterAtUW/workspaces-rapid)
+* [TaskarCenterAtUW/workspaces-tasking-manager](https://github.com/TaskarCenterAtUW/workspaces-tasking-manager)
+* [TaskarCenterAtUW/workspaces-leaderboard](https://github.com/TaskarCenterAtUW/workspaces-leaderboard)
 
 We use lightweight tags to indicate the environment a specific commit will deploy to:
 ```
@@ -58,7 +59,7 @@ See GitHub's actions tab in this repo for more deployment examples/steps.
     * ```osm-cgimap```: Faster version of osm-rails. API format the same as osm-rails. Only some functions of osm-rails. 
 * ```tasking-manager```: Not currently using, but task manager for OSM. 
 
-# Getting Started
+# Getting Started (Possibly Outdated; See Individual Repos)
 
 ### To build images for deploy
 
@@ -81,7 +82,7 @@ Replace XXX.env with the environment definition file of the environment for whic
 * ```example.env```: template of the .env file required by the Docker compose YAML files
 * ```tdei_uw.env```: .env for deployment at UW's TDEI center. Only UW should use this, new users should adapt example.env to suit their needs. LTG: remove this file from this repo.
 
-# Local Development
+# Local Development (Possibly Outdated; See Individual Repos)
 
 ### To build images for local development
 
diff --git a/docker-compose.build.yml b/docker-compose.build.yml
@@ -1,5 +1,4 @@
 services:
-    
   # workspaces FE (Vue app)
   frontend:
     image: ${WS_DOCKER_REGISTRY}/workspaces-frontend:${ENV}
@@ -17,6 +16,9 @@ services:
         VITE_RAPID_URL: ${WS_RAPID_URL}
         VITE_PATHWAYS_EDITOR_URL: ${WS_PATHWAYS_EDITOR_URL}
         VITE_IMAGERY_SCHEMA: ${WS_IMAGERY_SCHEMA}
+        VITE_IMAGERY_EXAMPLE_URL: ${WS_IMAGERY_EXAMPLE_URL}
+        VITE_LONG_FORM_QUEST_SCHEMA: ${WS_LONG_FORM_QUEST_SCHEMA}
+        VITE_LONG_FORM_QUEST_EXAMPLE_URL: ${WS_LONG_FORM_QUEST_EXAMPLE_URL}
         CODE_VERSION: ${CODE_VERSION}
 
   frontend_tag:
@@ -112,7 +114,7 @@ services:
         - type=registry,ref=${WS_DOCKER_REGISTRY}/workspaces-osm-rails:buildcache,mode=max
       context: osm-rails
       dockerfile: Dockerfile.prod
-      
+
   osm-rails_tag:
     extends: osm-rails
     image: ${WS_DOCKER_REGISTRY}/workspaces-osm-rails:${CODE_VERSION}
@@ -133,23 +135,23 @@ services:
     image: ${WS_DOCKER_REGISTRY}/workspaces-osm-cgimap:${CODE_VERSION}
 
   # tasking manager
-  tasks-frontend:
-    image: ${WS_DOCKER_REGISTRY}/workspaces-tasks-frontend:${ENV}
-    build:
-      cache_from:
-        - type=registry,ref=${WS_DOCKER_REGISTRY}/workspaces-tasks-frontend:buildcache
-      cache_to:
-        - type=registry,ref=${WS_DOCKER_REGISTRY}/workspaces-tasks-frontend:buildcache,mode=max
-      context: tasking-manager
-      dockerfile: ./scripts/docker/Dockerfile.frontend
-      args:
-        TM_APP_API_URL: ${WS_TASKS_URL}
-        #TM_CONSUMER_KEY
-        #TM_CONSUMER_SECRET
-
-  tasks-frontend_tag:
-    extends: tasks-frontend
-    image: ${WS_DOCKER_REGISTRY}/workspaces-tasks-frontend:${CODE_VERSION}
+  # tasks-frontend:
+  #   image: ${WS_DOCKER_REGISTRY}/workspaces-tasks-frontend:${ENV}
+  #   build:
+  #     cache_from:
+  #       - type=registry,ref=${WS_DOCKER_REGISTRY}/workspaces-tasks-frontend:buildcache
+  #     cache_to:
+  #       - type=registry,ref=${WS_DOCKER_REGISTRY}/workspaces-tasks-frontend:buildcache,mode=max
+  #     context: tasking-manager
+  #     dockerfile: ./scripts/docker/Dockerfile.frontend
+  #     args:
+  #       TM_APP_API_URL: ${WS_TASKS_URL}
+  #       #TM_CONSUMER_KEY
+  #       #TM_CONSUMER_SECRET
+
+  # tasks-frontend_tag:
+  #   extends: tasks-frontend
+  #   image: ${WS_DOCKER_REGISTRY}/workspaces-tasks-frontend:${CODE_VERSION}
 
   # tasking manager
   tasks-backend:
diff --git a/docker-compose.deploy.yml b/docker-compose.deploy.yml
@@ -176,15 +176,15 @@ services:
       CGIMAP_MAP_AREA: ${WS_OSM_MAX_EXPORT_AREA}
 
   # tasking manager (*not* Workspaces)
-  tasks-frontend:
-    image: ${WS_DOCKER_REGISTRY}/workspaces-tasks-frontend:${WS_DOCKER_TAG}
-    restart: always
-    labels:
-      - traefik.enable=true
-      - traefik.http.routers.tasks-frontend.rule=Host(`${WS_TASKS_HOST}`)
-      - traefik.http.services.tasks-frontend.loadbalancer.server.port=80
-      - traefik.http.routers.tasks-frontend.entrypoints=websecure
-      - traefik.http.routers.tasks-frontend.tls.certresolver=myresolver
+  # tasks-frontend:
+  #   image: ${WS_DOCKER_REGISTRY}/workspaces-tasks-frontend:${WS_DOCKER_TAG}
+  #   restart: always
+  #   labels:
+  #     - traefik.enable=true
+  #     - traefik.http.routers.tasks-frontend.rule=Host(`${WS_TASKS_HOST}`)
+  #     - traefik.http.services.tasks-frontend.loadbalancer.server.port=80
+  #     - traefik.http.routers.tasks-frontend.entrypoints=websecure
+  #     - traefik.http.routers.tasks-frontend.tls.certresolver=myresolver
 
   tasks-backend:
     image: ${WS_DOCKER_REGISTRY}/workspaces-tasks-backend:${WS_DOCKER_TAG}
diff --git a/tdei_uw.env b/tdei_uw.env
@@ -44,6 +44,9 @@ WS_PATHWAYS_EDITOR_HOST=pathways.workspaces${ENV_NAME_PARAM}.sidewalks.washingto
 WS_OSM_HOST=osm.workspaces${ENV_NAME_PARAM}.sidewalks.washington.edu
 WS_TASKS_HOST=tasks.workspaces${ENV_NAME_PARAM}.sidewalks.washington.edu
 WS_IMAGERY_SCHEMA=https://raw.githubusercontent.com/TaskarCenterAtUW/tdei-tools/refs/heads/main/docs/imagery-layer/schema.json
+WS_IMAGERY_EXAMPLE_URL=https://raw.githubusercontent.com/TaskarCenterAtUW/tdei-tools/refs/heads/main/docs/imagery-layer/example.json
+WS_LONG_FORM_QUEST_SCHEMA=https://raw.githubusercontent.com/TaskarCenterAtUW/tdei-tools/refs/heads/main/docs/quest-definition/schema.json
+WS_LONG_FORM_QUEST_EXAMPLE_URL=https://raw.githubusercontent.com/TaskarCenterAtUW/tdei-tools/refs/heads/main/docs/quest-definition/example.json
 
 WS_DEV_PORT=3000
 
@@ -58,6 +61,11 @@ WS_OSM_SECRET_KEY_BASE=${WS_OSM_SECRET_KEY_BASE}
 WS_TASKS_SECRET_KEY=${WS_TASKS_SECRET_KEY}
 WS_MAPBOX_ACCESS_TOKEN=${WS_MAPBOX_ACCESS_TOKEN}
 
+# Backend
+
+IMAGERY_SCHEMA_URL=https://raw.githubusercontent.com/TaskarCenterAtUW/tdei-tools/refs/heads/main/docs/imagery-layer/schema.json
+LONGFORM_SCHEMA_URL=https://raw.githubusercontent.com/TaskarCenterAtUW/tdei-tools/refs/heads/main/docs/quest-definition/schema.json
+
 ###############################################################################
 # Databases
 ###############################################################################
