- | props.detailBlockHandler(props.Number)}>
+ | props.detailBlockHandler(props.Number)}>
{props.Number}
|
{props.Hash} |
diff --git a/shyftBlockExplorerUI/src/components/table/blocks/blocksDetailsRow.js b/shyftBlockExplorerUI/src/components/table/blocks/blocksDetailsRow.js
index 64639c9b46..eaf97a1667 100644
--- a/shyftBlockExplorerUI/src/components/table/blocks/blocksDetailsRow.js
+++ b/shyftBlockExplorerUI/src/components/table/blocks/blocksDetailsRow.js
@@ -11,7 +11,7 @@ class DetailBlockTable extends Component {
- | Height: |
+ Height 2: |
{data.Number} |
diff --git a/shyftBlockExplorerUI/src/containers/App.js b/shyftBlockExplorerUI/src/containers/App.js
index 0bc5379cf7..58b414e937 100644
--- a/shyftBlockExplorerUI/src/containers/App.js
+++ b/shyftBlockExplorerUI/src/containers/App.js
@@ -5,6 +5,11 @@ import { BrowserRouter, Route } from 'react-router-dom'
import { Link } from 'react-router-dom'
+import Modal from 'react-bootstrap/lib/Modal';
+import Button from 'react-bootstrap/lib/Button';
+import Grid from 'react-bootstrap/lib/Grid';
+import Col from 'react-bootstrap/lib/Col';
+import Row from 'react-bootstrap/lib/Row';
///**LANDING PAGE**///
import Home from '../components/home/home';
@@ -29,6 +34,7 @@ import AccountDetailHeader from "../components/nav/accountHeaders/accountDetailH
import classes from './App.css';
+
class App extends Component {
constructor(props) {
super(props);
@@ -38,14 +44,16 @@ class App extends Component {
accountDetailData: [],
blocksMined: [],
blockTransactions: [],
- reqAccount: ''
+ reqAccount: '',
+ overlayTriggered: false,
+ overlayContent: "",
};
}
detailBlockHandler = async(blockNumber) => {
try {
const response = await axios.get(`http://localhost:8080/api/get_block/${blockNumber}`)
- await this.setState({ blockDetailData: response.data })
+ await this.setState({ blockDetailData: response.data, overlayTriggered: true, overlayContent: "block" })
}
catch(error) {
console.log(error)
@@ -92,98 +100,185 @@ class App extends Component {
}
};
+ hideOverlay = () => {
+ this.setState({overlayTriggered: false})
+ };
+
+ getBlockData = (data) => {
+ let components = [];
+ for (let key in data) {
+ let value =data[key]
+ console.log(key, value)
+ components.push(
+
+
+
+
+ {key}
+
+
+ {value}
+
+
+
+
+
+
+ //
+ // {key}:
+ // {value}
+ //
+ //
+ );
+ }
+
+ return components;
+ }
+
+ renderOverlay = () => {
+
+ const page = this.state.overlayContent;
+ let data, title;
+ let keys = [];
+ let values = [];
+
+ switch (page) {
+ case "block" :
+ title = "BLOCK OVERVIEW";
+ data = this.state.blockDetailData;
+ break;
+
+ default: console.log("error");
+ }
+
+
+ return (
+
+
+
+ {title}
+
+
+
+
+ {this.getBlockData(data)}
+
+
+
+
+
+
+
+
-
-
-
-
- }
- />
+
-
-
-
+
+
+
+
+ }
+ />
+
+
+
+
+
+ }
+ />
+
+
+
+
+
+ }
+ />
+
+
+
+ }
+ />
+
+
+
+
+
+
}
+ />
+
+
+
+
+
+
}
+ />
+
+
+
+
+
-
- }
- />
-
-
-
}
+ />
+
+
+
+
+
-
- }
- />
+ getBlocksMined={this.getBlocksMined}
+ data={this.state.blocksMined}/>
+
-
-
-
}
- />
-
-
-
-
-
-
}
- />
-
-
-
-
-
-
-
}
- />
-
-
-
-
-
-
}
- />
-
-
- }
- />
+
+ }
+ />
+