diff --git a/Makefile b/Makefile index de88a2122..b82735dfc 100644 --- a/Makefile +++ b/Makefile @@ -9,8 +9,6 @@ IMAGE := andig/evcc ALPINE := 3.12 TARGETS := arm.v6,arm.v8,amd64 -AUDI_HASH_SECRET := ${AUDI_HASH_SECRET} - default: clean install assets lint test build clean: @@ -33,7 +31,7 @@ assets: build: @echo Version: $(VERSION) $(BUILD_DATE) - go build -v -tags=release -ldflags '-X "github.com/andig/evcc/server.Version=${VERSION}" -X "github.com/andig/evcc/server.Commit=${SHA}" -X "github.com/andig/evcc/vehicle.AudiHashSecret=${AUDI_HASH_SECRET}"' + go build -v -tags=release -ldflags '-X "github.com/andig/evcc/server.Version=${VERSION}" -X "github.com/andig/evcc/server.Commit=${SHA}"' release-test: goreleaser --snapshot --skip-publish --rm-dist diff --git a/assets/js/app.js b/assets/js/app.js index 8f0137062..86f769ac9 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -1,11 +1,5 @@ -// axios setup with test fallback -const loc = window.location.href.indexOf("http://localhost/evcc/assets/") === 0 ? { - protocol: "http:", - hostname: "localhost", - port: "7070", -} : window.location; - -axios.defaults.baseURL = loc.protocol + "//" + loc.hostname + (loc.port ? ":" + loc.port : "") + "/api"; +const loc = window.location; +axios.defaults.baseURL = loc.protocol + "//" + loc.hostname + (loc.port ? ":" + loc.port : "") + loc.pathname + "api"; axios.defaults.headers.post['Content-Type'] = 'application/json'; // @@ -268,7 +262,7 @@ Vue.component('site', { methods: { connect: function() { const protocol = loc.protocol == "https:" ? "wss:" : "ws:"; - const uri = protocol + "//" + loc.hostname + (loc.port ? ":" + loc.port : "") + "/ws"; + const uri = protocol + "//" + loc.hostname + (loc.port ? ":" + loc.port : "") + loc.pathname + "ws"; const ws = new WebSocket(uri), self = this; ws.onerror = function(evt) { ws.close(); diff --git a/server/assets.go b/server/assets.go index 7060cf597..b4cb48e7e 100644 --- a/server/assets.go +++ b/server/assets.go @@ -3651,58 +3651,56 @@ Hp8eD9PZ7nOcfzQanPoHjYpi/LP6/1E0/kCWVrqGV03cr8ZEE/cDcf8XAAD//2pP41YxTgAA "/js/app.js": { name: "app.js", local: "assets/js/app.js", - size: 10014, + size: 9869, modtime: 1566640112, compressed: ` -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 -Mc7s3vKvAAAA///3LwghHicAAA== +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 `, },