Merge pull request #32 from sudipt1999/node-color

UI-Improvements fixes as per the #11
HTTP-APIs · Mar 4, 2020 · 624554e · 624554e
2 parents 2b46058 + e7e9617
commit 624554e
Show file tree

Hide file tree

Showing 20 changed files with 61 additions and 44 deletions.
diff --git a/app.py b/app.py
@@ -132,7 +132,10 @@ def create_node(id, shape, size, label):
         "id": id,
         "shape": shape,
         "size": size,
-        "label": label
+        "label": label,
+        "color": {
+            "background": "#FBD20B"
+        }
     }
     return node
 

diff --git a/console-frontend/build/asset-manifest.json b/console-frontend/build/asset-manifest.json
@@ -1,15 +1,15 @@
 {
   "files": {
-    "main.css": "/static/css/main.e1e60513.chunk.css",
-    "main.js": "/static/js/main.4a66fa29.chunk.js",
-    "main.js.map": "/static/js/main.4a66fa29.chunk.js.map",
+    "main.css": "/static/css/main.b015b8f6.chunk.css",
+    "main.js": "/static/js/main.2e5459c8.chunk.js",
+    "main.js.map": "/static/js/main.2e5459c8.chunk.js.map",
     "runtime~main.js": "/static/js/runtime~main.a8a9905a.js",
     "runtime~main.js.map": "/static/js/runtime~main.a8a9905a.js.map",
-    "static/js/2.35b9e6a7.chunk.js": "/static/js/2.35b9e6a7.chunk.js",
-    "static/js/2.35b9e6a7.chunk.js.map": "/static/js/2.35b9e6a7.chunk.js.map",
+    "static/js/2.cd05a796.chunk.js": "/static/js/2.cd05a796.chunk.js",
+    "static/js/2.cd05a796.chunk.js.map": "/static/js/2.cd05a796.chunk.js.map",
     "index.html": "/index.html",
-    "precache-manifest.c078ef30ae02dc6bfe603e436a107da6.js": "/precache-manifest.c078ef30ae02dc6bfe603e436a107da6.js",
+    "precache-manifest.dbd30e7bbeb78a0eae5dcb8a4e9d52e9.js": "/precache-manifest.dbd30e7bbeb78a0eae5dcb8a4e9d52e9.js",
     "service-worker.js": "/service-worker.js",
-    "static/css/main.e1e60513.chunk.css.map": "/static/css/main.e1e60513.chunk.css.map"
+    "static/css/main.b015b8f6.chunk.css.map": "/static/css/main.b015b8f6.chunk.css.map"
   }
 }
