Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
File renamed without changes.
1 change: 1 addition & 0 deletions Secret Project #2.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Passcode: Alma.56
1 change: 1 addition & 0 deletions h33-devops
Submodule h33-devops added at d5411e
103 changes: 103 additions & 0 deletions lesson_06/alexandra.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Student Name - Alexandra Solorzano</title>
<style>
body{
background-color: #e7e9f2;
background-image: url("img/bg.jpg");
background-size: cover;
font-family: 'Josefin Sans', sans-serif;
}
header {
background: #4a90e2;
color: white;
padding: 20px;
text-align: center;
}
.container {
max-width: 900px;
margin: 20px auto;
padding: 20px;
background: white;
border-radius: 10px;
box-shadow: 0 2px 8px rgba(0,0,0,0.1);
}
h2 {
color: #4a90e2;
border-bottom: 2px solid #eee;
padding-bottom: 5px;
}
.profile {
display: flex;
align-items: center;
gap: 20px;
}
.profile img {
width: 120px;
height: 120px;
border-radius: 50%;
object-fit: cover;
border: 3px solid #4a90e2;
}
ul {
list-style: none;
padding-left: 0;
}
ul li {
margin: 6px 0;
}
footer {
text-align: center;
padding: 15px;
background: #f0f0f0;
margin-top: 30px;
font-size: 0.9em;
color: #666;
}
</style>
</head>
<body>

<header>
<h1>Student Profile</h1>
<p>Welcome to the page of <strong>Alexandra Solorzano</strong></p>
</header>

<div class="container">
<section class="profile">
<img src="img/alexa.jpg" alt="Student Photo">
<div>
<h2>About Me</h2>
<p>Hello! My name is <strong>Alexandra Solorzano</strong>. I am a programmer student passionate about learning, exploring new ideas, and developing my skills in different areas of coding</p>
</div>
</section>

<section>
<h2>Education</h2>
<ul>
<li><strong>High School:</strong> Example High School (2018 - 2022)</li>
<li><strong>University:</strong> Example University - Computer Science Major (2022 - Present)</li>
</ul>
</section>

<section>
<h2>Skills</h2>
<ul>
<li>HTML, CSS, JS, Python</li>
<li>Teamwork</li>
<li>Research & Writing</li>
</ul>
</section>

<section>
<h2>Contact</h2>
<p>Email: alexandra@example.com</a></p>
<p>Phone: (123) 456-7890</p>
</section>
</div>

</body>
</html>
Binary file added lesson_06/img/Screenshot 2024-06-02 163520.png
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/alexa.jpg
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/josh.png
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/zombie icon.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
103 changes: 103 additions & 0 deletions lesson_06/joshuan3.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Student Name - Joshua Nathan</title>
<style>
body{
background-color: #2aee79;
background-image: url("img/bg.jpg");
background-size: cover;
font-family: 'Josefin Sans', sans-serif;
}
header {
background: #0fd2bb;
color: white;
padding: 20px;
text-align: center;
}
.container {
max-width: 900px;
margin: 20px auto;
padding: 20px;
background: white;
border-radius: 10px;
box-shadow: 0 2px 8px rgba(0,0,0,0.1);
}
h2 {
color: #4ae2b9;
border-bottom: 2px solid #eee;
padding-bottom: 5px;
}
.profile {
display: flex;
align-items: center;
gap: 20px;
}
.profile img {
width: 120px;
height: 120px;
border-radius: 50%;
object-fit: cover;
border: 3px solid #4a90e2;
}
ul {
list-style: none;
padding-left: 0;
}
ul li {
margin: 6px 0;
}
footer {
text-align: center;
padding: 15px;
background: #f0f0f0;
margin-top: 30px;
font-size: 0.9em;
color: #666;
}
</style>
</head>
<body>

<header>
<h1>Student Profile</h1>
<p>Welcome to the page of <strong>Joshua Nathan</strong></p>
</header>

<div class="container">
<img src="img/josh.png" alt="Student Photo">
<div>
<h2>About Me</h2>
<p>Hello! My name is Joshua Nathan!</p>
<p>I'm a coding student passionate about learning and growing!</p>
<p>I started learning on Scratch and have now learned some content through Javascript, Python, and the HTML/CSS pairing.</p>
<p>I'm just looking to do better each time and learn/grow.</p>
</div>


<h2>Education</h2>
<ul>
<li>High School: The Texas High School for Joshuas (1975-2025)</li>
<li>College/University: The Texan Joshua College, Major: Environmental Technology (2025-2075)</li>
</ul>

<h2>Skills</h2>
<ul>
<li>Writing/Reading</li>
<li>Critical Thinking</li>
<li>Problem Solving</li>
<li>Scratch, Javascript, Python, HTML, CSS, and some Java</li>
<li>Biology...?</li>
<li>Calculus...?</li>
</ul>

<h2>Contact</h2>
<p>Should Anyone need to contact me</p>
<p>Email: thegreatjoshua@joshua.gov</a></p>
<p>Phone #: +9 (999)-999-999</p>
</div>

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

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

<p><img class="member-pic" src="img/josh.png"></p>
<p><a href="joshua.html">Joshua Nathan</a></p>
</div>

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

<p><img class="member-pic" src="img/alexa.jpg"></p>
<p><a href="alexandra.html">Alexandra Solorzano</a></p>

</div>

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

<p><img class="member-pic" src="img/zombie icon.jpg.png"></p>
<p>Eric Oler</p>
</div>

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

<p><img class="member-pic" src="img/Screenshot 2024-06-02 163520.png"></p>
<p>Andrew Poh</p>
</div>

<div class="member">
Expand Down
21 changes: 21 additions & 0 deletions lesson_07/cherry_content.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
@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>Beech</h3>

<p>Cherry trees produce fruit. The story of George Washington chopping down a cherry tree is a myth. No one in the 1700s was stupid enough to kill a tree that gives you free food.</p>
<p>The same cannot be said of people in the 2000s.</p>
35 changes: 35 additions & 0 deletions lesson_07/cherry_summary.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<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: Idk</p>


16 changes: 14 additions & 2 deletions lesson_07/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ <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="cherry">Cherry</button></p>
</div>
<div class="content">
<iframe id="i_content" src="oak_content.html"
Expand All @@ -51,8 +51,20 @@ <h3>Index</h3>
})
$("#beech").click(function(){


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

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

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


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


/* This will not be merged ! */

Expand Down