From bc1f4b9305c16e01eb0a09c412da6f204cc226fa Mon Sep 17 00:00:00 2001 From: demarcogleason Date: Thu, 15 Jun 2017 20:15:47 -0500 Subject: [PATCH 1/2] add app.js --- src/components/App.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/App.js b/src/components/App.js index e29e0c9..96be571 100644 --- a/src/components/App.js +++ b/src/components/App.js @@ -4,7 +4,7 @@ import './App.css'; function App(props) { return (
-

Hello React

+

Hello DeMarco

); } From 2dd734a836fcdb285bc72d6bca129f87b00a47ba Mon Sep 17 00:00:00 2001 From: demarcogleason Date: Thu, 15 Jun 2017 21:00:01 -0500 Subject: [PATCH 2/2] add users --- src/components/App.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/components/App.js b/src/components/App.js index 96be571..3ab8e71 100644 --- a/src/components/App.js +++ b/src/components/App.js @@ -1,12 +1,22 @@ import React from 'react'; import './App.css'; +import Users from '../sampleUser.json'; -function App(props) { - return ( +class App extends React.Component { +constructor(props){ + super(props); + this.state = { + users: Users.results, + }; +} + + render () { + return (

Hello DeMarco

); } +} export default App;