From 1fa74c9ccf54e81b14229c4ba9b52f6263f2a55e Mon Sep 17 00:00:00 2001 From: Tyler Date: Sun, 3 Dec 2017 21:06:34 -0500 Subject: [PATCH] Add configuration file --- .gitlab-ci.yml | 2 +- index.html | 3 ++- src/App.vue | 2 +- static/config.js | 3 +++ 4 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 static/config.js diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 84a92ff..f5a29d7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ before_script: - - export VERSION=1.0.0 + - export VERSION=1.0.1 - chmod +x packaging/build-package.sh packaging/package-upload.sh stages: diff --git a/index.html b/index.html index da68384..29f2e2a 100644 --- a/index.html +++ b/index.html @@ -2,10 +2,11 @@ - arm-web + ARM-Web
+ diff --git a/src/App.vue b/src/App.vue index bf9bad2..c26c33c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -23,7 +23,7 @@ let d = { sensors: {} }; -let ws = new EventWebSocket('ws://192.168.2.85:8080/ws'); +let ws = new EventWebSocket(window.arm_config.url); ws.on('jobs', function(data) { // Create jobs components diff --git a/static/config.js b/static/config.js new file mode 100644 index 0000000..23f186f --- /dev/null +++ b/static/config.js @@ -0,0 +1,3 @@ +window.arm_config = { + url: 'ws://127.0.0.1:8080/ws' +};