Skip to content
Open
Show file tree
Hide file tree
Changes from 2 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
19 changes: 0 additions & 19 deletions src/App.js

This file was deleted.

33 changes: 33 additions & 0 deletions src/components/App.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import React from "react";
// import logo from "./logo.svg";
import "../App.css";
// import apple from "./apple.svg";
// import france from "./france.svg";
import Header from "./Header";
import SmileyFace from "./Smiley";
import Main from "./Main";
import Insert from "./Insert";
// import users from "./users";
import Component5 from "./Component5";
import Component6 from "./Component6";
import ComponentX from "./Component7";


function App() {
return (
<div className="App">
<Header />
<Insert message="We got this." />
<Main />
<SmileyFace />
<Component5 />
<Component6 />
<ComponentX />
</div>

);
}



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

function Component5() {
return (
<div>
<p className="App-intro"> Component5!!</p>
</div>

);

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

function Component6() {

return (
<div>
<p className="App-intro"> Component6!!</p>
</div>
);

}

export default Component6;
12 changes: 12 additions & 0 deletions src/components/Component7.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import React from "react";
function Component7() {
Copy link

Choose a reason for hiding this comment

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

Try to use consistent line spacing between import statements and code (1 empty line)


return (
<div>
<p className="App-intro"> Component7!!</p>
</div>
);

}

export default Component7;
17 changes: 17 additions & 0 deletions src/components/Header.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import React from "react";
import france from "./france.svg";

function Header() {
return (
<div>
<img src={france} className="App-logo" alt="logo" />
<h2> Were rockin NOW!!! </h2>
</div>
);



Copy link

Choose a reason for hiding this comment

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

Unnecessary whitespace...

}


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

function Insert(props){
return(
<div className="App-header">
<h2>{props.message}</h2>
</div>
);
}

export default Insert;
17 changes: 17 additions & 0 deletions src/components/Main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import React from "react";
function Main() {

return (
<p className="App-intro">
Day 1 - Form Learning Teams<br />
Day 3 - Team Charters are due<br />
Day 5 - Learning Teams submit project proposals<br />
Day 9 - Learning Team Check-ins<br />
Day 15 - Learning Team Check-ins<br />
Day 20 - Learning Team Project Presentations.
Copy link

Choose a reason for hiding this comment

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

Indent content of elements by 2 spaces

</p>
);

}

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

function Smiley() {
return (
<div className="Smiley">
<img src={face} className="App-logo" alt="logo" />
Copy link

Choose a reason for hiding this comment

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

Check eslint indentation errors here.

</div>
);
}

export default Smiley;
6 changes: 6 additions & 0 deletions src/components/apple.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions src/components/france.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
Binary file added src/components/nerdSmiley.ico
Binary file not shown.
7 changes: 5 additions & 2 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
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";
// import users from "./users";


function render() {
Expand All @@ -11,4 +11,7 @@ function render() {
document.getElementById("root")
);
}



render();
Loading