diff --git a/public/home/js/scroll.js b/public/home/js/scroll.js index 6905518..4e556ce 100644 --- a/public/home/js/scroll.js +++ b/public/home/js/scroll.js @@ -50,14 +50,6 @@ $(window).on('load',function (){ // bail out if we’re missing the basics: if (!titles.length || !sections.length) { // scroll.js — right before your `if (!titles.length || !sections.length) {…}` -console.log( - '🔍 scroll.js finds:', - 'titles=', titles.length, - 'sections=', sections.length, - 'projectBlocks=', projectBlocks.length, - 'newsBlocks=', newsBlocks.length - ); - console.warn("⚠️ Missing key elements, skipping scroll animations."); return; } @@ -655,196 +647,13 @@ console.log( gsap.set(sections, {xPercent: 0}); - //menu navigation - $(document).on('click', '.js-scroll-link', function () { - event.preventDefault(); - if (!blockNavigation && !skipMode){ - $('.header__menu').addClass('blocked'); - gsap.fromTo('.home-page', {autoAlpha: 1}, {duration: 0.4,autoAlpha: 0},0); - skipMode = true; - let link = $(this).data('link'), - currentScroll = $('html').scrollTop(); - setTimeout(function (){ - st.scroll(parseInt(linkData[link])); - switch (link) { - case 0: - tlScrollLast.progress(0); - tlScroll.progress(0); - tl7.progress(0); - tl61.progress(0); - tl6.progress(0); - tl51.progress(0); - tl5.progress(0); - tl41.progress(0); - tl4.progress(0); - tl31.progress(0); - tl3.progress(0); - tl11.progress(0); - tl1.progress(0); - - tlTitle7.progress(0).pause(); - tlTitle6.progress(0).pause(); - tlTitle5.progress(0).pause(); - tlTitle4.progress(0).pause(); - tlTitle3.progress(0).pause(); - tlTitle2.progress(0).pause(); - break; - case 1: - tlScrollLast.progress(0); - tlScroll.progress(0); - tl7.progress(0); - tl61.progress(0); - tl6.progress(0); - tl51.progress(0); - tl5.progress(0); - tl41.progress(0); - tl4.progress(0); - tl31.progress(0); - tl3.progress(0); - tl11.progress(0); - tl1.progress(1); - - tlTitle7.progress(0).pause(); - tlTitle6.progress(0).pause(); - tlTitle5.progress(0).pause(); - tlTitle4.progress(0).pause(); - tlTitle3.progress(0).pause(); - tlTitle2.progress(1).pause(); - break; - case 2: - tlScrollLast.progress(0); - tlScroll.progress(0.25); - tl7.progress(0); - tl61.progress(0); - tl6.progress(0); - tl51.progress(0); - tl5.progress(0); - tl41.progress(0); - tl4.progress(0); - tl31.progress(1); - tl3.progress(1); - tl11.progress(1); - tl1.progress(1); - - tlTitle7.progress(0).pause(); - tlTitle6.progress(0).pause(); - tlTitle5.progress(0).pause(); - tlTitle4.progress(0).pause(); - tlTitle3.progress(1).pause(); - tlTitle2.progress(1).pause(); - break; - case 3: - tlScrollLast.progress(0); - tlScroll.progress(0.5); - tl7.progress(0); - tl61.progress(0); - tl6.progress(0); - tl51.progress(0); - tl5.progress(0); - tl41.progress(1); - tl4.progress(1); - tl31.progress(1); - tl3.progress(1); - tl11.progress(1); - tl1.progress(1); - - tlTitle7.progress(0).pause(); - tlTitle6.progress(0).pause(); - tlTitle5.progress(0).pause(); - tlTitle4.progress(1).pause(); - tlTitle3.progress(1).pause(); - tlTitle2.progress(1).pause(); - break; - case 4: - tlScrollLast.progress(0); - tlScroll.progress(0.75); - tl7.progress(0); - tl61.progress(0); - tl6.progress(0); - tl51.progress(1); - tl5.progress(1); - tl41.progress(1); - tl4.progress(1); - tl31.progress(1); - tl3.progress(1); - tl11.progress(1); - tl1.progress(1); - - tlTitle7.progress(0).pause(); - tlTitle6.progress(0).pause(); - tlTitle5.progress(1).pause(); - tlTitle4.progress(1).pause(); - tlTitle3.progress(1).pause(); - tlTitle2.progress(1).pause(); - break; - case 5: - tlScrollLast.progress(0); - tlScroll.progress(1); - tl7.progress(0); - tl61.progress(0); - tl6.progress(1); - tl51.progress(1); - tl5.progress(1); - tl41.progress(1); - tl4.progress(1); - tl31.progress(1); - tl3.progress(1); - tl11.progress(1); - tl1.progress(1); - - tlTitle7.progress(0).pause(); - tlTitle6.progress(1).pause(); - tlTitle5.progress(1).pause(); - tlTitle4.progress(1).pause(); - tlTitle3.progress(1).pause(); - tlTitle2.progress(1).pause(); - break; - case 6: - tlScrollLast.progress(1); - tlScroll.progress(1); - tl7.progress(1); - tl61.progress(1); - tl6.progress(1); - tl51.progress(1); - tl5.progress(1); - tl41.progress(1); - tl4.progress(1); - tl31.progress(1); - tl3.progress(1); - tl11.progress(1); - tl1.progress(1); +// menu navigation +// super‑basic menu nav test - tlTitle7.progress(1).pause(); - tlTitle6.progress(1).pause(); - tlTitle5.progress(1).pause(); - tlTitle4.progress(1).pause(); - tlTitle3.progress(1).pause(); - tlTitle2.progress(1).pause(); - break; - default: - break; - } - gsap.set(titles, {y: "100%"}); - gsap.set(titles[parseInt(link)], {y: "0"}); - gsap.set(sections, {xPercent: -100 * parseInt(link), ease: "none"}, 0); - ScrollTrigger.refresh(); - console.log('[✓] ScrollTrigger refreshed after menu click'); - $('.header__menu li').removeClass('active'); - $('.header__menu li').eq(parseInt(link)).addClass('active'); - - gsap.fromTo('.home-page', {autoAlpha: 0}, {duration: 0.5,autoAlpha: 1},0); - setTimeout(function (){ - skipMode = false; - $('.header__menu').removeClass('blocked'); - },500); - },500); - } - }); - - $(document).on('click', '.projects__menu a', function () { + $(document).on('click', '.projects__menu a', function (event) { event.preventDefault(); let parent = $(this).parent(), progress = projectHeightsScroll[parent.index()] / (projectHeightsTotal - $('.projects__blocks').innerHeight()), @@ -859,7 +668,7 @@ console.log( st.scroll(scrollTo); }); } else { - $(document).on('click', '.js-scroll-link', function () { + $(document).on('click', '.js-scroll-link', function (event) { event.preventDefault(); let href = $(this).attr('href'), topPos = $(href).offset(), diff --git a/resources/views/home/index.blade.php b/resources/views/home/index.blade.php index 7787b2d..6b7cc3e 100644 --- a/resources/views/home/index.blade.php +++ b/resources/views/home/index.blade.php @@ -9,7 +9,7 @@