Skip to content

Aaronn #25

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.

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
wants to merge 25 commits into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
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
1 change: 1 addition & 0 deletions homework1.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
This is homework 1
Binary file added lesson_06/img/cwhq_aaron.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 5 additions & 4 deletions lesson_06/team.html
Original file line number Diff line number Diff line change
@@ -31,15 +31,16 @@ <h1 class="header1 header">
<p><img class="member-pic" src="img/Alex_001.png"></p>
<p>John Mastercoder</p>
</div>

<div class="member">
<!-- student 01 -->
<!-- Instructor -->


<p> Lev F</p>

</div>

<div class="member">
<!-- student 02 -->

<p>Eshaan Katar</p>
</div>

<div class="member">
12 changes: 11 additions & 1 deletion lesson_07/index.html
Original file line number Diff line number Diff line change
@@ -22,8 +22,10 @@ <h1>The Tree Encyclopedia</h1>

<div class="index">
<h3>Index</h3>
<p><button id="oak">Oak</button></p>
<p><button id="oak">ak</button></p>
<p><button id="beech">Beech</button></p>
<p><button id="rosewood">Rosewood</button></p>
<p><button id="Palmtree">Palmtree</button></p>

</div>
<div class="content">
@@ -51,7 +53,15 @@ <h3>Index</h3>
})
$("#beech").click(function(){

$("#i_content").attr("src","beech_content.html");
$("#i_summary").attr("src","beech_summary.html");



})
$("#rose").click(function(){
$("#i_content").attr("src","rosewood_content.html");
$("#i_summary").attr("src","rosewood.html");
})

/* This will not be merged ! */
21 changes: 21 additions & 0 deletions lesson_07/palmtree_content.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<style>
@import url('https://fonts.googleapis.com/css2?family=Lato&family=Overlock:wght@700&display=swap');
body{font-family: 'Lato', sans-serif;
text-align: center;
color: white;
}
h3{
font-family: 'Overlock', cursive;
font-size: 28px;
margin: 0px;
padding-top: 10px;
}
p{
font-size: 16px;
padding: 0px;
}
</style>

<h3>Oak</h3>

<p>The Arecaceae is a family of perennial, flowering plants in the monocot order Arecales. Their growth form can be climbers, shrubs, tree-like and stemless plants, all commonly known as palms. Those having a tree-like form are called palm trees.</p>
33 changes: 33 additions & 0 deletions lesson_07/palmtree_summary.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<style>body{font-family:'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif;
color: white;}</style>
<style>
@import url('https://fonts.googleapis.com/css2?family=Lato&family=Overlock:wght@700&display=swap');
body{font-family: 'Lato', sans-serif;
text-align: center;
}
h3{
font-family: 'Overlock', cursive;
font-size: 26px;
margin: 0px;
padding-top: 10px;

}
p{
font-size: 15px;
padding: 0px;
}
#type{
font-size: 12px;
margin: 0;
padding: 0;
margin-bottom: 10px;
}
</style>


<h3>Palm Tree</h3>

<p id="type"> Tree or shrub </p>
<img src="img/oak.jpg" style="width: 200px;">
<p>Family: genus Quercus of the beech family, Fagaceae.
</p>
23 changes: 23 additions & 0 deletions lesson_07/rosewood_content.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<style>
@import url('https://fonts.googleapis.com/css2?family=Lato&family=Overlock:wght@700&display=swap');
body{font-family: 'Lato', sans-serif;
text-align: center;
color: white;
}
h3{
font-family: 'Overlock', cursive;
font-size: 28px;
margin: 0px;
padding-top: 10px;
}
p{
font-size: 16px;
padding: 0px;
}
</style>

<h3>Oak</h3>

<p>There are approximately 500 extant species of oaks.[2] The common name "oak" also appears in the names of species in related genera, notably Lithocarpus (stone oaks), as well as in those of unrelated species such as Grevillea robusta (silky oaks) and the Casuarinaceae (she-oaks). </p>

<p>The genus Quercus is native to the Northern Hemisphere, and includes deciduous and evergreen species extending from cool temperate to tropical latitudes in the Americas, Asia, Europe, and North Africa. North America contains the largest number of oak species, with approximately 90 occurring in the United States, while Mexico has 160 species of which 109 are endemic. The second greatest center of oak diversity is China, which contains approximately 100 species.[3]</p>
33 changes: 33 additions & 0 deletions lesson_07/rosewood_summary.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<style>body{font-family:'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif;
color: white;}</style>
<style>
@import url('https://fonts.googleapis.com/css2?family=Lato&family=Overlock:wght@700&display=swap');
body{font-family: 'Lato', sans-serif;
text-align: center;
}
h3{
font-family: 'Overlock', cursive;
font-size: 26px;
margin: 0px;
padding-top: 10px;

}
p{
font-size: 15px;
padding: 0px;
}
#type{
font-size: 12px;
margin: 0;
padding: 0;
margin-bottom: 10px;
}
</style>


<h3>Oak</h3>

<p id="type"> Tree or shrub </p>
<img src="img/rosewood.jpg" style="width: 200px;">
<p>Family: genus Quercus of the beech family, Fagaceae.
</p>
9 changes: 3 additions & 6 deletions lesson_08/chocolate.html
Original file line number Diff line number Diff line change
@@ -7,14 +7,11 @@
<link rel="stylesheet" href="style.css">
</head>
<body>

<!-- I think there is something wrong in this part -->
<div clas="container">
<h1 class="title">Chocolate</h1>
<diiv class="description">>>
<div class="description">
Our chocolate ice cream is really good, made with real cacao !
<!-- --------------------------------------------- -->

</div>
Here are some of the countries where cacao is harvested:

<ul>
@@ -25,7 +22,7 @@ <h1 class="title">Chocolate</h1>
<li>Ghana</li>
</ul>

<img src="">
<img src="img/chocolate.jpg">

<a href="index.html"><button type="button">Back</button></a>

6 changes: 4 additions & 2 deletions lesson_08/coconut.html
Original file line number Diff line number Diff line change
@@ -25,9 +25,11 @@ <h1 class="title">Coconut</h1>

<!-- I think there is something wrong in this part -->

<a hrf="index.html"><button type="button">Back</button></aa>
<a href="index.html">
<button type="button">Back</button>
</a>

</dif>
</div>
</div>

<!-- --------------------------------------------- -->