diff --git a/components/about-page/ContactUs.vue b/components/about-page/ContactUs.vue new file mode 100644 index 0000000..6df214d --- /dev/null +++ b/components/about-page/ContactUs.vue @@ -0,0 +1,447 @@ + \ No newline at end of file diff --git a/components/about-page/Header.vue b/components/about-page/Header.vue new file mode 100644 index 0000000..27966eb --- /dev/null +++ b/components/about-page/Header.vue @@ -0,0 +1,379 @@ + + + + + + + + + + \ No newline at end of file diff --git a/components/about-page/Map.vue b/components/about-page/Map.vue new file mode 100644 index 0000000..8d39c40 --- /dev/null +++ b/components/about-page/Map.vue @@ -0,0 +1,64 @@ + \ No newline at end of file diff --git a/components/home-page/AboutUs.vue b/components/home-page/AboutUs.vue index 31cc2dc..cd49e6c 100644 --- a/components/home-page/AboutUs.vue +++ b/components/home-page/AboutUs.vue @@ -222,37 +222,12 @@ let ctx; const pnl = ref() onMounted(() => { const panels = gsap.utils.toArray(".panel"); + gsap.set(panels, { xPercent: 0, yPercent: 100, autoAlpha: 1 }); console.clear(); + ctx = gsap.context((self) => { -// const boxes = gsap.utils.toArray('.panel'); -// const timeline = gsap.timeline({ -// scrollTrigger: { -// trigger: project, -// start: "center bottom", -// ease: "power2", -// toggleActions: "play none none reverse" -// } -// }) -// boxes.forEach((box, i) => { -// const anim = gsap.fromTo(box, -// {opacity: 0, y: 200}, -// {opacity: 1, y: 0}, "-=0.5"); -// ScrollTrigger.create({ -// trigger: box, -// animation: anim, -// toggleActions: "play none none reverse", -// repeat: -1 -// // once: true, -// }); -// }); - - - - - - gsap.to("#crclrMotion", { scrollTrigger: { trigger: ".panel", @@ -271,7 +246,7 @@ onMounted(() => { trigger: ".panel", start: "top 80%", end: () => - "+=4000", + "+=3000", // "+=" + 150 * panels.length + "%", // "+=" + document.querySelector(".about").getBoundingClientRect().width, scrub: 1, @@ -304,14 +279,16 @@ onMounted(() => { // y: 50000, pin: true, scrub: 1, + }, - y: 110000, + y: 11000, }); panels.forEach((panel, index) => { if (index) { tl.to( panel, { + y: -window.innerHeight * 0.001, yPercent: 0, ease: "none", }, diff --git a/components/honor-page/ShinanHonors.vue b/components/honor-page/ShinanHonors.vue index d595446..a58eec7 100644 --- a/components/honor-page/ShinanHonors.vue +++ b/components/honor-page/ShinanHonors.vue @@ -1,7 +1,7 @@ - \ No newline at end of file + + + diff --git a/package-lock.json b/package-lock.json index ed27e12..63520cd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,6 +11,7 @@ "leaflet": "^1.9.4", "nuxt": "^3.11.2", "nuxt-swiper": "^1.2.2", + "smooth-scrollbar": "^8.8.4", "swiper": "^11.1.1", "vue": "^3.4.21", "vue-router": "^4.3.0", @@ -4855,6 +4856,16 @@ "node": ">= 0.8" } }, + "node_modules/core-js": { + "version": "3.37.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.37.0.tgz", + "integrity": "sha512-fu5vHevQ8ZG4og+LXug8ulUtVxjOcEYvifJr7L5Bfq9GOztVqsKd9/59hUk2ZSbCrS3BqUr3EpaYGIYzq7g3Ug==", + "hasInstallScript": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/core-js" + } + }, "node_modules/core-util-is": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", @@ -9915,6 +9926,15 @@ "resolved": "https://registry.npmjs.org/smob/-/smob-1.5.0.tgz", "integrity": "sha512-g6T+p7QO8npa+/hNx9ohv1E5pVCmWrVCUzUXJyLdMmftX6ER0oiWY/w9knEonLpnOp6b6FenKnMfR8gqwWdwig==" }, + "node_modules/smooth-scrollbar": { + "version": "8.8.4", + "resolved": "https://registry.npmjs.org/smooth-scrollbar/-/smooth-scrollbar-8.8.4.tgz", + "integrity": "sha512-Wn2Q/iE+PE1ef4EfhFMhgaIMfSrjJl2LalRu0hBWSrw5nZKGsUIjWFWHnLB/Lpx7N+a1pJH6+wkQzBr+5nWPUg==", + "dependencies": { + "core-js": "^3.6.4", + "tslib": "^1.10.0" + } + }, "node_modules/socks": { "version": "2.8.3", "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz", @@ -10642,6 +10662,11 @@ "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==", "dev": true }, + "node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + }, "node_modules/tsscmp": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.6.tgz", diff --git a/package.json b/package.json index 61e4a74..e7754c0 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "leaflet": "^1.9.4", "nuxt": "^3.11.2", "nuxt-swiper": "^1.2.2", + "smooth-scrollbar": "^8.8.4", "swiper": "^11.1.1", "vue": "^3.4.21", "vue-router": "^4.3.0", diff --git a/pages/about.vue b/pages/about.vue index 2ec5fd9..07656e1 100644 --- a/pages/about.vue +++ b/pages/about.vue @@ -1,426 +1,87 @@ - - \ No newline at end of file diff --git a/pages/index.vue b/pages/index.vue index 42f1eba..3666a2f 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -1,5 +1,4 @@ diff --git a/pages/test.vue b/pages/test.vue deleted file mode 100644 index 8b4c831..0000000 --- a/pages/test.vue +++ /dev/null @@ -1,160 +0,0 @@ - - - - - \ No newline at end of file