Remove dependency on debug.js

maku1604 · Mar 22, 2020 · 9a87f0d · 9a87f0d
1 parent 1d1ad3d
commit 9a87f0d
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 72 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,5 +1,4 @@
 .vscode
-assets/js/debug.js
 *.conf
 *.json
 *.sh

diff --git 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
@@ -348,9 +348,6 @@ <h5 class="pb-2 pt-4 mx-auto text-center">Zähler</h5>
   }
 </script>
 
-<!-- << if .Debug >> -->
-<script src="js/debug.js"></script>
-<!-- << end >> -->
 <script src="js/app.js"></script>
 
 </body>

diff --git 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.defaults.baseURL = uri;
+// 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 = 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
-Original file line number
+Diff line change
@@ -1,5 +1,4 @@
     .vscode
-    assets/js/debug.js
     *.conf
     *.json
     *.sh
@@ Expand Down @@