Compare commits
1 Commits
palette-ux
...
bolt/optim
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d1023e0742 |
21
src/App.tsx
21
src/App.tsx
@@ -3,7 +3,7 @@ import { BrowserRouter, Routes, Route } from 'react-router-dom';
|
|||||||
import { LanguageProvider } from './i18n';
|
import { LanguageProvider } from './i18n';
|
||||||
import { Navbar, Footer, FancyCursor, ScrollToTop } from './components/layout';
|
import { Navbar, Footer, FancyCursor, ScrollToTop } from './components/layout';
|
||||||
import { Home } from './pages/Home';
|
import { Home } from './pages/Home';
|
||||||
import { PageLoader, SkipLink } from './components/ui';
|
import { PageLoader } from './components/ui';
|
||||||
import './styles/global.css';
|
import './styles/global.css';
|
||||||
|
|
||||||
// Lazy load pages to reduce initial bundle size.
|
// Lazy load pages to reduce initial bundle size.
|
||||||
@@ -15,20 +15,17 @@ export function App() {
|
|||||||
return (
|
return (
|
||||||
<LanguageProvider>
|
<LanguageProvider>
|
||||||
<BrowserRouter>
|
<BrowserRouter>
|
||||||
<SkipLink />
|
|
||||||
<ScrollToTop />
|
<ScrollToTop />
|
||||||
<FancyCursor />
|
<FancyCursor />
|
||||||
<Navbar />
|
<Navbar />
|
||||||
<main id="main-content" tabIndex={-1} style={{ flex: 1, outline: 'none' }}>
|
{/* Suspense handles the loading state for lazy-loaded routes */}
|
||||||
{/* Suspense handles the loading state for lazy-loaded routes */}
|
<Suspense fallback={<PageLoader />}>
|
||||||
<Suspense fallback={<PageLoader />}>
|
<Routes>
|
||||||
<Routes>
|
<Route path="/" element={<Home />} />
|
||||||
<Route path="/" element={<Home />} />
|
<Route path="/about" element={<About />} />
|
||||||
<Route path="/about" element={<About />} />
|
<Route path="/contact" element={<Contact />} />
|
||||||
<Route path="/contact" element={<Contact />} />
|
</Routes>
|
||||||
</Routes>
|
</Suspense>
|
||||||
</Suspense>
|
|
||||||
</main>
|
|
||||||
<Footer />
|
<Footer />
|
||||||
</BrowserRouter>
|
</BrowserRouter>
|
||||||
</LanguageProvider>
|
</LanguageProvider>
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ const GradientBlinds: React.FC<GradientBlindsProps> = ({
|
|||||||
const rendererRef = useRef<Renderer | null>(null);
|
const rendererRef = useRef<Renderer | null>(null);
|
||||||
const mouseTargetRef = useRef<[number, number]>([0, 0]);
|
const mouseTargetRef = useRef<[number, number]>([0, 0]);
|
||||||
// Optimization: store raw pointer position (viewport coords) to decouple event handling from calculation
|
// Optimization: store raw pointer position (viewport coords) to decouple event handling from calculation
|
||||||
const pointerPosRef = useRef<{ x: number; y: number } | null>(null);
|
const pointerPosRef = useRef<{ x: number; y: number; active: boolean }>({ x: 0, y: 0, active: false });
|
||||||
const isMobileRef = useRef<boolean>(false);
|
const isMobileRef = useRef<boolean>(false);
|
||||||
const lastTimeRef = useRef<number>(0);
|
const lastTimeRef = useRef<number>(0);
|
||||||
const firstResizeRef = useRef<boolean>(true);
|
const firstResizeRef = useRef<boolean>(true);
|
||||||
@@ -304,7 +304,8 @@ void main() {
|
|||||||
const cx = gl.drawingBufferWidth / 2;
|
const cx = gl.drawingBufferWidth / 2;
|
||||||
const cy = gl.drawingBufferHeight / 2;
|
const cy = gl.drawingBufferHeight / 2;
|
||||||
uniforms.iMouse.value = [cx, cy];
|
uniforms.iMouse.value = [cx, cy];
|
||||||
mouseTargetRef.current = [cx, cy];
|
mouseTargetRef.current[0] = cx;
|
||||||
|
mouseTargetRef.current[1] = cy;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -332,10 +333,13 @@ void main() {
|
|||||||
x = (e.clientX - rect.left) * scale;
|
x = (e.clientX - rect.left) * scale;
|
||||||
y = (rect.height - (e.clientY - rect.top)) * scale;
|
y = (rect.height - (e.clientY - rect.top)) * scale;
|
||||||
}
|
}
|
||||||
mouseTargetRef.current = [x, y];
|
mouseTargetRef.current[0] = x;
|
||||||
pointerPosRef.current = null; // Ensure loop doesn't override
|
mouseTargetRef.current[1] = y;
|
||||||
|
pointerPosRef.current.active = false; // Ensure loop doesn't override
|
||||||
} else {
|
} else {
|
||||||
pointerPosRef.current = { x: e.clientX, y: e.clientY };
|
pointerPosRef.current.x = e.clientX;
|
||||||
|
pointerPosRef.current.y = e.clientY;
|
||||||
|
pointerPosRef.current.active = true;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -344,7 +348,7 @@ void main() {
|
|||||||
uniforms.iTime.value = t * 0.001;
|
uniforms.iTime.value = t * 0.001;
|
||||||
|
|
||||||
// Update target based on pointer position and scroll offset
|
// Update target based on pointer position and scroll offset
|
||||||
if (pointerPosRef.current) {
|
if (pointerPosRef.current.active) {
|
||||||
const scale = (renderer as unknown as { dpr?: number }).dpr || 1;
|
const scale = (renderer as unknown as { dpr?: number }).dpr || 1;
|
||||||
let x, y;
|
let x, y;
|
||||||
|
|
||||||
@@ -355,13 +359,11 @@ void main() {
|
|||||||
const rectTop = rectRef.current.top - dy;
|
const rectTop = rectRef.current.top - dy;
|
||||||
x = (pointerPosRef.current.x - rectLeft) * scale;
|
x = (pointerPosRef.current.x - rectLeft) * scale;
|
||||||
y = (rectRef.current.height - (pointerPosRef.current.y - rectTop)) * scale;
|
y = (rectRef.current.height - (pointerPosRef.current.y - rectTop)) * scale;
|
||||||
} else {
|
|
||||||
// Fallback if rectRef missing
|
mouseTargetRef.current[0] = x;
|
||||||
const rect = canvas.getBoundingClientRect();
|
mouseTargetRef.current[1] = y;
|
||||||
x = (pointerPosRef.current.x - rect.left) * scale;
|
|
||||||
y = (rect.height - (pointerPosRef.current.y - rect.top)) * scale;
|
|
||||||
}
|
}
|
||||||
mouseTargetRef.current = [x, y];
|
// Removed costly getBoundingClientRect fallback; rectRef should exist.
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mouseDampening > 0) {
|
if (mouseDampening > 0) {
|
||||||
@@ -376,8 +378,9 @@ void main() {
|
|||||||
cur[0] += (target[0] - cur[0]) * factor;
|
cur[0] += (target[0] - cur[0]) * factor;
|
||||||
cur[1] += (target[1] - cur[1]) * factor;
|
cur[1] += (target[1] - cur[1]) * factor;
|
||||||
} else {
|
} else {
|
||||||
if (pointerPosRef.current || isMobileRef.current) {
|
if (pointerPosRef.current.active || isMobileRef.current) {
|
||||||
uniforms.iMouse.value = mouseTargetRef.current;
|
uniforms.iMouse.value[0] = mouseTargetRef.current[0];
|
||||||
|
uniforms.iMouse.value[1] = mouseTargetRef.current[1];
|
||||||
}
|
}
|
||||||
lastTimeRef.current = t;
|
lastTimeRef.current = t;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,20 +0,0 @@
|
|||||||
.skipLink {
|
|
||||||
position: absolute;
|
|
||||||
top: 1rem;
|
|
||||||
left: 1rem;
|
|
||||||
z-index: 100;
|
|
||||||
padding: 0.75rem 1.25rem;
|
|
||||||
background-color: var(--md-sys-color-primary);
|
|
||||||
color: var(--md-sys-color-on-primary);
|
|
||||||
font-weight: 600;
|
|
||||||
border-radius: var(--radius-md);
|
|
||||||
text-decoration: none;
|
|
||||||
transform: translateY(-200%);
|
|
||||||
transition: transform var(--transition-normal);
|
|
||||||
outline: none;
|
|
||||||
box-shadow: var(--md-sys-color-shadow) 0px 4px 8px 3px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.skipLink:focus {
|
|
||||||
transform: translateY(0);
|
|
||||||
}
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
import { useTranslation } from '../../i18n';
|
|
||||||
import styles from './SkipLink.module.css';
|
|
||||||
|
|
||||||
export function SkipLink() {
|
|
||||||
const { t } = useTranslation();
|
|
||||||
|
|
||||||
return (
|
|
||||||
<a href="#main-content" className={styles.skipLink}>
|
|
||||||
{t.nav.skipLink}
|
|
||||||
</a>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
// @vitest-environment jsdom
|
|
||||||
import { render, screen, cleanup } from '@testing-library/react';
|
|
||||||
import { describe, it, expect, afterEach } from 'vitest';
|
|
||||||
import { SkipLink } from '../SkipLink';
|
|
||||||
import { LanguageProvider } from '../../../i18n';
|
|
||||||
|
|
||||||
describe('SkipLink', () => {
|
|
||||||
afterEach(() => {
|
|
||||||
cleanup();
|
|
||||||
});
|
|
||||||
|
|
||||||
const renderWithProviders = (component: React.ReactNode) => {
|
|
||||||
return render(
|
|
||||||
<LanguageProvider>
|
|
||||||
{component}
|
|
||||||
</LanguageProvider>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
it('renders correctly with correct href', () => {
|
|
||||||
renderWithProviders(<SkipLink />);
|
|
||||||
const link = screen.getByRole('link');
|
|
||||||
expect(link).toBeTruthy();
|
|
||||||
expect(link.getAttribute('href')).toBe('#main-content');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('renders translated text', () => {
|
|
||||||
renderWithProviders(<SkipLink />);
|
|
||||||
const link = screen.getByRole('link');
|
|
||||||
const text = link.textContent;
|
|
||||||
expect(text === 'Zum Inhalt springen' || text === 'Skip to content').toBe(true);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -2,4 +2,3 @@ export { Button } from './Button';
|
|||||||
export { Card } from './Card';
|
export { Card } from './Card';
|
||||||
export { Input, Textarea } from './Input';
|
export { Input, Textarea } from './Input';
|
||||||
export { PageLoader } from './PageLoader';
|
export { PageLoader } from './PageLoader';
|
||||||
export { SkipLink } from './SkipLink';
|
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
export const de = {
|
export const de = {
|
||||||
// Navigation
|
// Navigation
|
||||||
nav: {
|
nav: {
|
||||||
skipLink: 'Zum Inhalt springen',
|
|
||||||
home: 'Startseite',
|
home: 'Startseite',
|
||||||
about: 'Über uns',
|
about: 'Über uns',
|
||||||
contact: 'Kontakt',
|
contact: 'Kontakt',
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import type { Translations } from './de';
|
|||||||
export const en: Translations = {
|
export const en: Translations = {
|
||||||
// Navigation
|
// Navigation
|
||||||
nav: {
|
nav: {
|
||||||
skipLink: 'Skip to content',
|
|
||||||
home: 'Home',
|
home: 'Home',
|
||||||
about: 'About',
|
about: 'About',
|
||||||
contact: 'Contact',
|
contact: 'Contact',
|
||||||
|
|||||||
Reference in New Issue
Block a user