From 443f1d0269d66bbd3250ac0ef783b338e42ea37c Mon Sep 17 00:00:00 2001 From: jbnadal Date: Thu, 8 Jun 2017 13:55:09 +0200 Subject: [PATCH] Add a package for the dashboard. and remove hardcoded IP address. --- .../package/dashboard/Config.in | 5 ++++ .../package/dashboard/dashboard.mk | 24 +++++++++++++++++++ src/prog/dashboard/src/components/Lights.vue | 4 ++-- .../dashboard/src/components/Sprinklers.vue | 4 ++-- 4 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 bsp/buildroot_external/package/dashboard/Config.in create mode 100644 bsp/buildroot_external/package/dashboard/dashboard.mk diff --git a/bsp/buildroot_external/package/dashboard/Config.in b/bsp/buildroot_external/package/dashboard/Config.in new file mode 100644 index 00000000..785e7acf --- /dev/null +++ b/bsp/buildroot_external/package/dashboard/Config.in @@ -0,0 +1,5 @@ +config BR2_PACKAGE_DASHBOARD + bool "dashboard" + default n + help + html control dashboard diff --git a/bsp/buildroot_external/package/dashboard/dashboard.mk b/bsp/buildroot_external/package/dashboard/dashboard.mk new file mode 100644 index 00000000..a5dc7296 --- /dev/null +++ b/bsp/buildroot_external/package/dashboard/dashboard.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# DASHBOARD +# +################################################################################ + +DASHBOARD_VERSION:= 1.0.0 + +DASHBOARD_SITE = $(TOPDIR)/../../src/prog/dashboard +DASHBOARD_SITE_METHOD = local +DASHBOARD_INSTALL_STAGING = NO + +define DASHBOARD_BUILD_CMDS + cd $(@D) && \ + npm install && \ + npm run build +endef + +define DASHBOARD_INSTALL_TARGET_CMDS + mkdir -p $(TARGET_DIR)/usr/local/share/dashboard + cp -a $(@D)/dist/* $(TARGET_DIR)/usr/local/share/dashboard +endef + +$(eval $(generic-package)) diff --git a/src/prog/dashboard/src/components/Lights.vue b/src/prog/dashboard/src/components/Lights.vue index 39837c5d..31390edd 100644 --- a/src/prog/dashboard/src/components/Lights.vue +++ b/src/prog/dashboard/src/components/Lights.vue @@ -31,7 +31,7 @@ export default { methods: { /* Get Lights */ getLights () { - this.$http.get('http://192.168.1.6:8081/v1/capabilities/lights') + this.$http.get('/v1/capabilities/lights') .then(function (response) { this.$set('lights', response.data.Lights) console.log('Success!:', response.data) @@ -45,7 +45,7 @@ export default { console.log(data) msg = '{"id": ' + data.id + ', "state": ' + data.state + '}' console.log(msg) - this.$http.post('http://192.168.1.6:8081/v1/capabilities/lights', msg) + this.$http.post('/v1/capabilities/lights', msg) .then(function (response) { console.log('Success!:', response.data) }, function (err) { diff --git a/src/prog/dashboard/src/components/Sprinklers.vue b/src/prog/dashboard/src/components/Sprinklers.vue index e4e4a088..a8a20717 100644 --- a/src/prog/dashboard/src/components/Sprinklers.vue +++ b/src/prog/dashboard/src/components/Sprinklers.vue @@ -32,7 +32,7 @@ export default { methods: { /* Get Sprinklers */ getSprinklers () { - this.$http.get('http://192.168.1.6:8081/v1/capabilities/sprinklers') + this.$http.get('/v1/capabilities/sprinklers') .then(function (response) { this.$set('sprinklers', response.data.Sprinklers) console.log('Success!:', response.data) @@ -46,7 +46,7 @@ export default { console.log(data) msg = '{"id": ' + data.id + ', "state": ' + data.state + '}' console.log(msg) - this.$http.post('http://192.168.1.6:8081/v1/capabilities/sprinklers', msg) + this.$http.post('/v1/capabilities/sprinklers', msg) .then(function (response) { console.log('Success!:', response.data) }, function (err) {