Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
05a59fe
new member added, kenda
Feb 16, 2025
4e52fa2
testing git commit
Feb 23, 2025
bf88a8b
Testing if pushing code works
invalid-email-address Feb 23, 2025
8d0d319
added functionality to beech button
akshr-07 Feb 23, 2025
6bce6ac
beech button functionality
Feb 23, 2025
1e6745f
Merge branch 'main' into kendaa
yafetkadu Feb 23, 2025
b1922e5
Merge pull request #1 from yafetkadu/kendaa
yafetkadu Feb 23, 2025
f54e9aa
aksharal1 added page for cherry tree
akshr-07 Mar 2, 2025
08a0c69
fixed the errors
akshr-07 Mar 2, 2025
722b2c7
Maple tree added
Feb 24, 2025
c59ede8
a
Feb 24, 2025
3b21149
Fixed HTML errors
Mar 2, 2025
416fb1c
Merge pull request #3 from yafetkadu/aksharal1
yafetkadu Mar 2, 2025
b87c6b5
Merge branch 'main' into kendaa
yafetkadu Mar 2, 2025
8d22d19
Merge pull request #2 from yafetkadu/kendaa
yafetkadu Mar 2, 2025
3b60605
added image for chocolate.html
akshr-07 Mar 2, 2025
6b7fc60
Mango image added
Mar 2, 2025
4ae23b3
Merge pull request #4 from yafetkadu/kendaa
yafetkadu Mar 2, 2025
dffc60d
Merge pull request #5 from yafetkadu/aksharal1
yafetkadu Mar 2, 2025
af5c229
New flavour added (Raspberry)
Mar 2, 2025
948c27c
Merge pull request #6 from yafetkadu/kendaa
yafetkadu Mar 2, 2025
bacd6a1
added matcha flavor
akshr-07 Mar 2, 2025
60554b9
Merge pull request #7 from yafetkadu/aksharal1
yafetkadu Mar 2, 2025
0522547
added new student
Mar 1, 2026
3e73760
added name
Matt-L-053124 Mar 1, 2026
927e56b
Merge branch 'main' of https://github.com/yafetkadu/h33-devops
Matt-L-053124 Mar 1, 2026
b5eecd4
Code clean up
Mar 1, 2026
8b592e9
add new tree
Mar 8, 2026
6df19d7
added cherry function
Matt-L-053124 Mar 8, 2026
53d5dd2
Merge pull request #8 from yafetkadu/Matthew_L
yafetkadu Mar 8, 2026
9d26b6d
reset
Mar 8, 2026
29855e7
reset
Mar 8, 2026
ef95d7a
added mahogany feature
Matt-L-053124 Mar 8, 2026
308ae88
Merge pull request #9 from yafetkadu/Matthew_L2
yafetkadu Mar 8, 2026
8272b84
Added poplar tree page
Matt-L-053124 Mar 15, 2026
1882c30
fixed error
Matt-L-053124 Mar 15, 2026
a906fbc
testing account
Mar 15, 2026
1ec98ad
lemon.html fixed
Chidiogo14 Mar 15, 2026
8c18276
Merge pull request #10 from yafetkadu/Matthew_L
Matt-L-053124 Mar 15, 2026
c61589d
Merge pull request #11 from yafetkadu/yami
yafetkadu Mar 15, 2026
3c1cb37
Merge pull request #12 from yafetkadu/chidiogo14
Chidiogo14 Mar 15, 2026
3b417a1
Added myself again
Jul 15, 2026
3941d12
add name Noe
Jul 15, 2026
51ae6ab
adding my name
Jul 15, 2026
d56597e
this is cool
Jul 15, 2026
2b898d4
testing
dommik14-maker Jul 15, 2026
254dcb8
testing 2
dommik14-maker Jul 15, 2026
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
Binary file added .DS_Store
Binary file not shown.
3 changes: 3 additions & 0 deletions lesson_06/.vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"liveServer.settings.port": 5501
}
33 changes: 33 additions & 0 deletions lesson_06/kindaCool.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
html>
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Cool page</title>
<link rel="stylesheet" href="style.css">
<link rel="preconnect" href="https://fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css2?family=Bree+Serif&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Josefin+Sans:wght@500&family=Lato&display=swap" rel="stylesheet">
</head>
<body>
<div class="container">

<div class='navbar'>
<p class="logo">Logo</p>
<a href="index.html"><p class='nav-button'>Home</p></a>
<a href="about.html"><p class='nav-button'>About</p></a>
<a href="team.html"><p class='nav-button selected'>Team</p></a>
<a href="contact.html"><p class='nav-button'>Contact</p></a>
</div>

<div class='main team'>

<!-- testing -->
<h1>Some Cool Content and stuff</h1>
<a href="https://www.google.com">Cool link</a>

<!-- Testing more more code -->


</div>
</div>
</body>
</html>
38 changes: 25 additions & 13 deletions lesson_06/team.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,40 +33,52 @@ <h1 class="header1 header">
</div>

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

<p>></p>
<p>Kenda</p>
</div>
<div class="member">
<p>></p>
<p>Dominik</p>
</div>


<div class="member">
<!-- student 02 -->
<p>Matt Lynch</p>

</div>

<div class="member">
<!-- student 03 -->
<p> Chidiogo Nnamani</p>

</div>

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

<div class="member">
<!-- student 06 -->
Yami Awesome
</div>

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

<div class="member">
<!-- student 06 -->
Noe Castle
</div>

<div class="member">

<div class="member">
<!-- student 06 -->
Yami Awesome 2

