Skip to content

Made bug fixes and removed unused images #56

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.

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
merged 1 commit into from
Sep 23, 2024
Merged
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
5 changes: 2 additions & 3 deletions Sponsor.html
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ <h3>Why Sponsor Us?</h3>
assets/images/photos/2024RoverRevealGroup/2024RoverRevealGroup-1200w.webp?width=1200 1200w,
assets/images/photos/2024RoverRevealGroup/2024RoverRevealGroup-1920w.webp?width=1920 1920w
"
sizes="(max-width: 768px) 70vw, 30vw"
sizes="(max-width: 768px) 88vw, 100vw"
/>
<img
src="assets/images/photos/2024RoverRevealGroup/2024RoverRevealGroup-320w.jpg"
Expand All @@ -107,7 +107,7 @@ <h3>Why Sponsor Us?</h3>
assets/images/photos/2024RoverRevealGroup/2024RoverRevealGroup-1200w.jpg?width=1200 1200w,
assets/images/photos/2024RoverRevealGroup/2024RoverRevealGroup-1920w.jpg?width=1920 1920w
"
sizes="(max-width: 768px) 70vw, 30vw"
sizes="(max-width: 768px) 88vw, 100vw"
alt="Group photo of the 2024 rover reveal with Viator"
/>
</picture>
Expand Down Expand Up @@ -205,7 +205,6 @@ <h3>How to Support Us: Step-by-Step Guide</h3>
assets/images/photos/ViatorStreetPhoto/ViatorStreetPhoto-1920w.webp?width=1920 1920w
"
sizes="(max-width: 768px) 70vw, 20vw"

/>
<img
src="assets/images/photos/ViatorStreetPhoto/ViatorStreetPhoto-320w.jpg"
Expand Down
Binary file removed assets/images/photos/Sponsor Tiers.jpg
Binary file not shown.
Binary file removed assets/images/photos/about-us.jpg
Binary file not shown.
Binary file removed assets/images/photos/atlas.png
Binary file not shown.
Binary file removed assets/images/photos/biology_2024.jpg
Binary file not shown.
Binary file removed assets/images/photos/college_fair_outreach_2017.jpg
Binary file not shown.
Binary file removed assets/images/photos/daybreak.png
Binary file not shown.
Binary file removed assets/images/photos/drilling_full.png
Binary file not shown.
Binary file removed assets/images/photos/electrical.png
Binary file not shown.
Binary file removed assets/images/photos/finance.png
Binary file not shown.
Binary file removed assets/images/photos/funny_people.jpg
Binary file not shown.
Binary file removed assets/images/photos/grimlock.png
Binary file not shown.
Binary file removed assets/images/photos/houdini.png
Binary file not shown.
Binary file removed assets/images/photos/join_us.png
Binary file not shown.
Binary file removed assets/images/photos/lunar_surface.jpg
Binary file not shown.
Binary file removed assets/images/photos/mechanical.png
Binary file not shown.
Binary file removed assets/images/photos/mechanical_machinary.jpg
Binary file not shown.
Binary file removed assets/images/photos/outreach.png
Binary file not shown.
Binary file removed assets/images/photos/outreach_2016.jpg
Binary file not shown.
Binary file not shown.
Binary file removed assets/images/photos/rmc_lunabotics.png
Binary file not shown.
Binary file removed assets/images/photos/robot_parts.jpg
Binary file not shown.
Binary file removed assets/images/photos/robot_parts_compressed.jpg
Binary file not shown.
Binary file removed assets/images/photos/rover_image_1.png
Binary file not shown.
Binary file removed assets/images/photos/software.png
Binary file not shown.
Binary file removed assets/images/photos/sw sqr.png
Binary file not shown.
Binary file removed assets/images/photos/teaching_new_member.jpg
Diff not rendered.
Binary file removed assets/images/photos/team_photo_2020.jpg
Diff not rendered.
Binary file removed assets/images/photos/team_photo_2020_compressed.jpg
Diff not rendered.
Binary file removed assets/images/photos/team_photo_2024_compressed.jpg
Diff not rendered.
Binary file removed assets/images/photos/team_photo_rmc_2017.jpg
Diff not rendered.
Binary file removed assets/images/photos/trickfire_business_cards.jpg
Diff not rendered.
Binary file removed assets/images/photos/wood.jpg
Diff not rendered.
Binary file removed assets/images/photos/wood_compressed.jpg
Diff not rendered.
18 changes: 0 additions & 18 deletions assets/javascript/Event.js
Original file line number Diff line number Diff line change
Expand Up @@ -304,24 +304,6 @@ function openPopup(eventData) {
popup.style.display = "flex";
}

