Skip to content

Commit b72e0db

Browse files
author
Quashnock
committed
Made bug fixes and removed unused images
1 parent 745d05a commit b72e0db

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+120
-201
lines changed

Sponsor.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ <h3>Why Sponsor Us?</h3>
9696
assets/images/photos/2024RoverRevealGroup/2024RoverRevealGroup-1200w.webp?width=1200 1200w,
9797
assets/images/photos/2024RoverRevealGroup/2024RoverRevealGroup-1920w.webp?width=1920 1920w
9898
"
99-
sizes="(max-width: 768px) 70vw, 30vw"
99+
sizes="(max-width: 768px) 88vw, 100vw"
100100
/>
101101
<img
102102
src="assets/images/photos/2024RoverRevealGroup/2024RoverRevealGroup-320w.jpg"
@@ -107,7 +107,7 @@ <h3>Why Sponsor Us?</h3>
107107
assets/images/photos/2024RoverRevealGroup/2024RoverRevealGroup-1200w.jpg?width=1200 1200w,
108108
assets/images/photos/2024RoverRevealGroup/2024RoverRevealGroup-1920w.jpg?width=1920 1920w
109109
"
110-
sizes="(max-width: 768px) 70vw, 30vw"
110+
sizes="(max-width: 768px) 88vw, 100vw"
111111
alt="Group photo of the 2024 rover reveal with Viator"
112112
/>
113113
</picture>
@@ -205,7 +205,6 @@ <h3>How to Support Us: Step-by-Step Guide</h3>
205205
assets/images/photos/ViatorStreetPhoto/ViatorStreetPhoto-1920w.webp?width=1920 1920w
206206
"
207207
sizes="(max-width: 768px) 70vw, 20vw"
208-
209208
/>
210209
<img
211210
src="assets/images/photos/ViatorStreetPhoto/ViatorStreetPhoto-320w.jpg"
-1.1 MB
Binary file not shown.

assets/images/photos/about-us.jpg

-210 KB
Binary file not shown.

assets/images/photos/atlas.png

-654 KB
Binary file not shown.

assets/images/photos/biology_2024.jpg

-283 KB
Binary file not shown.
Binary file not shown.

assets/images/photos/daybreak.png

-800 KB
Binary file not shown.
-264 KB
Binary file not shown.

assets/images/photos/electrical.png

-251 KB
Binary file not shown.

assets/images/photos/finance.png

-270 KB
Binary file not shown.

assets/images/photos/funny_people.jpg

-883 KB
Binary file not shown.

assets/images/photos/grimlock.png

-716 KB
Binary file not shown.

assets/images/photos/houdini.png

-504 KB
Binary file not shown.

assets/images/photos/join_us.png

-292 KB
Binary file not shown.
-239 KB
Binary file not shown.

assets/images/photos/mechanical.png

-201 KB
Binary file not shown.
-600 KB
Binary file not shown.

assets/images/photos/outreach.png

-220 KB
Binary file not shown.
-186 KB
Binary file not shown.
Binary file not shown.
-202 KB
Binary file not shown.

assets/images/photos/robot_parts.jpg

-5.98 MB
Binary file not shown.
-177 KB
Binary file not shown.
-306 KB
Binary file not shown.

assets/images/photos/software.png

-284 KB
Binary file not shown.

assets/images/photos/sw sqr.png

-273 KB
Binary file not shown.
-5.58 MB
Binary file not shown.
-382 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
-191 KB
Binary file not shown.
Binary file not shown.

assets/images/photos/wood.jpg

-5.66 MB
Binary file not shown.
-126 KB
Binary file not shown.

assets/javascript/Event.js

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -304,24 +304,6 @@ function openPopup(eventData) {
304304
popup.style.display = "flex";
305305
}
306306

