website refactor

apps/website/app/admin/users/AdminUsersWrapper.tsx

@@ -6,7 +6,7 @@ import { AdminUsersTemplate } from '@/templates/AdminUsersTemplate';
 import { AdminUsersViewData } from '@/lib/view-data/AdminUsersViewData';
 import { updateUserStatus, deleteUser } from '@/app/actions/adminActions';
 import { routes } from '@/lib/routing/RouteConfig';
-import { ConfirmDialog } from '@/components/shared/ux/ConfirmDialog';
+import { ConfirmDialog } from '@/ui/ConfirmDialog';
 
 interface AdminUsersWrapperProps {
   initialViewData: AdminUsersViewData;

apps/website/app/drivers/DriversPageClient.tsx

@@ -3,7 +3,7 @@
 import type { DriversViewData } from '@/lib/types/view-data/DriversViewData';
 import { DriversTemplate } from '@/templates/DriversTemplate';
 import { Container } from '@/ui/Container';
-import { Stack } from '@/ui/primitives/Stack';
+import { Stack } from '@/ui/Stack';
 import { Text } from '@/ui/Text';
 import { useRouter } from 'next/navigation';
 import { useMemo, useState } from 'react';

apps/website/app/drivers/[id]/DriverProfilePageClient.tsx

@@ -4,7 +4,7 @@ import type { ProfileTab } from '@/components/profile/ProfileTabs';
 import type { DriverProfileViewData } from '@/lib/types/view-data/DriverProfileViewData';
 import { DriverProfileTemplate } from '@/templates/DriverProfileTemplate';
 import { Container } from '@/ui/Container';
-import { Stack } from '@/ui/primitives/Stack';
+import { Stack } from '@/ui/Stack';
 import { Text } from '@/ui/Text';
 import { useRouter } from 'next/navigation';
 import { useState } from 'react';

apps/website/app/leagues/LeaguesPageClient.tsx

@@ -4,26 +4,26 @@ import { LeagueCard } from '@/components/leagues/LeagueCardWrapper';
 import { routes } from '@/lib/routing/RouteConfig';
 import type { LeaguesViewData } from '@/lib/view-data/LeaguesViewData';
 import { LeagueSummaryViewModel } from '@/lib/view-models/LeagueSummaryViewModel';
+import { Box } from '@/ui/Box';
 import { Button } from '@/ui/Button';
 import { Heading } from '@/ui/Heading';
 import { Input } from '@/ui/Input';
-import { Box } from '@/ui/primitives/Box';
-import { Stack } from '@/ui/primitives/Stack';
+import { Stack } from '@/ui/Stack';
 import { Text } from '@/ui/Text';
 import {
-    Award,
-    Clock,
-    Flag,
-    Flame,
-    Globe,
-    Plus,
-    Search,
-    Sparkles,
-    Target,
-    Timer,
-    Trophy,
-    Users,
-    type LucideIcon,
+  Award,
+  Clock,
+  Flag,
+  Flame,
+  Globe,
+  Plus,
+  Search,
+  Sparkles,
+  Target,
+  Timer,
+  Trophy,
+  Users,
+  type LucideIcon,
 } from 'lucide-react';
 import { useRouter } from 'next/navigation';
 import React, { useState } from 'react';

apps/website/app/leagues/[id]/schedule/admin/LeagueAdminSchedulePageClient.tsx

@@ -1,26 +1,26 @@
 'use client';
 
 import {
-    createRaceAction,
-    deleteRaceAction,
-    publishScheduleAction,
-    unpublishScheduleAction,
-    updateRaceAction
+  createRaceAction,
+  deleteRaceAction,
+  publishScheduleAction,
+  unpublishScheduleAction,
+  updateRaceAction
 } from '@/app/actions/leagueScheduleActions';
-import { PageWrapper } from '@/components/shared/state/PageWrapper';
-import { ConfirmDialog } from '@/components/shared/ux/ConfirmDialog';
+import { PageWrapper } from '@/ui/PageWrapper';
+import { ConfirmDialog } from '@/ui/ConfirmDialog';
 import {
-    useLeagueAdminSchedule,
-    useLeagueAdminStatus,
-    useLeagueSeasons
+  useLeagueAdminSchedule,
+  useLeagueAdminStatus,
+  useLeagueSeasons
 } from "@/hooks/league/useLeagueScheduleAdminPageData";
 import { useEffectiveDriverId } from "@/hooks/useEffectiveDriverId";
 import { RaceScheduleCommandModel } from '@/lib/command-models/leagues/RaceScheduleCommandModel';
 import { LeagueAdminScheduleTemplate } from '@/templates/LeagueAdminScheduleTemplate';
+import { Box } from '@/ui/Box';
 import { Card } from '@/ui/Card';
 import { Heading } from '@/ui/Heading';
-import { Box } from '@/ui/primitives/Box';
-import { Stack } from '@/ui/primitives/Stack';
+import { Stack } from '@/ui/Stack';
 import { Text } from '@/ui/Text';
 import { useParams, useRouter } from 'next/navigation';
 import { useState } from 'react';

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

@@ -11,10 +11,10 @@ import type { StewardingViewData } from '@/lib/view-data/leagues/StewardingViewD
 import { DriverViewModel } from '@/lib/view-models/DriverViewModel';
 import { ProtestViewModel } from '@/lib/view-models/ProtestViewModel';
 import { RaceViewModel } from '@/lib/view-models/RaceViewModel';
+import { Box } from '@/ui/Box';
 import { Button } from '@/ui/Button';
 import { Card } from '@/ui/Card';
-import { Box } from '@/ui/primitives/Box';
-import { Stack } from '@/ui/primitives/Stack';
+import { Stack } from '@/ui/Stack';
 import { Text } from '@/ui/Text';
 import { useMemo, useState } from 'react';
 

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

@@ -7,44 +7,44 @@ import { PROTEST_SERVICE_TOKEN } from '@/lib/di/tokens';
 import { Button } from '@/ui/Button';
 import { Card } from '@/ui/Card';
 import {
-    AlertCircle,
-    AlertTriangle,
-    ArrowLeft,
-    Calendar,
-    CheckCircle,
-    ChevronDown,
-    Clock,
-    ExternalLink,
-    Flag,
-    Gavel,
-    Grid3x3,
-    MapPin,
-    MessageCircle,
-    Send,
-    Shield,
-    ShieldAlert,
-    TrendingDown,
-    User,
-    Video,
-    XCircle,
-    type LucideIcon
+  AlertCircle,
+  AlertTriangle,
+  ArrowLeft,
+  Calendar,
+  CheckCircle,
+  ChevronDown,
+  Clock,
+  ExternalLink,
+  Flag,
+  Gavel,
+  Grid3x3,
+  MapPin,
+  MessageCircle,
+  Send,
+  Shield,
+  ShieldAlert,
+  TrendingDown,
+  User,
+  Video,
+  XCircle,
+  type LucideIcon
 } from 'lucide-react';
 import { useParams, useRouter } from 'next/navigation';
 import { useEffect, useMemo, useState } from 'react';
 
 // Shared state components
-import { LoadingWrapper } from '@/components/shared/state/LoadingWrapper';
-import { StateContainer } from '@/components/shared/state/StateContainer';
+import { LoadingWrapper } from '@/ui/LoadingWrapper';
+import { StateContainer } from '@/ui/StateContainer';
 import { useLeagueAdminStatus } from "@/hooks/league/useLeagueAdminStatus";
 import { useProtestDetail } from "@/hooks/league/useProtestDetail";
 import { routes } from '@/lib/routing/RouteConfig';
-import { GridItem } from '@/ui/primitives/GridItem';
+import { Box } from '@/ui/Box';
 import { Heading } from '@/ui/Heading';
 import { Icon as UIIcon } from '@/ui/Icon';
 import { Link as UILink } from '@/ui/Link';
-import { Box } from '@/ui/primitives/Box';
-import { Grid } from '@/ui/primitives/Grid';
-import { Stack } from '@/ui/primitives/Stack';
+import { Grid } from '@/ui/Grid';
+import { GridItem } from '@/ui/GridItem';
+import { Stack } from '@/ui/Stack';
 import { Text } from '@/ui/Text';
 
 type PenaltyUiConfig = {

apps/website/app/leagues/[id]/wallet/LeagueWalletPageClient.tsx

@@ -2,15 +2,15 @@
 
 import { WalletSummaryPanel } from '@/components/leagues/WalletSummaryPanel';
 import type { LeagueWalletViewData } from '@/lib/view-data/leagues/LeagueWalletViewData';
+import { Box } from '@/ui/Box';
 import { Button } from '@/ui/Button';
 import { Container } from '@/ui/Container';
 import { Heading } from '@/ui/Heading';
 import { Icon as UIIcon } from '@/ui/Icon';
-import { Box } from '@/ui/primitives/Box';
-import { Stack } from '@/ui/primitives/Stack';
+import { Stack } from '@/ui/Stack';
 import { Text } from '@/ui/Text';
 import {
-    Download
+  Download
 } from 'lucide-react';
 
 interface WalletTemplateProps {

apps/website/app/leagues/create/CreateLeagueWizard.tsx

@@ -2,28 +2,28 @@
 
 import { useAuth } from '@/components/auth/AuthContext';
 import { LeagueReviewSummary } from '@/components/leagues/LeagueReviewSummary';
+import { Box } from '@/ui/Box';
 import { Button } from '@/ui/Button';
 import { Card } from '@/ui/Card';
 import { Heading } from '@/ui/Heading';
 import { Icon } from '@/ui/Icon';
 import { Input } from '@/ui/Input';
-import { Box } from '@/ui/primitives/Box';
-import { Stack } from '@/ui/primitives/Stack';
+import { Stack } from '@/ui/Stack';
 import { Text } from '@/ui/Text';
 import {
-    AlertCircle,
-    Award,
-    Calendar,
-    Check,
-    CheckCircle2,
-    ChevronLeft,
-    ChevronRight,
-    FileText,
-    Loader2,
-    Scale,
-    Sparkles,
-    Trophy,
-    Users,
+  AlertCircle,
+  Award,
+  Calendar,
+  Check,
+  CheckCircle2,
+  ChevronLeft,
+  ChevronRight,
+  FileText,
+  Loader2,
+  Scale,
+  Sparkles,
+  Trophy,
+  Users,
 } from 'lucide-react';
 import { useRouter } from 'next/navigation';
 import { FormEvent, useCallback, useEffect, useState } from 'react';
@@ -33,8 +33,8 @@ import { LeagueWizardCommandModel } from '@/lib/command-models/leagues/LeagueWiz
 import { LeagueBasicsSection } from '@/components/leagues/LeagueBasicsSection';
 import { LeagueDropSection } from '@/components/leagues/LeagueDropSection';
 import {
-    ChampionshipsSection,
-    ScoringPatternSection
+  ChampionshipsSection,
+  ScoringPatternSection
 } from '@/components/leagues/LeagueScoringSection';
 import { LeagueStewardingSection } from '@/components/leagues/LeagueStewardingSection';
 import { LeagueStructureSection } from '@/components/leagues/LeagueStructureSection';

apps/website/app/page.tsx

@@ -1,4 +1,4 @@
-import { PageWrapper } from '@/components/shared/state/PageWrapper';
+import { PageWrapper } from '@/ui/PageWrapper';
 import { HomeTemplate, type HomeViewData } from '@/templates/HomeTemplate';
 import { PageDataFetcher } from '@/lib/page/PageDataFetcher';
 import { HomePageQuery } from '@/lib/page-queries/HomePageQuery';

apps/website/app/profile/liveries/upload/ProfileLiveryUploadPageClient.tsx

@@ -2,6 +2,7 @@
 
 import { UploadDropzone } from '@/components/media/UploadDropzone';
 import { routes } from '@/lib/routing/RouteConfig';
+import { Box } from '@/ui/Box';
 import { Button } from '@/ui/Button';
 import { Card } from '@/ui/Card';
 import { Container } from '@/ui/Container';
@@ -9,7 +10,6 @@ import { Heading } from '@/ui/Heading';
 import { MediaMetaPanel, mapMediaMetadata } from '@/ui/MediaMetaPanel';
 import { MediaPreviewCard } from '@/ui/MediaPreviewCard';
 import { Text } from '@/ui/Text';
-import { Box } from '@/ui/primitives/Box';
 import Link from 'next/link';
 import { useState } from 'react';
 

apps/website/app/profile/settings/ProfileSettingsPageClient.tsx

@@ -1,11 +1,11 @@
 'use client';
 
-import { InlineNotice } from '@/components/shared/ux/InlineNotice';
-import { ProgressLine } from '@/components/shared/ux/ProgressLine';
+import { InlineNotice } from '@/ui/InlineNotice';
+import { ProgressLine } from '@/ui/ProgressLine';
 import type { Result } from '@/lib/contracts/Result';
 import type { ProfileViewData } from '@/lib/view-data/ProfileViewData';
 import { ProfileSettingsTemplate } from '@/templates/ProfileSettingsTemplate';
-import { Box } from '@/ui/primitives/Box';
+import { Box } from '@/ui/Box';
 import { useRouter } from 'next/navigation';
 import { useState } from 'react';
 

apps/website/app/profile/sponsorship-requests/SponsorshipRequestsClient.tsx

@@ -1,11 +1,11 @@
 'use client';
 
-import { InlineNotice } from '@/components/shared/ux/InlineNotice';
-import { ProgressLine } from '@/components/shared/ux/ProgressLine';
+import { InlineNotice } from '@/ui/InlineNotice';
+import { ProgressLine } from '@/ui/ProgressLine';
 import type { Result } from '@/lib/contracts/Result';
 import type { SponsorshipRequestsViewData } from '@/lib/view-data/SponsorshipRequestsViewData';
 import { SponsorshipRequestsTemplate } from '@/templates/SponsorshipRequestsTemplate';
-import { Box } from '@/ui/primitives/Box';
+import { Box } from '@/ui/Box';
 import { useRouter } from 'next/navigation';
 import { useState } from 'react';
 

apps/website/app/races/[id]/page.tsx

@@ -1,5 +1,5 @@
 import { notFound } from 'next/navigation';
-import { PageWrapper } from '@/components/shared/state/PageWrapper';
+import { PageWrapper } from '@/ui/PageWrapper';
 import { RaceDetailPageQuery } from '@/lib/page-queries/races/RaceDetailPageQuery';
 import { RaceDetailPageClient } from './RaceDetailPageClient';
 

apps/website/app/races/[id]/results/page.tsx

@@ -1,5 +1,5 @@
 import { notFound } from 'next/navigation';
-import { PageWrapper } from '@/components/shared/state/PageWrapper';
+import { PageWrapper } from '@/ui/PageWrapper';
 import { RaceResultsPageQuery } from '@/lib/page-queries/races/RaceResultsPageQuery';
 import { RaceResultsPageClient } from './RaceResultsPageClient';
 

apps/website/app/races/[id]/stewarding/page.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import { notFound } from 'next/navigation';
-import { PageWrapper } from '@/components/shared/state/PageWrapper';
+import { PageWrapper } from '@/ui/PageWrapper';
 import { RaceStewardingTemplate, type StewardingTab } from '@/templates/RaceStewardingTemplate';
 import { RaceStewardingPageQuery } from '@/lib/page-queries/races/RaceStewardingPageQuery';
 import { type RaceStewardingViewData } from '@/lib/view-data/races/RaceStewardingViewData';

apps/website/app/races/all/RacesAllPageClient.tsx

@@ -2,7 +2,7 @@
 
 import { useState } from 'react';
 import { useRouter } from 'next/navigation';
-import { StatefulPageWrapper } from '@/components/shared/state/StatefulPageWrapper';
+import { StatefulPageWrapper } from '@/ui/StatefulPageWrapper';
 import { RacesAllTemplate } from '@/templates/RacesAllTemplate';
 import { useAllRacesPageData } from '@/hooks/race/useAllRacesPageData';
 import { type RacesViewData, type RaceViewData } from '@/lib/view-data/RacesViewData';

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

@@ -2,10 +2,10 @@
 
 import { useSponsorBilling } from "@/hooks/sponsor/useSponsorBilling";
 import { SponsorBillingTemplate } from "@/templates/SponsorBillingTemplate";
-import { Box } from "@/ui/primitives/Box";
-import { Text } from "@/ui/Text";
+import { Box } from "@/ui/Box";
 import { Button } from "@/ui/Button";
-import { DollarSign, AlertTriangle, Calendar, TrendingUp } from "lucide-react";
+import { Text } from "@/ui/Text";
+import { AlertTriangle, Calendar, DollarSign, TrendingUp } from "lucide-react";
 
 export default function SponsorBillingPage() {
   const { data: billingData, isLoading, error, retry } = useSponsorBilling('demo-sponsor-1');
@@ -40,11 +40,6 @@ export default function SponsorBillingPage() {
     console.log('Setting default payment method:', methodId);
   };
 
-  const handleRemoveMethod = (methodId: string) => {
-    if (window.confirm('Remove this payment method?')) {
-      console.log('Removing payment method:', methodId);
-    }
-  };
 
   const handleDownloadInvoice = (invoiceId: string) => {
     console.log('Downloading invoice:', invoiceId);

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

@@ -1,11 +1,11 @@
 'use client';
 
-import { useState } from 'react';
 import { useSponsorSponsorships } from "@/hooks/sponsor/useSponsorSponsorships";
 import { SponsorCampaignsTemplate, SponsorshipType } from "@/templates/SponsorCampaignsTemplate";
-import { Box } from "@/ui/primitives/Box";
-import { Text } from "@/ui/Text";
+import { Box } from "@/ui/Box";
 import { Button } from "@/ui/Button";
+import { Text } from "@/ui/Text";
+import { useState } from 'react';
 
 export default function SponsorCampaignsPage() {
   const [typeFilter, setTypeFilter] = useState<SponsorshipType>('all');

apps/website/app/sponsor/layout.tsx

@@ -1,5 +1,5 @@
 import { createRouteGuard } from '@/lib/auth/createRouteGuard';
-import { Box } from '@/ui/primitives/Box';
+import { Box } from '@/ui/Box';
 import { headers } from 'next/headers';
 import { redirect } from 'next/navigation';
 

apps/website/app/sponsor/leagues/[id]/page.tsx

@@ -1,5 +1,5 @@
 import { notFound } from 'next/navigation';
-import { PageWrapper } from '@/components/shared/state/PageWrapper';
+import { PageWrapper } from '@/ui/PageWrapper';
 import { SponsorLeagueDetailPageClient } from './SponsorLeagueDetailPageClient';
 import { SponsorsApiClient } from '@/lib/api/sponsors/SponsorsApiClient';
 import { EnhancedErrorReporter } from '@/lib/infrastructure/EnhancedErrorReporter';

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

@@ -1,4 +1,4 @@
-import { PageWrapper } from '@/components/shared/state/PageWrapper';
+import { PageWrapper } from '@/ui/PageWrapper';
 import { SponsorLeaguesPageClient } from './SponsorLeaguesPageClient';
 import { SponsorsApiClient } from '@/lib/api/sponsors/SponsorsApiClient';
 import { EnhancedErrorReporter } from '@/lib/infrastructure/EnhancedErrorReporter';

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

@@ -3,7 +3,7 @@
 import { useState } from 'react';
 import { SponsorSettingsTemplate } from '@/templates/SponsorSettingsTemplate';
 import { logoutAction } from '@/app/actions/logoutAction';
-import { ConfirmDialog } from '@/components/shared/ux/ConfirmDialog';
+import { ConfirmDialog } from '@/ui/ConfirmDialog';
 import { useRouter } from 'next/navigation';
 import { routes } from '@/lib/routing/RouteConfig';
 import { logger } from '@/lib/infrastructure/logging/logger';

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

@@ -5,31 +5,31 @@ import { SponsorHero } from '@/components/sponsors/SponsorHero';
 import { SponsorWorkflowMockup } from '@/components/sponsors/SponsorWorkflowMockup';
 import { SponsorSignupCommandModel } from '@/lib/command-models/sponsors/SponsorSignupCommandModel';
 import { siteConfig } from '@/lib/siteConfig';
+import { Box } from '@/ui/Box';
 import { Button } from '@/ui/Button';
 import { Card } from '@/ui/Card';
 import { Heading } from '@/ui/Heading';
 import { Input } from '@/ui/Input';
-import { Box } from '@/ui/primitives/Box';
-import { Stack } from '@/ui/primitives/Stack';
+import { Stack } from '@/ui/Stack';
 import { Text } from '@/ui/Text';
 import { motion, useReducedMotion } from 'framer-motion';
 import {
-    ArrowRight,
-    BarChart3,
-    Building2,
-    Car,
-    CheckCircle2,
-    Eye,
-    Flag,
-    Globe,
-    Mail,
-    Megaphone,
-    Shield,
-    Target,
-    TrendingUp,
-    Trophy,
-    Upload,
-    Users
+  ArrowRight,
+  BarChart3,
+  Building2,
+  Car,
+  CheckCircle2,
+  Eye,
+  Flag,
+  Globe,
+  Mail,
+  Megaphone,
+  Shield,
+  Target,
+  TrendingUp,
+  Trophy,
+  Upload,
+  Users
 } from 'lucide-react';
 import { useState } from 'react';
 

apps/website/app/teams/create/page.tsx

@@ -4,7 +4,7 @@ import { CreateTeamForm } from '@/components/teams/CreateTeamForm';
 import { routes } from '@/lib/routing/RouteConfig';
 import { Container } from '@/ui/Container';
 import { Heading } from '@/ui/Heading';
-import { Stack } from '@/ui/primitives/Stack';
+import { Stack } from '@/ui/Stack';
 import { Section } from '@/ui/Section';
 import { useRouter } from 'next/navigation';