atmos SUPPORT
diff --git a/parfum-shop/src/hooks/useLenisSmoothScroll.js b/parfum-shop/src/hooks/useLenisSmoothScroll.js
new file mode 100644
index 0000000..0c2964a
--- /dev/null
+++ b/parfum-shop/src/hooks/useLenisSmoothScroll.js
@@ -0,0 +1,79 @@
+import { useEffect, useRef } from "react";
+import Lenis from "lenis";
+import { gsap } from "gsap";
+import { ScrollTrigger } from "gsap/ScrollTrigger";
+
+let scrollTriggerRegistered = false;
+
+const registerScrollTrigger = () => {
+ if (!scrollTriggerRegistered) {
+ gsap.registerPlugin(ScrollTrigger);
+ scrollTriggerRegistered = true;
+ }
+};
+
+function useLenisSmoothScroll(dependencyKey = "") {
+ const lenisRef = useRef(null);
+
+ useEffect(() => {
+ if (typeof window === "undefined") {
+ return undefined;
+ }
+
+ const prefersReducedMotion = window.matchMedia(
+ "(prefers-reduced-motion: reduce)"
+ ).matches;
+
+ if (prefersReducedMotion) {
+ return undefined;
+ }
+
+ registerScrollTrigger();
+
+ const lenis = new Lenis({
+ anchors: {
+ duration: 1.05,
+ easing: (time) => 1 - Math.pow(1 - time, 4),
+ },
+ duration: 1.1,
+ easing: (time) => Math.min(1, 1.001 - Math.pow(2, -10 * time)),
+ lerp: 0.09,
+ smoothWheel: true,
+ syncTouch: false,
+ wheelMultiplier: 0.9,
+ });
+ lenisRef.current = lenis;
+
+ const updateScrollTrigger = () => ScrollTrigger.update();
+ const raf = (time) => {
+ lenis.raf(time * 1000);
+ };
+
+ lenis.on("scroll", updateScrollTrigger);
+ gsap.ticker.add(raf);
+ gsap.ticker.lagSmoothing(0);
+
+ return () => {
+ lenis.off("scroll", updateScrollTrigger);
+ gsap.ticker.remove(raf);
+ lenis.destroy();
+ lenisRef.current = null;
+ };
+ }, []);
+
+ useEffect(() => {
+ if (typeof window === "undefined") {
+ return undefined;
+ }
+
+ const frame = window.requestAnimationFrame(() => {
+ lenisRef.current?.scrollTo(0, { immediate: true, force: true });
+ window.scrollTo(0, 0);
+ ScrollTrigger.refresh();
+ });
+
+ return () => window.cancelAnimationFrame(frame);
+ }, [dependencyKey]);
+}
+
+export default useLenisSmoothScroll;
diff --git a/parfum-shop/src/hooks/useScrollTextReveal.js b/parfum-shop/src/hooks/useScrollTextReveal.js
index 9095d11..78ed513 100644
--- a/parfum-shop/src/hooks/useScrollTextReveal.js
+++ b/parfum-shop/src/hooks/useScrollTextReveal.js
@@ -11,13 +11,13 @@ const registerGsap = () => {
}
};
-const createRevealLines = (element) => {
+const createRevealWords = (element) => {
if (!element) {
return [];
}
if (element.dataset.revealPrepared === "true") {
- return Array.from(element.querySelectorAll(".reveal-line"));
+ return Array.from(element.querySelectorAll(".reveal-word"));
}
const originalHtml = element.innerHTML;
@@ -33,16 +33,24 @@ const createRevealLines = (element) => {
element.dataset.revealPrepared = "true";
element.dataset.revealOriginalHtml = originalHtml;
element.innerHTML = segments
- .map(
- (segment) =>
- `
${segment}`
- )
+ .map((segment) => {
+ const words = segment
+ .split(/\s+/)
+ .filter(Boolean)
+ .map(
+ (word) =>
+ `
${word}`
+ )
+ .join(" ");
+
+ return `
${words}`;
+ })
.join("");
- return Array.from(element.querySelectorAll(".reveal-line"));
+ return Array.from(element.querySelectorAll(".reveal-word"));
};
-const restoreRevealLines = (element) => {
+const restoreRevealWords = (element) => {
if (!element || element.dataset.revealPrepared !== "true") {
return;
}
@@ -108,15 +116,15 @@ function useScrollTextReveal(scopeRef, dependencyKey = "") {
const position = index === 0 ? 0 : "<0.16";
if (item.dataset.reveal === "lines") {
- const lines = createRevealLines(item);
+ const words = createRevealWords(item);
- if (lines.length === 0) {
+ if (words.length === 0) {
return;
}
preparedElements.push(item);
gsap.set(item, { autoAlpha: 1 });
- gsap.set(lines, {
+ gsap.set(words, {
yPercent: 115,
rotate: 2.2,
transformOrigin: "0% 100%",
@@ -124,12 +132,12 @@ function useScrollTextReveal(scopeRef, dependencyKey = "") {
});
timeline.to(
- lines,
+ words,
{
yPercent: 0,
rotate: 0,
- duration: 1.18,
- stagger: 0.1,
+ duration: 1.08,
+ stagger: 0.065,
ease: "power4.out",
clearProps: "transform",
},
@@ -160,7 +168,7 @@ function useScrollTextReveal(scopeRef, dependencyKey = "") {
return () => {
ctx.revert();
- preparedElements.forEach((element) => restoreRevealLines(element));
+ preparedElements.forEach((element) => restoreRevealWords(element));
};
}, [scopeRef, dependencyKey]);
}
diff --git a/parfum-shop/src/index.css b/parfum-shop/src/index.css
index 7c767b4..31a9749 100644
--- a/parfum-shop/src/index.css
+++ b/parfum-shop/src/index.css
@@ -69,7 +69,7 @@
}
html {
- scroll-behavior: smooth;
+ scroll-behavior: auto;
}
body {
diff --git a/parfum-shop/src/main.jsx b/parfum-shop/src/main.jsx
index 72ad5cf..a26e769 100644
--- a/parfum-shop/src/main.jsx
+++ b/parfum-shop/src/main.jsx
@@ -3,6 +3,7 @@ import ReactDOM from "react-dom/client";
import { BrowserRouter } from "react-router";
import App from "./App";
import { ShopProvider } from "./shop/ShopContext";
+import "lenis/dist/lenis.css";
import "./index.css";
import "./App.css";
diff --git a/parfum-shop/src/pages/AboutPage.css b/parfum-shop/src/pages/AboutPage.css
index 5d31257..56d7f35 100644
--- a/parfum-shop/src/pages/AboutPage.css
+++ b/parfum-shop/src/pages/AboutPage.css
@@ -304,7 +304,7 @@
min-height: 48px;
padding: 0 1.1rem;
border: 1px solid transparent;
- border-radius: 999px;
+ border-radius: var(--radius-lg);
color: inherit;
font-size: var(--text-sm);
text-decoration: none;
diff --git a/parfum-shop/src/pages/DiscoverySetPage.css b/parfum-shop/src/pages/DiscoverySetPage.css
index 81c4778..d2573b8 100644
--- a/parfum-shop/src/pages/DiscoverySetPage.css
+++ b/parfum-shop/src/pages/DiscoverySetPage.css
@@ -5,50 +5,6 @@
background: var(--theme-bg);
}
-.discovery-topbar {
- position: fixed;
- top: clamp(0.75rem, 2.1vw, 1.4rem);
- right: var(--page-x);
- left: var(--page-x);
- z-index: 997;
- min-height: 44px;
- margin-bottom: 0;
- pointer-events: none;
-}
-
-.discovery-back-link {
- display: inline-flex;
- align-items: center;
- gap: 0.65rem;
- min-height: 44px;
- padding: 0;
- border: 0;
- background: transparent;
- color: var(--theme-text);
- cursor: pointer;
- font-size: var(--text-sm);
- pointer-events: auto;
- transition:
- opacity var(--duration-med) var(--ease-out),
- transform var(--duration-med) var(--ease-out);
-}
-
-.discovery-back-link:hover,
-.discovery-back-link:focus-visible {
- opacity: 0.68;
- transform: translateX(-0.2rem);
-}
-
-.discovery-back-arrow {
- display: inline-block;
- width: 1rem;
- height: 1rem;
- flex: 0 0 auto;
- background: currentColor;
- -webkit-mask: url("/icon-arrow-left.svg") center / contain no-repeat;
- mask: url("/icon-arrow-left.svg") center / contain no-repeat;
-}
-
.discovery-kicker,
.discovery-label,
.discovery-price-row span,
@@ -88,7 +44,7 @@
top: clamp(6.5rem, 11vw, 9rem);
left: 0;
z-index: 5;
- width: min(34vw, 540px);
+ width: min(26vw, 390px);
min-width: 0;
}
@@ -96,7 +52,7 @@
max-width: 9ch;
margin: clamp(0.75rem, 1.5vw, 1.15rem) 0 clamp(1rem, 2vw, 1.4rem);
color: var(--theme-text);
- font-size: clamp(3.35rem, 6.2vw, 7.6rem);
+ font-size: clamp(2.6rem, 5.1vw, 6.4rem);
line-height: 0.9;
font-weight: 300;
letter-spacing: 0;
@@ -115,14 +71,14 @@
.discovery-hero-visual {
position: relative;
- grid-column: 5 / 10;
+ grid-column: 4 / 10;
grid-row: 1;
justify-self: center;
align-self: center;
z-index: 1;
display: grid;
place-items: center;
- justify-items: end;
+ justify-items: center;
width: 100%;
min-height: inherit;
margin: 0;
@@ -133,11 +89,11 @@
position: relative;
z-index: 2;
display: block;
- width: min(100%, 520px);
- height: min(56svh, 640px);
- max-height: min(68svh, 760px);
- border: 1px solid var(--theme-border);
- object-fit: cover;
+ width: min(100%, 600px);
+ height: auto;
+ max-height: min(62svh, 700px);
+ border: 0;
+ object-fit: contain;
object-position: center;
filter: saturate(0.92) contrast(1.04) drop-shadow(0 34px 72px rgba(0, 0, 0, 0.42));
}
@@ -378,13 +334,12 @@
.discovery-benefit {
display: grid;
- grid-template-columns: 1.75rem minmax(0, 1fr);
+ grid-template-columns: minmax(0, 1fr);
gap: var(--gap-sm);
align-items: start;
padding-top: 1rem;
}
-.discovery-benefit-icon,
.discovery-comparison-icon {
display: inline-flex;
align-items: center;
@@ -663,8 +618,8 @@
}
.discovery-hero-visual img {
- width: min(100%, 480px);
- height: 100%;
+ width: min(74%, 430px);
+ height: auto;
max-height: 100%;
}
@@ -688,13 +643,6 @@
}
@media (max-width: 820px) {
- .discovery-topbar {
- top: clamp(4.35rem, 14vw, 5.05rem);
- z-index: 999;
- right: clamp(0.75rem, 4vw, 1rem);
- left: clamp(0.75rem, 4vw, 1rem);
- }
-
.discovery-hero {
grid-template-columns: 1fr;
gap: clamp(0.75rem, 2vw, 1rem);
@@ -735,7 +683,7 @@
}
.discovery-hero-visual img {
- width: 100%;
+ width: min(82%, 320px);
}
.discovery-panel-facts,
@@ -826,8 +774,7 @@
@media (prefers-reduced-motion: reduce) {
.discovery-primary-btn,
.discovery-product-card,
- .discovery-product-image img,
- .discovery-back-link {
+ .discovery-product-image img {
transition: none;
}
}
diff --git a/parfum-shop/src/pages/DiscoverySetPage.jsx b/parfum-shop/src/pages/DiscoverySetPage.jsx
index 72bc2ac..e3ee0cd 100644
--- a/parfum-shop/src/pages/DiscoverySetPage.jsx
+++ b/parfum-shop/src/pages/DiscoverySetPage.jsx
@@ -1,4 +1,3 @@
-import { useNavigate } from "react-router";
import perfumes from "../data/perfumes";
import SharedNavbar from "../components/SharedNavbar";
import { useShop } from "../shop/useShop";
@@ -81,7 +80,7 @@ function DiscoveryOrderPanel({ onBuy }) {
Nur das erste Set erstellt einen einmaligen CHF 48 Full-Size-Rabatt.
@@ -94,8 +93,8 @@ function DiscoveryHero({ onBuy }) {
-
Der Einstieg
-
Discovery Set
+
Discovery Set
+
Der Einstieg
6 Düfte × 2ml. Jeden Duft eine Woche tragen. Verstehen, was
@@ -126,7 +125,7 @@ function DiscoveryStorySection() {
Warum Discovery Set
-
Der klügere Einstieg in Nischendüfte.
+
Der klügere Einstieg.
Nischen-Parfums sind keine Impulskäufe. Sie brauchen Zeit, um zu
verstehen, wie sie auf deiner Haut funktionieren, wie sie sich im
@@ -142,9 +141,6 @@ function DiscoveryStorySection() {
{discoveryBenefits.map((benefit) => (
-
- ✓
-
{benefit.title}
{benefit.text}
@@ -261,7 +257,7 @@ function DiscoveryFinalCta({ onBuy }) {
@@ -269,7 +265,6 @@ function DiscoveryFinalCta({ onBuy }) {
}
function DiscoverySetPage() {
- const navigate = useNavigate();
const { addToCart } = useShop();
const buyDiscoverySet = () =>
addToCart("discovery-set", 1, "Discovery Set added.").catch(() => {});
@@ -279,13 +274,6 @@ function DiscoverySetPage() {
-
-
-
-
diff --git a/parfum-shop/src/pages/LandingPage.css b/parfum-shop/src/pages/LandingPage.css
index acdcd8e..aebebe6 100644
--- a/parfum-shop/src/pages/LandingPage.css
+++ b/parfum-shop/src/pages/LandingPage.css
@@ -140,7 +140,7 @@
.discovery-btn {
min-height: 48px;
border: none;
- border-radius: 999px;
+ border-radius: var(--radius-lg);
padding: 0 clamp(1rem, 2vw, 1.35rem);
font-size: var(--text-sm);
cursor: pointer;
@@ -223,6 +223,7 @@
}
.section-heading {
+ position: relative;
display: grid;
grid-template-columns: repeat(12, minmax(0, 1fr));
gap: var(--gap-md);
@@ -232,9 +233,11 @@
.section-heading::after {
content: "01 / Kollektion";
- grid-column: 9 / span 3;
- align-self: start;
- padding-top: 0.3rem;
+ position: absolute;
+ top: 0;
+ right: 0;
+ width: min(32vw, 420px);
+ padding-top: 0.55rem;
border-top: 1px solid var(--theme-border);
color: var(--theme-text-muted);
font-size: var(--text-xs);
@@ -591,6 +594,7 @@
.section-heading {
grid-template-columns: 1fr;
+ padding-top: clamp(2.4rem, 6vw, 3.4rem);
}
.section-heading h2,
@@ -662,6 +666,12 @@
grid-template-columns: 1fr;
}
+ .section-heading::after {
+ right: auto;
+ left: 0;
+ width: min(100%, 24rem);
+ }
+
.product-card {
min-height: clamp(340px, 118vw, 520px);
}
diff --git a/parfum-shop/src/pages/SmallBatchPage.css b/parfum-shop/src/pages/SmallBatchPage.css
index 808cdb6..96babe8 100644
--- a/parfum-shop/src/pages/SmallBatchPage.css
+++ b/parfum-shop/src/pages/SmallBatchPage.css
@@ -78,7 +78,7 @@
margin-top: 1.2rem;
padding: 0 1.1rem;
border: 1px solid #111;
- border-radius: 999px;
+ border-radius: var(--radius-lg);
background: #111;
color: #fff;
cursor: pointer;
diff --git a/parfum-shop/src/pages/SupportPage.css b/parfum-shop/src/pages/SupportPage.css
index d73d86b..8e6d493 100644
--- a/parfum-shop/src/pages/SupportPage.css
+++ b/parfum-shop/src/pages/SupportPage.css
@@ -204,7 +204,7 @@
min-height: 48px;
margin-top: 1.15rem;
padding: 0 1.1rem;
- border-radius: 999px;
+ border-radius: var(--radius-lg);
background: var(--theme-accent);
color: #fff;
font-size: var(--text-sm);
@@ -268,7 +268,7 @@
min-height: 48px;
padding: 0 1.1rem;
border: 1px solid transparent;
- border-radius: 999px;
+ border-radius: var(--radius-lg);
color: inherit;
font-size: var(--text-sm);
text-decoration: none;
diff --git a/parfum-shop/src/style/navbar.css b/parfum-shop/src/style/navbar.css
index 6438e8c..eb5b02d 100644
--- a/parfum-shop/src/style/navbar.css
+++ b/parfum-shop/src/style/navbar.css
@@ -47,35 +47,24 @@
transform var(--duration-med) var(--ease-out);
}
-.nav-link::after {
- content: "";
- position: absolute;
- right: 0.8rem;
- bottom: 0.45rem;
- left: 0.8rem;
- height: 1px;
- background: currentColor;
- opacity: 0;
- transform: scaleX(0.35);
- transform-origin: center;
- transition:
- opacity var(--duration-med) var(--ease-out),
- transform var(--duration-med) var(--ease-out);
-}
-
-.nav-link:hover::after,
-.nav-link.active::after {
- opacity: 0.5;
- transform: scaleX(1);
-}
-
.nav-link--brand {
padding-inline: clamp(0.75rem, 1.4vw, 1rem);
}
-.nav-link--brand::after,
-.nav-theme-switch::after {
- display: none;
+.nav-link--back {
+ gap: 0.5rem;
+ min-width: 0;
+ text-transform: none;
+}
+
+.nav-back-icon {
+ display: inline-block;
+ width: 0.95rem;
+ height: 0.95rem;
+ flex: 0 0 auto;
+ background: currentColor;
+ -webkit-mask: url("/icon-arrow-left.svg") center / contain no-repeat;
+ mask: url("/icon-arrow-left.svg") center / contain no-repeat;
}
.nav-brand-logo {
diff --git a/parfum-shop/src/style/textReveal.css b/parfum-shop/src/style/textReveal.css
index a288d61..7d61e86 100644
--- a/parfum-shop/src/style/textReveal.css
+++ b/parfum-shop/src/style/textReveal.css
@@ -5,12 +5,30 @@
margin-bottom: -0.08em;
}
+.reveal-word-line {
+ overflow: visible;
+}
+
+.reveal-word-mask {
+ display: inline-block;
+ overflow: hidden;
+ vertical-align: top;
+ padding-bottom: 0.08em;
+ margin-bottom: -0.08em;
+}
+
.reveal-line {
display: block;
will-change: transform;
backface-visibility: hidden;
}
+.reveal-word {
+ display: inline-block;
+ will-change: transform;
+ backface-visibility: hidden;
+}
+
[data-reveal="fade"] {
will-change: transform, opacity;
}