website refactor

apps/website/app/leagues/[id]/layout.tsx

@@ -2,8 +2,8 @@
 
 import Breadcrumbs from '@/components/layout/Breadcrumbs';
 import LeagueHeader from '@/components/leagues/LeagueHeader';
-import { useEffectiveDriverId } from '@/hooks/useEffectiveDriverId';
-import { useLeagueDetail } from '@/hooks/league/useLeagueDetail';
+import { useEffectiveDriverId } from "@/lib/hooks/useEffectiveDriverId";
+import { useLeagueDetail } from "@/lib/hooks/league/useLeagueDetail";
 import { useParams, usePathname, useRouter } from 'next/navigation';
 import React from 'react';
 

apps/website/app/leagues/[id]/roster/admin/RosterAdminPage.tsx

@@ -11,7 +11,7 @@ import {
   useRejectJoinRequest,
   useUpdateMemberRole,
   useRemoveMember,
-} from '@/hooks/league/useLeagueRosterAdmin';
+} from "@/lib/hooks/league/useLeagueRosterAdmin";
 
 const ROLE_OPTIONS: MembershipRole[] = ['owner', 'admin', 'steward', 'member'];
 

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

@@ -8,8 +8,8 @@ import {
   useLeagueAdminStatus,
   useLeagueSeasons,
   useLeagueAdminSchedule
-} from '@/hooks/league/useLeagueScheduleAdminPageData';
-import { useEffectiveDriverId } from '@/hooks/useEffectiveDriverId';
+} from "@/lib/hooks/league/useLeagueScheduleAdminPageData";
+import { useEffectiveDriverId } from "@/lib/hooks/useEffectiveDriverId";
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { useInject } from '@/lib/di/hooks/useInject';
 import { LEAGUE_SERVICE_TOKEN } from '@/lib/di/tokens';

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

@@ -10,12 +10,39 @@ import { EnhancedErrorReporter } from '@/lib/infrastructure/EnhancedErrorReporte
 import { ConsoleLogger } from '@/lib/infrastructure/logging/ConsoleLogger';
 import { getWebsiteApiBaseUrl } from '@/lib/config/apiBaseUrl';
 import { notFound } from 'next/navigation';
-import type { LeagueScheduleViewModel } from '@/lib/view-models/LeagueScheduleViewModel';
+import { LeagueScheduleViewModel, LeagueScheduleRaceViewModel } from '@/lib/view-models/LeagueScheduleViewModel';
+import type { LeagueScheduleDTO } from '@/lib/types/generated/LeagueScheduleDTO';
+import type { RaceDTO } from '@/lib/types/generated/RaceDTO';
 
 interface Props {
   params: { id: string };
 }
 