307-
// // Adding event listeners to each card
308-
// document.querySelectorAll('.event-card').forEach((card, index) => {
309-
// card.addEventListener('click', () => {
310-
// console.log("activated")
311-
// console.log(window.innerWidth)
312-
// if (window.innerWidth >= 1000) {
313-
// openPopup(events[index]);
314-
// }
315-
// });
316-
// });
317-
318-
// // Closing the popup when clicking outside of the popup content
319-
// popup.addEventListener('click', (e) => {
320-
// if (e.target === popup) {
321-
// popup.style.display = "none";
322-
// }
323-
// });
324-
325307
function addPopupEventListeners() {
326308
document.querySelectorAll(".event-card").forEach((card, index) => {
327309
card.addEventListener("click", () => {

assets/javascript/getInstagramPosts.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ async function getInstagramPosts() {
44
const photoContainer = $("#photoContainer");
55
photoContainer.empty();
66
try {
7+
//Only attempt to fetch if the JSON data isn't present in local storage.
78
if (!data) {
89
//const response = await fetch('FETCH URL');
910
if (true /*response.ok*/) {
@@ -1221,25 +1222,24 @@ async function getInstagramPosts() {
12211222
throw new Error("Error recieving behold fetch");
12221223
}
12231224
}
1225+
1226+
//Parses the JSON and renders each post.
12241227
JSON.parse(data).posts.forEach((post) => {
12251228
const link = $(`<a href = '${post.permalink}' target = '_blank'></a>`);
12261229
const icon = $(
12271230
`<img class = "postIconOverlay" src = "assets/images/icons/InstagramIcon.svg" alt = "Instagram icon"/>`
12281231
);
1229-
const picture = $(`<img />`);
1232+
const picture = $(`<img src = "${post.sizes.small.mediaUrl}" srcset =
1233+
"${post.sizes.small.mediaUrl} 768w, ${post.sizes.medium.mediaUrl} 1200w" alt = "${post.caption}"/>`);
12301234

1231-
picture.attr("src", post.sizes.small.mediaUrl);
1232-
picture.attr(
1233-
"srcset",
1234-
`${post.sizes.small.mediaUrl} 768w, ${post.sizes.medium.mediaUrl} 1200w`
1235-
);
1236-
picture.attr("alt", post.caption);
12371235
link.append(icon);
12381236
link.append(picture);
12391237
photoContainer.append(link);
12401238
});
12411239
} catch (err) {
12421240
console.log(err);
1241+
1242+
//Renders an error mesage and retry button.
12431243
const errorMessage = $("<h4>Error Loading Instagram Feed</h4>");
12441244
const refreshButton = $("<button>Refresh</button>");
12451245
refreshButton.click(getInstagramPosts);

assets/javascript/imageGallery.js

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,27 @@
11
let imgIdx = 0;
2+
3+
//Gets all images and sets the one at the initial index to display.
24
const images = $("#galleryImagesContainer img");
35
images.get(imgIdx).style.display = "inline-block";
46

7+
//Set click event listeners to set the current image
58
$("#backArrow").click(function () {
6-
imgIdx--;
7-
setCurrImage();
9+
setCurrImage(-1);
810
});
911

1012
$("#forwardArrow").click(function () {
11-
imgIdx++;
12-
setCurrImage();
13+
setCurrImage(1);
1314
});
1415

15-
function setCurrImage() {
16+
function setCurrImage(idxMod) {
17+
//Modifies the imgIdx by the passed in idxMod.
18+
imgIdx += idxMod;
19+
20+
//If the current image index is outside the bounds, reset it so the order wraps around.
1621
if (imgIdx < 0) imgIdx = images.length - 1;
1722
else if (imgIdx >= images.length) imgIdx = 0;
23+
24+
//Set the display of all images to none except the one at the current index.
1825
images.each(function (i, obj) {
1926
obj.style.display = i === imgIdx ? "inline-block" : "none";
2027
});

assets/scss/HomePage.css

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ main div#starBackgroundSection section div.imageContainer div#galleryImagesConta
7474
main div#starBackgroundSection section picture.imageContainer div#galleryImagesContainer picture img {
7575
display: none;
7676
width: 100%;
77-
aspect-ratio: 16/9;
77+
aspect-ratio: 3/2;
7878
height: auto;
7979
-o-object-fit: cover;
8080
object-fit: cover;
@@ -300,12 +300,6 @@ main div#starBackgroundSection::before {
300300
left: 0;
301301
background-color: hsla(250, 40%, 10%, 0.4);
302302
}
303-
main div#starBackgroundSection section#teamCompetitionSection {
304-
flex-direction: column;
305-
text-align: center;
306-
padding: 0em 7vw;
307-
}
308-
309303
@media only screen and (max-width: 768px) {
310304
main div#introductionSection,
311305
main div#starBackgroundSection {
@@ -328,7 +322,6 @@ main div#starBackgroundSection section#teamCompetitionSection {
328322
main div#introductionSection section div.imageContainer div#galleryImagesContainer img,
329323
main div#starBackgroundSection section picture.imageContainer div#galleryImagesContainer img,
330324
main div#starBackgroundSection section div.imageContainer div#galleryImagesContainer img {
331-
display: none;
332325
width: 100%;
333326
height: 50svh;
334327
-o-object-fit: cover;

assets/scss/HomePage.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/scss/HomePage.scss

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ main {
6868
picture img {
6969
display: none;
7070
width: 100%;
71-
aspect-ratio: 16 / 9;
71+
aspect-ratio: 3 / 2;
7272
height: auto;
7373
object-fit: cover;
7474
border: hsl(222, 61%, 87%) 0.5em solid;
@@ -296,16 +296,7 @@ main {
296296
background-color: hsla(250, 40%, 10%, 40%);
297297
}
298298

299-
div#starBackgroundSection {
300-
section#teamCompetitionSection {
301-
flex-direction: column;
302-
text-align: center;
303-
padding: 0em 7vw;
304-
}
305-
}
306-
}
307-
@media only screen and (max-width: 768px) {
308-
main {
299+
@media only screen and (max-width: 768px) {
309300
div#introductionSection,
310301
div#starBackgroundSection {
311302
padding: 3em 6vw;
@@ -319,13 +310,11 @@ main {
319310
picture.imageContainer,
320311
div.imageContainer {
321312
width: 100%;
322-
div#galleryImagesContainer {
323-
img {
324-
display: none;
325-
width: 100%;
326-
height: 50svh;
327-
object-fit: cover;
328-
}
313+
314+
div#galleryImagesContainer img {
315+
width: 100%;
316+
height: 50svh;
317+
object-fit: cover;
329318
}
330319
}
331320

@@ -336,9 +325,11 @@ main {
336325
div {
337326
padding: 0.7em 0;
338327
}
328+
339329
img {
340330
padding: 0.7em;
341331
}
332+
342333
img.leftPointArrow {
343334
display: none !important;
344335
}
@@ -363,12 +354,15 @@ main {
363354
section#missionSection {
364355
background-color: black;
365356
overflow-y: visible;
357+
366358
h2 {
367359
margin-bottom: 3vh;
368360
}
361+
369362
div#cardContainer {
370363
flex-direction: column;
371364
gap: 2em;
365+
372366
article {
373367
flex-direction: row;
374368
background-color: hsl(0, 0%, 19%);

assets/scss/OurStory.css

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,10 @@ main section#teamInstagramSection div#photoContainer:has(button) {
172172
main section#teamInstagramSection div#photoContainer:has(button) h4 {
173173
color: hsl(0, 100%, 99%);
174174
font-size: calc(1rem + 0.4vw);
175+
text-align: center;
175176
}
176177
main section#teamInstagramSection div#photoContainer:has(button) button {
177-
width: 25%;
178+
width: 25vw;
178179
background-color: hsl(133, 97%, 38%);
179180
padding: 1.5em 0.5em;
180181
margin: 1em 0;
@@ -186,20 +187,6 @@ main section#teamInstagramSection div#photoContainer:has(button) button {
186187
main section#teamInstagramSection div#photoContainer:has(button) button:hover {
187188
background-color: hsl(133, 91%, 29%);
188189
}
189-
main section#teamCompetitionSection {
190-
text-align: center;
191-
padding: 4em 12vw;
192-
}
193-
main section#teamCompetitionSection div#awardLogoContainer {
194-
display: flex;
195-
justify-content: space-between;
196-
padding: 6em 0;
197-
}
198-
main section#teamCompetitionSection div#awardLogoContainer img {
199-
height: 8em;
200-
width: auto;
201-
}
202-
203190
@media only screen and (max-width: 768px) {
204191
main section#teamTextSection div {
205192
flex-direction: column;

assets/scss/OurStory.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/scss/OurStory.scss

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ main {
9393
width: 40%;
9494
}
9595
}
96+
9697
article {
9798
padding: 1.5em 0;
9899

@@ -203,9 +204,11 @@ main {
203204
h4 {
204205
color: hsl(0, 100%, 99%);
205206
font-size: calc(1rem + 0.4vw);
207+
text-align: center;
206208
}
209+
207210
button {
208-
width: 25%;
211+
width: 25vw;
209212
background-color: hsl(133, 97%, 38%);
210213
padding: 1.5em 0.5em;
211214
margin: 1em 0;
@@ -214,29 +217,13 @@ main {
214217
border-radius: 1em;
215218
cursor: pointer;
216219
}
220+
217221
button:hover {
218222
background-color: hsl(133, 91%, 29%);
219223
}
220224
}
221225
}
222-
section#teamCompetitionSection {
223-
text-align: center;
224-
padding: 4em 12vw;
225-
226-
div#awardLogoContainer {
227-
display: flex;
228-
justify-content: space-between;
229-
padding: 6em 0;
230-
231-
img {
232-
height: 8em;
233-
width: auto;
234-
}
235-
}
236-
}
237-
}
238-
@media only screen and (max-width: 768px) {
239-
main {
226+
@media only screen and (max-width: 768px) {
240227
section#teamTextSection {
241228
div {
242229
flex-direction: column;
@@ -280,6 +267,7 @@ main {
280267

281268
section#teamInstagramSection {
282269
padding: 2em 6vw;
270+
283271
div#photoContainer {
284272
margin: 2em 0;
285273
grid-template-columns: 1fr 1fr;

0 commit comments

Comments
 (0)