diff --git a/console-frontend/build/favicon.ico b/console-frontend/build/favicon.ico
diff --git a/console-frontend/build/index.html b/console-frontend/build/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><link rel="manifest" crossorigin="use-credentials" href="/manifest.json"/><title>Hydra Agent</title><link href="/static/css/main.e1e60513.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(l){function e(e){for(var r,t,n=e[0],o=e[1],u=e[2],f=0,i=[];f<n.length;f++)t=n[f],p[t]&&i.push(p[t][0]),p[t]=0;for(r in o)Object.prototype.hasOwnProperty.call(o,r)&&(l[r]=o[r]);for(s&&s(e);i.length;)i.shift()();return c.push.apply(c,u||[]),a()}function a(){for(var e,r=0;r<c.length;r++){for(var t=c[r],n=!0,o=1;o<t.length;o++){var u=t[o];0!==p[u]&&(n=!1)}n&&(c.splice(r--,1),e=f(f.s=t[0]))}return e}var t={},p={1:0},c=[];function f(e){if(t[e])return t[e].exports;var r=t[e]={i:e,l:!1,exports:{}};return l[e].call(r.exports,r,r.exports,f),r.l=!0,r.exports}f.m=l,f.c=t,f.d=function(e,r,t){f.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(r,e){if(1&e&&(r=f(r)),8&e)return r;if(4&e&&"object"==typeof r&&r&&r.__esModule)return r;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:r}),2&e&&"string"!=typeof r)for(var n in r)f.d(t,n,function(e){return r[e]}.bind(null,n));return t},f.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(r,"a",r),r},f.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},f.p="/";var r=window.webpackJsonp=window.webpackJsonp||[],n=r.push.bind(r);r.push=e,r=r.slice();for(var o=0;o<r.length;o++)e(r[o]);var s=n;a()}([])</script><script src="/static/js/2.35b9e6a7.chunk.js"></script><script src="/static/js/main.4a66fa29.chunk.js"></script></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><link rel="manifest" crossorigin="use-credentials" href="/manifest.json"/><title>Hydra Agent</title><link href="/static/css/main.b015b8f6.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(l){function e(e){for(var r,t,n=e[0],o=e[1],u=e[2],f=0,i=[];f<n.length;f++)t=n[f],p[t]&&i.push(p[t][0]),p[t]=0;for(r in o)Object.prototype.hasOwnProperty.call(o,r)&&(l[r]=o[r]);for(s&&s(e);i.length;)i.shift()();return c.push.apply(c,u||[]),a()}function a(){for(var e,r=0;r<c.length;r++){for(var t=c[r],n=!0,o=1;o<t.length;o++){var u=t[o];0!==p[u]&&(n=!1)}n&&(c.splice(r--,1),e=f(f.s=t[0]))}return e}var t={},p={1:0},c=[];function f(e){if(t[e])return t[e].exports;var r=t[e]={i:e,l:!1,exports:{}};return l[e].call(r.exports,r,r.exports,f),r.l=!0,r.exports}f.m=l,f.c=t,f.d=function(e,r,t){f.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(r,e){if(1&e&&(r=f(r)),8&e)return r;if(4&e&&"object"==typeof r&&r&&r.__esModule)return r;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:r}),2&e&&"string"!=typeof r)for(var n in r)f.d(t,n,function(e){return r[e]}.bind(null,n));return t},f.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(r,"a",r),r},f.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},f.p="/";var r=window.webpackJsonp=window.webpackJsonp||[],n=r.push.bind(r);r.push=e,r=r.slice();for(var o=0;o<r.length;o++)e(r[o]);var s=n;a()}([])</script><script src="/static/js/2.cd05a796.chunk.js"></script><script src="/static/js/main.2e5459c8.chunk.js"></script></body></html>
diff --git a/console-frontend/build/precache-manifest.c078ef30ae02dc6bfe603e436a107da6.js b/console-frontend/build/precache-manifest.c078ef30ae02dc6bfe603e436a107da6.js
diff --git a/console-frontend/build/precache-manifest.dbd30e7bbeb78a0eae5dcb8a4e9d52e9.js b/console-frontend/build/precache-manifest.dbd30e7bbeb78a0eae5dcb8a4e9d52e9.js
@@ -0,0 +1,22 @@
+self.__precacheManifest = (self.__precacheManifest || []).concat([
+  {
+    "revision": "999204136a12eed5087f55e50aa5917b",
+    "url": "/index.html"
+  },
+  {
+    "revision": "968b818ae6dd728e250d",
+    "url": "/static/css/main.b015b8f6.chunk.css"
+  },
+  {
+    "revision": "a60891681800a984f7f5",
+    "url": "/static/js/2.cd05a796.chunk.js"
+  },
+  {
+    "revision": "968b818ae6dd728e250d",
+    "url": "/static/js/main.2e5459c8.chunk.js"
+  },
+  {
+    "revision": "42ac5946195a7306e2a5",
+    "url": "/static/js/runtime~main.a8a9905a.js"
+  }
+]);
diff --git a/console-frontend/build/service-worker.js b/console-frontend/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.c078ef30ae02dc6bfe603e436a107da6.js"
+  "/precache-manifest.dbd30e7bbeb78a0eae5dcb8a4e9d52e9.js"
 );
 
 self.addEventListener('message', (event) => {
@@ -35,5 +35,5 @@ workbox.precaching.precacheAndRoute(self.__precacheManifest, {});
 
 workbox.routing.registerNavigationRoute(workbox.precaching.getCacheKeyForURL("/index.html"), {
 
-  blacklist: [/^\/_/,/\/[^\/]+\.[^\/]+$/],
+  blacklist: [/^\/_/,/\/[^/]+\.[^/]+$/],
 });
diff --git a/.../build/static/css/main.e1e60513.chunk.css → .../build/static/css/main.b015b8f6.chunk.css b/.../build/static/css/main.e1e60513.chunk.css → .../build/static/css/main.b015b8f6.chunk.css
diff --git a/console-frontend/build/static/css/main.b015b8f6.chunk.css.map b/console-frontend/build/static/css/main.b015b8f6.chunk.css.map
diff --git a/console-frontend/build/static/css/main.e1e60513.chunk.css.map b/console-frontend/build/static/css/main.e1e60513.chunk.css.map
diff --git a/console-frontend/build/static/js/2.35b9e6a7.chunk.js b/console-frontend/build/static/js/2.35b9e6a7.chunk.js
diff --git a/console-frontend/build/static/js/2.35b9e6a7.chunk.js.map b/console-frontend/build/static/js/2.35b9e6a7.chunk.js.map
diff --git a/console-frontend/build/static/js/2.cd05a796.chunk.js b/console-frontend/build/static/js/2.cd05a796.chunk.js
diff --git a/console-frontend/build/static/js/2.cd05a796.chunk.js.map b/console-frontend/build/static/js/2.cd05a796.chunk.js.map
diff --git a/console-frontend/build/static/js/main.2e5459c8.chunk.js b/console-frontend/build/static/js/main.2e5459c8.chunk.js
diff --git a/console-frontend/build/static/js/main.2e5459c8.chunk.js.map b/console-frontend/build/static/js/main.2e5459c8.chunk.js.map
diff --git a/console-frontend/build/static/js/main.4a66fa29.chunk.js b/console-frontend/build/static/js/main.4a66fa29.chunk.js
diff --git a/console-frontend/build/static/js/main.4a66fa29.chunk.js.map b/console-frontend/build/static/js/main.4a66fa29.chunk.js.map
diff --git a/console-frontend/src/app/app.js b/console-frontend/src/app/app.js
@@ -18,9 +18,14 @@ const styles = theme => ({
   serverInputContainer: {
     width: '100%',
     backgroundColor: GuiTheme.palette.primary.light,
+    border: 10
   },
   serverInput: {
-      width: '93%'
+      width: '93%',
+      backgroundColor: '#FBD20B',
+      padding: '5px',
+      borderColor: '#000',
+      borderRadius: 10,
   },
 });
 
@@ -130,6 +135,7 @@ class AgentGUI extends React.Component {
                       value={this.state.serverURL}
                       onChange={ (e) => this.handleChangeServerURL(e) }
                       className={classes.serverInput}
+                      disableUnderline={true} 
                       inputProps={{
                           'aria-label': 'hydrus-url',
                       }}

diff --git a/console-frontend/src/components/hydra-console/HydraConsole.jsx b/console-frontend/src/components/hydra-console/HydraConsole.jsx
@@ -44,6 +44,9 @@ const styles = theme => ({
     outContainer: {
         height: '87vh',
         backgroundColor: GuiTheme.palette.primary.dark,
+        [theme.breakpoints.down('md')]: {
+            height: '160vh'
+        }
     },
     propertiesContainer: {
         maxHeight: '40vh',
@@ -73,6 +76,10 @@ const styles = theme => ({
         backgroundColor: GuiTheme.palette.primary.light,
         whiteSpace: 'pre',
         overflowY: 'auto',
+        ['@media (min-width:780px)']: { 
+            width: '80%',
+            fontSize: '0.8em'
+        }
     },
     outputContainerHeader: {
         width: '90%',
@@ -94,7 +101,7 @@ const styles = theme => ({
         boxShadow: '0 3px 5px 2px rgba(255, 255, 255, .3)',
         height: 48,
         width: '22%',
-    },
+    }
 });
 
 class HydraConsole extends React.Component {
@@ -327,7 +334,7 @@ class HydraConsole extends React.Component {
         }
 
         return (
-            <Grid container className={classes.outContainer}>
+            <Grid container className={classes.outContainer} md={12}>
                 <Grid item md={4} xs={12} container
                     direction="column"
                     justify="space-evenly"
@@ -417,6 +424,7 @@ class HydraConsole extends React.Component {
                     </Button>
                 </Grid>
                 <Grid item xs={12}
+                    spacing={5}
                     container
                     direction="column"
                     justify="center"