diff --git a/package.json b/package.json index c7156cd..6511423 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "scripts": { "predeploy": "npm run build", "deploy": "gh-pages -d build -o origin", - "build-css": "node-sass-chokidar src/assets/App.scss -o src/assets --output-style=compressed", + "build-css": "node-sass-chokidar src/assets/stylesheets/index.scss -o src/assets/stylesheets/ --output-style=compressed", "watch-css": "nodemon -e scss -x \"npm run build-css\"", "start-js": "node scripts/start.js", "start": "npm-run-all -p watch-css start-js", diff --git a/src/App.js b/src/App.js index 4af532c..a603422 100644 --- a/src/App.js +++ b/src/App.js @@ -1,13 +1,13 @@ -//import DevTools from 'mobx-react-devtools' -import './assets/App.css' -// import Loading from './components/Loading' import React, { Component } from 'react' +import swal from 'sweetalert2' import { Header, Ballots, NewBallot, Settings, Footer, Loading } from './components' import { Route } from 'react-router-dom' -import { inject, observer } from 'mobx-react' -import swal from 'sweetalert2' -import { messages } from './utils/messages' import { constants } from './utils/constants' +import { inject, observer } from 'mobx-react' +import { messages } from './utils/messages' +import { getNetworkBranch } from './utils/utils' + +import './assets/stylesheets/index.css' @inject('commonStore', 'contractsStore') @observer @@ -130,6 +130,7 @@ class App extends Component { render() { const { commonStore, contractsStore } = this.props + const networkBranch = contractsStore.netId ? getNetworkBranch(contractsStore.netId) : null const loading = commonStore.loading ? : '' const search = this.shouldShowSearch() ? ( @@ -138,9 +139,7 @@ class App extends Component { - ) : ( - '' - ) + ) : null const isTestnet = contractsStore.netId in constants.NETWORKS && constants.NETWORKS[contractsStore.netId].TESTNET @@ -172,7 +171,7 @@ class App extends Component { {/**/} -