Refactoring

app/package.json

@@ -20,7 +20,7 @@
     "react-router-dom": "^4.3.1",
     "react-scripts": "^2.1.5",
     "redux": "^4.0.1",
-    "redux-saga": "^0.16.0",
+    "redux-saga": "^0.16.2",
     "semantic-ui-react": "^0.85.0"
   },
   "scripts": {

app/src/components/NotFound.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import pageNotFound from '../resources/PageNotFound.jpg';
+import pageNotFound from '../assets/images/PageNotFound.jpg';
 
 const NotFound = () => {
     return (

app/src/containers/HomeContainer.js

@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import {connect} from "react-redux";
+import { connect } from 'react-redux';
 
 class HomeContainer extends Component {
   render() {

app/src/containers/NavBar.js → app/src/containers/NavBarContainer.js

@@ -1,23 +1,17 @@
 import React, { Component } from 'react';
+import {bindActionCreators} from 'redux';
+import {connect} from 'react-redux';
 import { push } from 'connected-react-router'
 import PropTypes from 'prop-types';
-
 import { Image, Menu } from 'semantic-ui-react'
 
-import logo from '../resources/logo.png';
+import logo from '../assets/images/logo.png';
-import {bindActionCreators} from "redux";
-import {connect} from "react-redux";
 
-class NavBar extends Component {
+class NavBarContainer extends Component {
     constructor(props){
         super(props);
-
-       // this.handleItemClick = this.handleItemClick.bind(this);
-
-        this.navRef = React.createRef();
     }
 
-
     render() {
         return (
             <Menu fixed='top' inverted>
@@ -37,7 +31,7 @@ class NavBar extends Component {
     }
 }
 
-NavBar.contextTypes = {
+NavBarContainer.contextTypes = {
     router: PropTypes.object
 };
 
@@ -45,13 +39,10 @@ const mapDispatchToProps = dispatch => bindActionCreators({
     navigateTo: (location) => push(location)
 }, dispatch);
 
-
 const mapStateToProps = state => {
     return {
         hasSignedUp: state.user.hasSignedUp,
     }
 };
 
-//export default drizzleConnect(NavBar, mapStateToProps, mapDispatchToProps);
+export default connect(mapStateToProps, mapDispatchToProps)(NavBarContainer);
-
-export default connect(mapStateToProps, mapDispatchToProps)(NavBar);

app/src/routes.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import { Route, Switch } from 'react-router-dom'
-import NavBar from "./containers/NavBar";
+import NavBarContainer from "./containers/NavBarContainer";
 import HomeContainer from './containers/HomeContainer'
 import SignUpContainer from './containers/SignUpContainer'
 import NotFound from './components/NotFound'
@@ -8,7 +8,7 @@ import NotFound from './components/NotFound'
 
 const routes = (
     <div>
-        <NavBar />
+        <NavBarContainer />
         <Switch>
             <Route exact path="/" component={HomeContainer} />
             <Route path="/signup" component={SignUpContainer} />

contracts/Forum.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.4;
+pragma solidity >=0.5.4 <0.6.0;
 
 contract Forum {
 

contracts/Migrations.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.4;
+pragma solidity >=0.5.4 <0.6.0;
 
 contract Migrations {
   address public owner;

migrations/1_initial_migration.js

@@ -1,4 +1,4 @@
-var Migrations = artifacts.require("./Migrations.sol");
+const Migrations = artifacts.require("./Migrations.sol");
 
 module.exports = function(deployer) {
   deployer.deploy(Migrations);

migrations/2_deploy_contracts.js

@@ -1,4 +1,4 @@
-var Forum = artifacts.require("Forum");
+const Forum = artifacts.require("Forum");
 
 module.exports = function(deployer) {
   deployer.deploy(Forum);