</div>

<div class="member">
</div>

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

</div>
Dominik M
</div>
<!-- testing -->

<!-- Testing more more code -->

</div>

Expand Down
23 changes: 23 additions & 0 deletions lesson_07/cherry_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>Cherry</h3>

<p>Cherry wood is a type of hardwood that comes from the cherry tree, a species of tree that belongs to the Rosaceae family. There are two main types of cherry trees used for woodworking: the black cherry tree and the wild cherry tree. Both trees produce high-quality lumber, but the black cherry tree is more commonly used due to its larger size and greater availability. (From Custom Country Woods)</p>

<p>Cherry is debatably one of the most beautiful American hardwood species. Its rich reddish color makes it easily recognizable to just about anyone. Cherry is a deciduous hardwood with broad leaves that drop in the fall and have seeds that are contained in ovaries. All deciduous trees are hardwoods. Cherry primarily grows in the eastern half of the USA, with the best stands of cherry being found in the Appalachian region. Cherry trees typically grow to 60-80 feet tall and about 2-3’ at DBH (diameter at breast height.) (From Kretz Lumber, Written by Jessica Becker)</p>
32 changes: 32 additions & 0 deletions lesson_07/cherry_summary.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<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>Cherry</h3>

<p id="type"> Tree </p>
<img src="img/cherry.jpg" style="width: 200px;">
<p>Family: Rosaceae</p>
Binary file added lesson_07/img/poplar.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file added lesson_07/img/something.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 22 additions & 2 deletions lesson_07/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,12 @@ <h1>The Tree Encyclopedia</h1>
<div class="index">
<h3>Index</h3>
<p><button id="oak">Oak</button></p>
<p><button id="beech">Beech</button></p>
<p><button id="beech">Beech</button></p
<p><button id="maple">Maple</button></p>
<p><button id="cherry">Cherry</button></p>
<p><button id="mahogany">Mahogany</button></p>
<p><button id="poplar">Poplar</button></p>


</div>
<div class="content">
Expand All @@ -49,8 +54,23 @@ <h3>Index</h3>
$("#i_content").attr("src","oak_content.html");
$("#i_summary").attr("src","oak_summary.html");
})
$("#beech").click(function(){


$("#mahogany").click(function(){
$("#i_content").attr("src","mahogany_content.html");
$("#i_summary").attr("src","mahogany_summary.html");

})

$("#poplar").click(function(){
$("#i_content").attr("src","poplar_content.html");
$("#i_summary").attr("src","poplar_summary.html");

})

$("#cherry").click(function(){
$("#i_content").attr("src","cherry_content.html");
$("#i_summary").attr("src","cherry_summary.html");

})

Expand Down
23 changes: 23 additions & 0 deletions lesson_07/mahogany_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>Mahogany</h3>

<p>There are approximately 500 extant species of mahogany.[2] The common name "mahogany" 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 mahogany species, with approximately 90 occurring in the United States, while Mexico has 160 species of which 109 are endemic. The second greatest center of mahogany diversity is China, which contains approximately 100 species.[3]</p>
33 changes: 33 additions & 0 deletions lesson_07/mahogany_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>Mahogany</h3>

<p id="type"> Tree or shrub </p>
<img src="img/mahogany.jpg" style="width: 200px;">
<p>Family: The mahogany family (Meliaceae) is a pantropical group of about 50–53 genera and 565–600 species of trees and shrubs, including the renowned Swietenia genus, which produces true mahogany timber.
</p>
Empty file added lesson_07/mangrove_content.html
Empty file.
Empty file added lesson_07/mangrove_summary.html
Empty file.
25 changes: 25 additions & 0 deletions lesson_07/maple_content.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<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>Maple</h3>

<p>Acer is a genus of trees and shrubs commonly known as maples. The genus is placed in the soapberry family Sapindaceae. There are approximately 132 species, most of which are native to Asia, with a number also appearing in Europe, northern Africa, and North America. Only one species, Acer laurinum, extends to the Southern Hemisphere.</p>

<p>The type species of the genus is the sycamore maple Acer pseudoplatanus, one of the most common maple species in Europe. Most maples usually have easily identifiable palmate leaves (with a few exceptions, such as Acer carpinifolium, Acer laurinum, and Acer negundo) and all share distinctive winged fruits.</p>


36 changes: 36 additions & 0 deletions lesson_07/maple_summary.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<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>Maple</h3>

<p id="type"> Tree </p>
<img src="img/maple.jpg" style="width: 200px;">

<p>Family: Soapberry Family</p>



23 changes: 23 additions & 0 deletions lesson_07/poplar_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>Poplar</h3>

<p>Populus is a genus of 25–30 species of deciduous flowering plants in the family Salicaceae, native to most of the Northern Hemisphere. English names variously applied to different species include poplar, aspen, and cottonwood.</p>

<p>Matthew L.</p>
33 changes: 33 additions & 0 deletions lesson_07/poplar_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>Poplar</h3>

<p id="type"> Tree or shrub </p>
<img src="img/poplar.jpg" style="width: 200px;">
<p>Family: Poplar trees belong to the genus Populus within the willow family (Salicaceae), typically featuring fast-growing, deciduous trees like cottonwoods and aspens.
</p>
Empty file added lesson_07/spruce_content.html
Empty file.
Empty file added lesson_07/spruce_summary.html
Empty file.
Binary file added lesson_08/.DS_Store
Binary file not shown.
3 changes: 3 additions & 0 deletions lesson_08/.vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"liveServer.settings.port": 5502
}
Loading