Skip to content

Simplify git tutorial #72

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.

Sign up for GitHub

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

Merged
adambricelis merged 4 commits into from
Sep 3, 2021
Merged

Simplify git tutorial #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3c85c76
Remove HTML editing from tutorial
adambricelis Sep 3, 2021
95d46d6
Code cleanup
adambricelis Sep 3, 2021
b963ee2
Remove CODEOWNERS file
adambricelis Sep 3, 2021
0431bb0
Rename Mackenzie's picture
adambricelis Sep 3, 2021
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
8 changes: 0 additions & 8 deletions CODEOWNERS
View file
Open in desktop

This file was deleted.

0 images/cute me.jpg → images/mackenzie_scott.jpg
View file
Open in desktop
File renamed without changes
105 changes: 2 additions & 103 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,111 +1,10 @@
<html>
<head>
<link rel="stylesheet" type="text/css" href="main.css" />
<script src="main.js"></script>
<script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
<script defer src="main.js"></script>
</head>

<body>
<div id="heads-area">
<div class="person-frame-inner">
<img class="ball" src="images/leong.jpg" />
<p>Jason Leong :D</p>
</div>
<div class="person-frame-inner">
<img class="ball" src="images/nathan.jpg" />
<p>Nathan VanSickle</p>
</div>
<div class="person-frame-inner">
<img class="ball" src="images/max_gruber.jpg" />
<p>Max Gruber</p>
</div>
<div class="person-frame-inner">
<img class="ball" src="images/adam_lis.jpg" />
<p>Adam Lis</p>
</div>
<div class="person-frame-inner">
<img class="ball" src="images/cute me.jpg" />
<p>Mackenzie Scott</p>
</div>
<div class="person-frame-inner">
<img class="ball" src="images/jose_chico.PNG" />
<p>Jose Nieves-Diaz</p>
</div>
<div class="person-frame-inner">
<img class="ball" src="images/afrah_taj.jpg" />
<p>Afrah</p>
</div>
<div class="person-frame-inner">
<img class="ball" src="images/bouch_pic.jpg" />
<p>Adam Bouchakour</p>
</div>
<div class="person-frame-inner">
<img class="ball" src="images/lisha_nawani.jpg" />
<p>Lisha Nawani</p>
</div>
<div class="person-frame-inner">
<img class="ball" src="images/unnamed.jpg" />
<p>Carter Scheatzle</p>
</div>
<div class="person-frame-inner">
<img class="ball" src="images/jacob_smearsoll.jpg" />
<p>Jacob Smearsoll</p>
</div>
<div class="person-frame-inner">
<img class="ball" src="images/Olivia Picture.jpg" />
<p>Olivia Maynard</p>
</div>
<div class="person-frame-inner">
<img class="ball" src="images/waite138.jpeg" />
<p>Matt Waite</p>
</div>
<div class="person-frame-inner">
<img class="ball" src="images/friend.jpg" />
<p>Lena</p>
</div>
<div class="person-frame-inner">
<img class="ball" src="images/tran.623.jpg" />
<p>Tommy Tran</p>
</div>
<div class="person-frame-inner">
<img class="ball" src="images/kevin_tan.jpg" />
<p>Kevin Tan</p>
</div>
<div class="person-frame-inner">
<img class="ball" src="images/ari_zeltser.jpg" />
<p>Ari Zeltser</p>
</div>
<div class="person-frame-inner">
<img class="ball" src="images/onlypiconmypc.png" />
<p>Matthew Kundla</p>
</div>
<div class="person-frame-inner">
<img class="ball" src="images/ethan_h.jpg" />
<p>Ethan</p>
</div>
<div class="person-frame-inner">
<img class="ball" src="images/super_paper_mario_for_some_reason.png" />
<p>Super Paper Mario</p>
</div>
<div class="person-frame-inner">
<img class="ball" src="images/ava_scherocman.jpg" />
<p>Ava Scherocman</p>
</div>
<div class="person-frame-inner">
<img class="ball" src="images/john_meyer.jpg" />
<p>John Meyer</p>
</div>
<div class="person-frame-inner">
<img class="ball" src="images/valencia.jpg" />
<p>Valencia Nguyen</p>
</div>
<div class="person-frame-inner">
<img class="ball" src="images/guo.png" />
<p>Chenmeinian Guo</p>
</div>
<div class="person-frame-inner">
<img class="ball" src="images/kevin_dong.jpg" />
<p>Kevin Dong</p>
</div>
</div>
</body>
</html>
18 changes: 5 additions & 13 deletions main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,16 @@
body {
display: flex;
align-content: stretch;
height: 100%;
width: 100%;
margin: 0;
}

#heads-area {
margin: 75px;
flex-grow: 1;
}

.person-frame-inner {
.head-container {
display: inline-block;
position: absolute;
animation: animate 10s linear 0s infinite alternate, animate2 9s linear 0s infinite;
}

.person-frame-inner p {
text-align: center;
}

.ball {
.head {
height: 150px;
width: 150px;
border-radius: 150px;
Expand Down
21 changes: 16 additions & 5 deletions main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
document.addEventListener("DOMContentLoaded", function(event) {
var people = document.getElementsByClassName("person-frame-inner");
for (let person of people) {
person.style["animation-delay"] = -Math.floor(Math.random() * 1000) + "s"
$.ajax({
url: "images/",
success: data => {
$(data).find("a").attr("href", (_i, filename) => {
if (filename.match(/\.(jpe?g|png|gif)$/)) {
$('body').append(
"<div class=\"head-container\"><img class=\"head\" src=\"images/" + filename + "\"/></div>"
);
}
});

let people = document.getElementsByClassName("head-container");
for (let person of people) {
person.style["animation-delay"] = -Math.floor(Math.random() * 1000) + "s"
}
}
});
});