website refactor

apps/website/app/layout.tsx

@@ -6,7 +6,7 @@ import React from 'react';
 import './globals.css';
 import { AppWrapper } from '@/components/AppWrapper';
 import { Header } from '@/ui/Header';
-import { HeaderContent } from '@/ui/HeaderContent';
+import { HeaderContent } from '@/components/layout/HeaderContent';
 import { MainContent } from '@/ui/MainContent';
 
 export const dynamic = 'force-dynamic';

apps/website/app/leagues/LeaguesClient.tsx

@@ -18,7 +18,7 @@ import {
   Target,
   Timer,
 } from 'lucide-react';
-import { LeagueCard } from '@/ui/LeagueCardWrapper';
+import { LeagueCard } from '@/components/leagues/LeagueCardWrapper';
 import { Button } from '@/ui/Button';
 import { Card } from '@/ui/Card';
 import { Input } from '@/ui/Input';

apps/website/app/leagues/[id]/stewarding/StewardingTemplate.tsx

@@ -19,7 +19,7 @@ import {
 } from 'lucide-react';
 import Link from 'next/link';
 import { useMemo, useState } from 'react';
-import { PendingProtestsList } from '@/ui/PendingProtestsList';
+import { PendingProtestsList } from '@/components/leagues/PendingProtestsList';
 import { PenaltyHistoryList } from '@/components/leagues/PenaltyHistoryList';
 
 interface StewardingData {

apps/website/app/leagues/[id]/stewarding/protests/[protestId]/page.tsx

@@ -37,7 +37,7 @@ import { useMemo, useState } from 'react';
 
 // Shared state components
 import { StateContainer } from '@/components/shared/state/StateContainer';
-import { LoadingWrapper } from '@/ui/LoadingWrapper';
+import { LoadingWrapper } from '@/components/shared/state/LoadingWrapper';
 import { useLeagueAdminStatus } from "@/lib/hooks/league/useLeagueAdminStatus";
 import { useProtestDetail } from "@/lib/hooks/league/useProtestDetail";
 

apps/website/app/sponsor/signup/page.tsx

@@ -5,7 +5,7 @@ import { motion, useReducedMotion } from 'framer-motion';
 import { Card } from '@/ui/Card';
 import { Button } from '@/ui/Button';
 import { Input } from '@/ui/Input';
-import { SponsorHero } from '@/ui/SponsorHero';
+import { SponsorHero } from '@/components/sponsors/SponsorHero';
 import { SponsorWorkflowMockup } from '@/components/sponsors/SponsorWorkflowMockup';
 import { SponsorBenefitCard } from '@/components/sponsors/SponsorBenefitCard';
 import { siteConfig } from '@/lib/siteConfig';

apps/website/components/auth/AuthWorkflowMockup.tsx

@@ -8,7 +8,7 @@ import {
   Trophy,
   Car,
 } from 'lucide-react';
-import { WorkflowMockup, WorkflowStep } from '@/ui/WorkflowMockup';
+import { WorkflowMockup, WorkflowStep } from '@/components/mockups/WorkflowMockup';
 
 const WORKFLOW_STEPS: WorkflowStep[] = [
   {

apps/website/components/dashboard/QuickActions.tsx

@@ -2,9 +2,9 @@
 
 import { routes } from '@/lib/routing/RouteConfig';
 import { Trophy, Users } from 'lucide-react';
-import { Box } from './Box';
+import { Box } from '@/ui/Box';
-import { Heading } from './Heading';
+import { Heading } from '@/ui/Heading';
-import { QuickActionItem } from './QuickActionItem';
+import { QuickActionItem } from '@/ui/QuickActionItem';
 
 export function QuickActions() {
   return (

apps/website/components/dev/DebugModeToggle.tsx

@@ -6,11 +6,11 @@ import type { GlobalErrorHandler } from '@/lib/infrastructure/GlobalErrorHandler
 import { getGlobalErrorHandler } from '@/lib/infrastructure/GlobalErrorHandler';
 import { Bug, Shield, X } from 'lucide-react';
 import { useCallback, useEffect, useState } from 'react';
-import { Box } from './Box';
+import { Box } from '@/ui/Box';
-import { Button } from './Button';
+import { Button } from '@/ui/Button';
-import { Icon } from './Icon';
+import { Icon } from '@/ui/Icon';
-import { Stack } from './Stack';
+import { Stack } from '@/ui/Stack';
-import { Text } from './Text';
+import { Text } from '@/ui/Text';
 
 // Extend Window interface for debug globals
 declare global {

apps/website/components/drivers/DriverCard.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Card } from '@/ui/Card';
 import { RankBadge } from '@/ui/RankBadge';
-import { DriverIdentity } from '@/ui/DriverIdentity';
+import { DriverIdentity } from '@/components/drivers/DriverIdentity';
 import { DriverViewModel } from '@/lib/view-models/DriverViewModel';
 import { Stack } from '@/ui/Stack';
 import { DriverStats } from '@/ui/DriverStats';

apps/website/components/drivers/DriverEntryRow.tsx

@@ -2,12 +2,12 @@
 
 import { CountryFlagDisplay } from '@/lib/display-objects/CountryFlagDisplay';
 import { Zap } from 'lucide-react';
-import { Badge } from './Badge';
+import { Badge } from '@/ui/Badge';
-import { Box } from './Box';
+import { Box } from '@/ui/Box';
-import { Icon } from './Icon';
+import { Icon } from '@/ui/Icon';
-import { Image } from './Image';
+import { Image } from '@/ui/Image';
-import { Stack } from './Stack';
+import { Stack } from '@/ui/Stack';
-import { Text } from './Text';
+import { Text } from '@/ui/Text';
 
 interface DriverEntryRowProps {
   index: number;

apps/website/components/drivers/DriverIdentity.tsx

@@ -1,9 +1,9 @@
 import Link from 'next/link';
-import Image from 'next/image';
+import { PlaceholderImage } from '@/ui/PlaceholderImage';
-import { PlaceholderImage } from './PlaceholderImage';
+import { Box } from '@/ui/Box';
-import { Box } from './Box';
+import { Text } from '@/ui/Text';
-import { Text } from './Text';
+import { Badge } from '@/ui/Badge';
-import { Badge } from './Badge';
+import { Image } from '@/ui/Image';
 
 export interface DriverIdentityProps {
   driver: {
@@ -43,7 +43,9 @@ export function DriverIdentity(props: DriverIdentityProps) {
             alt={driver.name}
             width={avatarSize}
             height={avatarSize}
-            className="w-full h-full object-cover"
+            fullWidth
+            fullHeight
+            objectFit="cover"
           />
         ) : (
           <PlaceholderImage size={avatarSize} />

apps/website/components/drivers/DriverProfile.tsx

@@ -7,10 +7,10 @@ import { Text } from '@/ui/Text';
 import { Heading } from '@/ui/Heading';
 import { Stack } from '@/ui/Stack';
 import { StatCard } from '@/ui/StatCard';
-import { ProfileHeader } from '@/ui/ProfileHeader';
+import { ProfileHeader } from '@/components/drivers/ProfileHeader';
 import { ProfileStats } from './ProfileStats';
 import { CareerHighlights } from '@/ui/CareerHighlights';
-import { DriverRankings } from '@/ui/DriverRankings';
+import { DriverRankings } from '@/components/drivers/DriverRankings';
 import { PerformanceMetrics } from '@/ui/PerformanceMetrics';
 import { useDriverProfile } from "@/hooks/driver/useDriverProfile";
 

apps/website/components/drivers/DriverRankings.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
 import { Card } from '@/ui/Card';
 import { Heading } from '@/ui/Heading';
-import { RankingListItem } from '@/ui/RankingListItem';
+import { RankingListItem } from '@/components/leaderboards/RankingListItem';
-import { RankingList } from '@/ui/RankingList';
+import { RankingList } from '@/components/leaderboards/RankingList';
-import { MinimalEmptyState } from '@/ui/EmptyState';
+import { MinimalEmptyState } from '@/components/shared/state/EmptyState';
 
 export interface DriverRanking {
   type: 'overall' | 'league';

apps/website/components/drivers/ProfileHero.tsx

@@ -1,6 +1,7 @@
 
 
 import { mediaConfig } from '@/lib/config/mediaConfig';
+import { CountryFlagDisplay } from '@/lib/display-objects/CountryFlagDisplay';
 import { Box } from '@/ui/Box';
 import { Button } from '@/ui/Button';
 import { Heading } from '@/ui/Heading';

apps/website/components/drivers/ProfileRaceHistory.tsx

@@ -6,8 +6,8 @@ import { Button } from '@/ui/Button';
 import { Box } from '@/ui/Box';
 import { Text } from '@/ui/Text';
 import { Stack } from '@/ui/Stack';
-import { LoadingWrapper } from '@/ui/LoadingWrapper';
+import { LoadingWrapper } from '@/components/shared/state/LoadingWrapper';
-import { EmptyState } from '@/ui/EmptyState';
+import { EmptyState } from '@/components/shared/state/EmptyState';
 import { Pagination } from '@/ui/Pagination';
 import { Trophy } from 'lucide-react';
 

apps/website/components/errors/ApiErrorBoundary.tsx

@@ -3,7 +3,7 @@
 import React, { Component, ReactNode, useState } from 'react';
 import { ApiError } from '@/lib/api/base/ApiError';
 import { connectionMonitor } from '@/lib/api/base/ApiConnectionMonitor';
-import { ErrorDisplay } from './ErrorDisplay';
+import { ErrorDisplay } from '@/components/shared/state/ErrorDisplay';
 import { DevErrorPanel } from './DevErrorPanel';
 
 interface Props {

apps/website/components/errors/EnhancedErrorBoundary.tsx

@@ -4,7 +4,7 @@ import React, { Component, ReactNode, ErrorInfo, useState, version } from 'react
 import { ApiError } from '@/lib/api/base/ApiError';
 import { getGlobalErrorHandler } from '@/lib/infrastructure/GlobalErrorHandler';
 import { DevErrorPanel } from './DevErrorPanel';
-import { ErrorDisplay } from './ErrorDisplay';
+import { ErrorDisplay } from '@/components/shared/state/ErrorDisplay';
 
 interface Props {
   children: ReactNode;

apps/website/components/errors/ErrorDisplay.tsx

@@ -2,7 +2,7 @@
 
 import React from 'react';
 import { ApiError } from '@/lib/api/base/ApiError';
-import { ErrorDisplay as UiErrorDisplay } from '@/ui/ErrorDisplay';
+import { ErrorDisplay as UiErrorDisplay } from '@/components/shared/state/ErrorDisplay';
 
 interface ErrorDisplayProps {
   error: ApiError;

apps/website/components/feed/ActivityFeed.tsx

@@ -4,8 +4,8 @@ import { Card } from '@/ui/Card';
 import { Heading } from '@/ui/Heading';
 import { ActivityItem } from '@/ui/ActivityItem';
 import { Icon } from '@/ui/Icon';
-import { ActivityFeedList } from '@/ui/ActivityFeedList';
+import { ActivityFeedList } from '@/components/feed/ActivityFeedList';
-import { MinimalEmptyState } from '@/ui/EmptyState';
+import { MinimalEmptyState } from '@/components/shared/state/EmptyState';
 
 interface FeedItem {
   id: string;

apps/website/components/feed/ActivityFeedItem.tsx

@@ -1,8 +1,9 @@
 
 
 import { ReactNode } from 'react';
-import { Box } from './Box';
+import { Box } from '@/ui/Box';
-import { Surface } from './Surface';
+import { Surface } from '@/ui/Surface';
+import { Text } from '@/ui/Text';
 
 interface ActivityFeedItemProps {
   icon: ReactNode;

apps/website/components/feed/ActivityFeedList.tsx

@@ -1,5 +1,5 @@
 import React, { ReactNode } from 'react';
-import { Stack } from './Stack';
+import { Stack } from '@/ui/Stack';
 
 interface ActivityFeedListProps {
   children: ReactNode;

apps/website/components/feed/FeedLayout.tsx

@@ -1,7 +1,7 @@
 import { Card } from '@/ui/Card';
-import { FeedList } from '@/ui/FeedList';
+import { FeedList } from '@/components/feed/FeedList';
-import { UpcomingRacesSidebar } from '@/ui/UpcomingRacesSidebar';
+import { UpcomingRacesSidebar } from '@/components/races/UpcomingRacesSidebar';
-import { LatestResultsSidebar } from '@/ui/LatestResultsSidebar';
+import { LatestResultsSidebar } from '@/components/races/LatestResultsSidebar';
 
 interface FeedItemData {
   id: string;

apps/website/components/landing/BenefitCard.tsx

@@ -3,11 +3,11 @@
 import { motion, useReducedMotion } from 'framer-motion';
 import { LucideIcon } from 'lucide-react';
 import { useEffect, useState } from 'react';
-import { Box } from './Box';
+import { Box } from '@/ui/Box';
-import { Heading } from './Heading';
+import { Heading } from '@/ui/Heading';
-import { Icon } from './Icon';
+import { Icon } from '@/ui/Icon';
-import { Surface } from './Surface';
+import { Surface } from '@/ui/Surface';
-import { Text } from './Text';
+import { Text } from '@/ui/Text';
 
 interface BenefitCardProps {
   icon: LucideIcon;

apps/website/components/landing/FeatureGrid.tsx

@@ -1,12 +1,12 @@
 'use client';
 
-import { useRef, useState, useEffect } from 'react';
 import { Section } from '@/ui/Section';
 import { Container } from '@/ui/Container';
 import { Heading } from '@/ui/Heading';
-import { MockupStack } from '@/ui/MockupStack';
+import { MockupStack } from '@/components/mockups/MockupStack';
 import { Box } from '@/ui/Box';
 import { Text } from '@/ui/Text';
+import { Stack } from '@/ui/Stack';
 import { LeagueHomeMockup } from '@/components/mockups/LeagueHomeMockup';
 import { StandingsTableMockup } from '@/components/mockups/StandingsTableMockup';
 import { TeamCompetitionMockup } from '@/components/mockups/TeamCompetitionMockup';

apps/website/components/landing/LandingHero.tsx

@@ -1,5 +1,5 @@
 
-
+import { useRef } from 'react';
 import { useParallax } from '@/hooks/useScrollProgress';
 import { Box } from '@/ui/Box';
 import { Button } from '@/ui/Button';
@@ -126,7 +126,7 @@ export function LandingHero() {
           <Box display="flex" alignItems="center" justifyContent="center">
             <Button
               as="a"
-              href="#community"
+              href={discordUrl}
               variant="primary"
               px={8}
               py={4}
@@ -168,4 +168,4 @@ export function LandingHero() {
       </Container>
     </Box>
   );
-}
+}

apps/website/components/layout/HeaderContent.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import Image from 'next/image';
 import Link from 'next/link';
-import { Text } from './Text';
+import { Text } from '@/ui/Text';
 
 export function HeaderContent() {
   return (

apps/website/components/leaderboards/LeaderboardItem.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
-import Image from 'next/image';
 import { Crown, Flag } from 'lucide-react';
-import { Box } from './Box';
+import { Box } from '@/ui/Box';
-import { Text } from './Text';
+import { Text } from '@/ui/Text';
-import { Stack } from './Stack';
+import { Stack } from '@/ui/Stack';
+import { Image } from '@/ui/Image';
 import { mediaConfig } from '@/lib/config/mediaConfig';
 
 interface LeaderboardItemProps {
@@ -80,7 +80,7 @@ export function LeaderboardItem({
 
       {/* Avatar */}
       <Box position="relative" width="9" height="9" rounded="full" overflow="hidden" border={true} borderColor="border-charcoal-outline">
-        <Image src={avatarUrl || mediaConfig.avatars.defaultFallback} alt={name} fill className="object-cover" />
+        <Image src={avatarUrl || mediaConfig.avatars.defaultFallback} alt={name} fill objectFit="cover" />
       </Box>
 
       {/* Info */}

apps/website/components/leaderboards/LeaderboardPreview.tsx

@@ -5,7 +5,7 @@ import { Box } from '@/ui/Box';
 import { Button } from '@/ui/Button';
 import { Heading } from '@/ui/Heading';
 import { Icon } from '@/ui/Icon';
-import { LeaderboardItem } from '@/ui/LeaderboardItem';
+import { LeaderboardItem } from '@/components/leaderboards/LeaderboardItem';
 import { LeaderboardList } from '@/ui/LeaderboardList';
 import { Stack } from '@/ui/Stack';
 import { Text } from '@/ui/Text';

apps/website/components/leaderboards/RankingList.tsx

@@ -1,5 +1,5 @@
 import React, { ReactNode } from 'react';
-import { Stack } from './Stack';
+import { Stack } from '@/ui/Stack';
 
 interface RankingListProps {
   children: ReactNode;

apps/website/components/leaderboards/RankingListItem.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
-import { Box } from './Box';
+import { Box } from '@/ui/Box';
-import { Text } from './Text';
+import { Text } from '@/ui/Text';
-import { Stack } from './Stack';
+import { Stack } from '@/ui/Stack';
 
 interface RankingListItemProps {
   name: string;

apps/website/components/leagues/ChampionshipStandings.tsx

@@ -2,7 +2,7 @@
 
 import { routes } from '@/lib/routing/RouteConfig';
 import { Card } from '@/ui/Card';
-import { ChampionshipStandingsList } from '@/ui/ChampionshipStandingsList';
+import { ChampionshipStandingsList } from '@/components/leagues/ChampionshipStandingsList';
 import { Heading } from '@/ui/Heading';
 import { Icon } from '@/ui/Icon';
 import { Link } from '@/ui/Link';

apps/website/components/leagues/ChampionshipStandingsList.tsx

@@ -1,5 +1,5 @@
 import React, { ReactNode } from 'react';
-import { Stack } from './Stack';
+import { Stack } from '@/ui/Stack';
 
 interface ChampionshipStandingsListProps {
   children: ReactNode;

apps/website/components/leagues/EmptyState.tsx

@@ -1,6 +1,6 @@
 import { Trophy, Sparkles, LucideIcon } from 'lucide-react';
 import { Card } from '@/ui/Card';
-import { EmptyState as UiEmptyState } from '@/ui/EmptyState';
+import { EmptyState as UiEmptyState } from '@/components/shared/state/EmptyState';
 
 interface EmptyStateProps {
   title: string;

apps/website/components/leagues/LeagueActivityFeed.tsx

@@ -1,7 +1,7 @@
 import React, { useMemo } from 'react';
 import { Calendar, UserPlus, UserMinus, Shield, Flag, AlertTriangle } from 'lucide-react';
 import { useLeagueRaces } from "@/hooks/league/useLeagueRaces";
-import { ActivityFeedItem } from '@/ui/ActivityFeedItem';
+import { ActivityFeedItem } from '@/components/feed/ActivityFeedItem';
 import { Icon } from '@/ui/Icon';
 import { Text } from '@/ui/Text';
 import { Stack } from '@/ui/Stack';

apps/website/components/leagues/LeagueMemberRow.tsx

@@ -1,9 +1,9 @@
 import React, { ReactNode } from 'react';
-import { TableRow, TableCell } from './Table';
+import { TableRow, TableCell } from '@/ui/Table';
-import { Box } from './Box';
+import { Box } from '@/ui/Box';
-import { Text } from './Text';
+import { Text } from '@/ui/Text';
-import { Badge } from './Badge';
+import { Badge } from '@/ui/Badge';
-import { DriverIdentity } from './DriverIdentity';
+import { DriverIdentity } from '@/components/drivers/DriverIdentity';
 import { DriverViewModel } from '@/lib/view-models/DriverViewModel';
 
 interface LeagueMemberRowProps {
@@ -92,7 +92,7 @@ export function LeagueMemberRow({
         </Text>
       </TableCell>
       {actions && (
-        <TableCell align="right">
+        <TableCell textAlign="right">
           {actions}
         </TableCell>
       )}

apps/website/components/leagues/LeagueMembers.tsx

@@ -13,8 +13,8 @@ import { Text } from '@/ui/Text';
 import { Select } from '@/ui/Select';
 import { Button } from '@/ui/Button';
 import { LeagueMemberTable } from '@/ui/LeagueMemberTable';
-import { LeagueMemberRow } from '@/ui/LeagueMemberRow';
+import { LeagueMemberRow } from '@/components/leagues/LeagueMemberRow';
-import { MinimalEmptyState } from '@/ui/EmptyState';
+import { MinimalEmptyState } from '@/components/shared/state/EmptyState';
 
 interface LeagueMembersProps {
   leagueId: string;

apps/website/components/leagues/LeagueOwnershipTransfer.tsx

@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { DriverSummaryPill } from '@/ui/DriverSummaryPillWrapper';
+import { DriverSummaryPill } from '@/components/drivers/DriverSummaryPillWrapper';
 import { Button } from '@/ui/Button';
 import { UserCog } from 'lucide-react';
 import { LeagueSettingsViewModel } from '@/lib/view-models/LeagueSettingsViewModel';

apps/website/components/leagues/LeagueSchedule.tsx

@@ -7,7 +7,7 @@ import { useState } from 'react';
 import type { LeagueScheduleRaceViewModel } from '@/lib/view-models/LeagueScheduleViewModel';
 
 // Shared state components
-import { StateContainer } from '@/ui/StateContainer';
+import { StateContainer } from '@/components/shared/state/StateContainer';
 import { useLeagueSchedule } from "@/hooks/league/useLeagueSchedule";
 import { Calendar } from 'lucide-react';
 import { Box } from '@/ui/Box';

apps/website/components/leagues/LeagueTimingsSection.tsx

@@ -21,7 +21,7 @@ import {
 import type { LeagueConfigFormModel } from '@/lib/types/LeagueConfigFormModel';
 import type { Weekday } from '@/lib/types/Weekday';
 import { Input } from '@/ui/Input';
-import RangeField from '@/ui/RangeField';
+import { RangeField } from '@/components/shared/RangeField';
 import { Box } from '@/ui/Box';
 import { Text } from '@/ui/Text';
 import { Stack } from '@/ui/Stack';

apps/website/components/leagues/PendingProtestsList.tsx

@@ -5,7 +5,7 @@ import { ProtestViewModel } from "@/lib/view-models/ProtestViewModel";
 import { RaceViewModel } from "@/lib/view-models/RaceViewModel";
 import { Box } from "@/ui/Box";
 import { Card } from "@/ui/Card";
-import { ProtestListItem } from "@/ui/ProtestListItem";
+import { ProtestListItem } from "./ProtestListItem";
 import { Stack } from "@/ui/Stack";
 import { Text } from "@/ui/Text";
 import { Flag } from "lucide-react";
@@ -21,7 +21,9 @@ interface PendingProtestsListProps {
 
 export function PendingProtestsList({
   protests,
+  drivers,
   leagueId,
+  onReviewProtest,
 }: PendingProtestsListProps) {
 
   if (protests.length === 0) {
@@ -49,17 +51,25 @@ export function PendingProtestsList({
         const daysSinceFiled = Math.floor((Date.now() - new Date(filedAt).getTime()) / (1000 * 60 * 60 * 24));
         const isUrgent = daysSinceFiled > 2;
         
+        const protester = drivers[protest.protestingDriverId];
+        const accused = drivers[protest.accusedDriverId];
+        
         return (
           <ProtestListItem
             key={protest.id}
-            id={protest.id}
+            protesterName={protester?.name || 'Unknown'}
-            filedAt={filedAt}
+            protesterHref={`/drivers/${protest.protestingDriverId}`}
-            description={protest.incident?.description || protest.description}
+            accusedName={accused?.name || 'Unknown'}
-            lap={protest.incident?.lap}
+            accusedHref={`/drivers/${protest.accusedDriverId}`}
-            hasVideo={!!protest.proofVideoUrl}
+            status={protest.status}
             isUrgent={isUrgent}
             daysOld={daysSinceFiled}
-            href={`/leagues/${leagueId}/stewarding/protests/${protest.id}`}
+            lap={protest.incident?.lap ?? 0}
+            filedAtLabel={new Date(filedAt).toLocaleDateString()}
+            description={protest.incident?.description || protest.description}
+            proofVideoUrl={protest.proofVideoUrl || undefined}
+            isAdmin={true}
+            onReview={() => onReviewProtest(protest)}
           />
         );
       })}

apps/website/components/leagues/ProtestCardWrapper.tsx

@@ -1,7 +1,7 @@
 
 
 import { routes } from '@/lib/routing/RouteConfig';
-import { ProtestListItem } from '@/ui/ProtestListItem';
+import { ProtestListItem } from './ProtestListItem';
 
 interface Protest {
   id: string;

apps/website/components/leagues/ProtestListItem.tsx

@@ -1,14 +1,14 @@
 
 
 import { AlertCircle, AlertTriangle, Video } from 'lucide-react';
-import { Badge } from './Badge';
+import { Badge } from '@/ui/Badge';
-import { Box } from './Box';
+import { Box } from '@/ui/Box';
-import { Button } from './Button';
+import { Button } from '@/ui/Button';
-import { Card } from './Card';
+import { Card } from '@/ui/Card';
-import { Icon } from './Icon';
+import { Icon } from '@/ui/Icon';
-import { Link } from './Link';
+import { Link } from '@/ui/Link';
-import { Stack } from './Stack';
+import { Stack } from '@/ui/Stack';
-import { Text } from './Text';
+import { Text } from '@/ui/Text';
 
 interface ProtestListItemProps {
   protesterName: string;

apps/website/components/mockups/MockupStack.tsx

@@ -8,7 +8,7 @@ interface MockupStackProps {
   index?: number;
 }
 
-export default function MockupStack({ children, index = 0 }: MockupStackProps) {
+export function MockupStack({ children, index = 0 }: MockupStackProps) {
   const shouldReduceMotion = useReducedMotion();
   const [isMounted, setIsMounted] = useState(false);
   const [isMobile, setIsMobile] = useState(true); // Default to mobile (no animations)

apps/website/components/mockups/WorkflowMockup.tsx

@@ -3,11 +3,11 @@
 import { AnimatePresence, motion, useReducedMotion } from 'framer-motion';
 import { CheckCircle2, LucideIcon } from 'lucide-react';
 import { useEffect, useState } from 'react';
-import { Box } from './Box';
+import { Box } from '@/ui/Box';
-import { Icon } from './Icon';
+import { Icon } from '@/ui/Icon';
-import { Stack } from './Stack';
+import { Stack } from '@/ui/Stack';
-import { Surface } from './Surface';
+import { Surface } from '@/ui/Surface';
-import { Text } from './Text';
+import { Text } from '@/ui/Text';
 
 export interface WorkflowStep {
   id: number;

apps/website/components/onboarding/PersonalInfoStep.tsx

@@ -1,7 +1,7 @@
 import { User, Clock, ChevronRight } from 'lucide-react';
 import { Input } from '@/ui/Input';
 import { Heading } from '@/ui/Heading';
-import { CountrySelect } from '@/ui/CountrySelect';
+import { CountrySelect } from '@/components/shared/CountrySelect';
 import { Box } from '@/ui/Box';
 import { Stack } from '@/ui/Stack';
 import { Text } from '@/ui/Text';

apps/website/components/races/RaceEntryList.tsx

@@ -1,7 +1,7 @@
 
 
 import { Card } from '@/ui/Card';
-import { DriverEntryRow } from '@/ui/DriverEntryRow';
+import { DriverEntryRow } from '@/components/drivers/DriverEntryRow';
 import { Heading } from '@/ui/Heading';
 import { Icon } from '@/ui/Icon';
 import { Stack } from '@/ui/Stack';

apps/website/components/races/RaceList.tsx

@@ -6,7 +6,7 @@ import { Box } from '@/ui/Box';
 import { Card } from '@/ui/Card';
 import { DateHeader } from '@/ui/DateHeader';
 import { Icon } from '@/ui/Icon';
-import { RaceListItem } from '@/ui/RaceListItem';
+import { RaceListItem } from '@/components/races/RaceListItem';
 import { Stack } from '@/ui/Stack';
 import { Text } from '@/ui/Text';
 import { Calendar, CheckCircle2, Clock, PlayCircle, XCircle } from 'lucide-react';

apps/website/components/races/RaceListItem.tsx

@@ -1,13 +1,13 @@
 
 
 import { ArrowRight, Car, ChevronRight, LucideIcon, Trophy, Zap } from 'lucide-react';
-import { Badge } from './Badge';
+import { Badge } from '@/ui/Badge';
-import { Box } from './Box';
+import { Box } from '@/ui/Box';
-import { Heading } from './Heading';
+import { Heading } from '@/ui/Heading';
-import { Icon } from './Icon';
+import { Icon } from '@/ui/Icon';
-import { Link } from './Link';
+import { Link } from '@/ui/Link';
-import { Stack } from './Stack';
+import { Stack } from '@/ui/Stack';
-import { Text } from './Text';
+import { Text } from '@/ui/Text';
 
 interface RaceListItemProps {
   track: string;

apps/website/components/races/RaceListItemWrapper.tsx

@@ -1,7 +1,7 @@
 
 
 import { routes } from '@/lib/routing/RouteConfig';
-import { RaceListItem as UiRaceListItem } from '@/ui/RaceListItem';
+import { RaceListItem as UiRaceListItem } from '@/components/races/RaceListItem';
 import { CheckCircle2, Clock, PlayCircle, XCircle } from 'lucide-react';
 
 interface Race {

apps/website/components/races/RaceResultRow.tsx

@@ -1,11 +1,11 @@
 
 
 import { CountryFlagDisplay } from '@/lib/display-objects/CountryFlagDisplay';
-import { Box } from './Box';
+import { Box } from '@/ui/Box';
-import { Image } from './Image';
+import { Image } from '@/ui/Image';
-import { Stack } from './Stack';
+import { Stack } from '@/ui/Stack';
-import { Surface } from './Surface';
+import { Surface } from '@/ui/Surface';
-import { Text } from './Text';
+import { Text } from '@/ui/Text';
 
 interface ResultEntry {
   position: number;
@@ -64,7 +64,7 @@ export function RaceResultRow({ result, points }: RaceResultRowProps) {
         {/* Avatar */}
         <Box position="relative" flexShrink={0}>
           <Box width="10" height="10" rounded="full" overflow="hidden" border={isCurrentUser} borderColor="border-primary-blue/50" className={isCurrentUser ? 'border-2' : ''}>
-            <Image src={driverAvatar} alt={driverName} width={40} height={40} objectFit="cover" />
+            <Image src={driverAvatar} alt={driverName} width={40} height={40} fullWidth fullHeight objectFit="cover" />
           </Box>
           <Box position="absolute" bottom="-0.5" right="-0.5" width="5" height="5" rounded="full" bg="bg-deep-graphite" display="flex" center style={{ fontSize: '0.625rem' }}>
             {CountryFlagDisplay.fromCountryCode(country).toString()}

apps/website/components/races/UpcomingRaces.tsx

@@ -2,14 +2,14 @@
 
 import { routes } from '@/lib/routing/RouteConfig';
 import { Card } from '@/ui/Card';
-import { MinimalEmptyState } from '@/ui/EmptyState';
+import { MinimalEmptyState } from '@/components/shared/state/EmptyState';
 import { Heading } from '@/ui/Heading';
 import { Icon } from '@/ui/Icon';
 import { Link } from '@/ui/Link';
 import { Stack } from '@/ui/Stack';
 import { Text } from '@/ui/Text';
 import { UpcomingRaceItem } from '@/ui/UpcomingRaceItem';
-import { UpcomingRacesList } from '@/ui/UpcomingRacesList';
+import { UpcomingRacesList } from '@/components/races/UpcomingRacesList';
 import { Calendar } from 'lucide-react';
 
 interface UpcomingRace {

apps/website/components/races/UpcomingRacesList.tsx

@@ -1,5 +1,5 @@
 import React, { ReactNode } from 'react';
-import { Stack } from './Stack';
+import { Stack } from '@/ui/Stack';
 
 interface UpcomingRacesListProps {
   children: ReactNode;

apps/website/components/shared/CountrySelect.tsx

@@ -2,7 +2,7 @@
 
 import { Check, ChevronDown, Globe, Search } from 'lucide-react';
 import { useEffect, useRef, useState } from 'react';
-import { CountryFlag } from './CountryFlag';
+import { CountryFlag } from '@/ui/CountryFlag';
 
 export interface Country {
   code: string;

apps/website/components/shared/RangeField.tsx

@@ -20,7 +20,7 @@ interface RangeFieldProps {
   compact?: boolean;
 }
 
-export default function RangeField({
+export function RangeField({
   label,
   value,
   min,

apps/website/components/shared/state/EmptyState.tsx

@@ -1,7 +1,7 @@
 
 
-import { Button } from './Button';
+import { Button } from '@/ui/Button';
-import { EmptyStateProps } from './state-types';
+import { EmptyStateProps } from '@/ui/state-types';
 
 // Illustration components (simple SVG representations)
 const Illustrations = {

apps/website/components/shared/state/ErrorDisplay.tsx

@@ -2,14 +2,14 @@
 
 import { ApiError } from '@/lib/api/base/ApiError';
 import { AlertCircle, ArrowLeft, Home, RefreshCw } from 'lucide-react';
-import { Box } from './Box';
+import { Box } from '@/ui/Box';
-import { Button } from './Button';
+import { Button } from '@/ui/Button';
-import { Heading } from './Heading';
+import { Heading } from '@/ui/Heading';
-import { Icon } from './Icon';
+import { Icon } from '@/ui/Icon';
-import { Stack } from './Stack';
+import { Stack } from '@/ui/Stack';
-import { ErrorDisplayAction, ErrorDisplayProps } from './state-types';
+import { ErrorDisplayAction, ErrorDisplayProps } from '@/ui/state-types';
-import { Surface } from './Surface';
+import { Surface } from '@/ui/Surface';
-import { Text } from './Text';
+import { Text } from '@/ui/Text';
 
 export function ErrorDisplay({
   error,

apps/website/components/shared/state/LoadingWrapper.tsx

@@ -1,9 +1,9 @@
 
 
-import { Box } from './Box';
+import { Box } from '@/ui/Box';
-import { Stack } from './Stack';
+import { Stack } from '@/ui/Stack';
-import { LoadingWrapperProps } from './state-types';
+import { LoadingWrapperProps } from '@/ui/state-types';
-import { Text } from './Text';
+import { Text } from '@/ui/Text';
 
 /**
  * LoadingWrapper Component

apps/website/components/shared/state/PageWrapper.tsx

@@ -1,8 +1,8 @@
 import React, { ReactNode } from 'react';
 import { ApiError } from '@/lib/api/base/ApiError';
-import { LoadingWrapper } from '@/ui/LoadingWrapper';
+import { LoadingWrapper } from '@/components/shared/state/LoadingWrapper';
-import { ErrorDisplay } from '@/ui/ErrorDisplay';
+import { ErrorDisplay } from '@/components/shared/state/ErrorDisplay';
-import { EmptyState } from '@/ui/EmptyState';
+import { EmptyState } from '@/components/shared/state/EmptyState';
 import { Box } from '@/ui/Box';
 import { Inbox, List, LucideIcon } from 'lucide-react';
 

apps/website/components/shared/state/StateContainer.tsx

@@ -2,9 +2,9 @@
 
 import React from 'react';
 import { StateContainerProps, StateContainerConfig } from '@/ui/state-types';
-import { LoadingWrapper } from '@/ui/LoadingWrapper';
+import { LoadingWrapper } from '@/components/shared/state/LoadingWrapper';
-import { ErrorDisplay } from '@/ui/ErrorDisplay';
+import { ErrorDisplay } from '@/components/shared/state/ErrorDisplay';
-import { EmptyState } from '@/ui/EmptyState';
+import { EmptyState } from '@/components/shared/state/EmptyState';
 import { Box } from '@/ui/Box';
 import { Heading } from '@/ui/Heading';
 import { Text } from '@/ui/Text';
@@ -159,6 +159,11 @@ export function StateContainer<T>({
     );
   }
 
+  // Custom success render
+  if (config?.customRender?.success) {
+    return <>{config.customRender.success(data as T)}</>;
+  }
+
   // At this point, data is guaranteed to be non-null and non-undefined
   return <>{children(data as T)}</>;
 }
@@ -383,4 +388,4 @@ export function GridStateContainer<T>({
       {children}
     </StateContainer>
   );
-}
+}

apps/website/components/shared/state/StatefulPageWrapper.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import React from 'react';
-import { PageWrapper, PageWrapperProps } from './PageWrapper';
+import { PageWrapper, PageWrapperProps } from '@/components/shared/state/PageWrapper';
 
 /**
  * Stateful Page Wrapper - CLIENT SIDE ONLY
@@ -56,4 +56,4 @@ export function StatefulPageWrapper<TData>({
 }
 
 // Re-export types for convenience
-export type { PageWrapperProps, PageWrapperLoadingConfig, PageWrapperErrorConfig, PageWrapperEmptyConfig } from './PageWrapper';
+export type { PageWrapperProps, PageWrapperLoadingConfig, PageWrapperErrorConfig, PageWrapperEmptyConfig } from '@/components/shared/state/PageWrapper';

apps/website/components/social/FriendsSidebar.tsx

@@ -3,7 +3,7 @@
 import { routes } from '@/lib/routing/RouteConfig';
 import { Box } from '@/ui/Box';
 import { Card } from '@/ui/Card';
-import { MinimalEmptyState } from '@/ui/EmptyState';
+import { MinimalEmptyState } from '@/components/shared/state/EmptyState';
 import { FriendItem } from '@/ui/FriendItem';
 import { FriendsList } from '@/ui/FriendsList';
 import { Heading } from '@/ui/Heading';

apps/website/components/sponsors/SponsorBenefitCard.tsx

@@ -2,7 +2,7 @@
 
 import React from 'react';
 import { LucideIcon } from 'lucide-react';
-import { BenefitCard } from '@/ui/BenefitCard';
+import { BenefitCard } from '@/components/landing/BenefitCard';
 
 interface SponsorBenefitCardProps {
   icon: LucideIcon;

apps/website/components/sponsors/SponsorHero.tsx

@@ -3,11 +3,16 @@
 import { motion, useReducedMotion } from 'framer-motion';
 import { Building2 } from 'lucide-react';
 import { useEffect, useState } from 'react';
-import { Box } from './Box';
+import { Box } from '@/ui/Box';
-import { Heading } from './Heading';
+import { Heading } from '@/ui/Heading';
-import { Icon } from './Icon';
+import { Icon } from '@/ui/Icon';
-import { Text } from './Text';
+import { Text } from '@/ui/Text';
 
+interface SponsorHeroProps {
+  title: string;
+  subtitle: string;
+  children?: React.ReactNode;
+}
 
 export function SponsorHero({ title, subtitle, children }: SponsorHeroProps) {
   const shouldReduceMotion = useReducedMotion();

apps/website/components/sponsors/SponsorWorkflowMockup.tsx

@@ -8,7 +8,7 @@ import {
   Car,
   TrendingUp,
 } from 'lucide-react';
-import { WorkflowMockup, WorkflowStep } from '@/ui/WorkflowMockup';
+import { WorkflowMockup, WorkflowStep } from '@/components/mockups/WorkflowMockup';
 
 const WORKFLOW_STEPS: WorkflowStep[] = [
   {

apps/website/components/teams/TeamAdmin.tsx

@@ -12,7 +12,7 @@ import { Heading } from '@/ui/Heading';
 import { JoinRequestList } from '@/ui/JoinRequestList';
 import { JoinRequestItem } from '@/ui/JoinRequestItem';
 import { DangerZone } from '@/ui/DangerZone';
-import { MinimalEmptyState } from '@/ui/EmptyState';
+import { MinimalEmptyState } from '@/components/shared/state/EmptyState';
 import { useTeamJoinRequests, useUpdateTeam, useApproveJoinRequest, useRejectJoinRequest } from "@/hooks/team";
 import type { TeamJoinRequestViewModel } from '@/lib/view-models/TeamJoinRequestViewModel';
 

apps/website/components/teams/TeamHeroSection.tsx

@@ -2,11 +2,11 @@
 
 import { Users } from 'lucide-react';
 import { ReactNode } from 'react';
-import { Badge } from './Badge';
+import { Badge } from '@/ui/Badge';
-import { Box } from './Box';
+import { Box } from '@/ui/Box';
-import { Heading } from './Heading';
+import { Heading } from '@/ui/Heading';
-import { Stack } from './Stack';
+import { Stack } from '@/ui/Stack';
-import { Text } from './Text';
+import { Text } from '@/ui/Text';
 
 interface TeamHeroSectionProps {
   title: ReactNode;

apps/website/components/teams/TeamHeroSectionWrapper.tsx

@@ -5,8 +5,8 @@ import { Button } from '@/ui/Button';
 import { Icon } from '@/ui/Icon';
 import { SkillLevelButton } from '@/ui/SkillLevelButton';
 import { Stack } from '@/ui/Stack';
-import { TeamHeroSection as UiTeamHeroSection } from '@/ui/TeamHeroSection';
+import { TeamHeroSection as UiTeamHeroSection } from '@/components/teams/TeamHeroSection';
-import { TeamHeroStats } from '@/ui/TeamHeroStats';
+import { TeamHeroStats } from '@/components/teams/TeamHeroStats';
 import { Text } from '@/ui/Text';
 import {
     Crown,

apps/website/components/teams/TeamHeroStats.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
 import { Users, UserPlus } from 'lucide-react';
-import { Box } from './Box';
+import { Box } from '@/ui/Box';
-import { Text } from './Text';
+import { Text } from '@/ui/Text';
-import { Icon } from './Icon';
+import { Icon } from '@/ui/Icon';
-import { Stack } from './Stack';
+import { Stack } from '@/ui/Stack';
 
 interface TeamHeroStatsProps {
   teamCount: number;

apps/website/components/teams/TeamIdentity.tsx

@@ -1,8 +1,8 @@
 import React from 'react';
-import { Box } from './Box';
+import { Box } from '@/ui/Box';
-import { Stack } from './Stack';
+import { Stack } from '@/ui/Stack';
-import { Text } from './Text';
+import { Text } from '@/ui/Text';
-import { Image } from './Image';
+import { Image } from '@/ui/Image';
 
 interface TeamIdentityProps {
   name: string;
@@ -20,6 +20,9 @@ export function TeamIdentity({ name, logoUrl, performanceLevel, category }: Team
           alt={name}
           width={40}
           height={40}
+          fullWidth
+          fullHeight
+          objectFit="cover"
         />
       </Box>
       <Box flex={1}>

apps/website/components/teams/TeamPodium.tsx

@@ -2,13 +2,13 @@ import React from 'react';
 import { Trophy, Crown, Users } from 'lucide-react';
 import type { TeamSummaryViewModel } from '@/lib/view-models/TeamSummaryViewModel';
 import { getMediaUrl } from '@/lib/utilities/media';
-import { Box } from './Box';
+import { Box } from '@/ui/Box';
-import { Stack } from './Stack';
+import { Stack } from '@/ui/Stack';
-import { Text } from './Text';
+import { Text } from '@/ui/Text';
-import { Icon } from './Icon';
+import { Icon } from '@/ui/Icon';
-import { Button } from './Button';
+import { Button } from '@/ui/Button';
-import { Image } from './Image';
+import { Image } from '@/ui/Image';
-import { Podium, PodiumItem } from './Podium';
+import { Podium, PodiumItem } from '@/ui/Podium';
 
 interface TeamPodiumProps {
   teams: TeamSummaryViewModel[];

apps/website/components/teams/TeamRankingsTable.tsx

@@ -1,13 +1,13 @@
 import React from 'react';
 import { Users } from 'lucide-react';
-import { Box } from './Box';
+import { Box } from '@/ui/Box';
-import { Stack } from './Stack';
+import { Stack } from '@/ui/Stack';
-import { Text } from './Text';
+import { Text } from '@/ui/Text';
-import { Icon } from './Icon';
+import { Icon } from '@/ui/Icon';
-import { Card } from './Card';
+import { Card } from '@/ui/Card';
-import { Table, TableHead, TableBody, TableRow, TableHeader, TableCell } from './Table';
+import { Table, TableHead, TableBody, TableRow, TableHeader, TableCell } from '@/ui/Table';
-import { RankBadge } from './RankBadge';
+import { RankBadge } from '@/ui/RankBadge';
-import { TeamIdentity } from './TeamIdentity';
+import { TeamIdentity } from '@/components/teams/TeamIdentity';
 import { getMediaUrl } from '@/lib/utilities/media';
 
 interface Team {

apps/website/components/teams/TeamRoster.tsx

@@ -12,8 +12,8 @@ import { Select } from '@/ui/Select';
 import { Button } from '@/ui/Button';
 import { routes } from '@/lib/routing/RouteConfig';
 import { TeamRosterList } from '@/ui/TeamRosterList';
-import { TeamRosterItem } from '@/ui/TeamRosterItem';
+import { TeamRosterItem } from '@/components/teams/TeamRosterItem';
-import { MinimalEmptyState } from '@/ui/EmptyState';
+import { MinimalEmptyState } from '@/components/shared/state/EmptyState';
 import { sortMembers } from '@/lib/utilities/roster-utils';
 
 export type TeamRole = 'owner' | 'admin' | 'member';

apps/website/components/teams/TeamRosterItem.tsx

@@ -1,8 +1,8 @@
 import React, { ReactNode } from 'react';
-import { Box } from './Box';
+import { Box } from '@/ui/Box';
-import { Stack } from './Stack';
+import { Stack } from '@/ui/Stack';
-import { Text } from './Text';
+import { Text } from '@/ui/Text';
-import { DriverIdentity } from './DriverIdentity';
+import { DriverIdentity } from '@/components/drivers/DriverIdentity';
 import { DriverViewModel } from '@/lib/view-models/DriverViewModel';
 
 interface TeamRosterItemProps {

apps/website/components/teams/TeamStandings.tsx

@@ -5,8 +5,8 @@ import { useTeamStandings } from "@/hooks/team/useTeamStandings";
 import { Box } from '@/ui/Box';
 import { Heading } from '@/ui/Heading';
 import { StandingsList } from '@/ui/StandingsList';
-import { LoadingWrapper } from '@/ui/LoadingWrapper';
+import { LoadingWrapper } from '@/components/shared/state/LoadingWrapper';
-import { EmptyState } from '@/ui/EmptyState';
+import { EmptyState } from '@/components/shared/state/EmptyState';
 import { Trophy } from 'lucide-react';
 
 interface TeamStandingsProps {

apps/website/components/teams/WhyJoinTeamSection.tsx

@@ -10,7 +10,7 @@ import { Box } from '@/ui/Box';
 import { Text } from '@/ui/Text';
 import { Heading } from '@/ui/Heading';
 import { Grid } from '@/ui/Grid';
-import { BenefitCard } from '@/ui/BenefitCard';
+import { BenefitCard } from '@/components/landing/BenefitCard';
 
 interface Benefit {
   icon: LucideIcon;

apps/website/templates/DashboardTemplate.tsx

@@ -6,12 +6,12 @@ import { Box } from '@/ui/Box';
 import { Container } from '@/ui/Container';
 import { Grid } from '@/ui/Grid';
 import { GridItem } from '@/ui/GridItem';
-import { DashboardHero } from '@/ui/DashboardHeroWrapper';
+import { DashboardHero } from '@/components/dashboard/DashboardHeroWrapper';
-import { NextRaceCard } from '@/ui/NextRaceCardWrapper';
+import { NextRaceCard } from '@/components/races/NextRaceCardWrapper';
-import { ChampionshipStandings } from '@/ui/ChampionshipStandings';
+import { ChampionshipStandings } from '@/components/leagues/ChampionshipStandings';
-import { ActivityFeed } from '@/ui/ActivityFeed';
+import { ActivityFeed } from '@/components/feed/ActivityFeed';
-import { UpcomingRaces } from '@/ui/UpcomingRaces';
+import { UpcomingRaces } from '@/components/races/UpcomingRaces';
-import { FriendsSidebar } from '@/ui/FriendsSidebar';
+import { FriendsSidebar } from '@/components/social/FriendsSidebar';
 import { Stack } from '@/ui/Stack';
 
 interface DashboardTemplateProps {

apps/website/templates/DriverProfileTemplate.tsx

@@ -2,12 +2,12 @@
 
 import { RatingBreakdown } from '@/ui/RatingBreakdown';
 import { Breadcrumbs } from '@/ui/Breadcrumbs';
-import { AchievementGrid } from '@/ui/AchievementGrid';
+import { AchievementGrid } from '@/components/achievements/AchievementGrid';
 import { CareerStats } from '@/ui/CareerStats';
-import { FriendsPreview } from '@/ui/FriendsPreview';
+import { FriendsPreview } from '@/components/social/FriendsPreview';
 import { PerformanceOverview } from '@/ui/PerformanceOverview';
 import { ProfileBio } from '@/ui/ProfileBio';
-import { ProfileHero } from '@/ui/ProfileHero';
+import { ProfileHero } from '@/components/drivers/ProfileHero';
 import { ProfileTabs, type ProfileTab } from '@/ui/ProfileTabs';
 import { RacingProfile } from '@/ui/RacingProfile';
 import { TeamMembershipGrid } from '@/ui/TeamMembershipGrid';