Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@
"dependencies": {
"foreman": "^2.0.0",
"json-server": "^0.9.4",
"prop": "^0.1.1",
"react": "^15.3.2",
"react-dom": "^15.3.2"
"react-dom": "^15.3.2",
"types": "^0.1.1"
},
"scripts": {
"start": "nf start",
Expand All @@ -24,5 +26,5 @@
"test": "npm run lint && react-scripts test --env=jsdom",
"eject": "react-scripts eject"
},
"proxy" : "http://localhost:3001"
"proxy": "http://localhost:3001"
}
19 changes: 0 additions & 19 deletions src/App.js

This file was deleted.

7 changes: 7 additions & 0 deletions src/App.css → src/components/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,10 @@
from { transform: rotate(0deg); }
to { transform: rotate(360deg); }
}

.Grey-back {
background-color: #999;
height: 70px;
color: blue;
padding-top: 10px;
}
31 changes: 31 additions & 0 deletions src/components/App.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import React from "react";
import logo from "./logo.svg";
import "./App.css";
import ListOfUsers from "./ListOfUsers";
import UserDetails from "./UserDetails";
import PropTypes from "prop-types";



function App(props) {

return (
<div className="App">
<div className="App-header">
<img src={logo} className="App-logo" alt="logo" />
</div>
<div className="App-intro">
<h2>User List</h2>
<ListOfUsers arrayOfUsers={props.arrayOfUsers} />
<hr /><h2>User Details</h2><hr />
<UserDetails arrayOfUsers={props.arrayOfUsers} />
</div>
</div>
);
}

App.propTypes = {
arrayOfUsers: PropTypes.array
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing isRequired

};

export default App;
File renamed without changes.
15 changes: 15 additions & 0 deletions src/components/Button.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import React, {Component} from "react";

class Button extends Component {
constructor() {
super();
}

render() {
return (
<button>Show/Hide</button>
);
}
}

export default Button;
12 changes: 12 additions & 0 deletions src/components/Component2.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import React from "react";


export default class Component2 extends React.Component {
render() {
return (
<div>
<h1>Component2</h1>
</div>
);
}
}
61 changes: 61 additions & 0 deletions src/components/ListOfUsers.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
import React, {Component} from "react";
import PropTypes from "prop-types";

class ListOfUsers extends Component {
constructor(props) {
super(props);
this.state = {
buttonClicked: false
};
}

handleUserClick(event) {
console.log("Handle Click", event);

this.setState({
buttonClicked: !this.state.buttonClicked
});
}

render() {
if (!this.state.buttonClicked) {
return (
<div>
<hr />
{this.props.arrayOfUsers.map(user => {
return (
<p key={user.id} onClick={this.handleUserClick.bind(this)} > {user.firstName} </p>
);
})}
</div>
);
}
return (
<div>
<button onClick={this.handleUserClick.bind(this)}>
{this.state.buttonClicked ? "Show Names" : "Hide Names"}
</button>
</div>
);
}
}

// commented out old functional component once class component was built
// function ListOfUsers(props) {
// return (
// <div>
// <hr />
// {props.arrayOfUsers.map(user => {
// return (
// <p key={user.id}> {user.firstName} </p>
// );
// })}
// </div>
// );
// }

ListOfUsers.propTypes = {
arrayOfUsers: PropTypes.array.isRequired
};

export default ListOfUsers;
30 changes: 30 additions & 0 deletions src/components/UserDetails.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import React from "react";
import * as Helpers from "../constants";
import PropTypes from "prop-types";


function UserDetails(props) {
// const selectUser = (array, index) => array[index];
// commented out and saved in my "constants" folder
const {firstName, lastName, phone, address, occupation, avatar} =
Helpers.selectUser(props.arrayOfUsers, 0);
return (
<div>
<img src={avatar} />
<p>{firstName}</p>
<p>{lastName}</p>
<p>{phone}</p>
<p>{address}</p>
<p>{occupation}</p>
</div>
);
}

UserDetails.propTypes = {
arrayOfUsers: PropTypes.shape({
firstName: PropTypes.string.isRequired,
lastName: PropTypes.string.isRequired,
})
};

export default UserDetails;
File renamed without changes
2 changes: 2 additions & 0 deletions src/constants/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export const selectUser = (array, index) => array[index];
export const log = a => console.log(a);
4 changes: 2 additions & 2 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import React from "react";
import ReactDOM from "react-dom";
import App from "./App";
import App from "./components/App";
import "./index.css";
import users from "./users";


function render() {
ReactDOM.render(
<App />,
<App arrayOfUsers={users} />,
document.getElementById("root")
);
}
Expand Down
14 changes: 14 additions & 0 deletions src/node_modules/.yarn-integrity

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/node_modules/dotty/.npmignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 26 additions & 0 deletions src/node_modules/dotty/LICENSE.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

64 changes: 64 additions & 0 deletions src/node_modules/dotty/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading