From 9ad89627e174087c56b6ed280e750fbb41ffe8d3 Mon Sep 17 00:00:00 2001 From: AndressaStefany Date: Thu, 5 Apr 2018 11:30:39 -0300 Subject: [PATCH 1/2] package's update --- package.json | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 727eb28..3a4b4fc 100644 --- a/package.json +++ b/package.json @@ -4,15 +4,16 @@ "private": true, "homepage": "https://daxchen.github.io/material-ui-Link-within-MenuItem", "devDependencies": { - "gh-pages": "^0.12.0", - "react-scripts": "0.9.0" + "gh-pages": "^0.12.0" }, "dependencies": { - "material-ui": "^0.17.4", - "react": "^15.4.2", - "react-dom": "^15.4.2", - "react-router": "^3.0.2", - "react-tap-event-plugin": "^2.0.1" + "material-ui": "^0.20.0", + "react": "^16.3.1", + "react-dom": "^16.3.1", + "react-router": "^4.2.0", + "react-router-dom": "^4.2.2", + "react-scripts": "^1.1.4", + "react-tap-event-plugin": "^3.0.2" }, "scripts": { "start": "react-scripts start", From d0f90d9cb632db35c7b733db24617ca2b1250dff Mon Sep 17 00:00:00 2001 From: AndressaStefany Date: Thu, 5 Apr 2018 12:35:58 -0300 Subject: [PATCH 2/2] adaptation for version react-router-dom 4.2.0 --- src/App.js | 96 ++++++++++++++++++++++++++++------------------------ src/index.js | 27 ++++++--------- 2 files changed, 63 insertions(+), 60 deletions(-) diff --git a/src/App.js b/src/App.js index 7c02215..bc78f40 100644 --- a/src/App.js +++ b/src/App.js @@ -1,69 +1,77 @@ import React, { Component } from 'react' -import { Link } from 'react-router' +import { HashRouter as Router, Route, Link } from 'react-router-dom' import AppBar from 'material-ui/AppBar' import Drawer from 'material-ui/Drawer' import MenuItem from 'material-ui/MenuItem' import RaisedButton from 'material-ui/RaisedButton' +import Home from './components/Home' +import About from './components/About' class App extends Component { constructor(props) { - super(props) + super(props); this.state = { open: false } } - toggleDrawer = () => this.setState({ open: !this.state.open }) + toggleDrawer = () => this.setState({ open: !this.state.open }); render() { return ( -
- + +
+ - - - } - onTouchTap={() => { - console.log('going home') - alert('going home!') - this.toggleDrawer() - }} - /> - } - onTouchTap={() => { - console.log('about') - alert('going to about page!') - this.toggleDrawer() - }} - /> - + + + } + onTouchTap={() => { + console.log('going home') + alert('going home!') + this.toggleDrawer() + }} + /> + } + onTouchTap={() => { + console.log('about') + alert('going to about page!') + this.toggleDrawer() + }} + /> + +
+ {this.props.children} -
- {this.props.children} + - -
+ + +
-
+ +
+ ) } } -export default App +export default App; diff --git a/src/index.js b/src/index.js index c3a2f84..2290b9f 100644 --- a/src/index.js +++ b/src/index.js @@ -1,28 +1,23 @@ import React from 'react' import ReactDOM from 'react-dom' -import { Router, Route, IndexRoute, hashHistory } from 'react-router' +import { HashRouter } from 'react-router-dom' import injectTapEventPlugin from 'react-tap-event-plugin' import MuiThemeProvider from 'material-ui/styles/MuiThemeProvider' import App from './App' -import Home from './components/Home' -import About from './components/About' import './index.css' -injectTapEventPlugin() +injectTapEventPlugin(); const Root = () => ( - - - - - - - - -) + + + + + +); ReactDOM.render( - , - document.getElementById('root') -) + , + document.getElementById('root') +);