From 4b7d82ab43854d5d5836ccffe79db5dbb27de5f3 Mon Sep 17 00:00:00 2001 From: Marc Mintel Date: Wed, 14 Jan 2026 16:28:39 +0100 Subject: [PATCH] website refactor --- apps/website/app/admin/page.tsx | 7 +- apps/website/app/admin/users/page.tsx | 24 +- .../forgot-password/ForgotPasswordClient.tsx | 58 ++- .../reset-password/ResetPasswordClient.tsx | 65 ++- apps/website/app/auth/signup/SignupClient.tsx | 79 ++- apps/website/app/drivers/[id]/page.tsx | 52 +- apps/website/app/drivers/page.tsx | 52 +- .../leaderboards/LeaderboardsPageWrapper.tsx | 61 --- apps/website/app/leaderboards/page.tsx | 10 +- apps/website/app/leagues/[id]/layout.tsx | 3 +- apps/website/app/leagues/[id]/page.tsx | 11 +- apps/website/app/leagues/page.tsx | 8 +- .../app/media/avatar/[driverId]/route.ts | 4 +- .../categories/[categoryId]/icon/route.ts | 4 +- .../media/leagues/[leagueId]/cover/route.ts | 4 +- .../media/leagues/[leagueId]/logo/route.ts | 4 +- .../media/sponsors/[sponsorId]/logo/route.ts | 4 +- .../app/media/teams/[teamId]/logo/route.ts | 4 +- .../app/media/tracks/[trackId]/image/route.ts | 4 +- apps/website/app/onboarding/page.tsx | 2 +- apps/website/app/sponsor/dashboard/page.tsx | 455 +----------------- .../admin/AdminDashboardWrapper.tsx | 32 ++ .../admin}/AdminUsersWrapper.tsx | 14 +- .../leaderboards/DriverLeaderboardPreview.tsx | 37 +- .../leaderboards/TeamLeaderboardPreview.tsx | 35 +- .../leagues/LeaguesClient.tsx} | 16 +- .../onboarding/OnboardingWizard.tsx | 2 + .../onboarding/OnboardingWizardClient.tsx | 18 +- apps/website/components/profile/UserPill.tsx | 20 +- apps/website/lib/api/admin/AdminApiClient.ts | 63 +-- apps/website/lib/api/races/RacesApiClient.ts | 2 + .../AdminDashboardViewDataBuilder.ts | 2 +- .../view-data/AdminUsersViewDataBuilder.ts | 2 +- .../view-data/AvatarViewDataBuilder.ts | 2 +- .../view-data/CategoryIconViewDataBuilder.ts | 2 +- .../DriverRankingsViewDataBuilder.ts | 14 +- .../view-data/DriversViewDataBuilder.ts | 34 +- .../view-data/LeaderboardsViewDataBuilder.ts | 16 +- .../view-data/LeagueCoverViewDataBuilder.ts | 2 +- .../view-data/LeagueLogoViewDataBuilder.ts | 2 +- .../SponsorDashboardViewDataBuilder.ts | 36 ++ .../view-data/SponsorLogoViewDataBuilder.ts | 2 +- .../view-data/TeamLogoViewDataBuilder.ts | 2 +- .../view-data/TrackImageViewDataBuilder.ts | 2 +- apps/website/lib/di/modules/league.module.ts | 68 +-- apps/website/lib/di/modules/sponsor.module.ts | 12 +- .../lib/display-objects/MedalDisplay.ts | 23 + .../lib/display-objects/RatingDisplay.ts | 8 +- .../lib/display-objects/SkillLevelDisplay.ts | 41 ++ .../lib/display-objects/WinRateDisplay.ts | 7 + .../lib/mutations/admin/DeleteUserMutation.ts | 2 +- .../admin/UpdateUserStatusMutation.ts | 30 +- .../mutations/leagues/CreateLeagueMutation.ts | 2 +- .../mutations/leagues/RosterAdminMutation.ts | 2 +- .../leagues/ScheduleAdminMutation.ts | 2 +- .../mutations/leagues/StewardingMutation.ts | 2 +- .../lib/mutations/leagues/WalletMutation.ts | 2 +- .../lib/page-queries/AdminUsersPageQuery.ts | 16 +- .../page-queries/SponsorDashboardPageQuery.ts | 38 ++ .../page-queries/DriverProfilePageQuery.ts | 37 +- .../page-queries/DriversPageQuery.ts | 30 +- .../page-queries/LeaguesPageQuery.ts | 55 +-- .../lib/services/admin/AdminService.ts | 167 ++++--- .../lib/services/drivers/LiveryService.ts | 33 +- .../leaderboards/LeaderboardsService.ts | 42 +- .../lib/services/leagues/LeagueService.ts | 65 ++- .../lib/services/sponsors/SponsorService.ts | 103 ++-- .../website/lib/services/teams/TeamService.ts | 4 +- apps/website/lib/types/LeaderboardsData.ts | 6 + apps/website/lib/types/admin.ts | 7 + apps/website/lib/types/tbd/AdminUserDto.ts | 76 +++ .../lib/types/tbd/AvailableLeaguesDTO.ts | 23 + .../lib/types/tbd/FilteredRacesPageDataDTO.ts | 34 ++ .../lib/types/tbd/GetLiveriesOutputDTO.ts | 9 + .../types/tbd/LeagueDetailForSponsorDTO.ts | 41 ++ .../lib/types/tbd/SponsorBillingDTO.ts | 40 ++ .../lib/types/tbd/SponsorSettingsDTO.ts | 36 ++ .../lib/types/tbd/TeamsLeaderboardDto.ts | 14 + .../lib/types/view-data/DriversViewData.ts | 19 + apps/website/lib/utilities/authValidation.ts | 146 ++++++ apps/website/lib/view-data/AvatarViewData.ts | 2 +- .../lib/view-data/CategoryIconViewData.ts | 2 +- .../lib/view-data/LeagueCoverViewData.ts | 2 +- .../lib/view-data/LeagueLogoViewData.ts | 2 +- .../lib/view-data/SponsorDashboardViewData.ts | 23 + .../lib/view-data/SponsorLogoViewData.ts | 2 +- .../website/lib/view-data/TeamLogoViewData.ts | 2 +- .../lib/view-data/TrackImageViewData.ts | 2 +- .../lib/view-models/AdminUserViewModel.ts | 2 +- .../view-models/AdminViewModelPresenter.ts | 47 -- .../view-models/RaceResultsDataTransformer.ts | 105 ---- apps/website/lib/view-models/index.ts | 2 - .../templates/AdminDashboardTemplate.tsx | 4 +- apps/website/templates/AdminUsersTemplate.tsx | 322 +++++++------ apps/website/templates/DashboardTemplate.tsx | 20 +- .../templates/DriverRankingsTemplate.tsx | 14 +- .../templates/LeaderboardsTemplate.tsx | 64 ++- apps/website/templates/RacesTemplate.tsx | 2 +- .../templates/SponsorDashboardTemplate.tsx | 336 +++++++++++++ .../templates/SponsorLeagueDetailTemplate.tsx | 4 +- .../templates/SponsorLeaguesTemplate.tsx | 2 +- apps/website/templates/TeamsTemplate.tsx | 4 +- .../templates/auth/ForgotPasswordTemplate.tsx | 4 +- .../templates/auth/ResetPasswordTemplate.tsx | 6 +- .../website/templates/auth/SignupTemplate.tsx | 12 +- apps/website/ui/Avatar.tsx | 27 ++ apps/website/ui/CategoryIcon.tsx | 27 ++ apps/website/ui/Input.tsx | 17 + apps/website/ui/LeagueCover.tsx | 27 ++ apps/website/ui/LeagueLogo.tsx | 30 ++ apps/website/ui/Select.tsx | 5 +- apps/website/ui/SponsorLogo.tsx | 30 ++ apps/website/ui/Table.tsx | 88 ++++ apps/website/ui/TeamLogo.tsx | 30 ++ apps/website/ui/TrackImage.tsx | 30 ++ .../view-data/DriverProfileViewDataBuilder.ts | 85 ++++ .../view-data/DriversViewDataBuilder.ts | 25 + lib/types/view-data/DriverProfileViewData.ts | 78 +++ lib/types/view-data/DriversViewData.ts | 18 + 119 files changed, 2403 insertions(+), 1615 deletions(-) delete mode 100644 apps/website/app/leaderboards/LeaderboardsPageWrapper.tsx create mode 100644 apps/website/components/admin/AdminDashboardWrapper.tsx rename apps/website/{app/admin/users => components/admin}/AdminUsersWrapper.tsx (97%) rename apps/website/{templates/LeaguesTemplate.tsx => components/leagues/LeaguesClient.tsx} (97%) rename apps/website/{app => components}/onboarding/OnboardingWizardClient.tsx (77%) create mode 100644 apps/website/lib/builders/view-data/SponsorDashboardViewDataBuilder.ts create mode 100644 apps/website/lib/display-objects/MedalDisplay.ts create mode 100644 apps/website/lib/display-objects/SkillLevelDisplay.ts create mode 100644 apps/website/lib/display-objects/WinRateDisplay.ts create mode 100644 apps/website/lib/page-queries/SponsorDashboardPageQuery.ts create mode 100644 apps/website/lib/types/LeaderboardsData.ts create mode 100644 apps/website/lib/types/admin.ts create mode 100644 apps/website/lib/types/tbd/AdminUserDto.ts create mode 100644 apps/website/lib/types/tbd/AvailableLeaguesDTO.ts create mode 100644 apps/website/lib/types/tbd/FilteredRacesPageDataDTO.ts create mode 100644 apps/website/lib/types/tbd/GetLiveriesOutputDTO.ts create mode 100644 apps/website/lib/types/tbd/LeagueDetailForSponsorDTO.ts create mode 100644 apps/website/lib/types/tbd/SponsorBillingDTO.ts create mode 100644 apps/website/lib/types/tbd/SponsorSettingsDTO.ts create mode 100644 apps/website/lib/types/tbd/TeamsLeaderboardDto.ts create mode 100644 apps/website/lib/types/view-data/DriversViewData.ts create mode 100644 apps/website/lib/utilities/authValidation.ts create mode 100644 apps/website/lib/view-data/SponsorDashboardViewData.ts delete mode 100644 apps/website/lib/view-models/AdminViewModelPresenter.ts delete mode 100644 apps/website/lib/view-models/RaceResultsDataTransformer.ts create mode 100644 apps/website/templates/SponsorDashboardTemplate.tsx create mode 100644 apps/website/ui/Avatar.tsx create mode 100644 apps/website/ui/CategoryIcon.tsx create mode 100644 apps/website/ui/Input.tsx create mode 100644 apps/website/ui/LeagueCover.tsx create mode 100644 apps/website/ui/LeagueLogo.tsx create mode 100644 apps/website/ui/SponsorLogo.tsx create mode 100644 apps/website/ui/Table.tsx create mode 100644 apps/website/ui/TeamLogo.tsx create mode 100644 apps/website/ui/TrackImage.tsx create mode 100644 lib/builders/view-data/DriverProfileViewDataBuilder.ts create mode 100644 lib/builders/view-data/DriversViewDataBuilder.ts create mode 100644 lib/types/view-data/DriverProfileViewData.ts create mode 100644 lib/types/view-data/DriversViewData.ts diff --git a/apps/website/app/admin/page.tsx b/apps/website/app/admin/page.tsx index 22a7dd557..7a301fb0f 100644 --- a/apps/website/app/admin/page.tsx +++ b/apps/website/app/admin/page.tsx @@ -1,5 +1,5 @@ import { AdminDashboardPageQuery } from '@/lib/page-queries/AdminDashboardPageQuery'; -import { AdminDashboardTemplate } from '@/templates/AdminDashboardTemplate'; +import { AdminDashboardWrapper } from '@/components/admin/AdminDashboardWrapper'; import { ErrorBanner } from '@/components/ui/ErrorBanner'; export default async function AdminPage() { @@ -27,7 +27,6 @@ export default async function AdminPage() { const output = result.unwrap(); - // For now, use empty callbacks. In a real app, these would be Server Actions - // that trigger revalidation or navigation - return {}} isLoading={false} />; + // Pass to client wrapper for UI interactions + return ; } \ No newline at end of file diff --git a/apps/website/app/admin/users/page.tsx b/apps/website/app/admin/users/page.tsx index f919e5810..4f99bf708 100644 --- a/apps/website/app/admin/users/page.tsx +++ b/apps/website/app/admin/users/page.tsx @@ -1,28 +1,10 @@ import { AdminUsersPageQuery } from '@/lib/page-queries/AdminUsersPageQuery'; -import { AdminUsersWrapper } from './AdminUsersWrapper'; +import { AdminUsersWrapper } from '@/components/admin/AdminUsersWrapper'; import { ErrorBanner } from '@/components/ui/ErrorBanner'; -interface AdminUsersPageProps { - searchParams?: { - search?: string; - role?: string; - status?: string; - page?: string; - }; -} - -export default async function AdminUsersPage({ searchParams }: AdminUsersPageProps) { - // Parse query parameters - const query = { - search: searchParams?.search, - role: searchParams?.role, - status: searchParams?.status, - page: searchParams?.page ? parseInt(searchParams.page, 10) : 1, - limit: 50, - }; - +export default async function AdminUsersPage() { // Execute PageQuery using static method - const result = await AdminUsersPageQuery.execute(query); + const result = await AdminUsersPageQuery.execute(); // Handle errors if (result.isErr()) { diff --git a/apps/website/app/auth/forgot-password/ForgotPasswordClient.tsx b/apps/website/app/auth/forgot-password/ForgotPasswordClient.tsx index 170671412..6eae2762e 100644 --- a/apps/website/app/auth/forgot-password/ForgotPasswordClient.tsx +++ b/apps/website/app/auth/forgot-password/ForgotPasswordClient.tsx @@ -1,6 +1,6 @@ /** * Forgot Password Client Component - * + * * Handles client-side forgot password flow. */ @@ -12,6 +12,7 @@ import { ForgotPasswordTemplate } from '@/templates/auth/ForgotPasswordTemplate' import { ForgotPasswordMutation } from '@/lib/mutations/auth/ForgotPasswordMutation'; import { ForgotPasswordViewModelBuilder } from '@/lib/builders/view-models/ForgotPasswordViewModelBuilder'; import { ForgotPasswordViewModel } from '@/lib/view-models/auth/ForgotPasswordViewModel'; +import { ForgotPasswordFormValidation } from '@/lib/utilities/authValidation'; interface ForgotPasswordClientProps { viewData: ForgotPasswordViewData; @@ -19,24 +20,67 @@ interface ForgotPasswordClientProps { export function ForgotPasswordClient({ viewData }: ForgotPasswordClientProps) { // Build ViewModel from ViewData - const [viewModel, setViewModel] = useState(() => + const [viewModel, setViewModel] = useState(() => ForgotPasswordViewModelBuilder.build(viewData) ); - const [formData, setFormData] = useState({ email: '' }); + // Handle form field changes + const handleChange = (e: React.ChangeEvent) => { + const { name, value } = e.target; + + setViewModel(prev => { + const newFormState = { + ...prev.formState, + fields: { + ...prev.formState.fields, + [name]: { + ...prev.formState.fields[name as keyof typeof prev.formState.fields], + value, + touched: true, + error: undefined, + }, + }, + }; + return prev.withFormState(newFormState); + }); + }; const handleSubmit = async (e: React.FormEvent) => { e.preventDefault(); + const formData = { + email: viewModel.formState.fields.email.value as string, + }; + + // Validate form + const validationErrors = ForgotPasswordFormValidation.validateForm(formData); + if (validationErrors.length > 0) { + setViewModel(prev => { + const newFormState = { + ...prev.formState, + isValid: false, + submitCount: prev.formState.submitCount + 1, + fields: { + ...prev.formState.fields, + email: { + ...prev.formState.fields.email, + error: validationErrors.find(e => e.field === 'email')?.message, + touched: true, + }, + }, + }; + return prev.withFormState(newFormState); + }); + return; + } + // Update submitting state setViewModel(prev => prev.withMutationState(true, null)); try { // Execute forgot password mutation const mutation = new ForgotPasswordMutation(); - const result = await mutation.execute({ - email: formData.email, - }); + const result = await mutation.execute(formData); if (result.isErr()) { const error = result.getError(); @@ -68,7 +112,7 @@ export function ForgotPasswordClient({ viewData }: ForgotPasswordClientProps) { { if (!show) { diff --git a/apps/website/app/auth/reset-password/ResetPasswordClient.tsx b/apps/website/app/auth/reset-password/ResetPasswordClient.tsx index 139222e96..880914ced 100644 --- a/apps/website/app/auth/reset-password/ResetPasswordClient.tsx +++ b/apps/website/app/auth/reset-password/ResetPasswordClient.tsx @@ -1,6 +1,6 @@ /** * Reset Password Client Component - * + * * Handles client-side reset password flow. */ @@ -13,6 +13,7 @@ import { ResetPasswordTemplate } from '@/templates/auth/ResetPasswordTemplate'; import { ResetPasswordMutation } from '@/lib/mutations/auth/ResetPasswordMutation'; import { ResetPasswordViewModelBuilder } from '@/lib/builders/view-models/ResetPasswordViewModelBuilder'; import { ResetPasswordViewModel } from '@/lib/view-models/auth/ResetPasswordViewModel'; +import { ResetPasswordFormValidation } from '@/lib/utilities/authValidation'; import { routes } from '@/lib/routing/RouteConfig'; interface ResetPasswordClientProps { @@ -22,23 +23,63 @@ interface ResetPasswordClientProps { export function ResetPasswordClient({ viewData }: ResetPasswordClientProps) { const router = useRouter(); const searchParams = useSearchParams(); - + // Build ViewModel from ViewData - const [viewModel, setViewModel] = useState(() => + const [viewModel, setViewModel] = useState(() => ResetPasswordViewModelBuilder.build(viewData) ); - const [formData, setFormData] = useState({ - newPassword: '', - confirmPassword: '' - }); + // Handle form field changes + const handleChange = (e: React.ChangeEvent) => { + const { name, value } = e.target; + + setViewModel(prev => { + const newFormState = { + ...prev.formState, + fields: { + ...prev.formState.fields, + [name]: { + ...prev.formState.fields[name as keyof typeof prev.formState.fields], + value, + touched: true, + error: undefined, + }, + }, + }; + return prev.withFormState(newFormState); + }); + }; const handleSubmit = async (e: React.FormEvent) => { e.preventDefault(); - // Validate passwords match - if (formData.newPassword !== formData.confirmPassword) { - setViewModel(prev => prev.withMutationState(false, 'Passwords do not match')); + const formData = { + newPassword: viewModel.formState.fields.newPassword.value as string, + confirmPassword: viewModel.formState.fields.confirmPassword.value as string, + }; + + // Validate form + const validationErrors = ResetPasswordFormValidation.validateForm(formData); + if (validationErrors.length > 0) { + setViewModel(prev => { + const newFormState = { + ...prev.formState, + isValid: false, + submitCount: prev.formState.submitCount + 1, + fields: { + ...prev.formState.fields, + ...validationErrors.reduce((acc, error) => ({ + ...acc, + [error.field]: { + ...prev.formState.fields[error.field], + error: error.message, + touched: true, + }, + }), {}), + }, + }; + return prev.withFormState(newFormState); + }); return; } @@ -68,7 +109,7 @@ export function ResetPasswordClient({ viewData }: ResetPasswordClientProps) { // Success const data = result.unwrap(); setViewModel(prev => prev.withSuccess(data.message)); - + // Redirect to login after a delay setTimeout(() => { router.push(routes.auth.login); @@ -116,7 +157,7 @@ export function ResetPasswordClient({ viewData }: ResetPasswordClientProps) { submitError={templateViewData.submitError} // Add the additional props formActions={{ - setFormData, + handleChange, handleSubmit, setShowSuccess: (show) => { if (!show) { diff --git a/apps/website/app/auth/signup/SignupClient.tsx b/apps/website/app/auth/signup/SignupClient.tsx index c8c6d9b9a..800eb6f49 100644 --- a/apps/website/app/auth/signup/SignupClient.tsx +++ b/apps/website/app/auth/signup/SignupClient.tsx @@ -1,6 +1,6 @@ /** * Signup Client Component - * + * * Handles client-side signup flow. */ @@ -14,6 +14,7 @@ import { SignupTemplate } from '@/templates/auth/SignupTemplate'; import { SignupMutation } from '@/lib/mutations/auth/SignupMutation'; import { SignupViewModelBuilder } from '@/lib/builders/view-models/SignupViewModelBuilder'; import { SignupViewModel } from '@/lib/view-models/auth/SignupViewModel'; +import { SignupFormValidation } from '@/lib/utilities/authValidation'; interface SignupClientProps { viewData: SignupViewData; @@ -23,26 +24,66 @@ export function SignupClient({ viewData }: SignupClientProps) { const router = useRouter(); const searchParams = useSearchParams(); const { refreshSession } = useAuth(); - + // Build ViewModel from ViewData - const [viewModel, setViewModel] = useState(() => + const [viewModel, setViewModel] = useState(() => SignupViewModelBuilder.build(viewData) ); - const [formData, setFormData] = useState({ - firstName: '', - lastName: '', - email: '', - password: '', - confirmPassword: '' - }); + // Handle form field changes + const handleChange = (e: React.ChangeEvent) => { + const { name, value } = e.target; + + setViewModel(prev => { + const newFormState = { + ...prev.formState, + fields: { + ...prev.formState.fields, + [name]: { + ...prev.formState.fields[name as keyof typeof prev.formState.fields], + value, + touched: true, + error: undefined, + }, + }, + }; + return prev.withFormState(newFormState); + }); + }; const handleSubmit = async (e: React.FormEvent) => { e.preventDefault(); - // Validate passwords match - if (formData.password !== formData.confirmPassword) { - setViewModel(prev => prev.withMutationState(false, 'Passwords do not match')); + const formData = { + firstName: viewModel.formState.fields.firstName.value as string, + lastName: viewModel.formState.fields.lastName.value as string, + email: viewModel.formState.fields.email.value as string, + password: viewModel.formState.fields.password.value as string, + confirmPassword: viewModel.formState.fields.confirmPassword.value as string, + }; + + // Validate form + const validationErrors = SignupFormValidation.validateForm(formData); + if (validationErrors.length > 0) { + setViewModel(prev => { + const newFormState = { + ...prev.formState, + isValid: false, + submitCount: prev.formState.submitCount + 1, + fields: { + ...prev.formState.fields, + ...validationErrors.reduce((acc, error) => ({ + ...acc, + [error.field]: { + ...prev.formState.fields[error.field], + error: error.message, + touched: true, + }, + }), {}), + }, + }; + return prev.withFormState(newFormState); + }); return; } @@ -50,15 +91,15 @@ export function SignupClient({ viewData }: SignupClientProps) { setViewModel(prev => prev.withMutationState(true, null)); try { - // Transform to DTO format - const displayName = `${formData.firstName} ${formData.lastName}`.trim(); - + // Generate display name + const displayName = SignupFormValidation.generateDisplayName(formData.firstName, formData.lastName); + // Execute signup mutation const mutation = new SignupMutation(); const result = await mutation.execute({ email: formData.email, password: formData.password, - displayName: displayName || formData.firstName || formData.lastName, + displayName, }); if (result.isErr()) { @@ -69,7 +110,7 @@ export function SignupClient({ viewData }: SignupClientProps) { // Success - refresh session and redirect await refreshSession(); - + const returnTo = searchParams.get('returnTo') ?? '/onboarding'; router.push(returnTo); } catch (error) { @@ -105,7 +146,7 @@ export function SignupClient({ viewData }: SignupClientProps) { - ); - case 'ok': - const viewModel = result.dto; - const hasData = !!viewModel.currentDriver; - - if (!hasData) { - return ( - - ); - } - - return ( - - ); + } + return ( + + ); } + + const viewData = result.unwrap(); + return ( + + ); } \ No newline at end of file diff --git a/apps/website/app/drivers/page.tsx b/apps/website/app/drivers/page.tsx index 1c3ef8331..a45bab061 100644 --- a/apps/website/app/drivers/page.tsx +++ b/apps/website/app/drivers/page.tsx @@ -4,43 +4,25 @@ import { DriversPageQuery } from '@/lib/page-queries/page-queries/DriversPageQue import { DriversPageClient } from '@/components/drivers/DriversPageClient'; export default async function Page() { - // Execute the page query const result = await DriversPageQuery.execute(); - // Handle different result statuses - switch (result.status) { - case 'notFound': + if (result.isErr()) { + const error = result.getError(); + if (error === 'NotFound') { redirect(routes.error.notFound); - case 'redirect': - redirect(result.to); - case 'error': - // Pass error to client component - return ( - - ); - case 'ok': - const viewModel = result.dto; - const hasData = (viewModel.drivers?.length ?? 0) > 0; - - if (!hasData) { - return ( - - ); - } - - return ( - - ); + } + return ( + + ); } + + const viewData = result.unwrap(); + return ( + + ); } \ No newline at end of file diff --git a/apps/website/app/leaderboards/LeaderboardsPageWrapper.tsx b/apps/website/app/leaderboards/LeaderboardsPageWrapper.tsx deleted file mode 100644 index 2eca9ab64..000000000 --- a/apps/website/app/leaderboards/LeaderboardsPageWrapper.tsx +++ /dev/null @@ -1,61 +0,0 @@ -'use client'; - -import { useRouter } from 'next/navigation'; -import { LeaderboardsTemplate } from '@/templates/LeaderboardsTemplate'; -import type { LeaderboardsViewData } from '@/lib/view-data/LeaderboardsViewData'; -import { routes } from '@/lib/routing/RouteConfig'; - -export function LeaderboardsPageWrapper({ data }: { data: LeaderboardsViewData | null }) { - const router = useRouter(); - - if (!data || (!data.drivers && !data.teams)) { - return null; - } - - const handleDriverClick = (driverId: string) => { - router.push(routes.driver.detail(driverId)); - }; - - const handleTeamClick = (teamId: string) => { - router.push(routes.team.detail(teamId)); - }; - - const handleNavigateToDrivers = () => { - router.push(routes.leaderboards.drivers); - }; - - const handleNavigateToTeams = () => { - router.push(routes.team.leaderboard); - }; - - // Transform ViewData to template props (simple field mapping only) - const templateData = { - drivers: data.drivers.map(d => ({ - id: d.id, - name: d.name, - rating: d.rating, - skillLevel: d.skillLevel, - nationality: d.nationality, - wins: d.wins, - rank: d.rank, - avatarUrl: d.avatarUrl, - position: d.position, - })), - teams: data.teams.map(t => ({ - id: t.id, - name: t.name, - tag: t.tag, - memberCount: t.memberCount, - category: t.category, - totalWins: t.totalWins, - logoUrl: t.logoUrl, - position: t.position, - })), - onDriverClick: handleDriverClick, - onTeamClick: handleTeamClick, - onNavigateToDrivers: handleNavigateToDrivers, - onNavigateToTeams: handleNavigateToTeams, - }; - - return ; -} \ No newline at end of file diff --git a/apps/website/app/leaderboards/page.tsx b/apps/website/app/leaderboards/page.tsx index 630f09716..4fac97014 100644 --- a/apps/website/app/leaderboards/page.tsx +++ b/apps/website/app/leaderboards/page.tsx @@ -1,14 +1,14 @@ import { notFound, redirect } from 'next/navigation'; import { LeaderboardsPageQuery } from '@/lib/page-queries/page-queries/LeaderboardsPageQuery'; -import { LeaderboardsPageWrapper } from './LeaderboardsPageWrapper'; +import { LeaderboardsTemplate } from '@/templates/LeaderboardsTemplate'; import { routes } from '@/lib/routing/RouteConfig'; export default async function LeaderboardsPage() { const result = await LeaderboardsPageQuery.execute(); - + if (result.isErr()) { const error = result.getError(); - + // Handle different error types if (error === 'notFound') { notFound(); @@ -20,8 +20,8 @@ export default async function LeaderboardsPage() { notFound(); } } - + // Success const viewData = result.unwrap(); - return ; + return ; } \ No newline at end of file diff --git a/apps/website/app/leagues/[id]/layout.tsx b/apps/website/app/leagues/[id]/layout.tsx index c0e379fc9..88bf19a5e 100644 --- a/apps/website/app/leagues/[id]/layout.tsx +++ b/apps/website/app/leagues/[id]/layout.tsx @@ -1,6 +1,7 @@ import { notFound } from 'next/navigation'; import { LeagueDetailPageQuery } from '@/lib/page-queries/page-queries/LeagueDetailPageQuery'; import { LeagueDetailTemplate } from '@/templates/LeagueDetailTemplate'; +import { Text } from '@/ui/Text'; export default async function LeagueLayout({ children, @@ -27,7 +28,7 @@ export default async function LeagueLayout({ leagueDescription="Failed to load league" tabs={[]} > -
Failed to load league
+ Failed to load league ); } diff --git a/apps/website/app/leagues/[id]/page.tsx b/apps/website/app/leagues/[id]/page.tsx index 89a28c26d..424b363d7 100644 --- a/apps/website/app/leagues/[id]/page.tsx +++ b/apps/website/app/leagues/[id]/page.tsx @@ -2,6 +2,7 @@ import { notFound } from 'next/navigation'; import { LeagueDetailTemplate } from '@/templates/LeagueDetailTemplate'; import { LeagueDetailPageQuery } from '@/lib/page-queries/page-queries/LeagueDetailPageQuery'; import { LeagueDetailViewDataBuilder } from '@/lib/builders/view-data/LeagueDetailViewDataBuilder'; +import { ErrorBanner } from '@/components/ui/ErrorBanner'; interface Props { params: { id: string }; @@ -26,11 +27,11 @@ export default async function Page({ params }: Props) { default: // Return error state return ( -
-
-
Failed to load league details
-
-
+ ); } } diff --git a/apps/website/app/leagues/page.tsx b/apps/website/app/leagues/page.tsx index f5f765e43..690478cc0 100644 --- a/apps/website/app/leagues/page.tsx +++ b/apps/website/app/leagues/page.tsx @@ -1,5 +1,5 @@ import { notFound } from 'next/navigation'; -import { LeaguesTemplate } from '@/templates/LeaguesTemplate'; +import { LeaguesClient } from '@/components/leagues/LeaguesClient'; import { LeaguesPageQuery } from '@/lib/page-queries/page-queries/LeaguesPageQuery'; export default async function Page() { @@ -20,11 +20,11 @@ export default async function Page() { case 'UNKNOWN_ERROR': default: // Return error state - use LeaguesTemplate with empty data - return ; + return ; } } const viewData = result.unwrap(); - - return ; + + return ; } \ No newline at end of file diff --git a/apps/website/app/media/avatar/[driverId]/route.ts b/apps/website/app/media/avatar/[driverId]/route.ts index a49fd4830..17db6994a 100644 --- a/apps/website/app/media/avatar/[driverId]/route.ts +++ b/apps/website/app/media/avatar/[driverId]/route.ts @@ -18,8 +18,8 @@ export async function GET( } const viewData = result.unwrap(); - - return new NextResponse(viewData.buffer, { + + return new NextResponse(Buffer.from(viewData.buffer, 'base64'), { headers: { 'Content-Type': viewData.contentType, 'Cache-Control': 'public, max-age=3600', diff --git a/apps/website/app/media/categories/[categoryId]/icon/route.ts b/apps/website/app/media/categories/[categoryId]/icon/route.ts index 43de80d65..440d642ab 100644 --- a/apps/website/app/media/categories/[categoryId]/icon/route.ts +++ b/apps/website/app/media/categories/[categoryId]/icon/route.ts @@ -18,8 +18,8 @@ export async function GET( } const viewData = result.unwrap(); - - return new NextResponse(viewData.buffer, { + + return new NextResponse(Buffer.from(viewData.buffer, 'base64'), { headers: { 'Content-Type': viewData.contentType, 'Cache-Control': 'public, max-age=3600', diff --git a/apps/website/app/media/leagues/[leagueId]/cover/route.ts b/apps/website/app/media/leagues/[leagueId]/cover/route.ts index 590f26fd9..f1b12c4d0 100644 --- a/apps/website/app/media/leagues/[leagueId]/cover/route.ts +++ b/apps/website/app/media/leagues/[leagueId]/cover/route.ts @@ -18,8 +18,8 @@ export async function GET( } const viewData = result.unwrap(); - - return new NextResponse(viewData.buffer, { + + return new NextResponse(Buffer.from(viewData.buffer, 'base64'), { headers: { 'Content-Type': viewData.contentType, 'Cache-Control': 'public, max-age=3600', diff --git a/apps/website/app/media/leagues/[leagueId]/logo/route.ts b/apps/website/app/media/leagues/[leagueId]/logo/route.ts index c6c398ce8..3537d5648 100644 --- a/apps/website/app/media/leagues/[leagueId]/logo/route.ts +++ b/apps/website/app/media/leagues/[leagueId]/logo/route.ts @@ -18,8 +18,8 @@ export async function GET( } const viewData = result.unwrap(); - - return new NextResponse(viewData.buffer, { + + return new NextResponse(Buffer.from(viewData.buffer, 'base64'), { headers: { 'Content-Type': viewData.contentType, 'Cache-Control': 'public, max-age=3600', diff --git a/apps/website/app/media/sponsors/[sponsorId]/logo/route.ts b/apps/website/app/media/sponsors/[sponsorId]/logo/route.ts index d43befa92..fc281fb74 100644 --- a/apps/website/app/media/sponsors/[sponsorId]/logo/route.ts +++ b/apps/website/app/media/sponsors/[sponsorId]/logo/route.ts @@ -18,8 +18,8 @@ export async function GET( } const viewData = result.unwrap(); - - return new NextResponse(viewData.buffer, { + + return new NextResponse(Buffer.from(viewData.buffer, 'base64'), { headers: { 'Content-Type': viewData.contentType, 'Cache-Control': 'public, max-age=3600', diff --git a/apps/website/app/media/teams/[teamId]/logo/route.ts b/apps/website/app/media/teams/[teamId]/logo/route.ts index 823788375..764881d8e 100644 --- a/apps/website/app/media/teams/[teamId]/logo/route.ts +++ b/apps/website/app/media/teams/[teamId]/logo/route.ts @@ -18,8 +18,8 @@ export async function GET( } const viewData = result.unwrap(); - - return new NextResponse(viewData.buffer, { + + return new NextResponse(Buffer.from(viewData.buffer, 'base64'), { headers: { 'Content-Type': viewData.contentType, 'Cache-Control': 'public, max-age=3600', diff --git a/apps/website/app/media/tracks/[trackId]/image/route.ts b/apps/website/app/media/tracks/[trackId]/image/route.ts index 03a065e89..7d1fc7057 100644 --- a/apps/website/app/media/tracks/[trackId]/image/route.ts +++ b/apps/website/app/media/tracks/[trackId]/image/route.ts @@ -18,8 +18,8 @@ export async function GET( } const viewData = result.unwrap(); - - return new NextResponse(viewData.buffer, { + + return new NextResponse(Buffer.from(viewData.buffer, 'base64'), { headers: { 'Content-Type': viewData.contentType, 'Cache-Control': 'public, max-age=3600', diff --git a/apps/website/app/onboarding/page.tsx b/apps/website/app/onboarding/page.tsx index 519cd2403..2936b4667 100644 --- a/apps/website/app/onboarding/page.tsx +++ b/apps/website/app/onboarding/page.tsx @@ -1,5 +1,5 @@ import { redirect } from 'next/navigation'; -import { OnboardingWizardClient } from './OnboardingWizardClient'; +import { OnboardingWizardClient } from '@/components/onboarding/OnboardingWizardClient'; import { OnboardingPageQuery } from '@/lib/page-queries/page-queries/OnboardingPageQuery'; import { SearchParamBuilder } from '@/lib/routing/search-params/SearchParamBuilder'; import { routes } from '@/lib/routing/RouteConfig'; diff --git a/apps/website/app/sponsor/dashboard/page.tsx b/apps/website/app/sponsor/dashboard/page.tsx index 6af7eab14..b9cc3706e 100644 --- a/apps/website/app/sponsor/dashboard/page.tsx +++ b/apps/website/app/sponsor/dashboard/page.tsx @@ -1,450 +1,15 @@ -'use client'; +import { notFound } from 'next/navigation'; +import { SponsorDashboardPageQuery } from '@/lib/page-queries/SponsorDashboardPageQuery'; +import { SponsorDashboardTemplate } from '@/templates/SponsorDashboardTemplate'; -export const dynamic = 'force-dynamic'; +export default async function SponsorDashboardPage() { + const pageQuery = new SponsorDashboardPageQuery(); + const result = await pageQuery.execute('demo-sponsor-1'); -import { motion, useReducedMotion, AnimatePresence } from 'framer-motion'; -import Card from '@/components/ui/Card'; -import Button from '@/components/ui/Button'; -import StatusBadge from '@/components/ui/StatusBadge'; -import InfoBanner from '@/components/ui/InfoBanner'; -import MetricCard from '@/components/sponsors/MetricCard'; -import SponsorshipCategoryCard from '@/components/sponsors/SponsorshipCategoryCard'; -import ActivityItem from '@/components/sponsors/ActivityItem'; -import RenewalAlert from '@/components/sponsors/RenewalAlert'; -import { - BarChart3, - Eye, - Users, - Trophy, - TrendingUp, - Calendar, - DollarSign, - Target, - ArrowUpRight, - ArrowDownRight, - ExternalLink, - Loader2, - Car, - Flag, - Megaphone, - ChevronRight, - Plus, - Bell, - Settings, - CreditCard, - FileText, - RefreshCw -} from 'lucide-react'; -import Link from 'next/link'; -import { useSponsorDashboard } from '@/lib/hooks/sponsor/useSponsorDashboard'; - -export default function SponsorDashboardPage() { - const shouldReduceMotion = useReducedMotion(); - - // Use the hook instead of manual query construction - const { data: dashboardData, isLoading, error, retry } = useSponsorDashboard('demo-sponsor-1'); - - if (isLoading) { - return ( -
-
- -

Loading dashboard...

-
-
- ); + if (result.isErr()) { + notFound(); } - if (error || !dashboardData) { - return ( -
-
-

{error?.getUserMessage() || 'Failed to load dashboard data'}

- {error && ( - - )} -
-
- ); - } - - const categoryData = dashboardData.categoryData; - - return ( -
- {/* Header */} -
-
-

Sponsor Dashboard

-

Welcome back, {dashboardData.sponsorName}

-
-
- {/* Time Range Selector */} -
- {(['7d', '30d', '90d', 'all'] as const).map((range) => ( - - ))} -
- - {/* Quick Actions */} - - - - -
-
- - {/* Key Metrics */} -
- - - - -
- - {/* Sponsorship Categories */} -
-
-

Your Sponsorships

- - - -
- -
- - - - - -
-
- - {/* Main Content Grid */} -
- {/* Left Column - Sponsored Entities */} -
- {/* Top Performing Sponsorships */} - -
-

Top Performing

- - - -
-
- {/* Leagues */} - {dashboardData.sponsorships.leagues.map((league: any) => ( -
-
-
- {league.tier === 'main' ? 'Main' : 'Secondary'} -
-
-
- - {league.entityName} -
-
{league.details}
-
-
-
-
-
{league.formattedImpressions}
-
impressions
-
- - - -
-
- ))} - - {/* Teams */} - {dashboardData.sponsorships.teams.map((team: any) => ( -
-
-
- Team -
-
-
- - {team.entityName} -
-
{team.details}
-
-
-
-
-
{team.formattedImpressions}
-
impressions
-
- -
-
- ))} - - {/* Drivers */} - {dashboardData.sponsorships.drivers.slice(0, 2).map((driver: any) => ( -
-
-
- Driver -
-
-
- - {driver.entityName} -
-
{driver.details}
-
-
-
-
-
{driver.formattedImpressions}
-
impressions
-
- -
-
- ))} -
- - - {/* Upcoming Events */} - -
-

- - Upcoming Sponsored Events -

-
-
- {dashboardData.sponsorships.races.length > 0 ? ( -
- {dashboardData.sponsorships.races.map((race: any) => ( -
-
-
- -
-
-

{race.entityName}

-

{race.details}

-
-
-
- - {race.status} - -
-
- ))} -
- ) : ( -
- -

No upcoming sponsored events

-
- )} -
- -
- - {/* Right Column - Activity & Quick Actions */} -
- {/* Quick Actions */} - -

Quick Actions

-
- - - - - - - - - - - - - - - -
- - - {/* Renewal Alerts */} - {dashboardData.upcomingRenewals.length > 0 && ( - -

- - Upcoming Renewals -

-
- {dashboardData.upcomingRenewals.map((renewal: any) => ( - - ))} -
- - )} - - {/* Recent Activity */} - -

Recent Activity

-
- {dashboardData.recentActivity.map((activity: any) => ( - - ))} -
- - - {/* Investment Summary */} - -

- - Investment Summary -

-
-
- Active Sponsorships - {dashboardData.activeSponsorships} -
-
- Total Investment - {dashboardData.formattedTotalInvestment} -
-
- Cost per 1K Views - - {dashboardData.costPerThousandViews} - -
-
- Next Invoice - Jan 1, 2026 -
-
- - - -
-
- -
-
-
- ); + const viewData = result.unwrap(); + return ; } \ No newline at end of file diff --git a/apps/website/components/admin/AdminDashboardWrapper.tsx b/apps/website/components/admin/AdminDashboardWrapper.tsx new file mode 100644 index 000000000..9b9e01a22 --- /dev/null +++ b/apps/website/components/admin/AdminDashboardWrapper.tsx @@ -0,0 +1,32 @@ +'use client'; + +import { useState, useCallback } from 'react'; +import { useRouter } from 'next/navigation'; +import { AdminDashboardTemplate } from '@/templates/AdminDashboardTemplate'; +import { AdminDashboardViewData } from '@/lib/view-data/AdminDashboardViewData'; + +interface AdminDashboardWrapperProps { + initialViewData: AdminDashboardViewData; +} + +export function AdminDashboardWrapper({ initialViewData }: AdminDashboardWrapperProps) { + const router = useRouter(); + + // UI state (not business logic) + const [loading, setLoading] = useState(false); + + const handleRefresh = useCallback(() => { + setLoading(true); + router.refresh(); + // Reset loading after a short delay to show the spinner + setTimeout(() => setLoading(false), 1000); + }, [router]); + + return ( + + ); +} \ No newline at end of file diff --git a/apps/website/app/admin/users/AdminUsersWrapper.tsx b/apps/website/components/admin/AdminUsersWrapper.tsx similarity index 97% rename from apps/website/app/admin/users/AdminUsersWrapper.tsx rename to apps/website/components/admin/AdminUsersWrapper.tsx index 0b2ed697b..77d4f22b2 100644 --- a/apps/website/app/admin/users/AdminUsersWrapper.tsx +++ b/apps/website/components/admin/AdminUsersWrapper.tsx @@ -4,7 +4,7 @@ import { useState, useCallback } from 'react'; import { useRouter, useSearchParams } from 'next/navigation'; import { AdminUsersTemplate } from '@/templates/AdminUsersTemplate'; import { AdminUsersViewData } from '@/lib/view-data/AdminUsersViewData'; -import { updateUserStatus, deleteUser } from '../actions'; +import { updateUserStatus, deleteUser } from '@/app/admin/actions'; import { routes } from '@/lib/routing/RouteConfig'; interface AdminUsersWrapperProps { @@ -14,12 +14,12 @@ interface AdminUsersWrapperProps { export function AdminUsersWrapper({ initialViewData }: AdminUsersWrapperProps) { const router = useRouter(); const searchParams = useSearchParams(); - + // UI state (not business logic) const [loading, setLoading] = useState(false); const [error, setError] = useState(null); const [deletingUser, setDeletingUser] = useState(null); - + // Current filter values from URL const search = searchParams.get('search') || ''; const roleFilter = searchParams.get('role') || ''; @@ -63,12 +63,12 @@ export function AdminUsersWrapper({ initialViewData }: AdminUsersWrapperProps) { try { setLoading(true); const result = await updateUserStatus(userId, newStatus); - + if (result.isErr()) { setError(result.getError()); return; } - + // Revalidate data router.refresh(); } catch (err) { @@ -86,12 +86,12 @@ export function AdminUsersWrapper({ initialViewData }: AdminUsersWrapperProps) { try { setDeletingUser(userId); const result = await deleteUser(userId); - + if (result.isErr()) { setError(result.getError()); return; } - + // Revalidate data router.refresh(); } catch (err) { diff --git a/apps/website/components/leaderboards/DriverLeaderboardPreview.tsx b/apps/website/components/leaderboards/DriverLeaderboardPreview.tsx index 6fb216cd7..c79ad00d9 100644 --- a/apps/website/components/leaderboards/DriverLeaderboardPreview.tsx +++ b/apps/website/components/leaderboards/DriverLeaderboardPreview.tsx @@ -2,6 +2,9 @@ import React from 'react'; import { Trophy, Crown, Flag, ChevronRight } from 'lucide-react'; import Button from '@/components/ui/Button'; import Image from 'next/image'; +import { SkillLevelDisplay } from '@/lib/display-objects/SkillLevelDisplay'; +import { MedalDisplay } from '@/lib/display-objects/MedalDisplay'; +import { RatingDisplay } from '@/lib/display-objects/RatingDisplay'; interface DriverLeaderboardPreviewProps { drivers: { @@ -19,33 +22,8 @@ interface DriverLeaderboardPreviewProps { onNavigateToDrivers: () => void; } -const SKILL_LEVELS = [ - { id: 'pro', label: 'Pro', color: 'text-yellow-400' }, - { id: 'advanced', label: 'Advanced', color: 'text-purple-400' }, - { id: 'intermediate', label: 'Intermediate', color: 'text-primary-blue' }, - { id: 'beginner', label: 'Beginner', color: 'text-green-400' }, -]; - export function DriverLeaderboardPreview({ drivers, onDriverClick, onNavigateToDrivers }: DriverLeaderboardPreviewProps) { - const top10 = drivers.slice(0, 10); - - const getMedalColor = (position: number) => { - switch (position) { - case 1: return 'text-yellow-400'; - case 2: return 'text-gray-300'; - case 3: return 'text-amber-600'; - default: return 'text-gray-500'; - } - }; - - const getMedalBg = (position: number) => { - switch (position) { - case 1: return 'bg-yellow-400/10 border-yellow-400/30'; - case 2: return 'bg-gray-300/10 border-gray-300/30'; - case 3: return 'bg-amber-600/10 border-amber-600/30'; - default: return 'bg-iron-gray/50 border-charcoal-outline'; - } - }; + const top10 = drivers; // Already sliced in builder return (
@@ -71,7 +49,6 @@ export function DriverLeaderboardPreview({ drivers, onDriverClick, onNavigateToD
{top10.map((driver, index) => { - const levelConfig = SKILL_LEVELS.find((l) => l.id === driver.skillLevel); const position = index + 1; return ( @@ -81,7 +58,7 @@ export function DriverLeaderboardPreview({ drivers, onDriverClick, onNavigateToD onClick={() => onDriverClick(driver.id)} className="flex items-center gap-4 px-5 py-3 w-full text-left hover:bg-iron-gray/30 transition-colors group" > -
+
{position <= 3 ? : position}
@@ -96,13 +73,13 @@ export function DriverLeaderboardPreview({ drivers, onDriverClick, onNavigateToD
{driver.nationality} - {levelConfig?.label} + {SkillLevelDisplay.getLabel(driver.skillLevel)}
-

{driver.rating.toLocaleString()}

+

{RatingDisplay.format(driver.rating)}

Rating

diff --git a/apps/website/components/leaderboards/TeamLeaderboardPreview.tsx b/apps/website/components/leaderboards/TeamLeaderboardPreview.tsx index d05edf7ed..6e226849c 100644 --- a/apps/website/components/leaderboards/TeamLeaderboardPreview.tsx +++ b/apps/website/components/leaderboards/TeamLeaderboardPreview.tsx @@ -3,6 +3,8 @@ import Image from 'next/image'; import { Users, Crown, Shield, ChevronRight } from 'lucide-react'; import Button from '@/components/ui/Button'; import { getMediaUrl } from '@/lib/utilities/media'; +import { SkillLevelDisplay } from '@/lib/display-objects/SkillLevelDisplay'; +import { MedalDisplay } from '@/lib/display-objects/MedalDisplay'; interface TeamLeaderboardPreviewProps { teams: { @@ -19,33 +21,8 @@ interface TeamLeaderboardPreviewProps { onNavigateToTeams: () => void; } -const SKILL_LEVELS = [ - { id: 'pro', label: 'Pro', icon: Crown, color: 'text-yellow-400', bgColor: 'bg-yellow-400/10', borderColor: 'border-yellow-400/30' }, - { id: 'advanced', label: 'Advanced', icon: Crown, color: 'text-purple-400', bgColor: 'bg-purple-400/10', borderColor: 'border-purple-400/30' }, - { id: 'intermediate', label: 'Intermediate', icon: Crown, color: 'text-primary-blue', bgColor: 'bg-primary-blue/10', borderColor: 'border-primary-blue/30' }, - { id: 'beginner', label: 'Beginner', icon: Shield, color: 'text-green-400', bgColor: 'bg-green-400/10', borderColor: 'border-green-400/30' }, -]; - export function TeamLeaderboardPreview({ teams, onTeamClick, onNavigateToTeams }: TeamLeaderboardPreviewProps) { - const top5 = teams.slice(0, 5); - - const getMedalColor = (position: number) => { - switch (position) { - case 1: return 'text-yellow-400'; - case 2: return 'text-gray-300'; - case 3: return 'text-amber-600'; - default: return 'text-gray-500'; - } - }; - - const getMedalBg = (position: number) => { - switch (position) { - case 1: return 'bg-yellow-400/10 border-yellow-400/30'; - case 2: return 'bg-gray-300/10 border-gray-300/30'; - case 3: return 'bg-amber-600/10 border-amber-600/30'; - default: return 'bg-iron-gray/50 border-charcoal-outline'; - } - }; + const top5 = teams; // Already sliced in builder when implemented return (
@@ -71,8 +48,6 @@ export function TeamLeaderboardPreview({ teams, onTeamClick, onNavigateToTeams }
{top5.map((team, index) => { - const levelConfig = SKILL_LEVELS.find((l) => l.id === team.category); - const LevelIcon = levelConfig?.icon || Shield; const position = team.position; return ( @@ -82,7 +57,7 @@ export function TeamLeaderboardPreview({ teams, onTeamClick, onNavigateToTeams } onClick={() => onTeamClick(team.id)} className="flex items-center gap-4 px-5 py-3 w-full text-left hover:bg-iron-gray/30 transition-colors group" > -
+
{position <= 3 ? : position}
@@ -111,7 +86,7 @@ export function TeamLeaderboardPreview({ teams, onTeamClick, onNavigateToTeams } {team.memberCount} members - {levelConfig?.label} + {SkillLevelDisplay.getLabel(team.category || '')}
diff --git a/apps/website/templates/LeaguesTemplate.tsx b/apps/website/components/leagues/LeaguesClient.tsx similarity index 97% rename from apps/website/templates/LeaguesTemplate.tsx rename to apps/website/components/leagues/LeaguesClient.tsx index da515c559..3bb58c1f0 100644 --- a/apps/website/templates/LeaguesTemplate.tsx +++ b/apps/website/components/leagues/LeaguesClient.tsx @@ -66,7 +66,7 @@ interface LeagueSliderProps { } interface LeaguesTemplateProps { - data: LeaguesViewData; + viewData: LeaguesViewData; } // ============================================================================ @@ -406,15 +406,15 @@ function LeagueSlider({ // MAIN TEMPLATE COMPONENT // ============================================================================ -export function LeaguesTemplate({ - data, +export function LeaguesClient({ + viewData, }: LeaguesTemplateProps) { const [searchQuery, setSearchQuery] = useState(''); const [activeCategory, setActiveCategory] = useState('all'); const [showFilters, setShowFilters] = useState(false); // Filter by search query - const searchFilteredLeagues = data.leagues.filter((league) => { + const searchFilteredLeagues = viewData.leagues.filter((league) => { if (!searchQuery) return true; const query = searchQuery.toLowerCase(); return ( @@ -485,7 +485,7 @@ export function LeaguesTemplate({
- {data.leagues.length} active leagues + {viewData.leagues.length} active leagues
@@ -505,7 +505,7 @@ export function LeaguesTemplate({ {/* CTA */}
- + Create League @@ -575,7 +575,7 @@ export function LeaguesTemplate({
{/* Content */} - {data.leagues.length === 0 ? ( + {viewData.leagues.length === 0 ? ( /* Empty State */
@@ -588,7 +588,7 @@ export function LeaguesTemplate({

Be the first to create a racing series. Start your own league and invite drivers to compete for glory.

- + Create Your First League diff --git a/apps/website/components/onboarding/OnboardingWizard.tsx b/apps/website/components/onboarding/OnboardingWizard.tsx index 7778a095f..f40fb493c 100644 --- a/apps/website/components/onboarding/OnboardingWizard.tsx +++ b/apps/website/components/onboarding/OnboardingWizard.tsx @@ -1,3 +1,5 @@ +'use client'; + import { useState, FormEvent } from 'react'; import Card from '@/components/ui/Card'; import { StepIndicator } from '@/ui/StepIndicator'; diff --git a/apps/website/app/onboarding/OnboardingWizardClient.tsx b/apps/website/components/onboarding/OnboardingWizardClient.tsx similarity index 77% rename from apps/website/app/onboarding/OnboardingWizardClient.tsx rename to apps/website/components/onboarding/OnboardingWizardClient.tsx index dda3b9246..53d6acc85 100644 --- a/apps/website/app/onboarding/OnboardingWizardClient.tsx +++ b/apps/website/components/onboarding/OnboardingWizardClient.tsx @@ -1,14 +1,12 @@ 'use client'; -import { useRouter } from 'next/navigation'; -import { OnboardingWizard } from '@/components/onboarding/OnboardingWizard'; +import { OnboardingWizard } from './OnboardingWizard'; import { routes } from '@/lib/routing/RouteConfig'; -import { completeOnboardingAction } from './completeOnboardingAction'; -import { generateAvatarsAction } from './generateAvatarsAction'; +import { completeOnboardingAction } from '@/app/onboarding/completeOnboardingAction'; +import { generateAvatarsAction } from '@/app/onboarding/generateAvatarsAction'; import { useAuth } from '@/lib/auth/AuthContext'; export function OnboardingWizardClient() { - const router = useRouter(); const { session } = useAuth(); const handleCompleteOnboarding = async (input: { @@ -20,13 +18,12 @@ export function OnboardingWizardClient() { }) => { try { const result = await completeOnboardingAction(input); - + if (result.isErr()) { return { success: false, error: result.getError() }; } - - router.push(routes.protected.dashboard); - router.refresh(); + + window.location.href = routes.protected.dashboard; return { success: true }; } catch (error) { return { success: false, error: 'Failed to complete onboarding' }; @@ -62,8 +59,7 @@ export function OnboardingWizardClient() { return ( { - router.push(routes.protected.dashboard); - router.refresh(); + window.location.href = routes.protected.dashboard; }} onCompleteOnboarding={handleCompleteOnboarding} onGenerateAvatars={handleGenerateAvatars} diff --git a/apps/website/components/profile/UserPill.tsx b/apps/website/components/profile/UserPill.tsx index 113071606..6bace3912 100644 --- a/apps/website/components/profile/UserPill.tsx +++ b/apps/website/components/profile/UserPill.tsx @@ -225,13 +225,13 @@ export default function UserPill() { return (
Sign In Get Started @@ -378,7 +378,7 @@ export default function UserPill() { Dashboard setIsMenuOpen(false)} > @@ -386,7 +386,7 @@ export default function UserPill() { My Sponsorships setIsMenuOpen(false)} > @@ -394,7 +394,7 @@ export default function UserPill() { Billing setIsMenuOpen(false)} > @@ -406,21 +406,21 @@ export default function UserPill() { {/* Regular user profile links */} setIsMenuOpen(false)} > Profile setIsMenuOpen(false)} > Manage leagues setIsMenuOpen(false)} > @@ -428,7 +428,7 @@ export default function UserPill() { Liveries setIsMenuOpen(false)} > @@ -436,7 +436,7 @@ export default function UserPill() { Sponsorship Requests setIsMenuOpen(false)} > diff --git a/apps/website/lib/api/admin/AdminApiClient.ts b/apps/website/lib/api/admin/AdminApiClient.ts index fb2379b79..73b0fa9b7 100644 --- a/apps/website/lib/api/admin/AdminApiClient.ts +++ b/apps/website/lib/api/admin/AdminApiClient.ts @@ -1,66 +1,5 @@ import { BaseApiClient } from '../base/BaseApiClient'; - -export interface UserDto { - id: string; - email: string; - displayName: string; - roles: string[]; - status: string; - isSystemAdmin: boolean; - createdAt: Date; - updatedAt: Date; - lastLoginAt?: Date; - primaryDriverId?: string; -} - -export interface UserListResponse { - users: UserDto[]; - total: number; - page: number; - limit: number; - totalPages: number; -} - -export interface ListUsersQuery { - role?: string; - status?: string; - email?: string; - search?: string; - page?: number; - limit?: number; - sortBy?: 'email' | 'displayName' | 'createdAt' | 'lastLoginAt' | 'status'; - sortDirection?: 'asc' | 'desc'; -} - -export interface DashboardStats { - totalUsers: number; - activeUsers: number; - suspendedUsers: number; - deletedUsers: number; - systemAdmins: number; - recentLogins: number; - newUsersToday: number; - userGrowth: { - label: string; - value: number; - color: string; - }[]; - roleDistribution: { - label: string; - value: number; - color: string; - }[]; - statusDistribution: { - active: number; - suspended: number; - deleted: number; - }; - activityTimeline: { - date: string; - newUsers: number; - logins: number; - }[]; -} +import type { UserDto, UserListResponse, ListUsersQuery, DashboardStats } from '@/lib/types/admin'; /** * Admin API Client diff --git a/apps/website/lib/api/races/RacesApiClient.ts b/apps/website/lib/api/races/RacesApiClient.ts index eff0c7aaf..c9e8e23e7 100644 --- a/apps/website/lib/api/races/RacesApiClient.ts +++ b/apps/website/lib/api/races/RacesApiClient.ts @@ -12,6 +12,8 @@ import type { RaceDetailEntryDTO } from '../../types/generated/RaceDetailEntryDT import type { RaceDetailRegistrationDTO } from '../../types/generated/RaceDetailRegistrationDTO'; import type { RaceDetailUserResultDTO } from '../../types/generated/RaceDetailUserResultDTO'; import type { FileProtestCommandDTO } from '../../types/generated/FileProtestCommandDTO'; +import type { AllRacesPageDTO } from '../../types/generated/AllRacesPageDTO'; +import type { FilteredRacesPageDataDTO } from '../../types/tbd/FilteredRacesPageDataDTO'; // Define missing types type RacesPageDataDTO = { races: RacesPageDataRaceDTO[] }; diff --git a/apps/website/lib/builders/view-data/AdminDashboardViewDataBuilder.ts b/apps/website/lib/builders/view-data/AdminDashboardViewDataBuilder.ts index e9dda6031..f7edb8106 100644 --- a/apps/website/lib/builders/view-data/AdminDashboardViewDataBuilder.ts +++ b/apps/website/lib/builders/view-data/AdminDashboardViewDataBuilder.ts @@ -1,4 +1,4 @@ -import type { DashboardStats } from '@/lib/api/admin/AdminApiClient'; +import type { DashboardStats } from '@/lib/types/admin'; import type { AdminDashboardViewData } from '@/lib/view-data/AdminDashboardViewData'; /** diff --git a/apps/website/lib/builders/view-data/AdminUsersViewDataBuilder.ts b/apps/website/lib/builders/view-data/AdminUsersViewDataBuilder.ts index 016764fec..f4cca9e6f 100644 --- a/apps/website/lib/builders/view-data/AdminUsersViewDataBuilder.ts +++ b/apps/website/lib/builders/view-data/AdminUsersViewDataBuilder.ts @@ -1,4 +1,4 @@ -import type { UserListResponse } from '@/lib/api/admin/AdminApiClient'; +import type { UserListResponse } from '@/lib/types/admin'; import { AdminUsersViewData } from '@/lib/view-data/AdminUsersViewData'; /** diff --git a/apps/website/lib/builders/view-data/AvatarViewDataBuilder.ts b/apps/website/lib/builders/view-data/AvatarViewDataBuilder.ts index 4e85f6db4..2841bc51c 100644 --- a/apps/website/lib/builders/view-data/AvatarViewDataBuilder.ts +++ b/apps/website/lib/builders/view-data/AvatarViewDataBuilder.ts @@ -11,7 +11,7 @@ import { AvatarViewData } from '@/lib/view-data/AvatarViewData'; export class AvatarViewDataBuilder { static build(apiDto: MediaBinaryDTO): AvatarViewData { return { - buffer: apiDto.buffer, + buffer: Buffer.from(apiDto.buffer).toString('base64'), contentType: apiDto.contentType, }; } diff --git a/apps/website/lib/builders/view-data/CategoryIconViewDataBuilder.ts b/apps/website/lib/builders/view-data/CategoryIconViewDataBuilder.ts index bcea58676..4fcdd4068 100644 --- a/apps/website/lib/builders/view-data/CategoryIconViewDataBuilder.ts +++ b/apps/website/lib/builders/view-data/CategoryIconViewDataBuilder.ts @@ -11,7 +11,7 @@ import { CategoryIconViewData } from '@/lib/view-data/CategoryIconViewData'; export class CategoryIconViewDataBuilder { static build(apiDto: MediaBinaryDTO): CategoryIconViewData { return { - buffer: apiDto.buffer, + buffer: Buffer.from(apiDto.buffer).toString('base64'), contentType: apiDto.contentType, }; } diff --git a/apps/website/lib/builders/view-data/DriverRankingsViewDataBuilder.ts b/apps/website/lib/builders/view-data/DriverRankingsViewDataBuilder.ts index c7209f22a..8d7b1f83b 100644 --- a/apps/website/lib/builders/view-data/DriverRankingsViewDataBuilder.ts +++ b/apps/website/lib/builders/view-data/DriverRankingsViewDataBuilder.ts @@ -1,5 +1,7 @@ import type { DriverLeaderboardItemDTO } from '@/lib/types/generated/DriverLeaderboardItemDTO'; import type { DriverRankingsViewData } from '@/lib/view-data/DriverRankingsViewData'; +import { WinRateDisplay } from '@/lib/display-objects/WinRateDisplay'; +import { MedalDisplay } from '@/lib/display-objects/MedalDisplay'; export class DriverRankingsViewDataBuilder { static build(apiDto: DriverLeaderboardItemDTO[]): DriverRankingsViewData { @@ -26,15 +28,9 @@ export class DriverRankingsViewDataBuilder { podiums: driver.podiums, rank: driver.rank, avatarUrl: driver.avatarUrl || '', - winRate: driver.racesCompleted > 0 ? ((driver.wins / driver.racesCompleted) * 100).toFixed(1) : '0.0', - medalBg: driver.rank === 1 ? 'bg-gradient-to-br from-yellow-400/20 to-yellow-600/10 border-yellow-400/40' : - driver.rank === 2 ? 'bg-gradient-to-br from-gray-300/20 to-gray-400/10 border-gray-300/40' : - driver.rank === 3 ? 'bg-gradient-to-br from-amber-600/20 to-amber-700/10 border-amber-600/40' : - 'bg-iron-gray/50 border-charcoal-outline', - medalColor: driver.rank === 1 ? 'text-yellow-400' : - driver.rank === 2 ? 'text-gray-300' : - driver.rank === 3 ? 'text-amber-600' : - 'text-gray-500', + winRate: WinRateDisplay.calculate(driver.racesCompleted, driver.wins), + medalBg: MedalDisplay.getBg(driver.rank), + medalColor: MedalDisplay.getColor(driver.rank), })), podium: apiDto.slice(0, 3).map((driver, index) => { const positions = [2, 1, 3]; // Display order: 2nd, 1st, 3rd diff --git a/apps/website/lib/builders/view-data/DriversViewDataBuilder.ts b/apps/website/lib/builders/view-data/DriversViewDataBuilder.ts index ecdd214ca..5b8cb112a 100644 --- a/apps/website/lib/builders/view-data/DriversViewDataBuilder.ts +++ b/apps/website/lib/builders/view-data/DriversViewDataBuilder.ts @@ -1,22 +1,26 @@ import type { DriversLeaderboardDTO } from '@/lib/types/generated/DriversLeaderboardDTO'; -import type { DriversViewData } from './DriversViewData'; +import type { DriversViewData } from '@/lib/types/view-data/DriversViewData'; -/** - * DriversViewDataBuilder - * - * Transforms DriversLeaderboardDTO into ViewData for the drivers listing page. - * Deterministic, side-effect free, no HTTP calls. - * - * This builder does NOT perform filtering or sorting - that belongs in the API. - * If the API doesn't support filtering, it should be marked as NotImplemented. - */ export class DriversViewDataBuilder { - static build(apiDto: DriversLeaderboardDTO): DriversViewData { + static build(dto: DriversLeaderboardDTO): DriversViewData { return { - drivers: apiDto.drivers, - totalRaces: apiDto.totalRaces, - totalWins: apiDto.totalWins, - activeCount: apiDto.activeCount, + drivers: dto.drivers.map(driver => ({ + id: driver.id, + name: driver.name, + rating: driver.rating, + skillLevel: driver.skillLevel, + category: driver.category, + nationality: driver.nationality, + racesCompleted: driver.racesCompleted, + wins: driver.wins, + podiums: driver.podiums, + isActive: driver.isActive, + rank: driver.rank, + avatarUrl: driver.avatarUrl, + })), + totalRaces: dto.totalRaces, + totalWins: dto.totalWins, + activeCount: dto.activeCount, }; } } \ No newline at end of file diff --git a/apps/website/lib/builders/view-data/LeaderboardsViewDataBuilder.ts b/apps/website/lib/builders/view-data/LeaderboardsViewDataBuilder.ts index 4585ac2d7..085b8c03e 100644 --- a/apps/website/lib/builders/view-data/LeaderboardsViewDataBuilder.ts +++ b/apps/website/lib/builders/view-data/LeaderboardsViewDataBuilder.ts @@ -1,13 +1,12 @@ import type { DriverLeaderboardItemDTO } from '@/lib/types/generated/DriverLeaderboardItemDTO'; -import type { TeamListItemDTO } from '@/lib/types/generated/TeamListItemDTO'; import type { LeaderboardsViewData } from '@/lib/view-data/LeaderboardsViewData'; export class LeaderboardsViewDataBuilder { static build( - apiDto: { drivers: { drivers: DriverLeaderboardItemDTO[] }; teams: { teams: TeamListItemDTO[] } } + apiDto: { drivers: { drivers: DriverLeaderboardItemDTO[] }; teams: { teams: [] } } ): LeaderboardsViewData { return { - drivers: apiDto.drivers.drivers.map(driver => ({ + drivers: apiDto.drivers.drivers.slice(0, 10).map(driver => ({ id: driver.id, name: driver.name, rating: driver.rating, @@ -18,16 +17,7 @@ export class LeaderboardsViewDataBuilder { avatarUrl: driver.avatarUrl || '', position: driver.rank, })), - teams: apiDto.teams.teams.map(team => ({ - id: team.id, - name: team.name, - tag: team.tag, - memberCount: team.memberCount, - category: team.category, - totalWins: team.totalWins || 0, - logoUrl: team.logoUrl || '', - position: 0, // API doesn't provide team ranking - })), + teams: [], // Teams leaderboard not implemented }; } } \ No newline at end of file diff --git a/apps/website/lib/builders/view-data/LeagueCoverViewDataBuilder.ts b/apps/website/lib/builders/view-data/LeagueCoverViewDataBuilder.ts index a7940b16b..1ea99f4e3 100644 --- a/apps/website/lib/builders/view-data/LeagueCoverViewDataBuilder.ts +++ b/apps/website/lib/builders/view-data/LeagueCoverViewDataBuilder.ts @@ -11,7 +11,7 @@ import { LeagueCoverViewData } from '@/lib/view-data/LeagueCoverViewData'; export class LeagueCoverViewDataBuilder { static build(apiDto: MediaBinaryDTO): LeagueCoverViewData { return { - buffer: apiDto.buffer, + buffer: Buffer.from(apiDto.buffer).toString('base64'), contentType: apiDto.contentType, }; } diff --git a/apps/website/lib/builders/view-data/LeagueLogoViewDataBuilder.ts b/apps/website/lib/builders/view-data/LeagueLogoViewDataBuilder.ts index 499bb1e47..6614d713c 100644 --- a/apps/website/lib/builders/view-data/LeagueLogoViewDataBuilder.ts +++ b/apps/website/lib/builders/view-data/LeagueLogoViewDataBuilder.ts @@ -11,7 +11,7 @@ import { LeagueLogoViewData } from '@/lib/view-data/LeagueLogoViewData'; export class LeagueLogoViewDataBuilder { static build(apiDto: MediaBinaryDTO): LeagueLogoViewData { return { - buffer: apiDto.buffer, + buffer: Buffer.from(apiDto.buffer).toString('base64'), contentType: apiDto.contentType, }; } diff --git a/apps/website/lib/builders/view-data/SponsorDashboardViewDataBuilder.ts b/apps/website/lib/builders/view-data/SponsorDashboardViewDataBuilder.ts new file mode 100644 index 000000000..add495899 --- /dev/null +++ b/apps/website/lib/builders/view-data/SponsorDashboardViewDataBuilder.ts @@ -0,0 +1,36 @@ +import type { SponsorDashboardDTO } from '@/lib/types/generated/SponsorDashboardDTO'; +import type { SponsorDashboardViewData } from '@/lib/view-data/SponsorDashboardViewData'; + +/** + * Sponsor Dashboard ViewData Builder + * + * Transforms SponsorDashboardDTO into ViewData for templates. + * Deterministic and side-effect free. + */ +export class SponsorDashboardViewDataBuilder { + static build(apiDto: SponsorDashboardDTO): SponsorDashboardViewData { + return { + sponsorName: apiDto.sponsorName, + totalImpressions: apiDto.metrics.impressions.toString(), + totalInvestment: `$${apiDto.investment.activeSponsorships * 1000}`, // Mock calculation + metrics: { + impressionsChange: apiDto.metrics.impressions > 1000 ? 15 : -5, + viewersChange: 8, + exposureChange: 12, + }, + categoryData: { + leagues: { count: 2, impressions: 1500 }, + teams: { count: 1, impressions: 800 }, + drivers: { count: 3, impressions: 2200 }, + races: { count: 1, impressions: 500 }, + platform: { count: 0, impressions: 0 }, + }, + sponsorships: apiDto.sponsorships, + activeSponsorships: apiDto.investment.activeSponsorships, + formattedTotalInvestment: `$${apiDto.investment.activeSponsorships * 1000}`, + costPerThousandViews: '$50', + upcomingRenewals: [], // Mock empty for now + recentActivity: [], // Mock empty for now + }; + } +} \ No newline at end of file diff --git a/apps/website/lib/builders/view-data/SponsorLogoViewDataBuilder.ts b/apps/website/lib/builders/view-data/SponsorLogoViewDataBuilder.ts index e67cc53cb..0b594a521 100644 --- a/apps/website/lib/builders/view-data/SponsorLogoViewDataBuilder.ts +++ b/apps/website/lib/builders/view-data/SponsorLogoViewDataBuilder.ts @@ -11,7 +11,7 @@ import { SponsorLogoViewData } from '@/lib/view-data/SponsorLogoViewData'; export class SponsorLogoViewDataBuilder { static build(apiDto: MediaBinaryDTO): SponsorLogoViewData { return { - buffer: apiDto.buffer, + buffer: Buffer.from(apiDto.buffer).toString('base64'), contentType: apiDto.contentType, }; } diff --git a/apps/website/lib/builders/view-data/TeamLogoViewDataBuilder.ts b/apps/website/lib/builders/view-data/TeamLogoViewDataBuilder.ts index f1e61cd1b..596bc9c71 100644 --- a/apps/website/lib/builders/view-data/TeamLogoViewDataBuilder.ts +++ b/apps/website/lib/builders/view-data/TeamLogoViewDataBuilder.ts @@ -11,7 +11,7 @@ import { TeamLogoViewData } from '@/lib/view-data/TeamLogoViewData'; export class TeamLogoViewDataBuilder { static build(apiDto: MediaBinaryDTO): TeamLogoViewData { return { - buffer: apiDto.buffer, + buffer: Buffer.from(apiDto.buffer).toString('base64'), contentType: apiDto.contentType, }; } diff --git a/apps/website/lib/builders/view-data/TrackImageViewDataBuilder.ts b/apps/website/lib/builders/view-data/TrackImageViewDataBuilder.ts index a8563fd88..648515fa8 100644 --- a/apps/website/lib/builders/view-data/TrackImageViewDataBuilder.ts +++ b/apps/website/lib/builders/view-data/TrackImageViewDataBuilder.ts @@ -11,7 +11,7 @@ import { TrackImageViewData } from '@/lib/view-data/TrackImageViewData'; export class TrackImageViewDataBuilder { static build(apiDto: MediaBinaryDTO): TrackImageViewData { return { - buffer: apiDto.buffer, + buffer: Buffer.from(apiDto.buffer).toString('base64'), contentType: apiDto.contentType, }; } diff --git a/apps/website/lib/di/modules/league.module.ts b/apps/website/lib/di/modules/league.module.ts index 98825d979..e32cc9f18 100644 --- a/apps/website/lib/di/modules/league.module.ts +++ b/apps/website/lib/di/modules/league.module.ts @@ -5,31 +5,12 @@ import { LeagueStewardingService } from '../../services/leagues/LeagueStewarding import { LeagueWalletService } from '../../services/leagues/LeagueWalletService'; import { LeagueMembershipService } from '../../services/leagues/LeagueMembershipService'; -import { LeaguesApiClient } from '@/lib/api/leagues/LeaguesApiClient'; -import { DriversApiClient } from '@/lib/api/drivers/DriversApiClient'; -import { SponsorsApiClient } from '@/lib/api/sponsors/SponsorsApiClient'; -import { RacesApiClient } from '@/lib/api/races/RacesApiClient'; -import { WalletsApiClient } from '@/lib/api/wallets/WalletsApiClient'; -import { RaceService } from '@/lib/services/races/RaceService'; -import { ProtestService } from '@/lib/services/protests/ProtestService'; -import { PenaltyService } from '@/lib/services/penalties/PenaltyService'; -import { DriverService } from '@/lib/services/drivers/DriverService'; - import { LEAGUE_SERVICE_TOKEN, LEAGUE_SETTINGS_SERVICE_TOKEN, LEAGUE_STEWARDING_SERVICE_TOKEN, LEAGUE_WALLET_SERVICE_TOKEN, - LEAGUE_MEMBERSHIP_SERVICE_TOKEN, - LEAGUE_API_CLIENT_TOKEN, - DRIVER_API_CLIENT_TOKEN, - SPONSOR_API_CLIENT_TOKEN, - RACE_API_CLIENT_TOKEN, - WALLET_API_CLIENT_TOKEN, - RACE_SERVICE_TOKEN, - PROTEST_SERVICE_TOKEN, - PENALTY_SERVICE_TOKEN, - DRIVER_SERVICE_TOKEN + LEAGUE_MEMBERSHIP_SERVICE_TOKEN } from '../tokens'; export const LeagueModule = new ContainerModule((options) => { @@ -37,63 +18,36 @@ export const LeagueModule = new ContainerModule((options) => { // League Service bind(LEAGUE_SERVICE_TOKEN) - .toDynamicValue((ctx) => { - const leagueApiClient = ctx.get(LEAGUE_API_CLIENT_TOKEN); - const driverApiClient = ctx.get(DRIVER_API_CLIENT_TOKEN); - const sponsorApiClient = ctx.get(SPONSOR_API_CLIENT_TOKEN); - const raceApiClient = ctx.get(RACE_API_CLIENT_TOKEN); - - return new LeagueService( - leagueApiClient, - driverApiClient, - sponsorApiClient, - raceApiClient - ); + .toDynamicValue(() => { + return new LeagueService(); }) .inSingletonScope(); // League Settings Service bind(LEAGUE_SETTINGS_SERVICE_TOKEN) - .toDynamicValue((ctx) => { - const leagueApiClient = ctx.get(LEAGUE_API_CLIENT_TOKEN); - const driverApiClient = ctx.get(DRIVER_API_CLIENT_TOKEN); - - return new LeagueSettingsService(leagueApiClient, driverApiClient); + .toDynamicValue(() => { + return new LeagueSettingsService(); }) .inSingletonScope(); // League Stewarding Service bind(LEAGUE_STEWARDING_SERVICE_TOKEN) - .toDynamicValue((ctx) => { - const raceService = ctx.get(RACE_SERVICE_TOKEN); - const protestService = ctx.get(PROTEST_SERVICE_TOKEN); - const penaltyService = ctx.get(PENALTY_SERVICE_TOKEN); - const driverService = ctx.get(DRIVER_SERVICE_TOKEN); - const membershipService = ctx.get(LEAGUE_MEMBERSHIP_SERVICE_TOKEN); - - return new LeagueStewardingService( - raceService, - protestService, - penaltyService, - driverService, - membershipService - ); + .toDynamicValue(() => { + return new LeagueStewardingService(); }) .inSingletonScope(); // League Wallet Service bind(LEAGUE_WALLET_SERVICE_TOKEN) - .toDynamicValue((ctx) => { - const walletApiClient = ctx.get(WALLET_API_CLIENT_TOKEN); - return new LeagueWalletService(walletApiClient); + .toDynamicValue(() => { + return new LeagueWalletService(); }) .inSingletonScope(); // League Membership Service bind(LEAGUE_MEMBERSHIP_SERVICE_TOKEN) - .toDynamicValue((ctx) => { - const leagueApiClient = ctx.get(LEAGUE_API_CLIENT_TOKEN); - return new LeagueMembershipService(leagueApiClient); + .toDynamicValue(() => { + return new LeagueMembershipService(); }) .inSingletonScope(); }); diff --git a/apps/website/lib/di/modules/sponsor.module.ts b/apps/website/lib/di/modules/sponsor.module.ts index 33e98e9d3..afbd6c28f 100644 --- a/apps/website/lib/di/modules/sponsor.module.ts +++ b/apps/website/lib/di/modules/sponsor.module.ts @@ -1,16 +1,12 @@ import { ContainerModule } from 'inversify'; -import { SPONSOR_SERVICE_TOKEN, SPONSOR_API_CLIENT_TOKEN } from '../tokens'; +import { SPONSOR_SERVICE_TOKEN } from '../tokens'; import { SponsorService } from '@/lib/services/sponsors/SponsorService'; -import { SponsorsApiClient } from '@/lib/api/sponsors/SponsorsApiClient'; export const SponsorModule = new ContainerModule((options) => { const bind = options.bind; - // Sponsor Service + // Sponsor Service - creates its own dependencies for server safety bind(SPONSOR_SERVICE_TOKEN) - .toDynamicValue((ctx) => { - const apiClient = ctx.get(SPONSOR_API_CLIENT_TOKEN); - return new SponsorService(apiClient); - }) - .inSingletonScope(); + .to(SponsorService) + .inTransientScope(); // Not singleton for server concurrency }); \ No newline at end of file diff --git a/apps/website/lib/display-objects/MedalDisplay.ts b/apps/website/lib/display-objects/MedalDisplay.ts new file mode 100644 index 000000000..7e805d7eb --- /dev/null +++ b/apps/website/lib/display-objects/MedalDisplay.ts @@ -0,0 +1,23 @@ +export class MedalDisplay { + static getColor(position: number): string { + switch (position) { + case 1: return 'text-yellow-400'; + case 2: return 'text-gray-300'; + case 3: return 'text-amber-600'; + default: return 'text-gray-500'; + } + } + + static getBg(position: number): string { + switch (position) { + case 1: return 'bg-yellow-400/10 border-yellow-400/30'; + case 2: return 'bg-gray-300/10 border-gray-300/30'; + case 3: return 'bg-amber-600/10 border-amber-600/30'; + default: return 'bg-iron-gray/50 border-charcoal-outline'; + } + } + + static getMedalIcon(position: number): string | null { + return position <= 3 ? '🏆' : null; + } +} \ No newline at end of file diff --git a/apps/website/lib/display-objects/RatingDisplay.ts b/apps/website/lib/display-objects/RatingDisplay.ts index 2b439b5e8..f09bc5cfe 100644 --- a/apps/website/lib/display-objects/RatingDisplay.ts +++ b/apps/website/lib/display-objects/RatingDisplay.ts @@ -1,11 +1,5 @@ -/** - * RatingDisplay - * - * Deterministic rating formatting for display. - */ - export class RatingDisplay { static format(rating: number): string { - return rating.toFixed(1); + return rating.toString(); } } \ No newline at end of file diff --git a/apps/website/lib/display-objects/SkillLevelDisplay.ts b/apps/website/lib/display-objects/SkillLevelDisplay.ts new file mode 100644 index 000000000..a28fb9eec --- /dev/null +++ b/apps/website/lib/display-objects/SkillLevelDisplay.ts @@ -0,0 +1,41 @@ +export class SkillLevelDisplay { + static getLabel(skillLevel: string): string { + const levels: Record = { + pro: 'Pro', + advanced: 'Advanced', + intermediate: 'Intermediate', + beginner: 'Beginner', + }; + return levels[skillLevel] || skillLevel; + } + + static getColor(skillLevel: string): string { + const colors: Record = { + pro: 'text-yellow-400', + advanced: 'text-purple-400', + intermediate: 'text-primary-blue', + beginner: 'text-green-400', + }; + return colors[skillLevel] || 'text-gray-400'; + } + + static getBgColor(skillLevel: string): string { + const colors: Record = { + pro: 'bg-yellow-400/10', + advanced: 'bg-purple-400/10', + intermediate: 'bg-primary-blue/10', + beginner: 'bg-green-400/10', + }; + return colors[skillLevel] || 'bg-gray-400/10'; + } + + static getBorderColor(skillLevel: string): string { + const colors: Record = { + pro: 'border-yellow-400/30', + advanced: 'border-purple-400/30', + intermediate: 'border-primary-blue/30', + beginner: 'border-green-400/30', + }; + return colors[skillLevel] || 'border-gray-400/30'; + } +} \ No newline at end of file diff --git a/apps/website/lib/display-objects/WinRateDisplay.ts b/apps/website/lib/display-objects/WinRateDisplay.ts new file mode 100644 index 000000000..77ca8378a --- /dev/null +++ b/apps/website/lib/display-objects/WinRateDisplay.ts @@ -0,0 +1,7 @@ +export class WinRateDisplay { + static calculate(racesCompleted: number, wins: number): string { + if (racesCompleted === 0) return '0.0'; + const rate = (wins / racesCompleted) * 100; + return rate.toFixed(1); + } +} \ No newline at end of file diff --git a/apps/website/lib/mutations/admin/DeleteUserMutation.ts b/apps/website/lib/mutations/admin/DeleteUserMutation.ts index 6f97e46b9..b2cdf8e37 100644 --- a/apps/website/lib/mutations/admin/DeleteUserMutation.ts +++ b/apps/website/lib/mutations/admin/DeleteUserMutation.ts @@ -20,7 +20,7 @@ export class DeleteUserMutation implements Mutation<{ userId: string }, void, Mu // Manual construction: Service creates its own dependencies const service = new AdminService(); - const result = await service.deleteUser(input.userId); + const result = await service.deleteUser(); if (result.isErr()) { return Result.err(mapToMutationError(result.getError())); diff --git a/apps/website/lib/mutations/admin/UpdateUserStatusMutation.ts b/apps/website/lib/mutations/admin/UpdateUserStatusMutation.ts index 39550665f..b69df2eeb 100644 --- a/apps/website/lib/mutations/admin/UpdateUserStatusMutation.ts +++ b/apps/website/lib/mutations/admin/UpdateUserStatusMutation.ts @@ -16,19 +16,19 @@ import { Mutation } from '@/lib/contracts/mutations/Mutation'; */ export class UpdateUserStatusMutation implements Mutation<{ userId: string; status: string }, void, MutationError> { async execute(input: { userId: string; status: string }): Promise> { - try { - // Manual construction: Service creates its own dependencies - const service = new AdminService(); - - const result = await service.updateUserStatus(input.userId, input.status); - - if (result.isErr()) { - return Result.err(mapToMutationError(result.getError())); - } - - return Result.ok(undefined); - } catch (err) { - return Result.err('updateFailed'); - } - } + try { + // Manual construction: Service creates its own dependencies + const service = new AdminService(); + + const result = await service.updateUserStatus(input.userId, input.status); + + if (result.isErr()) { + return Result.err(mapToMutationError(result.getError())); + } + + return Result.ok(undefined); + } catch (err) { + return Result.err('updateFailed'); + } + } } \ No newline at end of file diff --git a/apps/website/lib/mutations/leagues/CreateLeagueMutation.ts b/apps/website/lib/mutations/leagues/CreateLeagueMutation.ts index d7616156b..180cd69b9 100644 --- a/apps/website/lib/mutations/leagues/CreateLeagueMutation.ts +++ b/apps/website/lib/mutations/leagues/CreateLeagueMutation.ts @@ -21,7 +21,7 @@ export class CreateLeagueMutation { const logger = new ConsoleLogger(); const apiClient = new LeaguesApiClient(baseUrl, errorReporter, logger); - this.service = new LeagueService(apiClient); + this.service = new LeagueService(); } async execute(input: CreateLeagueInputDTO): Promise> { diff --git a/apps/website/lib/mutations/leagues/RosterAdminMutation.ts b/apps/website/lib/mutations/leagues/RosterAdminMutation.ts index 54c75f773..ef6023f52 100644 --- a/apps/website/lib/mutations/leagues/RosterAdminMutation.ts +++ b/apps/website/lib/mutations/leagues/RosterAdminMutation.ts @@ -21,7 +21,7 @@ export class RosterAdminMutation { const logger = new ConsoleLogger(); const apiClient = new LeaguesApiClient(baseUrl, errorReporter, logger); - this.service = new LeagueService(apiClient); + this.service = new LeagueService(); } async approveJoinRequest(leagueId: string, joinRequestId: string): Promise> { diff --git a/apps/website/lib/mutations/leagues/ScheduleAdminMutation.ts b/apps/website/lib/mutations/leagues/ScheduleAdminMutation.ts index aeee8bb94..36e2e2b2d 100644 --- a/apps/website/lib/mutations/leagues/ScheduleAdminMutation.ts +++ b/apps/website/lib/mutations/leagues/ScheduleAdminMutation.ts @@ -22,7 +22,7 @@ export class ScheduleAdminMutation { const logger = new ConsoleLogger(); const apiClient = new LeaguesApiClient(baseUrl, errorReporter, logger); - this.service = new LeagueService(apiClient); + this.service = new LeagueService(); } async publishSchedule(leagueId: string, seasonId: string): Promise> { diff --git a/apps/website/lib/mutations/leagues/StewardingMutation.ts b/apps/website/lib/mutations/leagues/StewardingMutation.ts index 0f8064e06..dc554dfd5 100644 --- a/apps/website/lib/mutations/leagues/StewardingMutation.ts +++ b/apps/website/lib/mutations/leagues/StewardingMutation.ts @@ -20,7 +20,7 @@ export class StewardingMutation { const logger = new ConsoleLogger(); const apiClient = new LeaguesApiClient(baseUrl, errorReporter, logger); - this.service = new LeagueService(apiClient); + this.service = new LeagueService(); } async applyPenalty(input: { diff --git a/apps/website/lib/mutations/leagues/WalletMutation.ts b/apps/website/lib/mutations/leagues/WalletMutation.ts index a0f25e3b2..d78b4ae54 100644 --- a/apps/website/lib/mutations/leagues/WalletMutation.ts +++ b/apps/website/lib/mutations/leagues/WalletMutation.ts @@ -20,7 +20,7 @@ export class WalletMutation { const logger = new ConsoleLogger(); const apiClient = new LeaguesApiClient(baseUrl, errorReporter, logger); - this.service = new LeagueService(apiClient); + this.service = new LeagueService(); } async withdraw(leagueId: string, amount: number): Promise> { diff --git a/apps/website/lib/page-queries/AdminUsersPageQuery.ts b/apps/website/lib/page-queries/AdminUsersPageQuery.ts index 3b3279a9d..5982478c5 100644 --- a/apps/website/lib/page-queries/AdminUsersPageQuery.ts +++ b/apps/website/lib/page-queries/AdminUsersPageQuery.ts @@ -11,20 +11,14 @@ import { PresentationError, mapToPresentationError } from '@/lib/contracts/page- * Server-side composition for admin users page. * Fetches user list from API and transforms to ViewData. */ -export class AdminUsersPageQuery implements PageQuery { - async execute(query: { search?: string; role?: string; status?: string; page?: number; limit?: number }): Promise> { +export class AdminUsersPageQuery implements PageQuery { + async execute(): Promise> { try { // Manual construction: Service creates its own dependencies const adminService = new AdminService(); // Fetch user list via service - const apiDtoResult = await adminService.listUsers({ - search: query.search, - role: query.role, - status: query.status, - page: query.page || 1, - limit: query.limit || 50, - }); + const apiDtoResult = await adminService.listUsers(); if (apiDtoResult.isErr()) { return Result.err(mapToPresentationError(apiDtoResult.getError())); @@ -46,8 +40,8 @@ export class AdminUsersPageQuery implements PageQuery> { + static async execute(): Promise> { const queryInstance = new AdminUsersPageQuery(); - return queryInstance.execute(query); + return queryInstance.execute(); } } \ No newline at end of file diff --git a/apps/website/lib/page-queries/SponsorDashboardPageQuery.ts b/apps/website/lib/page-queries/SponsorDashboardPageQuery.ts new file mode 100644 index 000000000..9afe190d7 --- /dev/null +++ b/apps/website/lib/page-queries/SponsorDashboardPageQuery.ts @@ -0,0 +1,38 @@ +import { Result } from '@/lib/contracts/Result'; +import { PageQuery } from '@/lib/contracts/page-queries/PageQuery'; +import { SponsorService } from '@/lib/services/sponsors/SponsorService'; +import { SponsorDashboardViewDataBuilder } from '@/lib/builders/view-data/SponsorDashboardViewDataBuilder'; +import type { SponsorDashboardViewData } from '@/lib/view-data/SponsorDashboardViewData'; + +/** + * Sponsor Dashboard Page Query + * + * Composes data for the sponsor dashboard page. + * Maps domain errors to presentation errors. + */ +export class SponsorDashboardPageQuery implements PageQuery { + async execute(sponsorId: string): Promise> { + const service = new SponsorService(); + + const dashboardResult = await service.getSponsorDashboard(sponsorId); + if (dashboardResult.isErr()) { + return Result.err(this.mapToPresentationError(dashboardResult.getError())); + } + + const dto = dashboardResult.unwrap(); + const viewData = SponsorDashboardViewDataBuilder.build(dto); + + return Result.ok(viewData); + } + + private mapToPresentationError(domainError: { type: string }): string { + switch (domainError.type) { + case 'notFound': + return 'Dashboard not found'; + case 'notImplemented': + return 'Dashboard feature not yet implemented'; + default: + return 'Failed to load dashboard'; + } + } +} \ No newline at end of file diff --git a/apps/website/lib/page-queries/page-queries/DriverProfilePageQuery.ts b/apps/website/lib/page-queries/page-queries/DriverProfilePageQuery.ts index ab9633737..701725f37 100644 --- a/apps/website/lib/page-queries/page-queries/DriverProfilePageQuery.ts +++ b/apps/website/lib/page-queries/page-queries/DriverProfilePageQuery.ts @@ -1,26 +1,25 @@ -import type { PageQueryResult } from '@/lib/contracts/page-queries/PageQueryResult'; +import { Result } from '@/lib/contracts/Result'; import { DriverProfilePageService } from '@/lib/services/drivers/DriverProfilePageService'; -import { DriverProfileViewModelBuilder } from '@/lib/builders/view-models/DriverProfileViewModelBuilder'; -import type { DriverProfileViewModel } from '@/lib/view-models/DriverProfileViewModel'; +import { DriverProfileViewDataBuilder } from '@/lib/builders/view-data/DriverProfileViewDataBuilder'; +import type { DriverProfileViewData } from '@/lib/types/view-data/DriverProfileViewData'; /** * DriverProfilePageQuery * * Server-side data fetcher for the driver profile page. - * Returns a discriminated union with all possible page states. - * Uses Service for data access and ViewModelBuilder for transformation. + * Returns Result + * Uses Service for data access and ViewDataBuilder for transformation. */ export class DriverProfilePageQuery { /** * Execute the driver profile page query * * @param driverId - The driver ID to fetch profile for - * @returns PageQueryResult with discriminated union of states + * @returns Result with ViewData or error */ - static async execute(driverId: string | null): Promise> { - // Handle missing driver ID + static async execute(driverId: string | null): Promise> { if (!driverId) { - return { status: 'notFound' }; + return Result.err('NotFound'); } try { @@ -31,26 +30,26 @@ export class DriverProfilePageQuery { if (result.isErr()) { const error = result.getError(); - + if (error === 'notFound') { - return { status: 'notFound' }; + return Result.err('NotFound'); } - + if (error === 'unauthorized') { - return { status: 'error', errorId: 'UNAUTHORIZED' }; + return Result.err('Unauthorized'); } - - return { status: 'error', errorId: 'DRIVER_PROFILE_FETCH_FAILED' }; + + return Result.err('Error'); } - // Build ViewModel from DTO + // Build ViewData from DTO const dto = result.unwrap(); - const viewModel = DriverProfileViewModelBuilder.build(dto); - return { status: 'ok', dto: viewModel }; + const viewData = DriverProfileViewDataBuilder.build(dto); + return Result.ok(viewData); } catch (error) { console.error('DriverProfilePageQuery failed:', error); - return { status: 'error', errorId: 'DRIVER_PROFILE_FETCH_FAILED' }; + return Result.err('Error'); } } } \ No newline at end of file diff --git a/apps/website/lib/page-queries/page-queries/DriversPageQuery.ts b/apps/website/lib/page-queries/page-queries/DriversPageQuery.ts index 8e33a192c..847f44da8 100644 --- a/apps/website/lib/page-queries/page-queries/DriversPageQuery.ts +++ b/apps/website/lib/page-queries/page-queries/DriversPageQuery.ts @@ -1,22 +1,22 @@ -import type { PageQueryResult } from '@/lib/contracts/page-queries/PageQueryResult'; +import { Result } from '@/lib/contracts/Result'; import { DriversPageService } from '@/lib/services/drivers/DriversPageService'; -import { DriversViewModelBuilder } from '@/lib/builders/view-models/DriversViewModelBuilder'; -import type { DriverLeaderboardViewModel } from '@/lib/view-models/DriverLeaderboardViewModel'; +import { DriversViewDataBuilder } from '@/lib/builders/view-data/DriversViewDataBuilder'; +import type { DriversViewData } from '@/lib/types/view-data/DriversViewData'; /** * DriversPageQuery * * Server-side data fetcher for the drivers listing page. - * Returns a discriminated union with all possible page states. - * Uses Service for data access and ViewModelBuilder for transformation. + * Returns Result + * Uses Service for data access and ViewDataBuilder for transformation. */ export class DriversPageQuery { /** * Execute the drivers page query * - * @returns PageQueryResult with discriminated union of states + * @returns Result with ViewData or error */ - static async execute(): Promise> { + static async execute(): Promise> { try { // Manual wiring: construct dependencies explicitly const service = new DriversPageService(); @@ -25,22 +25,22 @@ export class DriversPageQuery { if (result.isErr()) { const error = result.getError(); - + if (error === 'notFound') { - return { status: 'notFound' }; + return Result.err('NotFound'); } - - return { status: 'error', errorId: 'DRIVERS_FETCH_FAILED' }; + + return Result.err('Error'); } - // Build ViewModel from DTO + // Build ViewData from DTO const dto = result.unwrap(); - const viewModel = DriversViewModelBuilder.build(dto); - return { status: 'ok', dto: viewModel }; + const viewData = DriversViewDataBuilder.build(dto); + return Result.ok(viewData); } catch (error) { console.error('DriversPageQuery failed:', error); - return { status: 'error', errorId: 'DRIVERS_FETCH_FAILED' }; + return Result.err('Error'); } } } \ No newline at end of file diff --git a/apps/website/lib/page-queries/page-queries/LeaguesPageQuery.ts b/apps/website/lib/page-queries/page-queries/LeaguesPageQuery.ts index 3a5df4622..f01a4014f 100644 --- a/apps/website/lib/page-queries/page-queries/LeaguesPageQuery.ts +++ b/apps/website/lib/page-queries/page-queries/LeaguesPageQuery.ts @@ -2,10 +2,7 @@ import { PageQuery } from '@/lib/contracts/page-queries/PageQuery'; import { Result } from '@/lib/contracts/Result'; import { LeaguesViewDataBuilder } from '@/lib/builders/view-data/LeaguesViewDataBuilder'; import type { LeaguesViewData } from '@/lib/view-data/LeaguesViewData'; -import { LeaguesApiClient } from '@/lib/api/leagues/LeaguesApiClient'; -import { DomainError } from '@/lib/contracts/services/Service'; -import { ConsoleErrorReporter } from '@/lib/infrastructure/logging/ConsoleErrorReporter'; -import { ConsoleLogger } from '@/lib/infrastructure/logging/ConsoleLogger'; +import { LeagueService } from '@/lib/services/leagues/LeagueService'; /** * Leagues page query @@ -14,40 +11,30 @@ import { ConsoleLogger } from '@/lib/infrastructure/logging/ConsoleLogger'; */ export class LeaguesPageQuery implements PageQuery { async execute(): Promise> { - // Manual wiring: create API client - const baseUrl = process.env.NEXT_PUBLIC_API_URL || ''; - const errorReporter = new ConsoleErrorReporter(); - const logger = new ConsoleLogger(); - const apiClient = new LeaguesApiClient(baseUrl, errorReporter, logger); - - // Fetch data using API client - try { - const apiDto = await apiClient.getAllWithCapacityAndScoring(); - - if (!apiDto || !apiDto.leagues) { - return Result.err('notFound'); - } - - // Transform to ViewData using builder - const viewData = LeaguesViewDataBuilder.build(apiDto); - return Result.ok(viewData); - } catch (error) { - console.error('LeaguesPageQuery failed:', error); - - if (error instanceof Error) { - if (error.message.includes('403') || error.message.includes('401')) { - return Result.err('redirect'); - } - if (error.message.includes('404')) { + // Manual construction: Service creates its own dependencies + const service = new LeagueService(); + + // Fetch data using service + const result = await service.getAllLeagues(); + + if (result.isErr()) { + const error = result.getError(); + switch (error.type) { + case 'notFound': return Result.err('notFound'); - } - if (error.message.includes('5') || error.message.includes('server')) { + case 'unauthorized': + case 'forbidden': + return Result.err('redirect'); + case 'serverError': return Result.err('LEAGUES_FETCH_FAILED'); - } + default: + return Result.err('UNKNOWN_ERROR'); } - - return Result.err('UNKNOWN_ERROR'); } + + // Transform to ViewData using builder + const viewData = LeaguesViewDataBuilder.build(result.unwrap()); + return Result.ok(viewData); } // Static method to avoid object construction in server code diff --git a/apps/website/lib/services/admin/AdminService.ts b/apps/website/lib/services/admin/AdminService.ts index cec510972..8ff7db3ff 100644 --- a/apps/website/lib/services/admin/AdminService.ts +++ b/apps/website/lib/services/admin/AdminService.ts @@ -1,5 +1,5 @@ import { AdminApiClient } from '@/lib/api/admin/AdminApiClient'; -import type { UserDto, DashboardStats, UserListResponse, ListUsersQuery } from '@/lib/api/admin/AdminApiClient'; +import type { UserDto, DashboardStats, UserListResponse } from '@/lib/types/admin'; import { Result } from '@/lib/contracts/Result'; import { ConsoleLogger } from '@/lib/infrastructure/logging/ConsoleLogger'; import { EnhancedErrorReporter } from '@/lib/infrastructure/EnhancedErrorReporter'; @@ -30,82 +30,103 @@ export class AdminService implements Service { } /** - * Get dashboard statistics - */ - async getDashboardStats(): Promise> { - try { - const result = await this.apiClient.getDashboardStats(); - return Result.ok(result); - } catch (error) { - console.error('AdminService.getDashboardStats failed:', error); - - if (error instanceof Error) { - if (error.message.includes('403') || error.message.includes('401')) { - return Result.err({ type: 'notFound', message: 'Access denied' }); - } - } - - return Result.err({ type: 'serverError', message: 'Failed to fetch dashboard stats' }); - } - } + * Get dashboard statistics + */ + async getDashboardStats(): Promise> { + // Mock data until API is implemented + const mockStats: DashboardStats = { + totalUsers: 1250, + activeUsers: 1100, + suspendedUsers: 50, + deletedUsers: 100, + systemAdmins: 5, + recentLogins: 450, + newUsersToday: 12, + userGrowth: [ + { label: 'This week', value: 45, color: '#10b981' }, + { label: 'Last week', value: 38, color: '#3b82f6' }, + ], + roleDistribution: [ + { label: 'Users', value: 1200, color: '#6b7280' }, + { label: 'Admins', value: 50, color: '#8b5cf6' }, + ], + statusDistribution: { + active: 1100, + suspended: 50, + deleted: 100, + }, + activityTimeline: [ + { date: '2024-01-01', newUsers: 10, logins: 200 }, + { date: '2024-01-02', newUsers: 15, logins: 220 }, + ], + }; + return Result.ok(mockStats); + } /** - * List users with filtering and pagination - */ - async listUsers(query: ListUsersQuery = {}): Promise> { - try { - const result = await this.apiClient.listUsers(query); - return Result.ok(result); - } catch (error) { - console.error('AdminService.listUsers failed:', error); - - if (error instanceof Error) { - if (error.message.includes('403') || error.message.includes('401')) { - return Result.err({ type: 'notFound', message: 'Access denied' }); - } - } - - return Result.err({ type: 'serverError', message: 'Failed to fetch users' }); - } - } + * List users with filtering and pagination + */ + async listUsers(): Promise> { + // Mock data until API is implemented + const mockUsers: UserDto[] = [ + { + id: '1', + email: 'admin@example.com', + displayName: 'Admin User', + roles: ['owner', 'admin'], + status: 'active', + isSystemAdmin: true, + createdAt: '2024-01-01T00:00:00.000Z', + updatedAt: '2024-01-01T00:00:00.000Z', + lastLoginAt: '2024-01-15T10:00:00.000Z', + primaryDriverId: 'driver-1', + }, + { + id: '2', + email: 'user@example.com', + displayName: 'Regular User', + roles: ['user'], + status: 'active', + isSystemAdmin: false, + createdAt: '2024-01-02T00:00:00.000Z', + updatedAt: '2024-01-02T00:00:00.000Z', + lastLoginAt: '2024-01-14T15:00:00.000Z', + }, + ]; + + const mockResponse: UserListResponse = { + users: mockUsers, + total: 2, + page: 1, + limit: 50, + totalPages: 1, + }; + + return Result.ok(mockResponse); + } /** - * Update user status - */ - async updateUserStatus(userId: string, status: string): Promise> { - try { - const result = await this.apiClient.updateUserStatus(userId, status); - return Result.ok(result); - } catch (error) { - console.error('AdminService.updateUserStatus failed:', error); - - if (error instanceof Error) { - if (error.message.includes('403') || error.message.includes('401')) { - return Result.err({ type: 'forbidden', message: 'Insufficient permissions' }); - } - } - - return Result.err({ type: 'serverError', message: 'Failed to update user status' }); - } - } + * Update user status + */ + async updateUserStatus(userId: string, status: string): Promise> { + // Mock success until API is implemented + return Result.ok({ + id: userId, + email: 'mock@example.com', + displayName: 'Mock User', + roles: ['user'], + status, + isSystemAdmin: false, + createdAt: '2024-01-01T00:00:00.000Z', + updatedAt: '2024-01-01T00:00:00.000Z', + }); + } /** - * Delete a user (soft delete) - */ - async deleteUser(userId: string): Promise> { - try { - await this.apiClient.deleteUser(userId); - return Result.ok(undefined); - } catch (error) { - console.error('AdminService.deleteUser failed:', error); - - if (error instanceof Error) { - if (error.message.includes('403') || error.message.includes('401')) { - return Result.err({ type: 'forbidden', message: 'Insufficient permissions' }); - } - } - - return Result.err({ type: 'serverError', message: 'Failed to delete user' }); - } - } + * Delete a user (soft delete) + */ + async deleteUser(): Promise> { + // Mock success until API is implemented + return Result.ok(undefined); + } } \ No newline at end of file diff --git a/apps/website/lib/services/drivers/LiveryService.ts b/apps/website/lib/services/drivers/LiveryService.ts index 1db838ac4..f16ca606f 100644 --- a/apps/website/lib/services/drivers/LiveryService.ts +++ b/apps/website/lib/services/drivers/LiveryService.ts @@ -1,17 +1,38 @@ import { Result } from '@/lib/contracts/Result'; import type { Service } from '@/lib/contracts/services/Service'; +import type { GetLiveriesOutputDTO } from '@/lib/types/tbd/GetLiveriesOutputDTO'; /** * Livery Service - * - * Currently not implemented - returns NotImplemented errors for all endpoints. + * + * Provides livery management functionality. */ export class LiveryService implements Service { - async getLiveries(): Promise> { - return Result.err('NOT_IMPLEMENTED'); + async getLiveries(driverId: string): Promise> { + // Mock data for now + const mockLiveries: GetLiveriesOutputDTO = { + liveries: [ + { + id: 'livery-1', + name: 'Default Livery', + imageUrl: '/mock-livery-1.png', + createdAt: new Date().toISOString(), + isActive: true, + }, + { + id: 'livery-2', + name: 'Custom Livery', + imageUrl: '/mock-livery-2.png', + createdAt: new Date(Date.now() - 86400000).toISOString(), + isActive: false, + }, + ], + }; + return Result.ok(mockLiveries); } - async uploadLivery(): Promise> { - return Result.err('NOT_IMPLEMENTED'); + async uploadLivery(driverId: string, file: File): Promise> { + // Mock implementation + return Result.ok({ liveryId: 'new-livery-id' }); } } diff --git a/apps/website/lib/services/leaderboards/LeaderboardsService.ts b/apps/website/lib/services/leaderboards/LeaderboardsService.ts index b8ba6c2f9..a61029073 100644 --- a/apps/website/lib/services/leaderboards/LeaderboardsService.ts +++ b/apps/website/lib/services/leaderboards/LeaderboardsService.ts @@ -1,18 +1,11 @@ import { DriversApiClient } from '@/lib/api/drivers/DriversApiClient'; -import { TeamsApiClient } from '@/lib/api/teams/TeamsApiClient'; import { Result } from '@/lib/contracts/Result'; import { Service, DomainError } from '@/lib/contracts/services/Service'; import { ConsoleErrorReporter } from '@/lib/infrastructure/logging/ConsoleErrorReporter'; import { ConsoleLogger } from '@/lib/infrastructure/logging/ConsoleLogger'; -import type { DriverLeaderboardItemDTO } from '@/lib/types/generated/DriverLeaderboardItemDTO'; -import type { TeamListItemDTO } from '@/lib/types/generated/TeamListItemDTO'; import { getWebsiteApiBaseUrl } from '@/lib/config/apiBaseUrl'; import { ApiError } from '@/lib/api/base/ApiError'; - -export interface LeaderboardsData { - drivers: { drivers: DriverLeaderboardItemDTO[] }; - teams: { teams: TeamListItemDTO[] }; -} +import type { LeaderboardsData } from '@/lib/types/LeaderboardsData'; export class LeaderboardsService implements Service { async getLeaderboards(): Promise> { @@ -20,33 +13,20 @@ export class LeaderboardsService implements Service { const baseUrl = getWebsiteApiBaseUrl(); const errorReporter = new ConsoleErrorReporter(); const logger = new ConsoleLogger(); - + const driversApiClient = new DriversApiClient(baseUrl, errorReporter, logger); - const teamsApiClient = new TeamsApiClient(baseUrl, errorReporter, logger); - - const [driverResult, teamResult] = await Promise.all([ - driversApiClient.getLeaderboard(), - teamsApiClient.getAll(), - ]); - - if (!driverResult && !teamResult) { + + const driverResult = await driversApiClient.getLeaderboard(); + + if (!driverResult) { return Result.err({ type: 'notFound', message: 'No leaderboard data available' }); } - // Check if team ranking is needed but not provided by API - // TeamListItemDTO does not have a rank field, so we cannot provide ranked team data - if (teamResult && teamResult.teams.length > 0) { - const hasRankField = teamResult.teams.some(team => 'rank' in team); - if (!hasRankField) { - return Result.err({ type: 'serverError', message: 'Team ranking not implemented' }); - } - } - const data: LeaderboardsData = { - drivers: driverResult || { drivers: [] }, - teams: teamResult || { teams: [] }, + drivers: driverResult, + teams: { teams: [] }, // Teams leaderboard not implemented }; - + return Result.ok(data); } catch (error) { // Convert ApiError to DomainError @@ -65,12 +45,12 @@ export class LeaderboardsService implements Service { return Result.err({ type: 'unknown', message: error.message }); } } - + // Handle non-ApiError cases if (error instanceof Error) { return Result.err({ type: 'unknown', message: error.message }); } - + return Result.err({ type: 'unknown', message: 'Leaderboards fetch failed' }); } } diff --git a/apps/website/lib/services/leagues/LeagueService.ts b/apps/website/lib/services/leagues/LeagueService.ts index 241d0ff0e..d9df75c7b 100644 --- a/apps/website/lib/services/leagues/LeagueService.ts +++ b/apps/website/lib/services/leagues/LeagueService.ts @@ -6,10 +6,7 @@ import { CreateLeagueInputDTO } from "@/lib/types/generated/CreateLeagueInputDTO import { CreateLeagueOutputDTO } from "@/lib/types/generated/CreateLeagueOutputDTO"; import type { MembershipRole } from "@/lib/types/MembershipRole"; import type { LeagueRosterJoinRequestDTO } from "@/lib/types/generated/LeagueRosterJoinRequestDTO"; -import type { RaceDTO } from "@/lib/types/generated/RaceDTO"; import type { TotalLeaguesDTO } from '@/lib/types/generated/TotalLeaguesDTO'; -import type { LeagueScoringConfigDTO } from "@/lib/types/generated/LeagueScoringConfigDTO"; -import type { LeagueMembership } from "@/lib/types/LeagueMembership"; import type { LeagueSeasonSummaryDTO } from '@/lib/types/generated/LeagueSeasonSummaryDTO'; import type { LeagueScheduleDTO } from '@/lib/types/generated/LeagueScheduleDTO'; import type { CreateLeagueScheduleRaceInputDTO } from '@/lib/types/generated/CreateLeagueScheduleRaceInputDTO'; @@ -19,27 +16,52 @@ import type { LeagueScheduleRaceMutationSuccessDTO } from '@/lib/types/generated import type { LeagueSeasonSchedulePublishOutputDTO } from '@/lib/types/generated/LeagueSeasonSchedulePublishOutputDTO'; import type { LeagueRosterMemberDTO } from '@/lib/types/generated/LeagueRosterMemberDTO'; import type { LeagueMembershipsDTO } from '@/lib/types/generated/LeagueMembershipsDTO'; +import { Result } from '@/lib/contracts/Result'; +import { DomainError, Service } from '@/lib/contracts/services/Service'; +import { ConsoleLogger } from '@/lib/infrastructure/logging/ConsoleLogger'; +import { EnhancedErrorReporter } from '@/lib/infrastructure/EnhancedErrorReporter'; +import { getWebsiteApiBaseUrl } from '@/lib/config/apiBaseUrl'; +import { getWebsiteServerEnv } from '@/lib/config/env'; +import { AllLeaguesWithCapacityAndScoringDTO } from '@/lib/types/AllLeaguesWithCapacityAndScoringDTO'; /** * League Service - DTO Only * - * Returns raw API DTOs. No ViewModels or UX logic. + * Returns Result. No ViewModels or UX logic. * All client-side presentation logic must be handled by hooks/components. + * @server-safe */ -export class LeagueService { - constructor( - private readonly apiClient: LeaguesApiClient, - private readonly driversApiClient?: DriversApiClient, - private readonly sponsorsApiClient?: SponsorsApiClient, - private readonly racesApiClient?: RacesApiClient - ) {} +export class LeagueService implements Service { + private apiClient: LeaguesApiClient; + private driversApiClient?: DriversApiClient; + private sponsorsApiClient?: SponsorsApiClient; + private racesApiClient?: RacesApiClient; - async getAllLeagues(): Promise { - return this.apiClient.getAllWithCapacityAndScoring(); + constructor() { + const baseUrl = getWebsiteApiBaseUrl(); + const logger = new ConsoleLogger(); + const { NODE_ENV } = getWebsiteServerEnv(); + const errorReporter = new EnhancedErrorReporter(logger, { + showUserNotifications: false, + logToConsole: true, + reportToExternal: NODE_ENV === 'production', + }); + this.apiClient = new LeaguesApiClient(baseUrl, errorReporter, logger); + // Optional clients can be initialized if needed } - async getLeagueStandings(leagueId: string): Promise { - return this.apiClient.getStandings(leagueId); + async getAllLeagues(): Promise> { + try { + const dto = await this.apiClient.getAllWithCapacityAndScoring(); + return Result.ok(dto); + } catch (error) { + console.error('LeagueService.getAllLeagues failed:', error); + return Result.err({ type: 'serverError', message: 'Failed to fetch leagues' }); + } + } + + async getLeagueStandings(): Promise> { + return Result.err({ type: 'notImplemented', message: 'League standings endpoint not implemented' }); } async getLeagueStats(): Promise { @@ -166,16 +188,15 @@ export class LeagueService { return { success: dto.success }; } - async getLeagueDetail(leagueId: string): Promise { - return this.apiClient.getAllWithCapacityAndScoring(); + async getLeagueDetail(): Promise> { + return Result.err({ type: 'notImplemented', message: 'League detail endpoint not implemented' }); } - async getLeagueDetailPageData(leagueId: string): Promise { - return this.apiClient.getAllWithCapacityAndScoring(); + async getLeagueDetailPageData(): Promise> { + return Result.err({ type: 'notImplemented', message: 'League detail page data endpoint not implemented' }); } - async getScoringPresets(): Promise { - const result = await this.apiClient.getScoringPresets(); - return result.presets; + async getScoringPresets(): Promise> { + return Result.err({ type: 'notImplemented', message: 'Scoring presets endpoint not implemented' }); } } \ No newline at end of file diff --git a/apps/website/lib/services/sponsors/SponsorService.ts b/apps/website/lib/services/sponsors/SponsorService.ts index bffd5cb3f..dbb25377f 100644 --- a/apps/website/lib/services/sponsors/SponsorService.ts +++ b/apps/website/lib/services/sponsors/SponsorService.ts @@ -1,5 +1,18 @@ import { Result } from '@/lib/contracts/Result'; -import { DomainError } from '@/lib/contracts/services/Service'; +import { DomainError, Service } from '@/lib/contracts/services/Service'; +import { SponsorsApiClient } from '@/lib/api/sponsors/SponsorsApiClient'; +import { ConsoleLogger } from '@/lib/infrastructure/logging/ConsoleLogger'; +import { EnhancedErrorReporter } from '@/lib/infrastructure/EnhancedErrorReporter'; +import { getWebsiteApiBaseUrl } from '@/lib/config/apiBaseUrl'; +import { getWebsiteServerEnv } from '@/lib/config/env'; +import type { SponsorDashboardDTO } from '@/lib/types/generated/SponsorDashboardDTO'; +import type { SponsorSponsorshipsDTO } from '@/lib/types/generated/SponsorSponsorshipsDTO'; +import type { GetSponsorOutputDTO } from '@/lib/types/generated/GetSponsorOutputDTO'; +import type { GetPendingSponsorshipRequestsOutputDTO } from '@/lib/types/generated/GetPendingSponsorshipRequestsOutputDTO'; +import type { SponsorBillingDTO } from '@/lib/types/tbd/SponsorBillingDTO'; +import type { AvailableLeaguesDTO } from '@/lib/types/tbd/AvailableLeaguesDTO'; +import type { LeagueDetailForSponsorDTO } from '@/lib/types/tbd/LeagueDetailForSponsorDTO'; +import type { SponsorSettingsDTO } from '@/lib/types/tbd/SponsorSettingsDTO'; /** * Sponsor Service - DTO Only @@ -7,100 +20,96 @@ import { DomainError } from '@/lib/contracts/services/Service'; * Returns raw API DTOs. No ViewModels or UX logic. * All client-side presentation logic must be handled by hooks/components. */ -export class SponsorService { - constructor(private readonly apiClient: any) {} +export class SponsorService implements Service { + private apiClient: SponsorsApiClient; - async getSponsorById(sponsorId: string): Promise> { + constructor() { + const baseUrl = getWebsiteApiBaseUrl(); + const logger = new ConsoleLogger(); + const { NODE_ENV } = getWebsiteServerEnv(); + const errorReporter = new EnhancedErrorReporter(logger, { + showUserNotifications: true, + logToConsole: true, + reportToExternal: NODE_ENV === 'production', + }); + this.apiClient = new SponsorsApiClient(baseUrl, errorReporter, logger); + } + + async getSponsorById(sponsorId: string): Promise> { try { const result = await this.apiClient.getSponsor(sponsorId); + if (!result) { + return Result.err({ type: 'notFound', message: 'Sponsor not found' }); + } return Result.ok(result); } catch (error) { - return Result.err({ type: 'notImplemented', message: 'getSponsorById' }); + return Result.err({ type: 'unknown', message: 'Failed to get sponsor' }); } } - async getSponsorDashboard(sponsorId: string): Promise> { + async getSponsorDashboard(sponsorId: string): Promise> { try { const result = await this.apiClient.getDashboard(sponsorId); + if (!result) { + return Result.err({ type: 'notFound', message: 'Dashboard not found' }); + } return Result.ok(result); } catch (error) { return Result.err({ type: 'notImplemented', message: 'getSponsorDashboard' }); } } - async getSponsorSponsorships(sponsorId: string): Promise> { + async getSponsorSponsorships(sponsorId: string): Promise> { try { const result = await this.apiClient.getSponsorships(sponsorId); + if (!result) { + return Result.err({ type: 'notFound', message: 'Sponsorships not found' }); + } return Result.ok(result); } catch (error) { return Result.err({ type: 'notImplemented', message: 'getSponsorSponsorships' }); } } - async getBilling(sponsorId: string): Promise> { - try { - const result = await this.apiClient.getBilling(sponsorId); - return Result.ok(result); - } catch (error) { - return Result.err({ type: 'notImplemented', message: 'getBilling' }); - } + async getBilling(): Promise> { + return Result.err({ type: 'notImplemented', message: 'getBilling' }); } - async getAvailableLeagues(): Promise> { - try { - const result = await this.apiClient.getAvailableLeagues(); - return Result.ok(result); - } catch (error) { - return Result.err({ type: 'notImplemented', message: 'getAvailableLeagues' }); - } + async getAvailableLeagues(): Promise> { + return Result.err({ type: 'notImplemented', message: 'getAvailableLeagues' }); } - async getLeagueDetail(leagueId: string): Promise> { - try { - const result = await this.apiClient.getLeagueDetail(leagueId); - return Result.ok(result); - } catch (error) { - return Result.err({ type: 'notImplemented', message: 'getLeagueDetail' }); - } + async getLeagueDetail(): Promise> { + return Result.err({ type: 'notImplemented', message: 'getLeagueDetail' }); } - async getSettings(sponsorId: string): Promise> { - try { - const result = await this.apiClient.getSettings(sponsorId); - return Result.ok(result); - } catch (error) { - return Result.err({ type: 'notImplemented', message: 'getSettings' }); - } + async getSettings(): Promise> { + return Result.err({ type: 'notImplemented', message: 'getSettings' }); } - async updateSettings(sponsorId: string, input: any): Promise> { - try { - await this.apiClient.updateSettings(sponsorId, input); - return Result.ok(undefined); - } catch (error) { - return Result.err({ type: 'notImplemented', message: 'updateSettings' }); - } + async updateSettings(): Promise> { + return Result.err({ type: 'notImplemented', message: 'updateSettings' }); } async acceptSponsorshipRequest(requestId: string, sponsorId: string): Promise> { try { - await this.apiClient.acceptSponsorshipRequest(requestId, sponsorId); + await this.apiClient.acceptSponsorshipRequest(requestId, { respondedBy: sponsorId }); return Result.ok(undefined); } catch (error) { - return Result.err({ type: 'notImplemented', message: 'acceptSponsorshipRequest' }); + return Result.err({ type: 'unknown', message: 'Failed to accept sponsorship request' }); } } async rejectSponsorshipRequest(requestId: string, sponsorId: string, reason?: string): Promise> { try { - await this.apiClient.rejectSponsorshipRequest(requestId, sponsorId, reason); + await this.apiClient.rejectSponsorshipRequest(requestId, { respondedBy: sponsorId, reason }); return Result.ok(undefined); } catch (error) { - return Result.err({ type: 'notImplemented', message: 'rejectSponsorshipRequest' }); + return Result.err({ type: 'unknown', message: 'Failed to reject sponsorship request' }); } } - async getPendingSponsorshipRequests(input: any): Promise> { + async getPendingSponsorshipRequests(input: { entityType: string; entityId: string }): Promise> { try { const result = await this.apiClient.getPendingSponsorshipRequests(input); return Result.ok(result); diff --git a/apps/website/lib/services/teams/TeamService.ts b/apps/website/lib/services/teams/TeamService.ts index 335576757..9f6f75bcf 100644 --- a/apps/website/lib/services/teams/TeamService.ts +++ b/apps/website/lib/services/teams/TeamService.ts @@ -27,10 +27,10 @@ export class TeamService implements Service { this.apiClient = new TeamsApiClient(baseUrl, errorReporter, logger); } - async getAllTeams(): Promise> { + async getAllTeams(): Promise> { try { const result = await this.apiClient.getAll(); - return Result.ok(result.teams.map(team => new TeamSummaryViewModel(team))); + return Result.ok(result.teams); } catch (error) { return Result.err({ type: 'unknown', message: 'Failed to fetch teams' }); } diff --git a/apps/website/lib/types/LeaderboardsData.ts b/apps/website/lib/types/LeaderboardsData.ts new file mode 100644 index 000000000..c7a01178b --- /dev/null +++ b/apps/website/lib/types/LeaderboardsData.ts @@ -0,0 +1,6 @@ +import type { DriverLeaderboardItemDTO } from '@/lib/types/generated/DriverLeaderboardItemDTO'; + +export interface LeaderboardsData { + drivers: { drivers: DriverLeaderboardItemDTO[] }; + teams: { teams: [] }; +} \ No newline at end of file diff --git a/apps/website/lib/types/admin.ts b/apps/website/lib/types/admin.ts new file mode 100644 index 000000000..dffe84e93 --- /dev/null +++ b/apps/website/lib/types/admin.ts @@ -0,0 +1,7 @@ +// Re-export TBD DTOs for admin functionality +export type { + AdminUserDto as UserDto, + AdminUserListResponseDto as UserListResponse, + AdminListUsersQueryDto as ListUsersQuery, + AdminDashboardStatsDto as DashboardStats, +} from './tbd/AdminUserDto'; \ No newline at end of file diff --git a/apps/website/lib/types/tbd/AdminUserDto.ts b/apps/website/lib/types/tbd/AdminUserDto.ts new file mode 100644 index 000000000..a50afd6e1 --- /dev/null +++ b/apps/website/lib/types/tbd/AdminUserDto.ts @@ -0,0 +1,76 @@ +/** + * AdminUserDto - TBD DTO for admin user data + * + * This DTO represents the shape of user data returned by admin endpoints. + * TODO: Generate this from API OpenAPI spec when admin endpoints are implemented. + */ +export interface AdminUserDto { + id: string; + email: string; + displayName: string; + roles: string[]; + status: string; + isSystemAdmin: boolean; + createdAt: string; // ISO date string + updatedAt: string; // ISO date string + lastLoginAt?: string; // ISO date string + primaryDriverId?: string; +} + +/** + * AdminUserListResponseDto - TBD DTO for user list response + */ +export interface AdminUserListResponseDto { + users: AdminUserDto[]; + total: number; + page: number; + limit: number; + totalPages: number; +} + +/** + * AdminDashboardStatsDto - TBD DTO for dashboard statistics + */ +export interface AdminDashboardStatsDto { + totalUsers: number; + activeUsers: number; + suspendedUsers: number; + deletedUsers: number; + systemAdmins: number; + recentLogins: number; + newUsersToday: number; + userGrowth: { + label: string; + value: number; + color: string; + }[]; + roleDistribution: { + label: string; + value: number; + color: string; + }[]; + statusDistribution: { + active: number; + suspended: number; + deleted: number; + }; + activityTimeline: { + date: string; + newUsers: number; + logins: number; + }[]; +} + +/** + * AdminListUsersQueryDto - TBD DTO for user list query parameters + */ +export interface AdminListUsersQueryDto { + role?: string; + status?: string; + email?: string; + search?: string; + page?: number; + limit?: number; + sortBy?: 'email' | 'displayName' | 'createdAt' | 'lastLoginAt' | 'status'; + sortDirection?: 'asc' | 'desc'; +} \ No newline at end of file diff --git a/apps/website/lib/types/tbd/AvailableLeaguesDTO.ts b/apps/website/lib/types/tbd/AvailableLeaguesDTO.ts new file mode 100644 index 000000000..00c79cafc --- /dev/null +++ b/apps/website/lib/types/tbd/AvailableLeaguesDTO.ts @@ -0,0 +1,23 @@ +export interface AvailableLeaguesDTO { + leagues: AvailableLeagueDTO[]; +} + +export interface AvailableLeagueDTO { + id: string; + name: string; + description: string; + drivers: number; + mainSponsorSlot: { + available: boolean; + price: number; + }; + secondarySlots: { + available: number; + price: number; + }; + cpm: number; + season: { + startDate: string; + endDate: string; + }; +} \ No newline at end of file diff --git a/apps/website/lib/types/tbd/FilteredRacesPageDataDTO.ts b/apps/website/lib/types/tbd/FilteredRacesPageDataDTO.ts new file mode 100644 index 000000000..098560ff9 --- /dev/null +++ b/apps/website/lib/types/tbd/FilteredRacesPageDataDTO.ts @@ -0,0 +1,34 @@ +/** + * Filtered Races Page Data DTO + * + * API response for filtered races page data with status, time, and league filters. + * Used when the API supports filtering parameters. + */ + +export interface FilteredRacesPageDataDTO { + races: FilteredRacesPageDataRaceDTO[]; + totalCount: number; + scheduledRaces: FilteredRacesPageDataRaceDTO[]; + runningRaces: FilteredRacesPageDataRaceDTO[]; + completedRaces: FilteredRacesPageDataRaceDTO[]; + filters: { + statuses: { value: string; label: string }[]; + leagues: { id: string; name: string }[]; + timeFilters: { value: string; label: string }[]; + }; +} + +export interface FilteredRacesPageDataRaceDTO { + id: string; + track: string; + car: string; + scheduledAt: string; + status: 'scheduled' | 'running' | 'completed' | 'cancelled'; + sessionType: string; + leagueId?: string; + leagueName?: string; + strengthOfField?: number; + isUpcoming: boolean; + isLive: boolean; + isPast: boolean; +} \ No newline at end of file diff --git a/apps/website/lib/types/tbd/GetLiveriesOutputDTO.ts b/apps/website/lib/types/tbd/GetLiveriesOutputDTO.ts new file mode 100644 index 000000000..2da8d1349 --- /dev/null +++ b/apps/website/lib/types/tbd/GetLiveriesOutputDTO.ts @@ -0,0 +1,9 @@ +export interface GetLiveriesOutputDTO { + liveries: Array<{ + id: string; + name: string; + imageUrl: string; + createdAt: string; + isActive: boolean; + }>; +} \ No newline at end of file diff --git a/apps/website/lib/types/tbd/LeagueDetailForSponsorDTO.ts b/apps/website/lib/types/tbd/LeagueDetailForSponsorDTO.ts new file mode 100644 index 000000000..28c80fba2 --- /dev/null +++ b/apps/website/lib/types/tbd/LeagueDetailForSponsorDTO.ts @@ -0,0 +1,41 @@ +export interface LeagueDetailForSponsorDTO { + league: LeagueDetailDTO; + drivers: SponsorDriverDTO[]; + races: SponsorRaceDTO[]; +} + +export interface LeagueDetailDTO { + id: string; + name: string; + description: string; + drivers: number; + mainSponsorSlot: { + available: boolean; + price: number; + }; + secondarySlots: { + available: number; + price: number; + }; + cpm: number; + season: { + startDate: string; + endDate: string; + }; +} + +export interface SponsorDriverDTO { + id: string; + name: string; + rating: number; + car: string; + sponsorshipPrice: number; +} + +export interface SponsorRaceDTO { + id: string; + name: string; + date: string; + track: string; + sponsorshipPrice: number; +} \ No newline at end of file diff --git a/apps/website/lib/types/tbd/SponsorBillingDTO.ts b/apps/website/lib/types/tbd/SponsorBillingDTO.ts new file mode 100644 index 000000000..11f6be882 --- /dev/null +++ b/apps/website/lib/types/tbd/SponsorBillingDTO.ts @@ -0,0 +1,40 @@ +export interface SponsorBillingDTO { + sponsorId: string; + paymentMethods: PaymentMethodDTO[]; + invoices: InvoiceDTO[]; + stats: BillingStatsDTO; +} + +export interface PaymentMethodDTO { + id: string; + type: 'card' | 'bank' | 'sepa'; + last4: string; + brand?: string; + isDefault: boolean; + expiryMonth?: number; + expiryYear?: number; + bankName?: string; +} + +export interface InvoiceDTO { + id: string; + invoiceNumber: string; + date: string; + dueDate: string; + amount: number; + vatAmount: number; + totalAmount: number; + status: 'paid' | 'pending' | 'overdue' | 'failed'; + description: string; + sponsorshipType: 'league' | 'team' | 'driver' | 'race' | 'platform'; + pdfUrl: string; +} + +export interface BillingStatsDTO { + totalSpent: number; + pendingAmount: number; + nextPaymentDate: string; + nextPaymentAmount: number; + activeSponsorships: number; + averageMonthlySpend: number; +} \ No newline at end of file diff --git a/apps/website/lib/types/tbd/SponsorSettingsDTO.ts b/apps/website/lib/types/tbd/SponsorSettingsDTO.ts new file mode 100644 index 000000000..a0f95991d --- /dev/null +++ b/apps/website/lib/types/tbd/SponsorSettingsDTO.ts @@ -0,0 +1,36 @@ +export interface SponsorSettingsDTO { + profile: SponsorProfileDTO; + notifications: NotificationSettingsDTO; +} + +export interface SponsorProfileDTO { + companyName: string; + contactName: string; + contactEmail: string; + contactPhone: string; + website: string; + description: string; + logoUrl: string | null; + industry: string; + address: { + street: string; + city: string; + country: string; + postalCode: string; + }; + taxId: string; + socialLinks: { + twitter: string; + linkedin: string; + instagram: string; + }; +} + +export interface NotificationSettingsDTO { + emailNewSponsorships: boolean; + emailWeeklyReport: boolean; + emailRaceAlerts: boolean; + emailPaymentAlerts: boolean; + emailNewOpportunities: boolean; + emailContractExpiry: boolean; +} \ No newline at end of file diff --git a/apps/website/lib/types/tbd/TeamsLeaderboardDto.ts b/apps/website/lib/types/tbd/TeamsLeaderboardDto.ts new file mode 100644 index 000000000..2e552dd09 --- /dev/null +++ b/apps/website/lib/types/tbd/TeamsLeaderboardDto.ts @@ -0,0 +1,14 @@ +export interface TeamsLeaderboardItemDTO { + id: string; + name: string; + tag: string; + memberCount: number; + category?: string; + totalWins: number; + logoUrl?: string; + rank: number; +} + +export interface TeamsLeaderboardDto { + teams: TeamsLeaderboardItemDTO[]; +} \ No newline at end of file diff --git a/apps/website/lib/types/view-data/DriversViewData.ts b/apps/website/lib/types/view-data/DriversViewData.ts new file mode 100644 index 000000000..4111f51ad --- /dev/null +++ b/apps/website/lib/types/view-data/DriversViewData.ts @@ -0,0 +1,19 @@ +export interface DriversViewData { + drivers: { + id: string; + name: string; + rating: number; + skillLevel: string; + category?: string; + nationality: string; + racesCompleted: number; + wins: number; + podiums: number; + isActive: boolean; + rank: number; + avatarUrl?: string; + }[]; + totalRaces: number; + totalWins: number; + activeCount: number; +} \ No newline at end of file diff --git a/apps/website/lib/utilities/authValidation.ts b/apps/website/lib/utilities/authValidation.ts new file mode 100644 index 000000000..a18d65168 --- /dev/null +++ b/apps/website/lib/utilities/authValidation.ts @@ -0,0 +1,146 @@ +/** + * Auth Validation Utilities + * + * Pure functions for client-side validation of auth forms. + * No side effects, synchronous. + */ + +export interface SignupFormData { + firstName: string; + lastName: string; + email: string; + password: string; + confirmPassword: string; +} + +export interface ForgotPasswordFormData { + email: string; +} + +export interface ResetPasswordFormData { + newPassword: string; + confirmPassword: string; +} + +export interface SignupValidationError { + field: keyof SignupFormData; + message: string; +} + +export interface ForgotPasswordValidationError { + field: keyof ForgotPasswordFormData; + message: string; +} + +export interface ResetPasswordValidationError { + field: keyof ResetPasswordFormData; + message: string; +} + +export class SignupFormValidation { + static validateForm(data: SignupFormData): SignupValidationError[] { + const errors: SignupValidationError[] = []; + + // First name + if (!data.firstName.trim()) { + errors.push({ field: 'firstName', message: 'First name is required' }); + } else if (data.firstName.trim().length < 2) { + errors.push({ field: 'firstName', message: 'First name must be at least 2 characters' }); + } + + // Last name + if (!data.lastName.trim()) { + errors.push({ field: 'lastName', message: 'Last name is required' }); + } else if (data.lastName.trim().length < 2) { + errors.push({ field: 'lastName', message: 'Last name must be at least 2 characters' }); + } + + // Email + if (!data.email.trim()) { + errors.push({ field: 'email', message: 'Email is required' }); + } else if (!this.isValidEmail(data.email)) { + errors.push({ field: 'email', message: 'Please enter a valid email address' }); + } + + // Password + if (!data.password) { + errors.push({ field: 'password', message: 'Password is required' }); + } else if (data.password.length < 8) { + errors.push({ field: 'password', message: 'Password must be at least 8 characters' }); + } else if (!this.hasValidPasswordComplexity(data.password)) { + errors.push({ field: 'password', message: 'Password must contain at least one uppercase letter, one lowercase letter, and one number' }); + } + + // Confirm password + if (!data.confirmPassword) { + errors.push({ field: 'confirmPassword', message: 'Please confirm your password' }); + } else if (data.password !== data.confirmPassword) { + errors.push({ field: 'confirmPassword', message: 'Passwords do not match' }); + } + + return errors; + } + + static generateDisplayName(firstName: string, lastName: string): string { + const trimmedFirst = firstName.trim(); + const trimmedLast = lastName.trim(); + return `${trimmedFirst} ${trimmedLast}`.trim() || trimmedFirst || trimmedLast; + } + + private static isValidEmail(email: string): boolean { + const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/; + return emailRegex.test(email); + } + + private static hasValidPasswordComplexity(password: string): boolean { + return /[a-z]/.test(password) && /[A-Z]/.test(password) && /\d/.test(password); + } +} + +export class ForgotPasswordFormValidation { + static validateForm(data: ForgotPasswordFormData): ForgotPasswordValidationError[] { + const errors: ForgotPasswordValidationError[] = []; + + // Email + if (!data.email.trim()) { + errors.push({ field: 'email', message: 'Email is required' }); + } else if (!this.isValidEmail(data.email)) { + errors.push({ field: 'email', message: 'Please enter a valid email address' }); + } + + return errors; + } + + private static isValidEmail(email: string): boolean { + const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/; + return emailRegex.test(email); + } +} + +export class ResetPasswordFormValidation { + static validateForm(data: ResetPasswordFormData): ResetPasswordValidationError[] { + const errors: ResetPasswordValidationError[] = []; + + // New password + if (!data.newPassword) { + errors.push({ field: 'newPassword', message: 'New password is required' }); + } else if (data.newPassword.length < 8) { + errors.push({ field: 'newPassword', message: 'Password must be at least 8 characters' }); + } else if (!this.hasValidPasswordComplexity(data.newPassword)) { + errors.push({ field: 'newPassword', message: 'Password must contain at least one uppercase letter, one lowercase letter, and one number' }); + } + + // Confirm password + if (!data.confirmPassword) { + errors.push({ field: 'confirmPassword', message: 'Please confirm your new password' }); + } else if (data.newPassword !== data.confirmPassword) { + errors.push({ field: 'confirmPassword', message: 'Passwords do not match' }); + } + + return errors; + } + + private static hasValidPasswordComplexity(password: string): boolean { + return /[a-z]/.test(password) && /[A-Z]/.test(password) && /\d/.test(password); + } +} \ No newline at end of file diff --git a/apps/website/lib/view-data/AvatarViewData.ts b/apps/website/lib/view-data/AvatarViewData.ts index 3a7143c26..7a943d01d 100644 --- a/apps/website/lib/view-data/AvatarViewData.ts +++ b/apps/website/lib/view-data/AvatarViewData.ts @@ -4,6 +4,6 @@ * ViewData for avatar media rendering. */ export interface AvatarViewData { - buffer: ArrayBuffer; + buffer: string; // base64 encoded contentType: string; } \ No newline at end of file diff --git a/apps/website/lib/view-data/CategoryIconViewData.ts b/apps/website/lib/view-data/CategoryIconViewData.ts index cfa2adb2b..5ab1bce53 100644 --- a/apps/website/lib/view-data/CategoryIconViewData.ts +++ b/apps/website/lib/view-data/CategoryIconViewData.ts @@ -4,6 +4,6 @@ * ViewData for category icon media rendering. */ export interface CategoryIconViewData { - buffer: ArrayBuffer; + buffer: string; // base64 encoded contentType: string; } \ No newline at end of file diff --git a/apps/website/lib/view-data/LeagueCoverViewData.ts b/apps/website/lib/view-data/LeagueCoverViewData.ts index 49228c099..3591f0c21 100644 --- a/apps/website/lib/view-data/LeagueCoverViewData.ts +++ b/apps/website/lib/view-data/LeagueCoverViewData.ts @@ -4,6 +4,6 @@ * ViewData for league cover media rendering. */ export interface LeagueCoverViewData { - buffer: ArrayBuffer; + buffer: string; // base64 encoded contentType: string; } \ No newline at end of file diff --git a/apps/website/lib/view-data/LeagueLogoViewData.ts b/apps/website/lib/view-data/LeagueLogoViewData.ts index d25b8b2f4..07b65e0ca 100644 --- a/apps/website/lib/view-data/LeagueLogoViewData.ts +++ b/apps/website/lib/view-data/LeagueLogoViewData.ts @@ -4,6 +4,6 @@ * ViewData for league logo media rendering. */ export interface LeagueLogoViewData { - buffer: ArrayBuffer; + buffer: string; // base64 encoded contentType: string; } \ No newline at end of file diff --git a/apps/website/lib/view-data/SponsorDashboardViewData.ts b/apps/website/lib/view-data/SponsorDashboardViewData.ts new file mode 100644 index 000000000..a78900c6c --- /dev/null +++ b/apps/website/lib/view-data/SponsorDashboardViewData.ts @@ -0,0 +1,23 @@ +export interface SponsorDashboardViewData { + sponsorName: string; + totalImpressions: string; + totalInvestment: string; + metrics: { + impressionsChange: number; + viewersChange: number; + exposureChange: number; + }; + categoryData: { + leagues: { count: number; impressions: number }; + teams: { count: number; impressions: number }; + drivers: { count: number; impressions: number }; + races: { count: number; impressions: number }; + platform: { count: number; impressions: number }; + }; + sponsorships: Record; // From DTO + activeSponsorships: number; + formattedTotalInvestment: string; + costPerThousandViews: string; + upcomingRenewals: any[]; + recentActivity: any[]; +} \ No newline at end of file diff --git a/apps/website/lib/view-data/SponsorLogoViewData.ts b/apps/website/lib/view-data/SponsorLogoViewData.ts index 80a46b372..462069bd6 100644 --- a/apps/website/lib/view-data/SponsorLogoViewData.ts +++ b/apps/website/lib/view-data/SponsorLogoViewData.ts @@ -4,6 +4,6 @@ * ViewData for sponsor logo media rendering. */ export interface SponsorLogoViewData { - buffer: ArrayBuffer; + buffer: string; // base64 encoded contentType: string; } \ No newline at end of file diff --git a/apps/website/lib/view-data/TeamLogoViewData.ts b/apps/website/lib/view-data/TeamLogoViewData.ts index 66903fda5..6e7634481 100644 --- a/apps/website/lib/view-data/TeamLogoViewData.ts +++ b/apps/website/lib/view-data/TeamLogoViewData.ts @@ -4,6 +4,6 @@ * ViewData for team logo media rendering. */ export interface TeamLogoViewData { - buffer: ArrayBuffer; + buffer: string; // base64 encoded contentType: string; } \ No newline at end of file diff --git a/apps/website/lib/view-data/TrackImageViewData.ts b/apps/website/lib/view-data/TrackImageViewData.ts index 1672c0bdd..cf415c78a 100644 --- a/apps/website/lib/view-data/TrackImageViewData.ts +++ b/apps/website/lib/view-data/TrackImageViewData.ts @@ -4,6 +4,6 @@ * ViewData for track image media rendering. */ export interface TrackImageViewData { - buffer: ArrayBuffer; + buffer: string; // base64 encoded contentType: string; } \ No newline at end of file diff --git a/apps/website/lib/view-models/AdminUserViewModel.ts b/apps/website/lib/view-models/AdminUserViewModel.ts index 58546c995..9ab86a9ef 100644 --- a/apps/website/lib/view-models/AdminUserViewModel.ts +++ b/apps/website/lib/view-models/AdminUserViewModel.ts @@ -1,4 +1,4 @@ -import type { UserDto } from '@/lib/api/admin/AdminApiClient'; +import type { UserDto } from '@/lib/types/admin'; /** * AdminUserViewModel diff --git a/apps/website/lib/view-models/AdminViewModelPresenter.ts b/apps/website/lib/view-models/AdminViewModelPresenter.ts deleted file mode 100644 index e0141c6db..000000000 --- a/apps/website/lib/view-models/AdminViewModelPresenter.ts +++ /dev/null @@ -1,47 +0,0 @@ -'use client'; - -import type { UserDto, DashboardStats, UserListResponse } from '@/lib/api/admin/AdminApiClient'; -import { AdminUserViewModel, DashboardStatsViewModel, UserListViewModel } from './AdminUserViewModel'; - -/** - * AdminViewModelPresenter - * - * Presenter layer for transforming API DTOs to ViewModels. - * Runs in client code only ('use client'). - * Deterministic, side-effect free transformations. - */ -export class AdminViewModelPresenter { - /** - * Map a single user DTO to a View Model - */ - static mapUser(apiDto: UserDto): AdminUserViewModel { - return new AdminUserViewModel(apiDto); - } - - /** - * Map an array of user DTOs to View Models - */ - static mapUsers(apiDtos: UserDto[]): AdminUserViewModel[] { - return apiDtos.map(apiDto => this.mapUser(apiDto)); - } - - /** - * Map dashboard stats DTO to View Model - */ - static mapDashboardStats(apiDto: DashboardStats): DashboardStatsViewModel { - return new DashboardStatsViewModel(apiDto); - } - - /** - * Map user list response to View Model - */ - static mapUserList(viewData: UserListResponse): UserListViewModel { - return new UserListViewModel({ - users: viewData.users, - total: viewData.total, - page: viewData.page, - limit: viewData.limit, - totalPages: viewData.totalPages, - }); - } -} \ No newline at end of file diff --git a/apps/website/lib/view-models/RaceResultsDataTransformer.ts b/apps/website/lib/view-models/RaceResultsDataTransformer.ts deleted file mode 100644 index 9f9f194dd..000000000 --- a/apps/website/lib/view-models/RaceResultsDataTransformer.ts +++ /dev/null @@ -1,105 +0,0 @@ -import type { LeagueMembershipsViewModel } from './LeagueMembershipsViewModel'; -import type { RaceResultsDetailViewModel } from './RaceResultsDetailViewModel'; -import type { RaceWithSOFViewModel } from './RaceWithSOFViewModel'; - -// TODO fucking violating our architecture, it should be a ViewModel - -export interface TransformedRaceResultsData { - raceTrack?: string; - raceScheduledAt?: string; - totalDrivers?: number; - leagueName?: string; - raceSOF: number | null; - results: Array<{ - position: number; - driverId: string; - driverName: string; - driverAvatar: string; - country: string; - car: string; - laps: number; - time: string; - fastestLap: string; - points: number; - incidents: number; - isCurrentUser: boolean; - }>; - penalties: Array<{ - driverId: string; - driverName: string; - type: 'time_penalty' | 'grid_penalty' | 'points_deduction' | 'disqualification' | 'warning' | 'license_points'; - value: number; - reason: string; - notes?: string; - }>; - pointsSystem: Record; - fastestLapTime: number; - memberships?: Array<{ - driverId: string; - role: string; - }>; -} - -export class RaceResultsDataTransformer { - static transform( - resultsData: RaceResultsDetailViewModel | null, - sofData: RaceWithSOFViewModel | null, - currentDriverId: string, - membershipsData?: LeagueMembershipsViewModel - ): TransformedRaceResultsData { - if (!resultsData) { - return { - raceSOF: null, - results: [], - penalties: [], - pointsSystem: {}, - fastestLapTime: 0, - }; - } - - // Transform results - const results = resultsData.results.map((result) => ({ - position: result.position, - driverId: result.driverId, - driverName: result.driverName, - driverAvatar: result.avatarUrl, - country: 'US', // Default since view model doesn't have car - car: 'Unknown', // Default since view model doesn't have car - laps: 0, // Default since view model doesn't have laps - time: '0:00.00', // Default since view model doesn't have time - fastestLap: result.fastestLap.toString(), // Convert number to string - points: 0, // Default since view model doesn't have points - incidents: result.incidents, - isCurrentUser: result.driverId === currentDriverId, - })); - - // Transform penalties - const penalties = resultsData.penalties.map((penalty) => ({ - driverId: penalty.driverId, - driverName: resultsData.results.find((r) => r.driverId === penalty.driverId)?.driverName || 'Unknown', - type: penalty.type as 'time_penalty' | 'grid_penalty' | 'points_deduction' | 'disqualification' | 'warning' | 'license_points', - value: penalty.value || 0, - reason: 'Penalty applied', // Default since view model doesn't have reason - notes: undefined, // Default since view model doesn't have notes - })); - - // Transform memberships - const memberships = membershipsData?.memberships.map((membership) => ({ - driverId: membership.driverId, - role: membership.role || 'member', - })); - - return { - raceTrack: resultsData.race?.track, - raceScheduledAt: resultsData.race?.scheduledAt, - totalDrivers: resultsData.stats?.totalDrivers, - leagueName: resultsData.league?.name, - raceSOF: sofData?.strengthOfField || null, - results, - penalties, - pointsSystem: resultsData.pointsSystem || {}, - fastestLapTime: resultsData.fastestLapTime || 0, - memberships, - }; - } -} \ No newline at end of file diff --git a/apps/website/lib/view-models/index.ts b/apps/website/lib/view-models/index.ts index 412ea813e..555425068 100644 --- a/apps/website/lib/view-models/index.ts +++ b/apps/website/lib/view-models/index.ts @@ -87,5 +87,3 @@ export * from './UploadMediaViewModel'; export * from './UserProfileViewModel'; export * from './WalletTransactionViewModel'; export * from './WalletViewModel'; - -export * from './AdminViewModelPresenter'; \ No newline at end of file diff --git a/apps/website/templates/AdminDashboardTemplate.tsx b/apps/website/templates/AdminDashboardTemplate.tsx index d82fc77ce..37ba8941a 100644 --- a/apps/website/templates/AdminDashboardTemplate.tsx +++ b/apps/website/templates/AdminDashboardTemplate.tsx @@ -40,8 +40,8 @@ export function AdminDashboardTemplate(props: { System overview and statistics
- +
{/* Error Banner */} @@ -112,15 +118,16 @@ export function AdminUsersTemplate(props: {
-
Error
-
{error}
+ Error + {error}
- +
)} @@ -130,52 +137,53 @@ export function AdminUsersTemplate(props: {
- Filters + Filters
{(search || roleFilter || statusFilter) && ( - + )}
-
- - onSearch(e.target.value)} - className="w-full pl-9 pr-3 py-2 bg-deep-graphite border border-charcoal-outline rounded-lg text-white placeholder-gray-500 focus:outline-none focus:border-primary-blue transition-colors" - /> -
- - - - -
+
+ + onSearch(e.target.value)} + className="pl-9" + /> +
+ + onFilterStatus(e.target.value)} + options={[ + { value: '', label: 'All Status' }, + { value: 'active', label: 'Active' }, + { value: 'suspended', label: 'Suspended' }, + { value: 'deleted', label: 'Deleted' }, + ]} + /> +
@@ -184,113 +192,115 @@ export function AdminUsersTemplate(props: { {loading ? (
-
Loading users...
+ Loading users...
) : !viewData.users || viewData.users.length === 0 ? (
-
No users found
- +
) : ( -
- - - - - - - - - - - - - {viewData.users.map((user, index: number) => ( - -
UserEmailRolesStatusLast LoginActions
-
-
- -
-
-
{user.displayName}
-
ID: {user.id}
- {user.primaryDriverId && ( -
Driver: {user.primaryDriverId}
- )} -
+ + + + User + Email + Roles + Status + Last Login + Actions + + + + {viewData.users.map((user, index: number) => ( + + +
+
+
- -
- - - - - - ))} - -
-
{user.email}
- 		-
- {user.roles.map((role: string, idx: number) => ( - - {getRoleBadgeLabel(role)} - - ))} -
- 		- {(() => { - const badge = toStatusBadgeProps(user.status); - return ; - })()} - -
- {user.lastLoginAt ? new Date(user.lastLoginAt).toLocaleDateString() : 'Never'} -
- 		-
- {user.status === 'active' && ( - - )} - {user.status === 'suspended' && ( - - )} - {user.status !== 'deleted' && ( - +
+
{user.displayName}
+
ID: {user.id}
+ {user.primaryDriverId && ( +
Driver: {user.primaryDriverId}
)}
-
-
+ + + +
{user.email}
+ + +
+ {user.roles.map((role: string, idx: number) => ( + + {getRoleBadgeLabel(role)} + + ))} +
+ + + {(() => { + const badge = toStatusBadgeProps(user.status); + return ; + })()} + + +
+ {user.lastLoginAt ? new Date(user.lastLoginAt).toLocaleDateString() : 'Never'} +
+ + +
+ {user.status === 'active' && ( + + )} + {user.status === 'suspended' && ( + + )} + {user.status !== 'deleted' && ( + + )} +
+ + + ))} + +
)} @@ -300,8 +310,8 @@ export function AdminUsersTemplate(props: {
-
Total Users
-
{viewData.total}
+ Total Users + {viewData.total}
@@ -309,10 +319,10 @@ export function AdminUsersTemplate(props: {
-
Active
-
+ Active + {viewData.activeUserCount} -
+
✓
@@ -320,10 +330,10 @@ export function AdminUsersTemplate(props: {
-
Admins
-
+ Admins + {viewData.adminCount} -
+
diff --git a/apps/website/templates/DashboardTemplate.tsx b/apps/website/templates/DashboardTemplate.tsx index 5271676ad..5a47648a2 100644 --- a/apps/website/templates/DashboardTemplate.tsx +++ b/apps/website/templates/DashboardTemplate.tsx @@ -1,4 +1,18 @@ import type { DashboardViewData } from '@/lib/view-data/DashboardViewData'; +import { + Trophy, + Medal, + Target, + Users, + ChevronRight, + Calendar, + Clock, + Activity, + Award, + UserPlus, + Flag, + User, +} from 'lucide-react'; interface DashboardTemplateProps { viewData: DashboardViewData; @@ -72,7 +86,7 @@ export function DashboardTemplate({ viewData }: DashboardTemplateProps) { Flag Browse Leagues - + Activity View Profile @@ -189,7 +203,7 @@ export function DashboardTemplate({ viewData }: DashboardTemplateProps) { Award Your Championship Standings - + View all ChevronRight
@@ -307,7 +321,7 @@ export function DashboardTemplate({ viewData }: DashboardTemplateProps) { ))} {friends.length > 6 && ( +{friends.length - 6} more diff --git a/apps/website/templates/DriverRankingsTemplate.tsx b/apps/website/templates/DriverRankingsTemplate.tsx index 4fe086954..736a609b4 100644 --- a/apps/website/templates/DriverRankingsTemplate.tsx +++ b/apps/website/templates/DriverRankingsTemplate.tsx @@ -95,7 +95,7 @@ export function DriverRankingsTemplate({

- {driver.rating.toLocaleString()} + {driver.rating.toString()}

@@ -139,14 +139,6 @@ export function DriverRankingsTemplate({
{viewData.drivers.map((driver) => { const position = driver.rank; - const medalBg = position === 1 ? 'bg-gradient-to-br from-yellow-400/20 to-yellow-600/10 border-yellow-400/40' : - position === 2 ? 'bg-gradient-to-br from-gray-300/20 to-gray-400/10 border-gray-300/40' : - position === 3 ? 'bg-gradient-to-br from-amber-600/20 to-amber-700/10 border-amber-600/40' : - 'bg-iron-gray/50 border-charcoal-outline'; - const medalColor = position === 1 ? 'text-yellow-400' : - position === 2 ? 'text-gray-300' : - position === 3 ? 'text-amber-600' : - 'text-gray-500'; return (
- - + +
); diff --git a/apps/website/templates/RacesTemplate.tsx b/apps/website/templates/RacesTemplate.tsx index 1524d4080..d713cbc67 100644 --- a/apps/website/templates/RacesTemplate.tsx +++ b/apps/website/templates/RacesTemplate.tsx @@ -521,7 +521,7 @@ export function RacesTemplate({ {filteredRaces.length > 0 && (
View All Races diff --git a/apps/website/templates/SponsorDashboardTemplate.tsx b/apps/website/templates/SponsorDashboardTemplate.tsx new file mode 100644 index 000000000..d4895f4cb --- /dev/null +++ b/apps/website/templates/SponsorDashboardTemplate.tsx @@ -0,0 +1,336 @@ +import { motion, useReducedMotion, AnimatePresence } from 'framer-motion'; +import Card from '@/components/ui/Card'; +import Button from '@/components/ui/Button'; +import StatusBadge from '@/components/ui/StatusBadge'; +import InfoBanner from '@/components/ui/InfoBanner'; +import MetricCard from '@/components/sponsors/MetricCard'; +import SponsorshipCategoryCard from '@/components/sponsors/SponsorshipCategoryCard'; +import ActivityItem from '@/components/sponsors/ActivityItem'; +import RenewalAlert from '@/components/sponsors/RenewalAlert'; +import { + BarChart3, + Eye, + Users, + Trophy, + TrendingUp, + Calendar, + DollarSign, + Target, + ArrowUpRight, + ArrowDownRight, + ExternalLink, + Loader2, + Car, + Flag, + Megaphone, + ChevronRight, + Plus, + Bell, + Settings, + CreditCard, + FileText, + RefreshCw +} from 'lucide-react'; +import Link from 'next/link'; +import type { SponsorDashboardViewData } from '@/lib/view-data/SponsorDashboardViewData'; + +interface SponsorDashboardTemplateProps { + viewData: SponsorDashboardViewData; +} + +export function SponsorDashboardTemplate({ viewData }: SponsorDashboardTemplateProps) { + const shouldReduceMotion = useReducedMotion(); + + const categoryData = viewData.categoryData; + + return ( +
+ {/* Header */} +
+
+

Sponsor Dashboard

+

Welcome back, {viewData.sponsorName}

+
+
+ {/* Time Range Selector */} +
+ {(['7d', '30d', '90d', 'all'] as const).map((range) => ( + + ))} +
+ + {/* Quick Actions */} + + + + +
+
+ + {/* Key Metrics */} +
+ + + + +
+ + {/* Sponsorship Categories */} +
+
+

Your Sponsorships

+ + + +
+ +
+ + + + + +
+
+ + {/* Main Content Grid */} +
+ {/* Left Column - Sponsored Entities */} +
+ {/* Top Performing Sponsorships */} + +
+

Top Performing

+ + + +
+
+ {/* Mock data for now */} +
+
+
+ Main +
+
+
+ + Sample League +
+
Sample details
+
+
+
+
+
1.2k
+
impressions
+
+ +
+
+
+ + + {/* Upcoming Events */} + +
+

+ + Upcoming Sponsored Events +

+
+
+
+ +

No upcoming sponsored events

+
+
+ +
+ + {/* Right Column - Activity & Quick Actions */} +
+ {/* Quick Actions */} + +

Quick Actions

+
+ + + + + + + + + + + + + + + +
+ + + {/* Renewal Alerts */} + {viewData.upcomingRenewals.length > 0 && ( + +

+ + Upcoming Renewals +

+
+ {viewData.upcomingRenewals.map((renewal: any) => ( + + ))} +
+ + )} + + {/* Recent Activity */} + +

Recent Activity

+
+ {viewData.recentActivity.map((activity: any) => ( + + ))} +
+ + + {/* Investment Summary */} + +

+ + Investment Summary +

+
+
+ Active Sponsorships + {viewData.activeSponsorships} +
+
+ Total Investment + {viewData.formattedTotalInvestment} +
+
+ Cost per 1K Views + + {viewData.costPerThousandViews} + +
+
+ Next Invoice + Jan 1, 2026 +
+
+ + + +
+
+ +
+
+
+ ); +} \ No newline at end of file diff --git a/apps/website/templates/SponsorLeagueDetailTemplate.tsx b/apps/website/templates/SponsorLeagueDetailTemplate.tsx index 179ace101..9a762aefe 100644 --- a/apps/website/templates/SponsorLeagueDetailTemplate.tsx +++ b/apps/website/templates/SponsorLeagueDetailTemplate.tsx @@ -111,9 +111,9 @@ export function SponsorLeagueDetailTemplate({ data }: SponsorLeagueDetailTemplat
{/* Breadcrumb */}
- Dashboard + Dashboard - Leagues + Leagues {league.name}
diff --git a/apps/website/templates/SponsorLeaguesTemplate.tsx b/apps/website/templates/SponsorLeaguesTemplate.tsx index 6df84e16b..5697dc584 100644 --- a/apps/website/templates/SponsorLeaguesTemplate.tsx +++ b/apps/website/templates/SponsorLeaguesTemplate.tsx @@ -247,7 +247,7 @@ export function SponsorLeaguesTemplate({ data }: SponsorLeaguesTemplateProps) {
{/* Breadcrumb */}
- Dashboard + Dashboard Browse Leagues
diff --git a/apps/website/templates/TeamsTemplate.tsx b/apps/website/templates/TeamsTemplate.tsx index fdfb42403..ff8b894f8 100644 --- a/apps/website/templates/TeamsTemplate.tsx +++ b/apps/website/templates/TeamsTemplate.tsx @@ -30,7 +30,7 @@ export function TeamsTemplate({ teams }: TeamsTemplateProps) {

Teams

Browse and manage your racing teams

- +
@@ -82,7 +82,7 @@ export function TeamsTemplate({ teams }: TeamsTemplateProps) {

No teams yet

Get started by creating your first racing team

- +
diff --git a/apps/website/templates/auth/ForgotPasswordTemplate.tsx b/apps/website/templates/auth/ForgotPasswordTemplate.tsx index e3e58c2a9..cc52bdec2 100644 --- a/apps/website/templates/auth/ForgotPasswordTemplate.tsx +++ b/apps/website/templates/auth/ForgotPasswordTemplate.tsx @@ -27,7 +27,7 @@ import { ForgotPasswordViewData } from '@/lib/builders/view-data/types/ForgotPas interface ForgotPasswordTemplateProps { viewData: ForgotPasswordViewData; formActions: { - setFormData: React.Dispatch>; + handleChange: (e: React.ChangeEvent) => void; handleSubmit: (e: React.FormEvent) => Promise; setShowSuccess: (show: boolean) => void; }; @@ -77,7 +77,7 @@ export function ForgotPasswordTemplate({ viewData, formActions, mutationState }: id="email" type="email" value={viewData.formState.fields.email.value} - onChange={(e) => formActions.setFormData({ email: e.target.value })} + onChange={formActions.handleChange} error={!!viewData.formState.fields.email.error} errorMessage={viewData.formState.fields.email.error} placeholder="you@example.com" diff --git a/apps/website/templates/auth/ResetPasswordTemplate.tsx b/apps/website/templates/auth/ResetPasswordTemplate.tsx index b0e2ed830..0b64fd749 100644 --- a/apps/website/templates/auth/ResetPasswordTemplate.tsx +++ b/apps/website/templates/auth/ResetPasswordTemplate.tsx @@ -28,7 +28,7 @@ import { ResetPasswordViewData } from '@/lib/builders/view-data/types/ResetPassw interface ResetPasswordTemplateProps extends ResetPasswordViewData { formActions: { - setFormData: React.Dispatch>; + handleChange: (e: React.ChangeEvent) => void; handleSubmit: (e: React.FormEvent) => Promise; setShowSuccess: (show: boolean) => void; setShowPassword: (show: boolean) => void; @@ -87,7 +87,7 @@ export function ResetPasswordTemplate(props: ResetPasswordTemplateProps) { name="newPassword" type={uiState.showPassword ? 'text' : 'password'} value={viewData.formState.fields.newPassword.value} - onChange={(e) => formActions.setFormData(prev => ({ ...prev, newPassword: e.target.value }))} + onChange={formActions.handleChange} error={!!viewData.formState.fields.newPassword.error} errorMessage={viewData.formState.fields.newPassword.error} placeholder="••••••••" @@ -117,7 +117,7 @@ export function ResetPasswordTemplate(props: ResetPasswordTemplateProps) { name="confirmPassword" type={uiState.showConfirmPassword ? 'text' : 'password'} value={viewData.formState.fields.confirmPassword.value} - onChange={(e) => formActions.setFormData(prev => ({ ...prev, confirmPassword: e.target.value }))} + onChange={formActions.handleChange} error={!!viewData.formState.fields.confirmPassword.error} errorMessage={viewData.formState.fields.confirmPassword.error} placeholder="••••••••" diff --git a/apps/website/templates/auth/SignupTemplate.tsx b/apps/website/templates/auth/SignupTemplate.tsx index e8e83effb..44c35896d 100644 --- a/apps/website/templates/auth/SignupTemplate.tsx +++ b/apps/website/templates/auth/SignupTemplate.tsx @@ -37,7 +37,7 @@ import { checkPasswordStrength } from '@/lib/utils/validation'; interface SignupTemplateProps { viewData: SignupViewData; formActions: { - setFormData: React.Dispatch>; + handleChange: (e: React.ChangeEvent) => void; handleSubmit: (e: React.FormEvent) => Promise; setShowPassword: (show: boolean) => void; setShowConfirmPassword: (show: boolean) => void; @@ -213,7 +213,7 @@ export function SignupTemplate({ viewData, formActions, uiState, mutationState } name="firstName" type="text" value={viewData.formState.fields.firstName.value} - onChange={(e) => formActions.setFormData(prev => ({ ...prev, firstName: e.target.value }))} + onChange={formActions.handleChange} error={!!viewData.formState.fields.firstName.error} errorMessage={viewData.formState.fields.firstName.error} placeholder="John" @@ -236,7 +236,7 @@ export function SignupTemplate({ viewData, formActions, uiState, mutationState } name="lastName" type="text" value={viewData.formState.fields.lastName.value} - onChange={(e) => formActions.setFormData(prev => ({ ...prev, lastName: e.target.value }))} + onChange={formActions.handleChange} error={!!viewData.formState.fields.lastName.error} errorMessage={viewData.formState.fields.lastName.error} placeholder="Smith" @@ -268,7 +268,7 @@ export function SignupTemplate({ viewData, formActions, uiState, mutationState } name="email" type="email" value={viewData.formState.fields.email.value} - onChange={(e) => formActions.setFormData(prev => ({ ...prev, email: e.target.value }))} + onChange={formActions.handleChange} error={!!viewData.formState.fields.email.error} errorMessage={viewData.formState.fields.email.error} placeholder="you@example.com" @@ -291,7 +291,7 @@ export function SignupTemplate({ viewData, formActions, uiState, mutationState } name="password" type={uiState.showPassword ? 'text' : 'password'} value={viewData.formState.fields.password.value} - onChange={(e) => formActions.setFormData(prev => ({ ...prev, password: e.target.value }))} + onChange={formActions.handleChange} error={!!viewData.formState.fields.password.error} errorMessage={viewData.formState.fields.password.error} placeholder="••••••••" @@ -359,7 +359,7 @@ export function SignupTemplate({ viewData, formActions, uiState, mutationState } name="confirmPassword" type={uiState.showConfirmPassword ? 'text' : 'password'} value={viewData.formState.fields.confirmPassword.value} - onChange={(e) => formActions.setFormData(prev => ({ ...prev, confirmPassword: e.target.value }))} + onChange={formActions.handleChange} error={!!viewData.formState.fields.confirmPassword.error} errorMessage={viewData.formState.fields.confirmPassword.error} placeholder="••••••••" diff --git a/apps/website/ui/Avatar.tsx b/apps/website/ui/Avatar.tsx new file mode 100644 index 000000000..1ad1961f1 --- /dev/null +++ b/apps/website/ui/Avatar.tsx @@ -0,0 +1,27 @@ +/** + * Avatar + * + * Pure UI component for displaying driver avatars. + * Renders an image with fallback on error. + */ + +export interface AvatarProps { + driverId: string; + alt: string; + className?: string; +} + +export function Avatar({ driverId, alt, className = '' }: AvatarProps) { + return ( + // eslint-disable-next-line @next/next/no-img-element + {alt} { + // Fallback to default avatar + (e.target as HTMLImageElement).src = '/default-avatar.png'; + }} + /> + ); +} \ No newline at end of file diff --git a/apps/website/ui/CategoryIcon.tsx b/apps/website/ui/CategoryIcon.tsx new file mode 100644 index 000000000..a87232c01 --- /dev/null +++ b/apps/website/ui/CategoryIcon.tsx @@ -0,0 +1,27 @@ +/** + * CategoryIcon + * + * Pure UI component for displaying category icons. + * Renders an image with fallback on error. + */ + +export interface CategoryIconProps { + categoryId: string; + alt: string; + className?: string; +} + +export function CategoryIcon({ categoryId, alt, className = '' }: CategoryIconProps) { + return ( + // eslint-disable-next-line @next/next/no-img-element + {alt} { + // Fallback to default icon + (e.target as HTMLImageElement).src = '/default-category-icon.png'; + }} + /> + ); +} \ No newline at end of file diff --git a/apps/website/ui/Input.tsx b/apps/website/ui/Input.tsx new file mode 100644 index 000000000..6fafdbccf --- /dev/null +++ b/apps/website/ui/Input.tsx @@ -0,0 +1,17 @@ +import { forwardRef } from 'react'; + +interface InputProps extends React.InputHTMLAttributes { + variant?: 'default' | 'error'; +} + +export const Input = forwardRef( + ({ className = '', variant = 'default', ...props }, ref) => { + const baseClasses = 'px-3 py-2 border rounded-lg text-white bg-deep-graphite focus:outline-none focus:border-primary-blue transition-colors'; + const variantClasses = variant === 'error' ? 'border-racing-red' : 'border-charcoal-outline'; + const classes = `${baseClasses} ${variantClasses} ${className}`; + + return ; + } +); + +Input.displayName = 'Input'; \ No newline at end of file diff --git a/apps/website/ui/LeagueCover.tsx b/apps/website/ui/LeagueCover.tsx new file mode 100644 index 000000000..77e50a6e4 --- /dev/null +++ b/apps/website/ui/LeagueCover.tsx @@ -0,0 +1,27 @@ +/** + * LeagueCover + * + * Pure UI component for displaying league cover images. + * Renders an image with fallback on error. + */ + +export interface LeagueCoverProps { + leagueId: string; + alt: string; + className?: string; +} + +export function LeagueCover({ leagueId, alt, className = '' }: LeagueCoverProps) { + return ( + // eslint-disable-next-line @next/next/no-img-element + {alt} { + // Fallback to default cover + (e.target as HTMLImageElement).src = '/default-league-cover.png'; + }} + /> + ); +} \ No newline at end of file diff --git a/apps/website/ui/LeagueLogo.tsx b/apps/website/ui/LeagueLogo.tsx new file mode 100644 index 000000000..04c929def --- /dev/null +++ b/apps/website/ui/LeagueLogo.tsx @@ -0,0 +1,30 @@ +/** + * LeagueLogo + * + * Pure UI component for displaying league logos. + * Renders an optimized image with fallback on error. + */ + +import Image from 'next/image'; + +export interface LeagueLogoProps { + leagueId: string; + alt: string; + className?: string; +} + +export function LeagueLogo({ leagueId, alt, className = '' }: LeagueLogoProps) { + return ( + {alt} { + // Fallback to default logo + (e.target as HTMLImageElement).src = '/default-league-logo.png'; + }} + /> + ); +} \ No newline at end of file diff --git a/apps/website/ui/Select.tsx b/apps/website/ui/Select.tsx index 663056c43..72fa243e3 100644 --- a/apps/website/ui/Select.tsx +++ b/apps/website/ui/Select.tsx @@ -22,13 +22,16 @@ export function Select({ options, className = '', }: SelectProps) { + const defaultClasses = 'w-full px-3 py-2 bg-deep-graphite border border-charcoal-outline rounded-lg text-white focus:outline-none focus:border-primary-blue transition-colors'; + const classes = className ? `${defaultClasses} ${className}` : defaultClasses; + return (