Merge pull request #118 from kikeelectronico/develop

Build v1.0 for release
kikeelectronico · Oct 31, 2020 · 1bcbcb4 · 1bcbcb4
2 parents eefae8b + 3689a3b
commit 1bcbcb4
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 19 deletions.
diff --git a/front/build/asset-manifest.json b/front/build/asset-manifest.json
@@ -1,14 +1,14 @@
 {
   "files": {
     "main.css": "/static/css/main.2d15d020.chunk.css",
-    "main.js": "/static/js/main.f5e71cab.chunk.js",
-    "main.js.map": "/static/js/main.f5e71cab.chunk.js.map",
+    "main.js": "/static/js/main.6564749c.chunk.js",
+    "main.js.map": "/static/js/main.6564749c.chunk.js.map",
     "runtime-main.js": "/static/js/runtime-main.db8f2875.js",
     "runtime-main.js.map": "/static/js/runtime-main.db8f2875.js.map",
     "static/js/2.b6bfd886.chunk.js": "/static/js/2.b6bfd886.chunk.js",
     "static/js/2.b6bfd886.chunk.js.map": "/static/js/2.b6bfd886.chunk.js.map",
     "index.html": "/index.html",
-    "precache-manifest.f6516c056036507f2e00fe494f9e0d7a.js": "/precache-manifest.f6516c056036507f2e00fe494f9e0d7a.js",
+    "precache-manifest.92352c6ecf63a4676b0a3ef3a7b5b2a8.js": "/precache-manifest.92352c6ecf63a4676b0a3ef3a7b5b2a8.js",
     "service-worker.js": "/service-worker.js",
     "static/css/main.2d15d020.chunk.css.map": "/static/css/main.2d15d020.chunk.css.map",
     "static/js/2.b6bfd886.chunk.js.LICENSE.txt": "/static/js/2.b6bfd886.chunk.js.LICENSE.txt"
@@ -17,6 +17,6 @@
     "static/js/runtime-main.db8f2875.js",
     "static/js/2.b6bfd886.chunk.js",
     "static/css/main.2d15d020.chunk.css",
-    "static/js/main.f5e71cab.chunk.js"
+    "static/js/main.6564749c.chunk.js"
   ]
 }
