diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 46865a7..81c4390 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -2,9 +2,9 @@ name: Docker Publishing on: push: branches: - - '*' + - "*" tags: - - '[0-9]+.[0-9]+.[0-9]+' + - "[0-9]+.[0-9]+.[0-9]+" jobs: publish-images: @@ -25,8 +25,8 @@ jobs: file: docker/app/Dockerfile push: true tags: | - pcic/vhmo-app:${{ github.ref_name }} - ${{ github.ref_name == 'main' && 'pcic/vhmo-app:latest' || '' }} + pcic/chyp-app:${{ github.ref_name }} + ${{ github.ref_name == 'main' && 'pcic/chyp-app:latest' || '' }} - name: Build and Publish Data Import uses: docker/build-push-action@v4 @@ -35,8 +35,8 @@ jobs: file: docker/data-import/Dockerfile push: true tags: | - pcic/vhmo-data-import:${{ github.ref_name }} - ${{ github.ref_name == 'main' && 'pcic/vhmo-data-import:latest' || '' }} + pcic/chyp-data-import:${{ github.ref_name }} + ${{ github.ref_name == 'main' && 'pcic/chyp-data-import:latest' || '' }} - name: Build and Publish PostGIS uses: docker/build-push-action@v4 @@ -45,9 +45,9 @@ jobs: file: docker/PostGIS/Dockerfile push: true tags: | - pcic/vhmo-postgis:${{ github.ref_name }} - ${{ github.ref_name == 'main' && 'pcic/vhmo-postgis:latest' || '' }} - + pcic/chyp-postgis:${{ github.ref_name }} + ${{ github.ref_name == 'main' && 'pcic/chyp-postgis:latest' || '' }} + - name: Build and Publish BBOX server uses: docker/build-push-action@v4 with: @@ -55,5 +55,5 @@ jobs: file: docker/BBOX/Dockerfile push: true tags: | - pcic/vhmo-server:${{ github.ref_name }} - ${{ github.ref_name == 'main' && 'pcic/vhmo-server:latest' || '' }} + pcic/chyp-server:${{ github.ref_name }} + ${{ github.ref_name == 'main' && 'pcic/chyp-server:latest' || '' }} diff --git a/README.md b/README.md index 0d2b040..cc81fbd 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Vector Hydrologic Model Output Portal (VHMO) — BCSRIF-P2 +# Channel-Scale Hydrologic Model Output Portal (CHYP) — BCSRIF-P2 This project provides an interactive web portal for visualizing and downloading hydrological model data, including water temperature, streamflow, and oxygen concentration timeseries. @@ -101,10 +101,10 @@ BC Geographic Warehouse (BCGW) [Public Map Server](https://delivery.maps.gov.bc. The following images are published to Docker Hub: -- `pcic/vhmo-app`: Frontend application -- `pcic/vhmo-data-import`: Data import utilities -- `pcic/vhmo-postgis`: PostGIS database -- `pcic/vhmo-server`: BBOX tile server +- `pcic/chyp-app`: Frontend application +- `pcic/chyp-data-import`: Data import utilities +- `pcic/chyp-postgis`: PostGIS database +- `pcic/chyp-server`: BBOX tile server ## Requirements diff --git a/app/index.html b/app/index.html index a5d40a8..e7c06a7 100644 --- a/app/index.html +++ b/app/index.html @@ -8,7 +8,7 @@ - Vector Hydrologic Model Output + Channel-Scale Hydrologic Model Output Portal diff --git a/app/package.json b/app/package.json index 2e66383..8811db7 100644 --- a/app/package.json +++ b/app/package.json @@ -8,8 +8,8 @@ "build": "vite build", "lint": "eslint .", "preview": "vite preview", - "docker-build": "docker build --file ../docker/app/Dockerfile --tag vec-hydro-portal ../", - "docker-run": "docker run --rm -p 3001:8080 vec-hydro-portal" + "docker-build": "docker build --file ../docker/app/Dockerfile --tag chyp ../", + "docker-run": "docker run --rm -p 3001:8080 chyp" }, "dependencies": { "leaflet": "^1.9.4", diff --git a/app/src/components/map/FwaNameSearch.jsx b/app/src/components/map/FwaNameSearch.jsx index c1ead05..9889828 100644 --- a/app/src/components/map/FwaNameSearch.jsx +++ b/app/src/components/map/FwaNameSearch.jsx @@ -110,7 +110,7 @@ const fetchLakeMeta = (keys, signal) => ); const loadIndex = async () => { - const resp = await fetch(`/vec-hydro-portal/fwa_index.json`); + const resp = await fetch(`/chyp/fwa_index.json`); if (!resp.ok) throw new Error("Index load failed"); return resp.json(); }; diff --git a/app/src/components/map/MapComponent.jsx b/app/src/components/map/MapComponent.jsx index bead966..ff74076 100644 --- a/app/src/components/map/MapComponent.jsx +++ b/app/src/components/map/MapComponent.jsx @@ -66,7 +66,7 @@ const MapComponent = () => { zoomAnimationThreshold={4} markerZoomAnimation={true} > - + diff --git a/app/src/services/timeseriesApi.js b/app/src/services/timeseriesApi.js index 9b32245..84c93f5 100644 --- a/app/src/services/timeseriesApi.js +++ b/app/src/services/timeseriesApi.js @@ -96,19 +96,11 @@ export const downloadTimeseries = async (outletId, selections) => { if (!timeseriesId) throw new Error("No matching timeseries found"); - const response = await fetch( - `${BASE_URL}/outlets/${outletId}/timeseries/${timeseriesId}/data` - ); - if (!response.ok) throw new Error("Failed to fetch data"); - - const data = await response.text(); - const blob = new Blob([data], { type: "text/csv" }); - const url = window.URL.createObjectURL(blob); + const url = `${BASE_URL}/outlets/${outletId}/timeseries/${timeseriesId}/data`; const a = document.createElement("a"); a.href = url; a.download = `${outletId}_${selections.model}_${selections.scenario}_${apiVariable}.csv`; document.body.appendChild(a); a.click(); document.body.removeChild(a); - window.URL.revokeObjectURL(url); }; diff --git a/app/vite.config.js b/app/vite.config.js index d036cd3..4c32e6e 100644 --- a/app/vite.config.js +++ b/app/vite.config.js @@ -12,7 +12,7 @@ export default defineConfig({ "https://swarm.pacificclimate.org/tiles/bc-albers-lite/{z}/{x}/{y}.png", }), ], - base: "/vec-hydro-portal", + base: "/chyp", // Local Dev only server: { warmup: { diff --git a/docker/app/server.js b/docker/app/server.js index ee0f306..56c6a0a 100644 --- a/docker/app/server.js +++ b/docker/app/server.js @@ -4,7 +4,7 @@ const path = require("node:path"); const PORT = Number(process.env.PORT || 8080); const DIST_DIR = path.join(__dirname, "dist"); -const BASE_PATH = "/vec-hydro-portal"; +const BASE_PATH = "/chyp"; const MIME_TYPES = { ".css": "text/css; charset=utf-8", diff --git a/package-lock.json b/package-lock.json index 6ef196a..07978cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "vec-hydro-portal", + "name": "chyp", "lockfileVersion": 3, "requires": true, "packages": {}