diff --git a/.gitignore b/.gitignore index 175c126..b8eebb2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .DS_Store venv +env/ node_modules static/bundle.js diff --git a/js/Hello.js b/js/Hello.js index fa2ba31..1d2183d 100644 --- a/js/Hello.js +++ b/js/Hello.js @@ -1,10 +1,16 @@ import React from 'react'; -var Hello = React.createClass({ - render() { - return

Hello, world

; - } -}); +class Hello extends React.Component{ + constructor(props){ + super(props); + this.state = {} + } -export default Hello; + render(){ + return ( +

Hello, world

+ ) + } +} +export default Hello; \ No newline at end of file diff --git a/js/app.js b/js/app.js index 46c29d6..ee5b579 100644 --- a/js/app.js +++ b/js/app.js @@ -1,6 +1,6 @@ -import Hello from './Hello'; import React from 'react'; -import ReactDOM from 'react-dom'; +import { render } from 'react-dom'; -ReactDOM.render(, document.getElementById('reactEntry')); +import Hello from './Hello'; +render(,document.getElementById('react')); diff --git a/package.json b/package.json index b999ea2..f8633e0 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "webpack": "^1.12.12" }, "dependencies": { - "react": "^0.14.7", - "react-dom": "^0.14.7" + "react": "^16.2.0", + "react-dom": "^16.2.0" } }