diff --git a/front/build/index.html b/front/build/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Homeware-LAN is a complete ecosystem that allows to connect any DIY hardware device to Google Home."/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>Homeware-LAN</title><link href="/static/css/main.2d15d020.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function r(r){for(var n,l,a=r[0],f=r[1],i=r[2],c=0,s=[];c<a.length;c++)l=a[c],Object.prototype.hasOwnProperty.call(o,l)&&o[l]&&s.push(o[l][0]),o[l]=0;for(n in f)Object.prototype.hasOwnProperty.call(f,n)&&(e[n]=f[n]);for(p&&p(r);s.length;)s.shift()();return u.push.apply(u,i||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,a=1;a<t.length;a++){var f=t[a];0!==o[f]&&(n=!1)}n&&(u.splice(r--,1),e=l(l.s=t[0]))}return e}var n={},o={1:0},u=[];function l(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,l),t.l=!0,t.exports}l.m=e,l.c=n,l.d=function(e,r,t){l.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},l.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},l.t=function(e,r){if(1&r&&(e=l(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(l.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)l.d(t,n,function(r){return e[r]}.bind(null,n));return t},l.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return l.d(r,"a",r),r},l.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},l.p="/";var a=this.webpackJsonpHomeware=this.webpackJsonpHomeware||[],f=a.push.bind(a);a.push=r,a=a.slice();for(var i=0;i<a.length;i++)r(a[i]);var p=f;t()}([])</script><script src="/static/js/2.b6bfd886.chunk.js"></script><script src="/static/js/main.f5e71cab.chunk.js"></script></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Homeware-LAN is a complete ecosystem that allows to connect any DIY hardware device to Google Home."/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>Homeware-LAN</title><link href="/static/css/main.2d15d020.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function r(r){for(var n,l,a=r[0],f=r[1],i=r[2],c=0,s=[];c<a.length;c++)l=a[c],Object.prototype.hasOwnProperty.call(o,l)&&o[l]&&s.push(o[l][0]),o[l]=0;for(n in f)Object.prototype.hasOwnProperty.call(f,n)&&(e[n]=f[n]);for(p&&p(r);s.length;)s.shift()();return u.push.apply(u,i||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,a=1;a<t.length;a++){var f=t[a];0!==o[f]&&(n=!1)}n&&(u.splice(r--,1),e=l(l.s=t[0]))}return e}var n={},o={1:0},u=[];function l(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,l),t.l=!0,t.exports}l.m=e,l.c=n,l.d=function(e,r,t){l.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},l.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},l.t=function(e,r){if(1&r&&(e=l(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(l.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)l.d(t,n,function(r){return e[r]}.bind(null,n));return t},l.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return l.d(r,"a",r),r},l.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},l.p="/";var a=this.webpackJsonpHomeware=this.webpackJsonpHomeware||[],f=a.push.bind(a);a.push=r,a=a.slice();for(var i=0;i<a.length;i++)r(a[i]);var p=f;t()}([])</script><script src="/static/js/2.b6bfd886.chunk.js"></script><script src="/static/js/main.6564749c.chunk.js"></script></body></html>
diff --git a/...ifest.f6516c056036507f2e00fe494f9e0d7a.js → ...ifest.92352c6ecf63a4676b0a3ef3a7b5b2a8.js b/...ifest.f6516c056036507f2e00fe494f9e0d7a.js → ...ifest.92352c6ecf63a4676b0a3ef3a7b5b2a8.js
@@ -1,10 +1,10 @@
 self.__precacheManifest = (self.__precacheManifest || []).concat([
   {
-    "revision": "272c561c9c54b570ba6ff4ee01d5fc9d",
+    "revision": "0e341a28acee7a6a5733c503eaca59bf",
     "url": "/index.html"
   },
   {
-    "revision": "c7b8bd7a8e25bf695c7a",
+    "revision": "bdca616ef5c466f85a3d",
     "url": "/static/css/main.2d15d020.chunk.css"
   },
   {
@@ -16,8 +16,8 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
     "url": "/static/js/2.b6bfd886.chunk.js.LICENSE.txt"
   },
   {
-    "revision": "c7b8bd7a8e25bf695c7a",
-    "url": "/static/js/main.f5e71cab.chunk.js"
+    "revision": "bdca616ef5c466f85a3d",
+    "url": "/static/js/main.6564749c.chunk.js"
   },
   {
     "revision": "ef13c11e300e1acbb1b7",

diff --git a/front/build/service-worker.js b/front/build/service-worker.js
@@ -14,7 +14,7 @@
 importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js");
 
 importScripts(
-  "/precache-manifest.f6516c056036507f2e00fe494f9e0d7a.js"
+  "/precache-manifest.92352c6ecf63a4676b0a3ef3a7b5b2a8.js"
 );
 
 self.addEventListener('message', (event) => {

diff --git a/front/build/static/js/main.6564749c.chunk.js b/front/build/static/js/main.6564749c.chunk.js
diff --git a/front/build/static/js/main.6564749c.chunk.js.map b/front/build/static/js/main.6564749c.chunk.js.map
diff --git a/front/build/static/js/main.f5e71cab.chunk.js b/front/build/static/js/main.f5e71cab.chunk.js
diff --git a/front/build/static/js/main.f5e71cab.chunk.js.map b/front/build/static/js/main.f5e71cab.chunk.js.map
diff --git a/front/src/components/devices/Light.js b/front/src/components/devices/Light.js
@@ -13,7 +13,7 @@ class Light extends React.Component {
     }
 
     var color = 'yellow';
-    if (this.props.device.traits.includes("action.devices.traits.ColorSetting")){
+    if (this.props.device.traits.includes("action.devices.traits.ColorSetting" && Object.keys(this.props.status).includes("color"))){
       if (Object.keys(this.props.status.color).includes("spectrumRgb"))
         color = "#" + this.props.status.color.spectrumRgb.toString(16);
       else

diff --git a/front/src/components/pages/System.js b/front/src/components/pages/System.js
@@ -130,7 +130,7 @@ class System extends React.Component {
           console.error(awa.statusText);
         }
       }
-    }.bind(this)
+    }
     awa.open("GET", root + "test/");
     awa.setRequestHeader('authorization', 'baerer ' + getCookieValue('token'))
     awa.send();
@@ -198,10 +198,6 @@ class System extends React.Component {
       textAlign: 'left'
     }
 
-    const red_text = {
-      color: 'red'
-    }
-
     const components = this.state.components.map((component) =>
       <Component title={ component.title } status={ component.status } enable={ component.enable } key={ component.title }/>
     );
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Homeware-LAN is a complete ecosystem that allows to connect any DIY hardware device to Google Home."/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>Homeware-LAN</title><link href="/static/css/main.2d15d020.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function r(r){for(var n,l,a=r[0],f=r[1],i=r[2],c=0,s=[];c<a.length;c++)l=a[c],Object.prototype.hasOwnProperty.call(o,l)&&o[l]&&s.push(o[l][0]),o[l]=0;for(n in f)Object.prototype.hasOwnProperty.call(f,n)&&(e[n]=f[n]);for(p&&p(r);s.length;)s.shift()();return u.push.apply(u,i\|\|[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,a=1;a<t.length;a++){var f=t[a];0!==o[f]&&(n=!1)}n&&(u.splice(r--,1),e=l(l.s=t[0]))}return e}var n={},o={1:0},u=[];function l(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,l),t.l=!0,t.exports}l.m=e,l.c=n,l.d=function(e,r,t){l.o(e,r)\|\|Object.defineProperty(e,r,{enumerable:!0,get:t})},l.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},l.t=function(e,r){if(1&r&&(e=l(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(l.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)l.d(t,n,function(r){return e[r]}.bind(null,n));return t},l.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return l.d(r,"a",r),r},l.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},l.p="/";var a=this.webpackJsonpHomeware=this.webpackJsonpHomeware\|\|[],f=a.push.bind(a);a.push=r,a=a.slice();for(var i=0;i<a.length;i++)r(a[i]);var p=f;t()}([])</script><script src="/static/js/2.b6bfd886.chunk.js"></script><script src="/static/js/main.f5e71cab.chunk.js"></script></body></html>
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Homeware-LAN is a complete ecosystem that allows to connect any DIY hardware device to Google Home."/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>Homeware-LAN</title><link href="/static/css/main.2d15d020.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function r(r){for(var n,l,a=r[0],f=r[1],i=r[2],c=0,s=[];c<a.length;c++)l=a[c],Object.prototype.hasOwnProperty.call(o,l)&&o[l]&&s.push(o[l][0]),o[l]=0;for(n in f)Object.prototype.hasOwnProperty.call(f,n)&&(e[n]=f[n]);for(p&&p(r);s.length;)s.shift()();return u.push.apply(u,i\|\|[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,a=1;a<t.length;a++){var f=t[a];0!==o[f]&&(n=!1)}n&&(u.splice(r--,1),e=l(l.s=t[0]))}return e}var n={},o={1:0},u=[];function l(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,l),t.l=!0,t.exports}l.m=e,l.c=n,l.d=function(e,r,t){l.o(e,r)\|\|Object.defineProperty(e,r,{enumerable:!0,get:t})},l.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},l.t=function(e,r){if(1&r&&(e=l(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(l.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)l.d(t,n,function(r){return e[r]}.bind(null,n));return t},l.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return l.d(r,"a",r),r},l.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},l.p="/";var a=this.webpackJsonpHomeware=this.webpackJsonpHomeware\|\|[],f=a.push.bind(a);a.push=r,a=a.slice();for(var i=0;i<a.length;i++)r(a[i]);var p=f;t()}([])</script><script src="/static/js/2.b6bfd886.chunk.js"></script><script src="/static/js/main.6564749c.chunk.js"></script></body></html>