Skip to content

Kyle Rhodes #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
k-rhodes wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Kyle Rhodes #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions public/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
function App(){
return <div><Main /></div>
}
return (
<div>
<Header />
<Main />
<Footer />
</div>
)
}
10 changes: 10 additions & 0 deletions public/Blue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
function Blue() {

return (
<div className="blue">
<p>muh background is blue</p>
<Kat3 />
<p>lorem ipsum</p>
</div>
)
}
4 changes: 4 additions & 0 deletions public/Footer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
function Footer() {

return <h2 className="footer">smelly footer</h2>
}
10 changes: 10 additions & 0 deletions public/Green.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
function Green() {

return (
<div className="green">
<p>muh background is green</p>
<Kat2 />
<p>lorem ipsum</p>
</div>
)
}
4 changes: 4 additions & 0 deletions public/Header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
function Header() {

return <h1 className="header">Welcome to Kitter</h1>
}
5 changes: 5 additions & 0 deletions public/Kat1.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
function Kat1() {
return (
<img src="https://media.giphy.com/media/v6aOjy0Qo1fIA/giphy.gif" className="kat1"></img>
)
}
4 changes: 4 additions & 0 deletions public/Kat2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
function Kat2() {

return <img src="http://37.media.tumblr.com/90a30135ab8238399008c6e00fd48553/tumblr_n2uh3b7Oey1qdlh1io1_250.gif" className="kat2"></img>
}
5 changes: 5 additions & 0 deletions public/Kat3.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
function Kat3() {
return (
<img src="http://www.drodd.com/images10/funny-cat-gifs3.gif" className="kat3"></img>
)
}
10 changes: 8 additions & 2 deletions public/Main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
function Main(){
return <div>Hello</div>
}
return (
<div className='main'>
<Red />
<Green />
<Blue />
</div>
)
}
10 changes: 10 additions & 0 deletions public/Red.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
function Red() {

return (
<div className="red">
<p>muh background is red</p>
<Kat1 />
<p>lorem ipsum</p>
</div>
)
}
25 changes: 19 additions & 6 deletions public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,26 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<link rel="stylesheet" href="styles.css">
<title>React App</title>
<script src="https://cdnjs.cloudflare.com/ajax/libs/react/15.0.1/react.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/react/15.0.1/react-dom.min.js"></script>
<script src="https://unpkg.com/babel-standalone@6/babel.min.js"></script>
</head>
<body>
<div id="root"></div>
<script>
<!-- <script>
var tweets = [
"ACA class was so awesome today.",
"I just checked out that new restaurant, it was okay",
"I just saw a movie that changed my life",
"shirts are 50% of at Macy's today"
];

</script>

<script>

var h1 = document.createElement("h1");
h1.innerHTML = tweets[0];
document.body.appendChild(h1);
Expand All @@ -41,10 +42,22 @@
<script type="text/jsx">
var tweet = React.createElement("h1",null,tweets[1])
ReactDOM.render(
tweet,
tweet,
document.getElementById('root')
);
</script>
</script> -->

<script src="Kat1.js" type="text/jsx"></script>
<script src="Kat2.js" type="text/jsx"></script>
<script src="Kat3.js" type="text/jsx"></script>
<script src="Red.js" type="text/jsx"></script>
<script src="Green.js" type="text/jsx"></script>
<script src="Blue.js" type="text/jsx"></script>
<script src="Header.js" type="text/jsx"></script>
<script src="Footer.js" type="text/jsx"></script>
<script src="Main.js"type="text/jsx"></script>
<script src='App.js' type="text/jsx"></script>
<script src="Index.js" type="text/jsx"></script>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.
Expand All @@ -55,6 +68,6 @@
To begin the development, run `npm start`.
To create a production bundle, use `npm run build`.
-->

</body>
</html>
46 changes: 46 additions & 0 deletions public/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
.header {
width: auto;
height: 10vh;
background-color: grey;
text-align: center;
}

.main {
display: flex;
height: 75vh;
width: auto;
justify-content: center;
}

.red {
width: 30%;
height: 100%;
background-color: red;
text-align: center;
}

.green {
width: 30%;
height: 100%;
background-color: green;
text-align: center;
}

.blue {
width: 30%;
height: 100%;
background-color: blue;
text-align: center;
}

.kat1 {
height: 75%;
width: auto;
}

.footer {
width: auto;
height: 10vh;
background-color: grey;
text-align: center;
}