mmintel/gridpilot.gg
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

api client refactor

Browse Source
This commit is contained in:
Marc Mintel
2025-12-17 18:01:47 +01:00
parent bab55955e1
commit 4177644b18
190 changed files with 6403 additions and 1624 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
apps/website/app/drivers/page.tsx
View File

@@ -27,15 +27,11 @@ import Button from '@/components/ui/Button';
import Input from '@/components/ui/Input';
import Card from '@/components/ui/Card';
import Heading from '@/components/ui/Heading';
import { DriversLeaderboardPresenter } from '@/lib/presenters/DriversLeaderboardPresenter';
import type { DriverLeaderboardItemViewModel, SkillLevel } from '@core/racing/application/presenters/IDriversLeaderboardPresenter';
import { getDriverLeaderboard } from '@/lib/services/drivers/DriverService';
import type { DriverLeaderboardViewModel } from '@/lib/view-models';
import Image from 'next/image';
// ============================================================================
// TYPES
// ============================================================================
type DriverListItem = DriverLeaderboardItemViewModel;
import type { DriverLeaderboardItemViewModel } from '@/lib/view-models/DriverLeaderboardItemViewModel';
// ============================================================================
// DEMO DATA
@@ -50,7 +46,7 @@ type DriverListItem = DriverLeaderboardItemViewModel;
// ============================================================================
const SKILL_LEVELS: {
id: SkillLevel;
id: string;
label: string;
icon: React.ElementType;
color: string;
@@ -69,7 +65,7 @@ const SKILL_LEVELS: {
// ============================================================================
interface FeaturedDriverCardProps {
driver: DriverListItem;
driver: DriverLeaderboardItemViewModel;
position: number;
onClick: () => void;
}
@@ -118,7 +114,7 @@ function FeaturedDriverCard({ driver, position, onClick }: FeaturedDriverCardPro
{/* Avatar & Name */}
<div className="flex items-center gap-4 mb-4">
<div className="relative w-16 h-16 rounded-full overflow-hidden border-2 border-charcoal-outline group-hover:border-primary-blue transition-colors">
<Image src={driver.avatarUrl} alt={driver.name} fill className="object-cover" />
<Image src={driver.avatarUrl || '/avatars/default.png'} alt={driver.name} fill className="object-cover" />
</div>
<div>
<h3 className="text-lg font-semibold text-white group-hover:text-primary-blue transition-colors">
@@ -155,7 +151,7 @@ function FeaturedDriverCard({ driver, position, onClick }: FeaturedDriverCardPro
// ============================================================================
interface SkillDistributionProps {
drivers: DriverListItem[];
drivers: DriverLeaderboardItemViewModel[];
}
function SkillDistribution({ drivers }: SkillDistributionProps) {
@@ -217,7 +213,7 @@ function SkillDistribution({ drivers }: SkillDistributionProps) {
// ============================================================================
interface LeaderboardPreviewProps {
drivers: DriverListItem[];
drivers: DriverLeaderboardItemViewModel[];
onDriverClick: (id: string) => void;
}
@@ -286,7 +282,7 @@ function LeaderboardPreview({ drivers, onDriverClick }: LeaderboardPreviewProps)
{/* Avatar */}
<div className="relative w-9 h-9 rounded-full overflow-hidden border-2 border-charcoal-outline">
<Image src={driver.avatarUrl} alt={driver.name} fill className="object-cover" />
<Image src={driver.avatarUrl || '/avatars/default.png'} alt={driver.name} fill className="object-cover" />
</div>
{/* Info */}
@@ -326,7 +322,7 @@ function LeaderboardPreview({ drivers, onDriverClick }: LeaderboardPreviewProps)
// ============================================================================
interface RecentActivityProps {
drivers: DriverListItem[];
drivers: DriverLeaderboardItemViewModel[];
onDriverClick: (id: string) => void;
}
@@ -356,7 +352,7 @@ function RecentActivity({ drivers, onDriverClick }: RecentActivityProps) {
className="p-3 rounded-xl bg-iron-gray/40 border border-charcoal-outline hover:border-performance-green/40 transition-all group text-center"
>
<div className="relative w-12 h-12 mx-auto rounded-full overflow-hidden border-2 border-charcoal-outline mb-2">
<Image src={driver.avatarUrl} alt={driver.name} fill className="object-cover" />
<Image src={driver.avatarUrl || '/avatars/default.png'} alt={driver.name} fill className="object-cover" />
<div className="absolute bottom-0 right-0 w-3 h-3 rounded-full bg-performance-green border-2 border-iron-gray" />
</div>
<p className="text-sm font-medium text-white truncate group-hover:text-performance-green transition-colors">
@@ -377,7 +373,8 @@ function RecentActivity({ drivers, onDriverClick }: RecentActivityProps) {
export default function DriversPage() {
const router = useRouter();
const [drivers, setDrivers] = useState<DriverListItem[]>([]);
const [drivers, setDrivers] = useState<DriverLeaderboardItemViewModel[]>([]);
const [viewModel, setViewModel] = useState<DriverLeaderboardViewModel | null>(null);
const [loading, setLoading] = useState(true);
const [searchQuery, setSearchQuery] = useState('');
const [totalRaces, setTotalRaces] = useState(0);
@@ -386,17 +383,12 @@ export default function DriversPage() {
useEffect(() => {
const load = async () => {
const useCase = getGetDriversLeaderboardUseCase();
const presenter = new DriversLeaderboardPresenter();
await useCase.execute(undefined as void, presenter);
const viewModel = presenter.getViewModel();
if (viewModel) {
setDrivers(viewModel.drivers);
setTotalRaces(viewModel.totalRaces);
setTotalWins(viewModel.totalWins);
setActiveCount(viewModel.activeCount);
}
const vm = await getDriverLeaderboard();
setViewModel(vm);
setDrivers(vm.drivers);
setTotalRaces(vm.totalRaces);
setTotalWins(vm.totalWins);
setActiveCount(vm.activeCount);
setLoading(false);
};

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

@@ -4,70 +4,37 @@ import { useState, useEffect, useCallback } from 'react';
import { useParams } from 'next/navigation';
import Card from '@/components/ui/Card';
import StandingsTable from '@/components/leagues/StandingsTable';
import {
EntityMappers,
type DriverDTO,
type LeagueDriverSeasonStatsDTO,
} from '@core/racing';
import { LeagueDriverSeasonStatsPresenter } from '@/lib/presenters/LeagueDriverSeasonStatsPresenter';
import { getLeagueStandings } from '@/lib/services/leagues/LeagueService';
import { useEffectiveDriverId } from '@/lib/currentDriver';
import { isLeagueAdminOrHigherRole } from '@/lib/leagueRoles';
import type { MembershipRole, LeagueMembership } from '@/lib/leagueMembership';
import type { LeagueStandingsViewModel } from '@/lib/view-models';
import type { StandingEntryViewModel } from '@/lib/view-models/StandingEntryViewModel';
import type { DriverDto } from '@/lib/dtos';
import type { LeagueMembership } from '@/lib/dtos';
export default function LeagueStandingsPage() {
const params = useParams();
const leagueId = params.id as string;
const currentDriverId = useEffectiveDriverId();
const [standings, setStandings] = useState<LeagueDriverSeasonStatsDTO[]>([]);
const [drivers, setDrivers] = useState<DriverDTO[]>([]);
const [standings, setStandings] = useState<StandingEntryViewModel[]>([]);
const [drivers, setDrivers] = useState<DriverDto[]>([]);
const [memberships, setMemberships] = useState<LeagueMembership[]>([]);
const [viewModel, setViewModel] = useState<LeagueStandingsViewModel | null>(null);
const [loading, setLoading] = useState(true);
const [error, setError] = useState<string | null>(null);
const [isAdmin, setIsAdmin] = useState(false);
const loadData = useCallback(async () => {
try {
const getLeagueDriverSeasonStatsUseCase = getGetLeagueDriverSeasonStatsUseCase();
const driverRepo = getDriverRepository();
const membershipRepo = getLeagueMembershipRepository();
const presenter = new LeagueDriverSeasonStatsPresenter();
await getLeagueDriverSeasonStatsUseCase.execute({ leagueId }, presenter);
const standingsViewModel = presenter.getViewModel();
setStandings(standingsViewModel.stats);
const allDrivers = await driverRepo.findAll();
const driverDtos: DriverDTO[] = allDrivers
.map((driver) => EntityMappers.toDriverDTO(driver))
.filter((dto): dto is DriverDTO => dto !== null);
setDrivers(driverDtos);
// Load league memberships from repository (consistent with other data)
const allMemberships = await membershipRepo.getLeagueMembers(leagueId);
type RawMembership = {
id: string | number;
leagueId: string;
driverId: string;
role: MembershipRole;
status: LeagueMembership['status'];
joinedAt: string | Date;
};
// Convert to the format expected by StandingsTable (website-level LeagueMembership)
const membershipData: LeagueMembership[] = (allMemberships as RawMembership[]).map((m) => ({
id: String(m.id),
leagueId: m.leagueId,
driverId: m.driverId,
role: m.role,
status: m.status,
joinedAt: m.joinedAt instanceof Date ? m.joinedAt.toISOString() : String(m.joinedAt),
}));
setMemberships(membershipData);
const vm = await getLeagueStandings(leagueId, currentDriverId);
setViewModel(vm);
setStandings(vm.standings);
setDrivers(vm.drivers);
setMemberships(vm.memberships);
// Check if current user is admin
const membership = await membershipRepo.getMembership(leagueId, currentDriverId);
const membership = vm.memberships.find(m => m.driverId === currentDriverId);
setIsAdmin(membership ? isLeagueAdminOrHigherRole(membership.role) : false);
} catch (err) {
setError(err instanceof Error ? err.message : 'Failed to load standings');
@@ -151,7 +118,7 @@ export default function LeagueStandingsPage() {
}
const leader = standings[0];
const totalRaces = Math.max(...standings.map(s => s.racesStarted), 0);
const totalRaces = Math.max(...standings.map(s => s.races), 0);
return (
<div className="space-y-6">
@@ -166,7 +133,7 @@ export default function LeagueStandingsPage() {
<div>
<p className="text-xs text-gray-400 mb-1">Championship Leader</p>
<p className="font-bold text-white">{drivers.find(d => d.id === leader?.driverId)?.name || 'N/A'}</p>
<p className="text-sm text-yellow-400 font-medium">{leader?.totalPoints || 0} points</p>
<p className="text-sm text-yellow-400 font-medium">{leader?.points || 0} points</p>
</div>
</div>
</Card>

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

@@ -9,51 +9,10 @@ import Breadcrumbs from '@/components/layout/Breadcrumbs';
import ResultsTable from '@/components/races/ResultsTable';
import ImportResultsForm from '@/components/races/ImportResultsForm';
import QuickPenaltyModal from '@/components/leagues/QuickPenaltyModal';
import { apiClient } from '@/lib/apiClient';
import { getRaceResults, getRaceSOF, importRaceResults } from '@/lib/services/races/RaceResultsService';
import { useEffectiveDriverId } from '@/lib/currentDriver';
import { isLeagueAdminOrHigherRole } from '@/lib/leagueRoles';
import type { RaceResultsDetailViewModel, RaceWithSOFViewModel } from '@/lib/apiClient';
type PenaltyTypeDTO =
| 'time_penalty'
| 'grid_penalty'
| 'points_deduction'
| 'disqualification'
| 'warning'
| 'license_points'
| string;
interface PenaltyData {
driverId: string;
type: PenaltyTypeDTO;
value?: number;
}
interface RaceResultRowDTO {
id: string;
raceId: string;
driverId: string;
position: number;
fastestLap: number;
incidents: number;
startPosition: number;
getPositionChange(): number;
}
interface DriverRowDTO {
id: string;
name: string;
}
interface ImportResultRowDTO {
id: string;
raceId: string;
driverId: string;
position: number;
fastestLap: number;
incidents: number;
startPosition: number;
}
import type { RaceResultsDetailViewModel } from '@/lib/view-models';
export default function RaceResultsPage() {
const router = useRouter();
@@ -69,16 +28,16 @@ export default function RaceResultsPage() {
const [importSuccess, setImportSuccess] = useState(false);
const [isAdmin, setIsAdmin] = useState(false);
const [showQuickPenaltyModal, setShowQuickPenaltyModal] = useState(false);
const [preSelectedDriver, setPreSelectedDriver] = useState<DriverRowDTO | undefined>(undefined);
const [preSelectedDriver, setPreSelectedDriver] = useState<{ id: string; name: string } | undefined>(undefined);
const loadData = async () => {
try {
const raceData = await apiClient.races.getResultsDetail(raceId);
const raceData = await getRaceResults(raceId, currentDriverId);
setRaceData(raceData);
setError(null);
try {
const sofData = await apiClient.races.getWithSOF(raceId);
const sofData = await getRaceSOF(raceId);
setRaceSOF(sofData.strengthOfField);
} catch (sofErr) {
console.error('Failed to load SOF:', sofErr);
@@ -106,12 +65,12 @@ export default function RaceResultsPage() {
}
}, [raceData?.league?.id, currentDriverId]);
const handleImportSuccess = async (importedResults: ImportResultRowDTO[]) => {
const handleImportSuccess = async (importedResults: any[]) => {
setImporting(true);
setError(null);
try {
await apiClient.races.importResults(raceId, {
await importRaceResults(raceId, {
resultsFileContent: JSON.stringify(importedResults), // Assuming the API expects JSON string
});
@@ -128,7 +87,7 @@ export default function RaceResultsPage() {
setError(errorMessage);
};
const handlePenaltyClick = (driver: DriverRowDTO) => {
const handlePenaltyClick = (driver: { id: string; name: string }) => {
setPreSelectedDriver(driver);
setShowQuickPenaltyModal(true);
};
@@ -241,7 +200,7 @@ export default function RaceResultsPage() {
</span>
<span className="flex items-center gap-2">
<Users className="w-4 h-4" />
{raceData.results.length} drivers classified
{raceData.stats.totalDrivers} drivers classified
</span>
</>
)}
@@ -265,11 +224,11 @@ export default function RaceResultsPage() {
<Card>
{hasResults && raceData ? (
<ResultsTable
results={raceData.results as any}
drivers={raceData.drivers as any}
results={raceData.resultsByPosition}
drivers={raceData.drivers}
pointsSystem={raceData.pointsSystem ?? {}}
fastestLapTime={raceData.fastestLapTime ?? 0}
penalties={raceData.penalties as any}
penalties={raceData.penalties}
currentDriverId={raceData.currentDriverId ?? ''}
isAdmin={isAdmin}
onPenaltyClick={handlePenaltyClick}