From f49d16baef5daf73c0a5c8afe6c103142bdc077b Mon Sep 17 00:00:00 2001 From: ModischFabrications Date: Tue, 16 Apr 2024 00:13:02 +0200 Subject: [PATCH 1/3] implement new API of cutsolver v1.1.0 (single stocks); show backend version in frontend; update URLs in footer; add solver url in .env and compose files --- .env | 1 + Caddyfile | 12 +++--- docker-compose-deploy.yml | 2 +- docker-compose.yml | 5 +-- package-lock.json | 4 +- package.json | 2 +- src/App.vue | 44 +++++++++++++++----- src/components/DataTable.vue | 22 +++++----- src/components/LengthsList.vue | 17 +++----- src/components/SolverInput.vue | 20 +++++---- src/components/SolverOutput.vue | 2 - src/components/data/Job.js | 14 +++---- src/components/data/Result.js | 9 ++-- src/main.js | 2 +- src/tests/data/testjob.json | 20 +++++---- src/tests/data/testresult.json | 74 +++++++++++++++++++++++++-------- 16 files changed, 157 insertions(+), 93 deletions(-) diff --git a/.env b/.env index d95d4ed..6f1ecf7 100644 --- a/.env +++ b/.env @@ -1,6 +1,7 @@ # Dev DOMAIN_NAME=localhost EMAIL_ADDRESS=mail@example.com +VUE_APP_BACKEND_SOLVER_URL=http://localhost:8000/ # Prod #DOMAIN_NAME=cutsolver.modisch.me diff --git a/Caddyfile b/Caddyfile index aeb57c3..015dbdc 100644 --- a/Caddyfile +++ b/Caddyfile @@ -8,11 +8,6 @@ } } -# remove once everyone forgot about it -vps.modisch.me { - redir /cutsolver https://{$DOMAIN_NAME} permanent -} - {$DOMAIN_NAME} { reverse_proxy /solve cutsolver reverse_proxy cutsolver_frontend @@ -28,3 +23,10 @@ vps.modisch.me { respond /ping "pong at {$DOMAIN_NAME}" } + +# This could be managed by DNS! + +# remove once everyone forgot about it +vps.modisch.me { + redir /cutsolver https://{$DOMAIN_NAME} permanent +} diff --git a/docker-compose-deploy.yml b/docker-compose-deploy.yml index 54f7d24..1a4acd5 100644 --- a/docker-compose-deploy.yml +++ b/docker-compose-deploy.yml @@ -6,7 +6,7 @@ services: image: modischfabrications/cutsolver_frontend:latest restart: unless-stopped environment: - - VUE_APP_BACKEND_SOLVER_URL=https://${DOMAIN_NAME:?err}/solve + - VUE_APP_BACKEND_SOLVER_URL=https://${DOMAIN_NAME:?err}/ networks: - webserver - cutsolver diff --git a/docker-compose.yml b/docker-compose.yml index a9c74f7..e56645c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,6 @@ -version: '3' +version: '3.3' services: - cutsolver_frontend: # use specific tags for a persistent reference image: modischfabrications/cutsolver_frontend:latest @@ -12,7 +11,7 @@ services: - cutsolver environment: # point this to your backend host URL! - - VUE_APP_BACKEND_SOLVER_URL=http://localhost:8000/solve + - VUE_APP_BACKEND_SOLVER_URL=http://localhost:8000/ cutsolver: image: modischfabrications/cutsolver:latest diff --git a/package-lock.json b/package-lock.json index ccca900..7ebd44f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "cutsolver_frontend", - "version": "0.3.8", + "version": "1.1.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "cutsolver_frontend", - "version": "0.3.8", + "version": "1.1.0", "dependencies": { "@sum.cumo/vue-browserupdate": "^3.0.1", "axios": "^1.6.5", diff --git a/package.json b/package.json index e44c232..88556be 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cutsolver_frontend", - "version": "1.0.0", + "version": "1.1.0", "private": true, "scripts": { "serve": "vue-cli-service serve", diff --git a/src/App.vue b/src/App.vue index 5e4ede4..2e2bceb 100644 --- a/src/App.vue +++ b/src/App.vue @@ -13,11 +13,13 @@