// // Adding event listeners to each card
// document.querySelectorAll('.event-card').forEach((card, index) => {
// card.addEventListener('click', () => {
// console.log("activated")
// console.log(window.innerWidth)
// if (window.innerWidth >= 1000) {
// openPopup(events[index]);
// }
// });
// });

// // Closing the popup when clicking outside of the popup content
// popup.addEventListener('click', (e) => {
// if (e.target === popup) {
// popup.style.display = "none";
// }
// });

function addPopupEventListeners() {
document.querySelectorAll(".event-card").forEach((card, index) => {
card.addEventListener("click", () => {
Expand Down
14 changes: 7 additions & 7 deletions assets/javascript/getInstagramPosts.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ async function getInstagramPosts() {
const photoContainer = $("#photoContainer");
photoContainer.empty();
try {
//Only attempt to fetch if the JSON data isn't present in local storage.
if (!data) {
//const response = await fetch('FETCH URL');
if (true /*response.ok*/) {
Expand Down Expand Up @@ -1221,25 +1222,24 @@ async function getInstagramPosts() {
throw new Error("Error recieving behold fetch");
}
}

//Parses the JSON and renders each post.
JSON.parse(data).posts.forEach((post) => {
const link = $(`<a href = '${post.permalink}' target = '_blank'></a>`);
const icon = $(
`<img class = "postIconOverlay" src = "assets/images/icons/InstagramIcon.svg" alt = "Instagram icon"/>`
);
const picture = $(`<img />`);
const picture = $(`<img src = "${post.sizes.small.mediaUrl}" srcset =
"${post.sizes.small.mediaUrl} 768w, ${post.sizes.medium.mediaUrl} 1200w" alt = "${post.caption}"/>`);

picture.attr("src", post.sizes.small.mediaUrl);
picture.attr(
"srcset",
`${post.sizes.small.mediaUrl} 768w, ${post.sizes.medium.mediaUrl} 1200w`
);
picture.attr("alt", post.caption);
link.append(icon);
link.append(picture);
photoContainer.append(link);
});
} catch (err) {
console.log(err);

//Renders an error mesage and retry button.
const errorMessage = $("<h4>Error Loading Instagram Feed</h4>");
const refreshButton = $("<button>Refresh</button>");
refreshButton.click(getInstagramPosts);
Expand Down
17 changes: 12 additions & 5 deletions assets/javascript/imageGallery.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,27 @@
let imgIdx = 0;

//Gets all images and sets the one at the initial index to display.
const images = $("#galleryImagesContainer img");
images.get(imgIdx).style.display = "inline-block";

//Set click event listeners to set the current image
$("#backArrow").click(function () {
imgIdx--;
setCurrImage();
setCurrImage(-1);
});

$("#forwardArrow").click(function () {
imgIdx++;
setCurrImage();
setCurrImage(1);
});

function setCurrImage() {
function setCurrImage(idxMod) {
//Modifies the imgIdx by the passed in idxMod.
imgIdx += idxMod;

//If the current image index is outside the bounds, reset it so the order wraps around.
if (imgIdx < 0) imgIdx = images.length - 1;
else if (imgIdx >= images.length) imgIdx = 0;

//Set the display of all images to none except the one at the current index.
images.each(function (i, obj) {
obj.style.display = i === imgIdx ? "inline-block" : "none";
});
Expand Down
9 changes: 1 addition & 8 deletions assets/scss/HomePage.css
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ main div#starBackgroundSection section div.imageContainer div#galleryImagesConta
main div#starBackgroundSection section picture.imageContainer div#galleryImagesContainer picture img {
display: none;
width: 100%;
aspect-ratio: 16/9;
aspect-ratio: 3/2;
height: auto;
-o-object-fit: cover;
object-fit: cover;
Expand Down Expand Up @@ -300,12 +300,6 @@ main div#starBackgroundSection::before {
left: 0;
background-color: hsla(250, 40%, 10%, 0.4);
}
main div#starBackgroundSection section#teamCompetitionSection {
flex-direction: column;
text-align: center;
padding: 0em 7vw;
}

@media only screen and (max-width: 768px) {
main div#introductionSection,
main div#starBackgroundSection {
Expand All @@ -328,7 +322,6 @@ main div#starBackgroundSection section#teamCompetitionSection {
main div#introductionSection section div.imageContainer div#galleryImagesContainer img,
main div#starBackgroundSection section picture.imageContainer div#galleryImagesContainer img,
main div#starBackgroundSection section div.imageContainer div#galleryImagesContainer img {
display: none;
width: 100%;
height: 50svh;
-o-object-fit: cover;
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/HomePage.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 12 additions & 18 deletions assets/scss/HomePage.scss
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ main {
picture img {
display: none;
width: 100%;
aspect-ratio: 16 / 9;
aspect-ratio: 3 / 2;
height: auto;
object-fit: cover;
border: hsl(222, 61%, 87%) 0.5em solid;
Expand Down Expand Up @@ -296,16 +296,7 @@ main {
background-color: hsla(250, 40%, 10%, 40%);
}

div#starBackgroundSection {
section#teamCompetitionSection {
flex-direction: column;
text-align: center;
padding: 0em 7vw;
}
}
}
@media only screen and (max-width: 768px) {
main {
@media only screen and (max-width: 768px) {
div#introductionSection,
div#starBackgroundSection {
padding: 3em 6vw;
Expand All @@ -319,13 +310,11 @@ main {
picture.imageContainer,
div.imageContainer {
width: 100%;
div#galleryImagesContainer {
img {
display: none;
width: 100%;
height: 50svh;
object-fit: cover;
}

div#galleryImagesContainer img {
width: 100%;
height: 50svh;
object-fit: cover;
}
}

Expand All @@ -336,9 +325,11 @@ main {
div {
padding: 0.7em 0;
}

img {
padding: 0.7em;
}

img.leftPointArrow {
display: none !important;
}
Expand All @@ -363,12 +354,15 @@ main {
section#missionSection {
background-color: black;
overflow-y: visible;

h2 {
margin-bottom: 3vh;
}

div#cardContainer {
flex-direction: column;
gap: 2em;

article {
flex-direction: row;
background-color: hsl(0, 0%, 19%);
Expand Down
17 changes: 2 additions & 15 deletions assets/scss/OurStory.css
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,10 @@ main section#teamInstagramSection div#photoContainer:has(button) {
main section#teamInstagramSection div#photoContainer:has(button) h4 {
color: hsl(0, 100%, 99%);
font-size: calc(1rem + 0.4vw);
text-align: center;
}
main section#teamInstagramSection div#photoContainer:has(button) button {
width: 25%;
width: 25vw;
background-color: hsl(133, 97%, 38%);
padding: 1.5em 0.5em;
margin: 1em 0;
Expand All @@ -186,20 +187,6 @@ main section#teamInstagramSection div#photoContainer:has(button) button {
main section#teamInstagramSection div#photoContainer:has(button) button:hover {
background-color: hsl(133, 91%, 29%);
}
main section#teamCompetitionSection {
text-align: center;
padding: 4em 12vw;
}
main section#teamCompetitionSection div#awardLogoContainer {
display: flex;
justify-content: space-between;
padding: 6em 0;
}
main section#teamCompetitionSection div#awardLogoContainer img {
height: 8em;
width: auto;
}

@media only screen and (max-width: 768px) {
main section#teamTextSection div {
flex-direction: column;
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/OurStory.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 7 additions & 19 deletions assets/scss/OurStory.scss
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ main {
width: 40%;
}
}

article {
padding: 1.5em 0;

Expand Down Expand Up @@ -203,9 +204,11 @@ main {
h4 {
color: hsl(0, 100%, 99%);
font-size: calc(1rem + 0.4vw);
text-align: center;
}

button {
width: 25%;
width: 25vw;
background-color: hsl(133, 97%, 38%);
padding: 1.5em 0.5em;
margin: 1em 0;
Expand All @@ -214,29 +217,13 @@ main {
border-radius: 1em;
cursor: pointer;
}

button:hover {
background-color: hsl(133, 91%, 29%);
}
}
}
section#teamCompetitionSection {
text-align: center;
padding: 4em 12vw;

div#awardLogoContainer {
display: flex;
justify-content: space-between;
padding: 6em 0;

img {
height: 8em;
width: auto;
}
}
}
}
@media only screen and (max-width: 768px) {
main {
@media only screen and (max-width: 768px) {
section#teamTextSection {
div {
flex-direction: column;
Expand Down Expand Up @@ -280,6 +267,7 @@ main {

section#teamInstagramSection {
padding: 2em 6vw;

div#photoContainer {
margin: 2em 0;
grid-template-columns: 1fr 1fr;
Expand Down
Loading