Skip to content

Commit

Permalink
General Fixes/Update
Browse files Browse the repository at this point in the history
  • Loading branch information
strayfade committed Dec 18, 2023
1 parent 9c09aa8 commit 25119b5
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 32 deletions.
2 changes: 1 addition & 1 deletion generators/Assemble.js
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ const GenerateBodyV2 = async function (
<p class="Author">Connect</p>
<h1 class="Slide3">` + Localize(Locale, "pageTitle3") + `</h1>
<p class="Slide3">You can send me an email at <a href="mailto:me@strayfade.com">me@strayfade.com</a> and I might read it, or you can shoot me a message on <a href="https://twitter.com/Strayfade">Twitter</a> or <a href="https://instagram.com/strayfade">Instagram</a>.</p>
<p class="Slide3" style="margin-top: 10px">My current Discord tag is <a href="https://discord.com/users/455790298082181120">Strayfade#8472</a>, although I do not usually respond to direct messages on Discord.</p>
<p class="Slide3" style="margin-top: 10px">My current Discord tag is <a href="https://discord.com/users/455790298082181120">strayfade</a>, although I do not usually respond to direct messages on Discord.</p>
</div>
</div>
<div style="opacity: 1.0">
Expand Down
1 change: 0 additions & 1 deletion scripts/EffectBoxes.js
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
61 changes: 34 additions & 27 deletions scripts/Scrolling.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,28 @@ 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)
}
else {
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")
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -171,62 +166,74 @@ 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")
})
}

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;
}
}

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) {
Expand Down
6 changes: 3 additions & 3 deletions scripts/TextAnimation.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down

0 comments on commit 25119b5

Please sign in to comment.