From 9a87f0d0595f45b40ca7f677290261dfa5bf82d7 Mon Sep 17 00:00:00 2001 From: andig Date: Sun, 22 Mar 2020 15:41:12 +0100 Subject: [PATCH] Remove dependency on debug.js --- .dockerignore | 1 - .gitignore | 1 - assets/index.html | 3 -- assets/js/app.js | 11 +++-- server/assets.go | 113 +++++++++++++++++++++------------------------- 5 files changed, 58 insertions(+), 71 deletions(-) diff --git a/.dockerignore b/.dockerignore index 806790439..c37b0aa76 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,5 +1,4 @@ .vscode -assets/js/debug.js *.conf *.json *.sh diff --git a/.gitignore b/.gitignore index a266cb642..13d275014 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,5 @@ manifest.json audi.* credentials.json token.json -assets/js/debug.js evcc __debug_bin diff --git a/assets/index.html b/assets/index.html index 83b1ea737..61aca2c36 100644 --- a/assets/index.html +++ b/assets/index.html @@ -348,9 +348,6 @@ } - - - diff --git a/assets/js/app.js b/assets/js/app.js index 830e43f40..b5bfe1c6e 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -1,8 +1,11 @@ -// axios setup -const loc = (typeof baseurl !== "undefined") ? baseurl : window.location; -const uri = loc.protocol + "//" + loc.hostname + (loc.port ? ":" + loc.port : "") + "/api"; +// axios setup with test fallback +const loc = window.location.href.indexOf("http://localhost/evcc/assets/") ? { + protocol: "http:", + hostname: "localhost", + port: "7070", +} : window.location; -axios.defaults.baseURL = uri; +axios.defaults.baseURL = loc.protocol + "//" + loc.hostname + (loc.port ? ":" + loc.port : "") + "/api"; axios.defaults.headers.post['Content-Type'] = 'application/json'; // diff --git a/server/assets.go b/server/assets.go index aef38c35e..1ee7cbabf 100644 --- a/server/assets.go +++ b/server/assets.go @@ -3768,11 +3768,11 @@ BwBgGCOZLZiHR9hNqCPBTjirhEBqFhcmTaJ5/x/SW+FktvBUn2VO1+2iUlsc3soK2al4t7STSqRlvxkO "/index.html": { name: "index.html", local: "../assets/index.html", - size: 12652, + size: 12572, modtime: 1566640112, compressed: ` H4sIAAAAAAAC/+xb23LkttG+11Ngaf9eu/7FUBpJa0fLYdVaq5xsbW1Zm3VVUrkAyR4SFg4MAM6MpJqn -yG0u/SZ+kzxJCgCPw9FxV3I5Fd0MCfYB3f11owlC0bNMpuaiBFQYzuKdyP4gRkQ+C0AEdgBIFu8gFHEw +yG0u/SZ+kzxJCgCPw9FxV3I5Fd0MCfYB3f11owFS0bNMpuaiBFQYzuKdyP4gRkQ+C0AEdgBIFu8gFHEw BKUFURrMLKjMHH8TdA8E4TALFhSWpVQmQKkUBoSZBUuamWKWwYKmgN3NC0QFNZQwrFPCYLb3AulCUXGO jcRzamZCjgRnoFNFS0Ol6Mk++YCOC6JyQMdSGCUZAzViJZUppOpxEZHRfExWlgwwlwllgJeQYFKWOCUl SRj0mC9A341VG2IqjROisDYXAxkJI+l5EO9YMYyKc6SANVKMrNIC09Taqekl6Fmw983uau+b3QAVCuaz @@ -3800,62 +3800,63 @@ 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 `, }, "/js/app.js": { name: "app.js", local: "../assets/js/app.js", - size: 4719, + size: 4808, modtime: 1566640112, compressed: ` -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 -TwAAAP//+fCcS28SAAA= +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 +AAA= `, }, @@ -6211,17 +6212,6 @@ d+Dx+e3/BQAA//84gj9OXdoEAA== `, }, - "/js/debug.js": { - name: "debug.js", - local: "../assets/js/debug.js", - size: 111, - modtime: 1566640112, - compressed: ` -H4sIAAAAAAAC/xzJQQoCMQwF0H1O8cl6YGY3UPEwtUQr1CYk6Uq8u+jy8fYdKwR3daREPucDttw0JKjp -jMSthiwfuOJNgLmmNh0F3DOt8EZA18hZX1LAQ1sdP//D1LOAz+M8eKPPhb4BAAD//26sNYlvAAAA -`, - }, - "/js/jquery-3.4.1.slim.min.js": { name: "jquery-3.4.1.slim.min.js", local: "../assets/js/jquery-3.4.1.slim.min.js", @@ -29633,7 +29623,6 @@ var _escDirs = map[string][]os.FileInfo{ _escData["/js/axios.min.map"], _escData["/js/bootstrap.bundle.min.js"], _escData["/js/bootstrap.bundle.min.js.map"], - _escData["/js/debug.js"], _escData["/js/jquery-3.4.1.slim.min.js"], _escData["/js/popper.min.js"], _escData["/js/popper.min.js.map"],