Browse Source

Minor ui improvements

develop
Ezerous 4 years ago
parent
commit
8aa74ab7fd
  1. 5
      packages/concordia-app/patches/web3-core-requestmanager+1.3.1.patch
  2. 9
      packages/concordia-app/src/assets/css/index.css
  3. 4
      packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/index.jsx
  4. 9
      packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/styles.css
  5. 2
      yarn.lock

5
packages/concordia-app/patches/web3-core-requestmanager+1.3.1.patch

@ -1,8 +1,8 @@
diff --git a/node_modules/web3-core-requestmanager/lib/index.js b/node_modules/web3-core-requestmanager/lib/index.js diff --git a/node_modules/web3-core-requestmanager/lib/index.js b/node_modules/web3-core-requestmanager/lib/index.js
index 32caf52..b51b734 100644 index 32caf52..835b4d8 100644
--- a/node_modules/web3-core-requestmanager/lib/index.js --- a/node_modules/web3-core-requestmanager/lib/index.js
+++ b/node_modules/web3-core-requestmanager/lib/index.js +++ b/node_modules/web3-core-requestmanager/lib/index.js
@@ -82,13 +82,25 @@ RequestManager.prototype.setProvider = function (provider, net) { @@ -82,13 +82,26 @@ RequestManager.prototype.setProvider = function (provider, net) {
this.provider = provider || null; this.provider = provider || null;
// listen to incoming notifications // listen to incoming notifications
if (this.provider && this.provider.on) { if (this.provider && this.provider.on) {
@ -13,6 +13,7 @@ index 32caf52..b51b734 100644
- _this.subscriptions.get(result.params.subscription).callback(null, result.params.result); - _this.subscriptions.get(result.params.subscription).callback(null, result.params.result);
- } - }
- }); - });
+ // See also https://github.com/ChainSafe/web3.js/pull/3864
+ if (typeof provider.request === 'function') { // EIP-1193 provider + if (typeof provider.request === 'function') { // EIP-1193 provider
+ this.provider.on('message', function (payload) { + this.provider.on('message', function (payload) {
+ if (payload && payload.type === 'eth_subscription' && payload.data) { + if (payload && payload.type === 'eth_subscription' && payload.data) {

9
packages/concordia-app/src/assets/css/index.css

@ -3,6 +3,10 @@ body.app {
margin: 0; margin: 0;
} }
div {
word-break: break-word;
}
#root { #root {
height: 100%; height: 100%;
} }
@ -15,8 +19,3 @@ body.app {
color: gray; color: gray;
font-style: italic; font-style: italic;
} }
.ui.inverted.menu {
background: #0B2540;
border-radius: 0;
}

4
packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/index.jsx

@ -4,8 +4,9 @@ import { useTranslation } from 'react-i18next';
import { useHistory } from 'react-router'; import { useHistory } from 'react-router';
import { useSelector } from 'react-redux'; import { useSelector } from 'react-redux';
import AppContext from '../../../components/AppContext'; import AppContext from '../../../components/AppContext';
import appLogo from '../../../assets/images/app_logo.svg';
import ClearDatabasesModal from '../../../components/ClearDatabasesModal'; import ClearDatabasesModal from '../../../components/ClearDatabasesModal';
import appLogo from '../../../assets/images/app_logo.svg';
import './styles.css';
const MainLayoutMenu = () => { const MainLayoutMenu = () => {
const hasSignedUp = useSelector((state) => state.user.hasSignedUp); const hasSignedUp = useSelector((state) => state.user.hasSignedUp);
@ -32,6 +33,7 @@ const MainLayoutMenu = () => {
{() => ( {() => (
<Menu inverted> <Menu inverted>
<Menu.Item <Menu.Item
id="home-button"
link link
name="home" name="home"
key="home" key="home"

9
packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/styles.css

@ -0,0 +1,9 @@
#home-button {
padding: 1.2em;
}
.ui.inverted.menu {
background: #0B2540 !important;
border-radius: 0;
margin-bottom: 5em;
}

2
yarn.lock

@ -17545,7 +17545,7 @@ web3-utils@1.3.1:
underscore "1.9.1" underscore "1.9.1"
utf8 "3.0.0" utf8 "3.0.0"
web3@~1.3.0, web3@~1.3.1: web3@1.3.1, web3@~1.3.0:
version "1.3.1" version "1.3.1"
resolved "https://registry.yarnpkg.com/web3/-/web3-1.3.1.tgz#f780138c92ae3c42ea45e1a3c6ae8844e0aa5054" resolved "https://registry.yarnpkg.com/web3/-/web3-1.3.1.tgz#f780138c92ae3c42ea45e1a3c6ae8844e0aa5054"
integrity sha512-lDJwOLSRWHYwhPy4h5TNgBRJ/lED7lWXyVOXHCHcEC8ai3coBNdgEXWBu/GGYbZMsS89EoUOJ14j3Ufi4dUkog== integrity sha512-lDJwOLSRWHYwhPy4h5TNgBRJ/lED7lWXyVOXHCHcEC8ai3coBNdgEXWBu/GGYbZMsS89EoUOJ14j3Ufi4dUkog==

Loading…
Cancel
Save