Skip to content
Open
Show file tree
Hide file tree
Changes from 4 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
2 changes: 2 additions & 0 deletions -
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
import React from "react";
import "./App.css";
19 changes: 0 additions & 19 deletions src/App.js

This file was deleted.

18 changes: 18 additions & 0 deletions src/App.css → src/components/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,24 @@
font-size: large;
}

.App-links {
width: 60px;
height: 60px;
margin-top: 10px;
}

.Berlin {
width:100%;
height:600px;
margin-top:10px;
}

.Schloss {
width:100%;
height:600px;
margin-top:10px;
}

@keyframes App-logo-spin {
from { transform: rotate(0deg); }
to { transform: rotate(360deg); }
Expand Down
38 changes: 38 additions & 0 deletions src/components/App.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import React from "react";
import "./App.css";
import Eins from "./Eins";
import Zwei from "./Zwei";
import Drei from "./Drei";
import Vier from "./Vier";
import Funf from "./Funf";
import UserDetail from "./UserDetail";
import users from "../users";


function App(props) {
const Menschen = props.users.map(function (user, index) {
const name = user.first_name + " " + user.last_name;
return (
<li key={index}>
{name}
</li>
);
});
return (
<div className="App">
<Eins />
<Zwei />
<Drei />
<UserDetail users={users} />
{Menschen}
<Vier />
<Funf />
</div>
);
}

// App.propTypes = {
// users: React.PropTypes.node,
// };

export default App;
Binary file added src/components/Brandenburg.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions src/components/Drei.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import React from "react";
import "./App.css";


function Drei() {
return (
<a href="mailto:popularwatson@gmail.com">popularwatson@gmail.com</a>
);
}

export default Drei;
17 changes: 17 additions & 0 deletions src/components/Eins.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import React from "react";
import "./App.css";
// import logo from "./logo.svg";
import Links from "./Links.png";
import Header from "./Header";

function Hund() {
return (
<div className="App-header">
<Header Schild="LINKS" />
<img src={Links} className="App-links" alt="Links" />
<h2>Wie geht es dir?</h2>
</div>
);
}

export default Hund;
12 changes: 12 additions & 0 deletions src/components/Funf.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import React from "react";
import "./App.css";
import Schloss from "./Schloss.jpg";


function Funf() {
return (
<img src={Schloss} className="Schloss" alt="Schloss" />
);
}

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

function Header(props) {
return (
<header>{props.Schild}</header>
);
}

// Header.propTypes = {
// Schild: React.PropTypes.node,
// };

export default Header;
Binary file added src/components/Links.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions src/components/ListOfUsers.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import React from "React";
import "./App.css";

function ListOfUsers(props) {
return (
const UserList = props.users.map(function(user, index) {
<li key={index}>
user.avatar;
</li>
});
);
}

export default ListOfUsers;
Binary file added src/components/Schloss.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions src/components/UserDetail.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import React from "react";
import "./App.css";

function UserDetail(props) {
const UserEins = props.users[0].first_name;
return (
<p>
{UserEins}
</p>
);
}



export default UserDetail;
12 changes: 12 additions & 0 deletions src/components/Vier.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import React from "react";
import "./App.css";
import Brandenburg from "./Brandenburg.jpg";


function Vier() {
return (
<img src={Brandenburg} className="Berlin" alt="Brandenburg" />
);
}

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


function Zwei() {
return (
<p className="App-intro">
Es hat mir viel Spass gemacht!!!
</p>
);
}

export default Zwei;
File renamed without changes
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 users={users}/>,
document.getElementById("root")
);
}
Expand Down
3 changes: 0 additions & 3 deletions src/users.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,3 @@ export default [
}

];