From a837dbfcfce03607e7ca80ee93a25f871a7e3e7f Mon Sep 17 00:00:00 2001 From: Visa Pollari Date: Wed, 28 Oct 2020 16:12:59 +0200 Subject: [PATCH 1/2] update package --- frontend/app/package-lock.json | 26 +++++++++---------- .../Connected/Components/HubSelector/index.js | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/frontend/app/package-lock.json b/frontend/app/package-lock.json index 1fdaa550..73a87694 100644 --- a/frontend/app/package-lock.json +++ b/frontend/app/package-lock.json @@ -9361,9 +9361,9 @@ } }, "lodash": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" }, "lodash-es": { "version": "4.17.15", @@ -10022,9 +10022,9 @@ } }, "node-forge": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz", - "integrity": "sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==" + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz", + "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==" }, "node-gyp": { "version": "3.8.0", @@ -10154,9 +10154,9 @@ }, "dependencies": { "lodash": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" } } }, @@ -13849,11 +13849,11 @@ "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=" }, "selfsigned": { - "version": "1.10.7", - "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.7.tgz", - "integrity": "sha512-8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA==", + "version": "1.10.8", + "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.8.tgz", + "integrity": "sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w==", "requires": { - "node-forge": "0.9.0" + "node-forge": "^0.10.0" } }, "semver": { diff --git a/frontend/app/src/pages/Connected/Components/HubSelector/index.js b/frontend/app/src/pages/Connected/Components/HubSelector/index.js index f850c30d..1196da1c 100644 --- a/frontend/app/src/pages/Connected/Components/HubSelector/index.js +++ b/frontend/app/src/pages/Connected/Components/HubSelector/index.js @@ -20,7 +20,7 @@ const HubSelector = ({ hubs }) => { {hub.name}
- {moment().utcOffset(hub.timezone).format('h:mm a')} + {moment(moment(), 'h:mm a').utcOffset(hub.timezone)}

{hub.country}

From 8af7a4e926657da3010dcd65b7eea406fe2ffd83 Mon Sep 17 00:00:00 2001 From: Visa Pollari Date: Wed, 28 Oct 2020 16:17:43 +0200 Subject: [PATCH 2/2] remove duplicate logo --- frontend/app/src/pages/Connected/Home/index.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/frontend/app/src/pages/Connected/Home/index.js b/frontend/app/src/pages/Connected/Home/index.js index 089f1402..609c791c 100644 --- a/frontend/app/src/pages/Connected/Home/index.js +++ b/frontend/app/src/pages/Connected/Home/index.js @@ -568,15 +568,6 @@ const ConnectedHome = (props) => { />
-
- - connected-logo-here - -