+function mapRaceDtoToViewModel(race: RaceDTO): LeagueScheduleRaceViewModel {
+  const scheduledAt = race.date ? new Date(race.date) : new Date(0);
+  const now = new Date();
+  const isPast = scheduledAt.getTime() < now.getTime();
+  const isUpcoming = !isPast;
+
+  return {
+    id: race.id,
+    name: race.name,
+    scheduledAt,
+    isPast,
+    isUpcoming,
+    status: isPast ? 'completed' : 'scheduled',
+    track: undefined,
+    car: undefined,
+    sessionType: undefined,
+    isRegistered: undefined,
+  };
+}
+
+function mapScheduleDtoToViewModel(dto: LeagueScheduleDTO): LeagueScheduleViewModel {
+  const races = dto.races.map(mapRaceDtoToViewModel);
+  return new LeagueScheduleViewModel(races);
+}
+
 export default async function Page({ params }: Props) {
   // Validate params
   if (!params.id) {
@@ -52,7 +79,7 @@ export default async function Page({ params }: Props) {
     if (!result) {
       throw new Error('League schedule not found');
     }
-    return result;
+    return mapScheduleDtoToViewModel(result);
   });
 
   if (!data) {

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

@@ -3,14 +3,14 @@
 import { ReadonlyLeagueInfo } from '@/components/leagues/ReadonlyLeagueInfo';
 import LeagueOwnershipTransfer from '@/components/leagues/LeagueOwnershipTransfer';
 import Card from '@/components/ui/Card';
-import { useEffectiveDriverId } from '@/hooks/useEffectiveDriverId';
+import { useEffectiveDriverId } from "@/lib/hooks/useEffectiveDriverId";
 import { useParams, useRouter } from 'next/navigation';
 
 // Shared state components
 import { StateContainer } from '@/components/shared/state/StateContainer';
 import { LoadingWrapper } from '@/components/shared/state/LoadingWrapper';
-import { useLeagueAdminStatus } from '@/hooks/league/useLeagueAdminStatus';
-import { useLeagueSettings } from '@/hooks/league/useLeagueSettings';
+import { useLeagueAdminStatus } from "@/lib/hooks/league/useLeagueAdminStatus";
+import { useLeagueSettings } from "@/lib/hooks/league/useLeagueSettings";
 import { useInject } from '@/lib/di/hooks/useInject';
 import { LEAGUE_SETTINGS_SERVICE_TOKEN } from '@/lib/di/tokens';
 import { AlertTriangle, Settings } from 'lucide-react';

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

@@ -2,9 +2,9 @@
 
 import { LeagueSponsorshipsSection } from '@/components/leagues/LeagueSponsorshipsSection';
 import { StatefulPageWrapper } from '@/components/shared/state/StatefulPageWrapper';
-import { useEffectiveDriverId } from '@/hooks/useEffectiveDriverId';
+import { useEffectiveDriverId } from "@/lib/hooks/useEffectiveDriverId";
 import { LeagueRoleUtility } from '@/lib/utilities/LeagueRoleUtility';
-import { useLeagueSponsorshipsPageData } from '@/hooks/league/useLeagueSponsorshipsPageData';
+import { useLeagueSponsorshipsPageData } from "@/lib/hooks/league/useLeagueSponsorshipsPageData";
 import { ApiError } from '@/lib/api/base/ApiError';
 import { Building } from 'lucide-react';
 import { useParams } from 'next/navigation';

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

@@ -10,9 +10,11 @@ import { EnhancedErrorReporter } from '@/lib/infrastructure/EnhancedErrorReporte
 import { ConsoleLogger } from '@/lib/infrastructure/logging/ConsoleLogger';
 import { getWebsiteApiBaseUrl } from '@/lib/config/apiBaseUrl';
 import { notFound } from 'next/navigation';
-import type { LeagueStandingsViewModel } from '@/lib/view-models/LeagueStandingsViewModel';
+import { StandingEntryViewModel } from '@/lib/view-models/StandingEntryViewModel';
 import { DriverViewModel } from '@/lib/view-models/DriverViewModel';
 import type { LeagueMembership } from '@/lib/types/LeagueMembership';
+import type { LeagueStandingDTO } from '@/lib/types/generated/LeagueStandingDTO';
+import type { LeagueMemberDTO } from '@/lib/types/generated/LeagueMemberDTO';
 
 interface Props {
   params: { id: string };
@@ -49,45 +51,72 @@ export default async function Page({ params }: Props) {
       racesApiClient
     );
 
-    // Fetch data - using empty string for currentDriverId since this is SSR without session
-    const result = await service.getLeagueStandings(params.id, '');
-    if (!result) {
+    // Fetch data
+    const standingsDto = await service.getLeagueStandings(params.id);
+    if (!standingsDto) {
       throw new Error('League standings not found');
     }
-    return result;
+    
+    // Get memberships for transformation
+    const membershipsDto = await service.getLeagueMemberships(params.id);
+    
+    // Transform standings to StandingEntryViewModel[]
+    const standings: LeagueStandingDTO[] = standingsDto.standings || [];
+    const leaderPoints = standings[0]?.points || 0;
+    const standingViewModels = standings.map((entry, index) => {
+      const nextPoints = standings[index + 1]?.points || entry.points;
+      return new StandingEntryViewModel(entry, leaderPoints, nextPoints, '', undefined);
+    });
+    
+    // Extract unique drivers from standings and convert to DriverViewModel[]
+    const driverMap = new Map<string, DriverViewModel>();
+    standings.forEach(standing => {
+      if (standing.driver && !driverMap.has(standing.driver.id)) {
+        const driver = standing.driver;
+        driverMap.set(driver.id, new DriverViewModel({
+          id: driver.id,
+          name: driver.name,
+          avatarUrl: null, // DriverDTO doesn't have avatarUrl
+          iracingId: driver.iracingId,
+          rating: undefined, // DriverDTO doesn't have rating
+          country: driver.country,
+        }));
+      }
+    });
+    const drivers = Array.from(driverMap.values());
+    
+    // Transform memberships
+    const memberships: LeagueMembership[] = (membershipsDto.members || []).map((m: LeagueMemberDTO) => ({
+      driverId: m.driverId,
+      leagueId: params.id,
+      role: (m.role as LeagueMembership['role']) ?? 'member',
+      joinedAt: m.joinedAt,
+      status: 'active' as const,
+    }));
+
+    return {
+      standings: standingViewModels,
+      drivers,
+      memberships,
+    };
   });
 
   if (!data) {
     notFound();
   }
 
-  // Transform data for template
-  const standings = data.standings ?? [];
-  const drivers: DriverViewModel[] = data.drivers?.map((d) =>
-    new DriverViewModel({
-      id: d.id,
-      name: d.name,
-      avatarUrl: d.avatarUrl || null,
-      iracingId: d.iracingId,
-      rating: d.rating,
-      country: d.country,
-    })
-  ) ?? [];
-  const memberships: LeagueMembership[] = data.memberships ?? [];
-
   // Create a wrapper component that passes data to the template
   const TemplateWrapper = () => {
     return (
       <LeagueStandingsTemplate
-        standings={standings}
-        drivers={drivers}
-        memberships={memberships}
+        standings={data.standings}
+        drivers={data.drivers}
+        memberships={data.memberships}
         leagueId={params.id}
         currentDriverId={null}
         isAdmin={false}
         onRemoveMember={() => {}}
         onUpdateRole={() => {}}
-        loading={false}
       />
     );
   };

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

@@ -6,7 +6,7 @@ import { ReviewProtestModal } from '@/components/leagues/ReviewProtestModal';
 import StewardingStats from '@/components/leagues/StewardingStats';
 import Button from '@/components/ui/Button';
 import Card from '@/components/ui/Card';
-import { useLeagueStewardingMutations } from '@/hooks/league/useLeagueStewardingMutations';
+import { useLeagueStewardingMutations } from "@/lib/hooks/league/useLeagueStewardingMutations";
 import {
   AlertCircle,
   AlertTriangle,

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

@@ -1,9 +1,9 @@
 'use client';
 
-import { useCurrentDriver } from '@/hooks/driver/useCurrentDriver';
-import { useLeagueAdminStatus } from '@/hooks/league/useLeagueAdminStatus';
-import { useLeagueStewardingData } from '@/hooks/league/useLeagueStewardingData';
-import { useLeagueStewardingMutations } from '@/hooks/league/useLeagueStewardingMutations';
+import { useCurrentDriver } from "@/lib/hooks/driver/useCurrentDriver";
+import { useLeagueAdminStatus } from "@/lib/hooks/league/useLeagueAdminStatus";
+import { useLeagueStewardingData } from "@/lib/hooks/league/useLeagueStewardingData";
+import { useLeagueStewardingMutations } from "@/lib/hooks/league/useLeagueStewardingMutations";
 import { StatefulPageWrapper } from '@/components/shared/state/StatefulPageWrapper';
 import { StewardingTemplate } from './StewardingTemplate';
 import { LoadingWrapper } from '@/components/shared/state/LoadingWrapper';

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

@@ -2,7 +2,7 @@
 
 import Button from '@/components/ui/Button';
 import Card from '@/components/ui/Card';
-import { useEffectiveDriverId } from '@/hooks/useEffectiveDriverId';
+import { useEffectiveDriverId } from "@/lib/hooks/useEffectiveDriverId";
 import { LeagueRoleUtility } from '@/lib/utilities/LeagueRoleUtility';
 import { useInject } from '@/lib/di/hooks/useInject';
 import { PROTEST_SERVICE_TOKEN } from '@/lib/di/tokens';
@@ -38,8 +38,8 @@ import { useMemo, useState } from 'react';
 // Shared state components
 import { StateContainer } from '@/components/shared/state/StateContainer';
 import { LoadingWrapper } from '@/components/shared/state/LoadingWrapper';
-import { useLeagueAdminStatus } from '@/hooks/league/useLeagueAdminStatus';
-import { useProtestDetail } from '@/hooks/league/useProtestDetail';
+import { useLeagueAdminStatus } from "@/lib/hooks/league/useLeagueAdminStatus";
+import { useProtestDetail } from "@/lib/hooks/league/useProtestDetail";
 
 // Timeline event types
 interface TimelineEvent {

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

@@ -1,7 +1,7 @@
 'use client';
 
 import { useParams } from 'next/navigation';
-import { useLeagueWalletPageData, useLeagueWalletWithdrawal } from '@/hooks/league/useLeagueWalletPageData';
+import { useLeagueWalletPageData, useLeagueWalletWithdrawal } from "@/lib/hooks/league/useLeagueWalletPageData";
 import { PageWrapper } from '@/components/shared/state/PageWrapper';
 import { WalletTemplate } from './WalletTemplate';
 import { Wallet } from 'lucide-react';