From 25119b50bad20de65b48352869df88792b8814ee Mon Sep 17 00:00:00 2001 From: Noah Date: Mon, 18 Dec 2023 10:00:23 -0500 Subject: [PATCH] General Fixes/Update --- generators/Assemble.js | 2 +- scripts/EffectBoxes.js | 1 - scripts/Scrolling.js | 61 ++++++++++++++++++++++------------------ scripts/TextAnimation.js | 6 ++-- 4 files changed, 38 insertions(+), 32 deletions(-) diff --git a/generators/Assemble.js b/generators/Assemble.js index 88f6dba..46f2927 100644 --- a/generators/Assemble.js +++ b/generators/Assemble.js @@ -297,7 +297,7 @@ const GenerateBodyV2 = async function (

Connect

` + Localize(Locale, "pageTitle3") + `

You can send me an email at me@strayfade.com and I might read it, or you can shoot me a message on Twitter or Instagram.

-

My current Discord tag is Strayfade#8472, although I do not usually respond to direct messages on Discord.

+

My current Discord tag is strayfade, although I do not usually respond to direct messages on Discord.

diff --git a/scripts/EffectBoxes.js b/scripts/EffectBoxes.js index 4fa8a5a..e56eb78 100644 --- a/scripts/EffectBoxes.js +++ b/scripts/EffectBoxes.js @@ -44,7 +44,6 @@ return min(max(a)) } AllBoxes.sort((a, b) => ((1 - document.getElementById("SlideContent1").contains(a)) * clamp(a.getBoundingClientRect().top - b.getBoundingClientRect().top))) - console.log(AllBoxes) let Iterator = 0; const ref = setInterval(() => { AllBoxes[Iterator].style.marginLeft = parseInt(AllBoxes[Iterator].getAttribute("initialwidth")) + "px" diff --git a/scripts/Scrolling.js b/scripts/Scrolling.js index 3e3b811..b855a05 100644 --- a/scripts/Scrolling.js +++ b/scripts/Scrolling.js @@ -6,16 +6,15 @@ const MaxSlides = 3; const SlideIDs = ["Slide1", "Slide2", "Slide3"] const SlideContentIDs = ["SlideContent1", "SlideContent2", "SlideContent3"] -function GoUp() { +const GoUp = () => { if (SlideNum == 1 || SlideNum == 2) UpdateSlides(SlideNum - 1) } -function GoDown() { +const GoDown = () => { if (SlideNum == 0 || SlideNum == 1) UpdateSlides(SlideNum + 1) } - -function GoHome() { +const GoHome = () => { if (window.location.pathname == "/" || !window.location.pathname) { UpdateSlides(0) } @@ -23,12 +22,12 @@ function GoHome() { window.location.href = "/" } } -function UpdateSlides(SlideNumb) { +const UpdateSlides = (SlideNumb) => { SlideNum = SlideNumb; let Icons2 = document.getElementsByClassName("Footer")[0]; let Icons3 = document.getElementsByClassName("Footer2")[0]; - let Icons4 = document.getElementsByClassName("MobileButton")[0]; // Next - let Icons5 = document.getElementsByClassName("MobileButton")[1]; // Previous + let Icons4 = document.getElementsByClassName("MobileButton")[0]; + let Icons5 = document.getElementsByClassName("MobileButton")[1]; let Slide1Elements = document.getElementsByClassName("Slide1") let Slide2Elements = document.getElementsByClassName("Slide2") let Slide3Elements = document.getElementsByClassName("Slide3") @@ -70,18 +69,14 @@ function UpdateSlides(SlideNumb) { for (let x = 0; x < Slide3Elements.length; x++) { Slide3Elements[x].classList.remove("Slide3Visible"); } - function CalculateAge() { + const CalculateAge = () => { var AgeDif = new Date(Date.now() - new Date(1131950100000)); return Math.abs(AgeDif.getUTCFullYear() - 1970); } - function SetYearsCoded(i) { - if (i < 0) return; - - setTimeout(function () { - + const SetYearsCoded = (i) => { + setTimeout(() => { document.getElementById("Counter").innerHTML = ((new Date().getFullYear() - 2016) - i).toString() + "+" SetYearsCoded(--i); - }, 200); } SetYearsCoded(CalculateAge() - 11); @@ -171,25 +166,25 @@ function UpdateSlides(SlideNumb) { UnmoveTargets.push(SlideIDs[i]) ContentUnmoveTargets.push(SlideContentIDs[i]) } - MoveTargets.forEach(function (item) { + MoveTargets.forEach((item) => { let Element = document.getElementById(item); Element.classList.remove("SlideViewed") Element.classList.remove("SlideNotViewed") Element.classList.add("SlideVisible") }) - UnmoveTargets.forEach(function (item) { + UnmoveTargets.forEach((item) => { let Element = document.getElementById(item); Element.classList.remove("SlideVisible") Element.classList.remove("SlideViewed") Element.classList.remove("SlideNotViewed") Element.classList.add(UnmoveTargets.indexOf(item) < (SlideNumb) ? "SlideViewed" : "SlideNotViewed") }) - ContentMoveTargets.forEach(function (item) { + ContentMoveTargets.forEach((item) => { let Element = document.getElementById(item); Element.classList.remove("SlideContentHidden") Element.classList.add("SlideContentVisible") }) - ContentUnmoveTargets.forEach(function (item) { + ContentUnmoveTargets.forEach((item) => { let Element = document.getElementById(item); Element.classList.add("SlideContentHidden") Element.classList.remove("SlideContentVisible") @@ -197,11 +192,11 @@ function UpdateSlides(SlideNumb) { } const keys = { 37: 1, 38: 1, 39: 1, 40: 1 }; -function PreventDefault(e) { +const PreventDefault = (e) => { e.preventDefault(); } -function PreventDefaultForScrollKeys(e) { +const PreventDefaultForScrollKeys = (e) => { if (keys[e.keyCode]) { PreventDefault(e); return false; @@ -209,24 +204,36 @@ function PreventDefaultForScrollKeys(e) { } if (window.location.pathname == "/" || !window.location.pathname) { - // modern Chrome requires { passive: false } when adding event + // Scroll to location + UpdateSlides(0) + let Slide = new URLSearchParams(window.location.search).get('p') + if (Slide) { + switch (Slide.toLowerCase()) { + case "skills": + UpdateSlides(1) + break; + case "contact": + UpdateSlides(2) + break; + } + } + // modern Chrome requires { passive: false } when adding events var supportsPassive = false; try { window.addEventListener("test", null, Object.defineProperty({}, 'passive', { - get: function () { supportsPassive = true; } + get: () => { supportsPassive = true; } })); } catch (e) { } var wheelOpt = supportsPassive ? { passive: false } : false; var wheelEvent = 'onwheel' in document.createElement('div') ? 'wheel' : 'mousewheel'; - // call this to Disable - window.addEventListener('DOMMouseScroll', PreventDefault, false); // older FF - window.addEventListener(wheelEvent, PreventDefault, wheelOpt); // modern desktop - window.addEventListener('touchmove', PreventDefault, wheelOpt); // mobile + window.addEventListener('DOMMouseScroll', PreventDefault, false); // Older Firefox versions + window.addEventListener(wheelEvent, PreventDefault, wheelOpt); // Desktop + window.addEventListener('touchmove', PreventDefault, wheelOpt); // Mobile (?) window.addEventListener('keydown', PreventDefaultForScrollKeys, false); - window.addEventListener("wheel", async function (event) { + window.addEventListener("wheel", async (event) => { let ScrollUpdate = event.deltaY - PrevScrollDist PrevScrollDist == event.deltaY; if (Math.abs(ScrollUpdate) > 10) { diff --git a/scripts/TextAnimation.js b/scripts/TextAnimation.js index 8a7eb22..ee46013 100644 --- a/scripts/TextAnimation.js +++ b/scripts/TextAnimation.js @@ -57,10 +57,10 @@ function DecryptElements(Elements) { Elements[x].innerHTML = NewString; } - //let DecryptChance = 0.8; - //if (Math.random() < DecryptChance) { // Chance of decrypting + let DecryptChance = 0.33; + if (Math.random() < DecryptChance) { // Chance of decrypting Iter++ - //} + } if (Iter < LongestString + 1) { DecryptLoop(Iter) }