codewizardshq · Connor566 · Oct 17, 2024 · Oct 17, 2024 · Oct 17, 2024 · Oct 17, 2024
diff --git a/homework1.txt b/homework1.txt
@@ -0,0 +1 @@
+This is homework 1
diff --git a/lesson_06/connore1.html b/lesson_06/connore1.html
@@ -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>
diff --git a/lesson_06/img/apod.webp b/lesson_06/img/apod.webp
diff --git a/lesson_06/img/cwhq_aaron.jpg b/lesson_06/img/cwhq_aaron.jpg
diff --git a/lesson_06/img/desktop.ini b/lesson_06/img/desktop.ini
@@ -0,0 +1,2 @@
+[LocalizedFileNames]
+apod.webp=@apod,0
diff --git a/lesson_06/team.html b/lesson_06/team.html
@@ -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>
@@ -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>

diff --git a/lesson_07/img/jacaranda.jpg b/lesson_07/img/jacaranda.jpg
diff --git a/lesson_07/img/palmtree.webp b/lesson_07/img/palmtree.webp
diff --git a/lesson_07/index.html b/lesson_07/index.html
@@ -24,6 +24,9 @@ <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>
+            <p><button id="jacaranda">Jacaranda</button></p>
 
         </div>
         <div class="content">
@@ -51,9 +54,25 @@ <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");
         })
 
+         $("#jacaranda").click(function() {
+            $("#i_content").attr("src", "jacaranda_content.html");
+            $("#i_summary").attr("src", "jacaranda_summary.html");
+        })
         /* This will not be merged !  */
 
 

diff --git a/lesson_07/jacaranda_content.html b/lesson_07/jacaranda_content.html
@@ -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>Jacaranda</h3>
+
+    <p>The species are shrubs to large trees ranging in size from 20 to 30 m (66 to 98 ft) tall. The leaves are bipinnate in most species, pinnate or simple in a few species. The flowers are produced in conspicuous large panicles, each flower with a five-lobed blue to purple-blue corolla; a few species have white flowers. The fruit is an oblong to oval flattened capsule containing numerous slender seeds. The genus differs from other genera in the Bignoniaceae in having a staminode that is longer than the stamens, tricolpate pollen, and a chromosome number of 18. </p>
diff --git a/lesson_07/jacaranda_summary.html b/lesson_07/jacaranda_summary.html
@@ -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>Jacaranda</h3>
+
+    <p id="type"> Tree or shrub </p>
+    <img src="img/jacaranda.jpg" style="width: 200px;">
+    <p>Family: Bignoniaceae.
+    </p> 
diff --git a/lesson_07/palmtree_content.html b/lesson_07/palmtree_content.html
@@ -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 Trees</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>
diff --git a/lesson_07/palmtree_summary.html b/lesson_07/palmtree_summary.html
@@ -0,0 +1,34 @@
+<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/palmtree.webp" style="width: 200px;">
+    <p>Family: Arecaceae.
+       Pictured above: Phoenix dactylifera (date palm)
+    </p> 
diff --git a/lesson_07/rosewood_content.html b/lesson_07/rosewood_content.html
@@ -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>Rosewoods</h3>
+
+    <p>Rosewood is any of a number of richly hued hardwoods, often brownish with darker veining, but found in other colours. It is hard, tough, strong, and dense. True rosewoods come from trees of the genus Dalbergia, but other woods are often called rosewood. Rosewood takes a high polish and is used for luxury furniture-making, flooring, musical instruments, and turnery.</p>
diff --git a/lesson_07/rosewood_summary.html b/lesson_07/rosewood_summary.html
@@ -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>Rosewoods</h3>
+
+    <p id="type"> Tree or shrub </p>
+    <img src="img/rosewood.jpg" style="width: 200px;">
+    <p>Family: Dalbergia.
+    </p> 
diff --git a/lesson_08/chocolate.html b/lesson_08/chocolate.html
@@ -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>
 

diff --git a/lesson_08/coconut.html b/lesson_08/coconut.html
@@ -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>
 
     <!-- --------------------------------------------- -->