diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..6801a64 Binary files /dev/null and b/.DS_Store differ diff --git a/assets/.DS_Store b/assets/.DS_Store new file mode 100644 index 0000000..3cc8702 Binary files /dev/null and b/assets/.DS_Store differ diff --git a/css/.DS_Store b/css/.DS_Store new file mode 100644 index 0000000..599aa9f Binary files /dev/null and b/css/.DS_Store differ diff --git a/css/general.css b/css/general.css index 3936051..b417708 100644 --- a/css/general.css +++ b/css/general.css @@ -1387,6 +1387,64 @@ section { transition: opacity .2s ease; } +.timeline-description { + font-size: 16px; + font-weight: normal; +} + +.timeline-description-list li { + margin: 10px 40px; + font-size: 16px; +} + +.important-text { + color: rgb(255, 126, 126); +} + +.timeline-links { + display: flex; + flex-flow: row wrap; + justify-content: center; + text-align: center; + text-decoration: none !important; + margin-top: 15px; +} + +.timeline-icon { + height: 23px; + width: 75px; + float: left; +} + +.timeline-button { + color: rgb(233, 203, 104); + text-decoration: none; + border-radius: 5px; + font-size: 18px; + border: 1px solid rgb(192, 168, 88); + padding: 5px; + display: inline-block; + margin: 0 10px; +} + +.zoom-link { + border: 1px solid rgb(45, 140, 255); +} + +.timeline-button.zoom-link:hover { + background-color: rgb(45, 140, 255); +} + +.timeline-button.zoom-link:hover > .timeline-icon{ + filter:hue-rotate(60deg); +} + +.timeline-button:hover { + color: white; + background-color: rgb(192, 168, 88); + transition: 0.5s; +} + /** * Time */ diff --git a/img/.DS_Store b/img/.DS_Store new file mode 100644 index 0000000..ffdd1bc Binary files /dev/null and b/img/.DS_Store differ diff --git a/js/.DS_Store b/js/.DS_Store new file mode 100644 index 0000000..a58de6a Binary files /dev/null and b/js/.DS_Store differ diff --git a/js/general.js b/js/general.js index dc6b273..791a62a 100644 --- a/js/general.js +++ b/js/general.js @@ -371,117 +371,117 @@ document.addEventListener( false ); -var slider = document.getElementById('slider'), - sliderItems = document.getElementById('items'), - prev = document.getElementById('prev'), - next = document.getElementById('next'); -slide(slider, sliderItems, prev, next); -function slide(wrapper, items, prev, next) { - var posX1 = 0, - posX2 = 0, - posInitial, - posFinal, - threshold = 100, - slides = items.getElementsByClassName('slide'), - slidesLength = slides.length, - slideSize = items.getElementsByClassName('slide')[0].offsetWidth, - firstSlide = slides[0], - lastSlide = slides[slidesLength - 1], - cloneFirst = firstSlide.cloneNode(true), - cloneLast = lastSlide.cloneNode(true), - index = 0, - allowShift = true; +// var slider = document.getElementById('slider'), +// sliderItems = document.getElementById('items'), +// prev = document.getElementById('prev'), +// next = document.getElementById('next'); +// slide(slider, sliderItems, prev, next); +// function slide(wrapper, items, prev, next) { +// var posX1 = 0, +// posX2 = 0, +// posInitial, +// posFinal, +// threshold = 100, +// slides = items.getElementsByClassName('slide'), +// slidesLength = slides.length, +// slideSize = items.getElementsByClassName('slide')[0].offsetWidth, +// firstSlide = slides[0], +// lastSlide = slides[slidesLength - 1], +// cloneFirst = firstSlide.cloneNode(true), +// cloneLast = lastSlide.cloneNode(true), +// index = 0, +// allowShift = true; - // Clone first and last slide - items.appendChild(cloneFirst); - items.insertBefore(cloneLast, firstSlide); - wrapper.classList.add('loaded'); +// // Clone first and last slide +// items.appendChild(cloneFirst); +// items.insertBefore(cloneLast, firstSlide); +// wrapper.classList.add('loaded'); - // Mouse and Touch events - items.onmousedown = dragStart; +// // Mouse and Touch events +// items.onmousedown = dragStart; - // Touch events - items.addEventListener('touchstart', dragStart); - items.addEventListener('touchend', dragEnd); - items.addEventListener('touchmove', dragAction); +// // Touch events +// items.addEventListener('touchstart', dragStart); +// items.addEventListener('touchend', dragEnd); +// items.addEventListener('touchmove', dragAction); - // Click events - prev.addEventListener('click', function () { shiftSlide(-1) }); - next.addEventListener('click', function () { shiftSlide(1) }); +// // Click events +// prev.addEventListener('click', function () { shiftSlide(-1) }); +// next.addEventListener('click', function () { shiftSlide(1) }); - // Transition events - items.addEventListener('transitionend', checkIndex); +// // Transition events +// items.addEventListener('transitionend', checkIndex); - function dragStart (e) { - e = e || window.event; - e.preventDefault(); - posInitial = items.offsetLeft; +// function dragStart (e) { +// e = e || window.event; +// e.preventDefault(); +// posInitial = items.offsetLeft; - if (e.type == 'touchstart') { - posX1 = e.touches[0].clientX; - } else { - posX1 = e.clientX; - document.onmouseup = dragEnd; - document.onmousemove = dragAction; - } - } - function dragAction (e) { - e = e || window.event; +// if (e.type == 'touchstart') { +// posX1 = e.touches[0].clientX; +// } else { +// posX1 = e.clientX; +// document.onmouseup = dragEnd; +// document.onmousemove = dragAction; +// } +// } +// function dragAction (e) { +// e = e || window.event; - if (e.type == 'touchmove') { - posX2 = posX1 - e.touches[0].clientX; - posX1 = e.touches[0].clientX; - } else { - posX2 = posX1 - e.clientX; - posX1 = e.clientX; - } - items.style.left = (items.offsetLeft - posX2) + "px"; - } +// if (e.type == 'touchmove') { +// posX2 = posX1 - e.touches[0].clientX; +// posX1 = e.touches[0].clientX; +// } else { +// posX2 = posX1 - e.clientX; +// posX1 = e.clientX; +// } +// items.style.left = (items.offsetLeft - posX2) + "px"; +// } - function dragEnd (e) { - posFinal = items.offsetLeft; - if (posFinal - posInitial < -threshold) { - shiftSlide(1, 'drag'); - } else if (posFinal - posInitial > threshold) { - shiftSlide(-1, 'drag'); - } else { - items.style.left = (posInitial) + "px"; - } - document.onmouseup = null; - document.onmousemove = null; - } +// function dragEnd (e) { +// posFinal = items.offsetLeft; +// if (posFinal - posInitial < -threshold) { +// shiftSlide(1, 'drag'); +// } else if (posFinal - posInitial > threshold) { +// shiftSlide(-1, 'drag'); +// } else { +// items.style.left = (posInitial) + "px"; +// } +// document.onmouseup = null; +// document.onmousemove = null; +// } - function shiftSlide(dir, action) { - items.classList.add('shifting'); +// function shiftSlide(dir, action) { +// items.classList.add('shifting'); - if (allowShift) { - if (!action) { posInitial = items.offsetLeft; } - if (dir == 1) { - items.style.left = (posInitial - slideSize) + "px"; - index++; - } else if (dir == -1) { - items.style.left = (posInitial + slideSize) + "px"; - index--; - } - }; +// if (allowShift) { +// if (!action) { posInitial = items.offsetLeft; } +// if (dir == 1) { +// items.style.left = (posInitial - slideSize) + "px"; +// index++; +// } else if (dir == -1) { +// items.style.left = (posInitial + slideSize) + "px"; +// index--; +// } +// }; - allowShift = false; - } +// allowShift = false; +// } - function checkIndex (){ - items.classList.remove('shifting'); - if (index == -1) { - items.style.left = -(slidesLength * slideSize) + "px"; - index = slidesLength - 1; - } - if (index == slidesLength) { - items.style.left = -(1 * slideSize) + "px"; - index = 0; - } +// function checkIndex (){ +// items.classList.remove('shifting'); +// if (index == -1) { +// items.style.left = -(slidesLength * slideSize) + "px"; +// index = slidesLength - 1; +// } +// if (index == slidesLength) { +// items.style.left = -(1 * slideSize) + "px"; +// index = 0; +// } - allowShift = true; - } -} +// allowShift = true; +// } +// } var options = { series: [{ @@ -561,4 +561,4 @@ var options = { }; var chart = new ApexCharts(document.querySelector("#chart"), options); - chart.re \ No newline at end of file + chart.render(); \ No newline at end of file diff --git a/js/second.js b/js/second.js index bb2a0f3..8a06fbd 100644 --- a/js/second.js +++ b/js/second.js @@ -1,103 +1,103 @@ -// Scroll Nav -// Gilroy Hacks Website Source Code -> JS (https://gilroyhacks.com) - -// Toggle the .pa-fixed-header class when the user -// scroll 100px - -window.onscroll = () => {scrollNavbar()}; - -var scrollNavbar = () => { - // Target elements - const navBar = document.getElementById("navBar"); - const links = document.querySelectorAll("#navBar a"); - -if (document.documentElement.scrollTop > 20) { - navBar.classList.add("pa-fixed-header"); - - // Change the color of links on scroll - for (let i = 0; i < links.length; i++) { - const element = links[i]; - element.classList.add('text-black'); - } - -} else { - navBar.classList.remove("pa-fixed-header"); - - // Change the color of links back to default - for (let i = 0; i < links.length; i++) { - const element = links[i]; - element.classList.remove('text-black'); - } -} -} - -// Email Replace -function setAttributes(elem, attrs) { - for(var key in attrs) { - elem.setAttribute(key, attrs[key]); - } -} - -const tech_emails = document.querySelectorAll('.email-replace-tech'); - tech_emails.forEach(entry => { - setAttributes(entry, {"href": "mailto:tech" + "@" + "gilroyhacks.com?subject=Gilroy Hacks", "target": "_blank"}); - entry.innerHTML = "tech" + "@" + "gilroyhacks.com"; - }); - -// Timer -// SRC: W3Schools https://www.w3schools.com/howto/howto_js_countdown.asp -// Set the date we're counting down to -const events = { - "Opening Ceremony": "Apr 15, 2023 10:00:00", - "Lunch": "Apr 15, 2023 12:00:00", - "Web Dev Workshop": "Apr 15, 2023 13:00:00", - "[REDACTED] Workshop": "Apr 15, 2023 15:00:00", - "Kahoot": "Apr 15, 2023 17:00:00", - "Hacking Ends": "Apr 16, 2023 14:00:00", - "Project Presentations": "Apr 16, 2023 14:30:00", - "Awards Ceremony" : "Apr 16, 2023 16:30:00" -} -var countDownDate = 0; -// Get today's date and time -var now = new Date().getTime(); - -// Test for the current event -for (const event in events) { -var testDate = new Date(events[event]).getTime(); -if (testDate > countDownDate && now < testDate) { - countDownDate = testDate; - document.getElementById("event-name").innerHTML = event; - document.styleSheets[0].addRule('#timer:after','content: "'+ events[event] +'";'); - break; -} -} - -// Update the count down every 1 second -var x = setInterval(function() { - - // Find the distance between now and the count down date - var distance = countDownDate - now; - - // Time calculations for days, hours, minutes and seconds - var days = Math.floor(distance / (1000 * 60 * 60 * 24)); - var hours = Math.floor((distance % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60)); - var minutes = Math.floor((distance % (1000 * 60 * 60)) / (1000 * 60)); - // var seconds = Math.floor((distance % (1000 * 60)) / 1000); - - // If the count down is finished, write some text - if (distance < 0) { - clearInterval(x); - document.getElementById("timer").innerHTML = "---"; - document.getElementById("event-name").innerHTML = "Event Ended"; - } - // Display the result in the element with id="timer" - else if (days != 0) { - document.getElementById("timer").innerHTML = days + "d " + hours + "h"; - } - else if (hours != 0) { - document.getElementById("timer").innerHTML = hours + "h " + minutes + "m"; - } - else { - document.getElementById("timer").innerHTML = minutes + "m"; - } +// Scroll Nav +// Gilroy Hacks Website Source Code -> JS (https://gilroyhacks.com) + +// Toggle the .pa-fixed-header class when the user +// scroll 100px + +window.onscroll = () => {scrollNavbar()}; + +var scrollNavbar = () => { + // Target elements + const navBar = document.getElementById("navBar"); + const links = document.querySelectorAll("#navBar a"); + +if (document.documentElement.scrollTop > 20) { + navBar.classList.add("pa-fixed-header"); + + // Change the color of links on scroll + for (let i = 0; i < links.length; i++) { + const element = links[i]; + element.classList.add('text-black'); + } + +} else { + navBar.classList.remove("pa-fixed-header"); + + // Change the color of links back to default + for (let i = 0; i < links.length; i++) { + const element = links[i]; + element.classList.remove('text-black'); + } +} +} + +// Email Replace +function setAttributes(elem, attrs) { + for(var key in attrs) { + elem.setAttribute(key, attrs[key]); + } +} + +const tech_emails = document.querySelectorAll('.email-replace-tech'); + tech_emails.forEach(entry => { + setAttributes(entry, {"href": "mailto:tech" + "@" + "gilroyhacks.com?subject=Gilroy Hacks", "target": "_blank"}); + entry.innerHTML = "tech" + "@" + "gilroyhacks.com"; + }); + +// Timer +// SRC: W3Schools https://www.w3schools.com/howto/howto_js_countdown.asp +// Set the date we're counting down to +const events = { + "Opening Ceremony": "Apr 15, 2023 10:00:00", + "Lunch": "Apr 15, 2023 12:00:00", + "Web Dev Workshop": "Apr 15, 2023 13:00:00", + "[REDACTED] Workshop": "Apr 15, 2023 15:00:00", + "Kahoot": "Apr 15, 2023 17:00:00", + "Hacking Ends": "Apr 16, 2023 14:00:00", + "Project Presentations": "Apr 16, 2023 14:30:00", + "Awards Ceremony" : "Apr 16, 2023 16:30:00" +} +var countDownDate = 0; +// Get today's date and time +var now = new Date().getTime(); + +// Test for the current event +for (const event in events) { +var testDate = new Date(events[event]).getTime(); +if (testDate > countDownDate && now < testDate) { + countDownDate = testDate; + document.getElementById("event-name").innerHTML = event; + document.styleSheets[0].addRule('#timer:after','content: "'+ events[event] +'";'); + break; +} +} + +// Update the count down every 1 second +var x = setInterval(function() { + + // Find the distance between now and the count down date + var distance = countDownDate - now; + + // Time calculations for days, hours, minutes and seconds + var days = Math.floor(distance / (1000 * 60 * 60 * 24)); + var hours = Math.floor((distance % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60)); + var minutes = Math.floor((distance % (1000 * 60 * 60)) / (1000 * 60)); + // var seconds = Math.floor((distance % (1000 * 60)) / 1000); + + // If the count down is finished, write some text + if (distance < 0) { + clearInterval(x); + document.getElementById("timer").innerHTML = "---"; + document.getElementById("event-name").innerHTML = "Event Ended"; + } + // Display the result in the element with id="timer" + else if (days != 0) { + document.getElementById("timer").innerHTML = days + "d " + hours + "h"; + } + else if (hours != 0) { + document.getElementById("timer").innerHTML = hours + "h " + minutes + "m"; + } + else { + document.getElementById("timer").innerHTML = minutes + "m"; + } }, 1000); \ No newline at end of file