Skip to content
Open

reys #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
2208e0f
Adding Aaron as a team member
aneme1038 Oct 17, 2024
9261e23
adding eshaan
EshaanKatar Oct 17, 2024
97656cc
Adding lev
triplelev Oct 17, 2024
0d2da6f
added aaron's photo
aneme1038 Oct 17, 2024
6fd5099
Merge branch 'main' of https://github.com/aneme1038/h33-devops
aneme1038 Oct 17, 2024
1c0b9b9
forgot a class name
aneme1038 Oct 17, 2024
27a72b8
Add homework1.txt
EshaanKatar Oct 19, 2024
aed9e4c
adding beech
aneme1038 Oct 24, 2024
2310dfe
adding beech button (lev)
triplelev Oct 24, 2024
c57ca88
Merge branch 'main' into levf1
aneme1038 Oct 24, 2024
03dbbc6
Merge pull request #1 from aneme1038/levf1
aneme1038 Oct 24, 2024
ce82480
Merge pull request #2 from aneme1038/aaronn
aneme1038 Oct 24, 2024
6ab41ac
dsadwa
lilbob11 Oct 24, 2024
19f2931
adding beech
EshaanKatar Oct 24, 2024
8f6e740
adding rosemary
EshaanKatar Oct 24, 2024
6bc57ab
adding rosemary
EshaanKatar Oct 24, 2024
0a04b53
fixed errors in chocolate.html
aneme1038 Oct 31, 2024
b32ec77
Fix the error in pistachio.html
EshaanKatar Oct 31, 2024
4ba8e24
kbh
lilbob11 Oct 31, 2024
2f718b8
Merge branch 'main' into eshaank3
EshaanKatar Oct 31, 2024
07adc7f
Merge branch 'main' into michaelt
lilbob11 Oct 31, 2024
73d19b9
Merge pull request #4 from aneme1038/michaelt
aneme1038 Oct 31, 2024
31703de
Merge pull request #3 from aneme1038/eshaank3
aneme1038 Oct 31, 2024
ebc37d0
Merge pull request #5 from aneme1038/aaronn
aneme1038 Oct 31, 2024
0b1d69b
Added image to chocolate.html
aneme1038 Oct 31, 2024
058a75c
Added the instructor as a team member
aneme1038 Nov 13, 2025
a283ac9
added myself as member
Nov 13, 2025
8b3e7a9
second commit
Connor566 Nov 13, 2025
c69ca98
third commit
Connor566 Nov 13, 2025
ded555e
commit 1
alxphx Nov 13, 2025
e5de8b5
test
Nov 13, 2025
0b333cd
commit
alxphx Nov 13, 2025
bf5f7ab
another commit
Nov 13, 2025
52283c7
added self to repo
Nov 13, 2025
15fc119
doodoo
aneme1038 Nov 13, 2025
2067f17
finalized repo
aneme1038 Nov 13, 2025
5cc89b4
added picture
Connor566 Nov 18, 2025
4e492e9
added my webpage
Connor566 Nov 18, 2025
87f2971
adding in rosewood and palmtree descriptions and summaries
aneme1038 Nov 20, 2025
8f9b791
Merge branch 'aaronn' of github.com:aneme1038/h33-devops into aaronn
aneme1038 Nov 20, 2025
44561a6
updated rose and palm slightly.
Nov 20, 2025
a6857e0
Merge pull request #6 from aneme1038/aaronn
aneme1038 Nov 20, 2025
a6115a9
Merge branch 'main' into sinaic
aneme1038 Nov 20, 2025
2b19c23
Merge pull request #7 from aneme1038/sinaic
aneme1038 Nov 20, 2025
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
23 changes: 23 additions & 0 deletions lesson_06/connore1.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Connor</title>
</head>
<body>
<div style="width: 30%;
background-color: cornsilk;
text-align: center;
left: 500px;
position: relative;
top: 215px;
height: 284px;
border-radius: 50px;
">
<h1>Connor</h1>
<p>Welcome to my webpage</p>
<p><img src="img/apod.webp" style="width: 30%;"></p>
</div>
</body>
</html>
Binary file added lesson_06/img/apod.webp
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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.
2 changes: 2 additions & 0 deletions lesson_06/img/desktop.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[LocalizedFileNames]
apod.webp=@apod,0
42 changes: 12 additions & 30 deletions lesson_06/team.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
<a href="contact.html"><p class='nav-button'>Contact</p></a>
</div>

<div class='main team'>
<h1 class="header1 header">
Team members
</h1>
Expand All @@ -31,44 +30,27 @@ <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 -->

</div>

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

</div>

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

</div>

<a href="connore1.html">
<div class="member">
<p><img class="member-pic" src="img/apod.webp"></p>
<p>Connor Eberhardt</p>
</div>
</a>

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

<p>Jackson C</p>
</div>

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

<p>Aaron Neme</p>
</div>

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

</div>

<div class="member">
<!-- student 06 -->
<p>Sinai C</p>

</div>


</div>



</div>
</div>
Expand Down
15 changes: 14 additions & 1 deletion lesson_07/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ <h1>The Tree Encyclopedia</h1>
<h3>Index</h3>
<p><button id="oak">Oak</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">
Expand Down Expand Up @@ -51,9 +53,20 @@ <h3>Index</h3>
})
$("#beech").click(function(){

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


})

})
$("#rosewood").click(function(){
$("#i_content").attr("src","rosewood_content.html");
$("#i_summary").attr("src","rosewood_summary.html");
})
$("#palmtree").click(function() {
$("#i_content").attr("src", "palmtree_content.html");
$("#i_summary").attr("src", "palmtree_summary.html");
})
/* This will not be merged ! */


Expand Down
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>Palm.</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>rose</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>roseee</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
Expand Up @@ -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>
Expand All @@ -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>

Expand Down
6 changes: 4 additions & 2 deletions lesson_08/coconut.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>

<!-- --------------------------------------------- -->
Expand Down