From e9fe4387cb291c35254f4d4567ca309fc9c6488a Mon Sep 17 00:00:00 2001 From: Alan Rynne Date: Thu, 4 Nov 2021 11:53:01 +0100 Subject: [PATCH] Minor env var tweaks --- frontend/src/components/commitSelector/CommitPanel.vue | 6 ++++-- server/main.py | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/frontend/src/components/commitSelector/CommitPanel.vue b/frontend/src/components/commitSelector/CommitPanel.vue index e315a26..20041e4 100644 --- a/frontend/src/components/commitSelector/CommitPanel.vue +++ b/frontend/src/components/commitSelector/CommitPanel.vue @@ -77,7 +77,8 @@ export default { }, async doesDiffExist(){ if(!this.currentCommit || !this.prevCommit) return { commit: null } - var diffUrl = `http://localhost:8000/diff_check/${this.$route.params.id}/${this.currentCommit.id}/${this.prevCommit.id}` + var backendUrl = process.env.VUE_APP_BACKEND_URL + var diffUrl = `${backendUrl}/diff_check/${this.$route.params.id}/${this.currentCommit.id}/${this.prevCommit.id}` var res = await fetch(diffUrl, { headers: { method: "GET", @@ -90,8 +91,9 @@ export default { }, async requestDiff() { this.loading = true + var backendUrl = process.env.VUE_APP_BACKEND_URL console.log("diff requested for", this.currentCommit.id, this.prevCommit.id) - var diffUrl = `http://localhost:8000/diff/${this.$route.params.id}/${this.currentCommit.id}/${this.prevCommit.id}` + var diffUrl = `${backendUrl}/diff/${this.$route.params.id}/${this.currentCommit.id}/${this.prevCommit.id}` var res = await fetch(diffUrl, { headers: { method: "GET", diff --git a/server/main.py b/server/main.py index c92f0c1..3b52942 100644 --- a/server/main.py +++ b/server/main.py @@ -10,10 +10,10 @@ app = FastAPI() server_url = os.environ.get("SPECKLE_SERVER", "https://speckle.xyz") diff_branch = os.environ.get("DIFF_BRANCH", "diff") - +frontend_url = os.environ.get("FRONTEND_URL", "http://localhost:8080") origins = [ "http://localhost", - "http://localhost:8080", + frontend_url, ] app.add_middleware(