Compare commits

..
48 changed files with 11202 additions and 11985 deletions
-12
View File
@@ -1,12 +0,0 @@
version: 2
updates:
- package-ecosystem: npm
directory: /
schedule: { interval: weekly }
open-pull-requests-limit: 10
groups:
react: { patterns: ["react", "react-dom", "@types/react", "@types/react-dom"] }
next: { patterns: ["next", "@next/*", "@serwist/*", "serwist"] }
types: { patterns: ["@types/*"] }
leaflet: { patterns: ["leaflet", "leaflet-*", "react-leaflet*", "@types/leaflet"] }
labels: ["dependencies"]
-19
View File
@@ -1,19 +0,0 @@
name: CI
on:
pull_request:
push:
branches: [main]
jobs:
check:
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- uses: actions/checkout@v7
- uses: actions/setup-node@v7
with:
node-version-file: .nvmrc
cache: yarn
- run: yarn install --frozen-lockfile
- run: yarn verify
+1 -1
View File
@@ -1,8 +1,8 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
/.idea/
/.yarn/
/.codegraph/
# dependencies
/node_modules
+1 -1
View File
@@ -1 +1 @@
24
22.18
+2 -2
View File
@@ -24,8 +24,8 @@ et est déployé sur [Vercel](https://vercel.com/)
## Plugins VSCode requis
- Oxlint
- Oxfmt
- ESLint
- Prettier - Formateur de code
## Plugins VSCode recommandés
+2 -2
View File
@@ -24,8 +24,8 @@ and is deployed on [Vercel](https://vercel.com/)
## Required VSCode plugins
- Oxlint
- Oxfmt
- ESLint
- Prettier - Code formatter
## Recommended VSCode plugins
Vendored
-2
View File
@@ -1,5 +1,3 @@
/// <reference types="next/image-types/global" />
// Use type safe message keys with `next-intl`
type Messages = typeof import("./src/messages/fr.json");
+2 -15
View File
@@ -1,19 +1,6 @@
{
"$schema": "https://unpkg.com/knip@6/schema.json",
"ignore": ["src/app/sw.ts", "src/i18n.ts", "src/__tests__/clubs/helpers/clubData.ts"],
"ignoreDependencies": [
"leaflet.markercluster",
"serwist",
"sharp",
"superjson",
"@swc-jotai/react-refresh",
"@testing-library/jest-dom",
"@headlessui/tailwindcss",
"@next/bundle-analyzer",
"@serwist/next",
"oxfmt",
"oxlint",
"vitest"
],
"ignore": [],
"ignoreDependencies": [],
"tags": ["-lintignore"]
}
+10304 -11162
View File
File diff suppressed because it is too large Load Diff
+30 -33
View File
@@ -3,53 +3,58 @@
"version": "0.1.0",
"private": true,
"scripts": {
"test": "vitest",
"test:ci": "vitest run",
"test:coverage": "vitest --coverage",
"test": "vitest --config vitetest.config.ts",
"dev": "next dev",
"build": "next build --webpack",
"start": "next start",
"lint": "oxlint",
"typeCheck": "tsc -p ./tsconfig.json --incremental false",
"typeCheck": "tsc -p ./tsconfig.json",
"postinstall": "patch-package",
"format": "oxfmt --check",
"format:fix": "oxfmt",
"knip": "knip",
"knip:prod": "knip --production",
"knip:ci": "knip --production --cache",
"verify": "yarn format && yarn lint && yarn typeCheck && yarn test:ci && yarn knip && yarn knip:prod"
"knip:ci": "knip --production --cache"
},
"dependencies": {
"@auth/mongodb-adapter": "^3.5.2",
"@headlessui/react": "^2.1.8",
"@headlessui/tailwindcss": "^0.2.1",
"@hookform/resolvers": "^3.9.0",
"@infra-blocks/zod-utils": "^0.32.0",
"@infra-blocks/zod-utils": "^0.4.2",
"@next/bundle-analyzer": "^16.3.6",
"@serwist/next": "^9.5.12",
"@socialgouv/matomo-next": "^1.14.2",
"@tanstack/react-query": "^5.104.2",
"@tanstack/react-query": "^5.29.0",
"@turf/boolean-point-in-polygon": "^7.0.0-alpha.114",
"@types/node": "^22.7.2",
"autoprefixer": "^10.4.16",
"class-variance-authority": "^0.7.0",
"date-fns": "^4.1.0",
"geojson": "^0.5.0",
"jotai": "^2.6.1",
"knip": "^6.38.0",
"leaflet": "^1.9.4",
"leaflet-defaulticon-compatibility": "^0.1.2",
"leaflet-draw": "^1.0.4",
"leaflet-gesture-handling": "^1.2.2",
"leaflet.markercluster": "^1.5.3",
"leaflet.smooth_marker_bouncing": "3.1.1",
"leaflet.smooth_marker_bouncing": "3.0.3",
"lodash": "^4.17.21",
"mongodb": "^7.0.0",
"next": "^16.4.3",
"next": "^16.3.6",
"next-auth": "^5.0.0-beta.32",
"next-intl": "^4.14.9",
"next-intl": "^4.14.7",
"next-safe-action": "^7.9.3",
"nodemailer": "^10.1.1",
"react": "^19.3.1",
"nodemailer": "^6.9.12",
"oxfmt": "^0.71.0",
"oxlint": "^1.86.0",
"postcss": "^8.4.47",
"react": "^19.3.0",
"react-date-range": "^2.0.1",
"react-datepicker": "^7.4.0",
"react-dom": "^19.3.1",
"react-hook-form": "^7.90.0",
"react-dom": "^19.3.0",
"react-hook-form": "^7.46.1",
"react-icons": "^5.3.0",
"react-input-mask": "^2.0.4",
"react-leaflet": "^4.2.1",
@@ -57,36 +62,28 @@
"react-leaflet-draw": "^0.20.4",
"react-select": "^5.7.4",
"react-tooltip": "^5.18.0",
"serwist": "^9.5.13",
"sharp": "^0.35.5",
"serwist": "^9.5.12",
"sharp": "^0.33.0",
"superjson": "^2.2.1",
"tailwind-merge": "^2.0.0",
"zod": "^4.6.5"
"tailwindcss": "^3.3.5",
"typescript": "^5.3.3",
"vitest": "^4.0.12",
"zod": "^3.22.4"
},
"devDependencies": {
"@headlessui/tailwindcss": "^0.2.1",
"@next/bundle-analyzer": "^16.4.3",
"@serwist/next": "^9.5.13",
"@swc-jotai/react-refresh": "^0.2.0",
"@tailwindcss/forms": "^0.5.4",
"@tailwindcss/typography": "^0.5.15",
"@testing-library/jest-dom": "^7.0.1",
"@testing-library/jest-dom": "^6.1.2",
"@types/leaflet": "^1.9.12",
"@types/lodash": "^4.17.26",
"@types/node": "^26.6.5",
"@types/lodash": "^4.14.195",
"@types/nodemailer": "^6.4.8",
"@types/react": "^19.3.0",
"@types/react-date-range": "^1.4.9",
"@types/react-dom": "^19.3.0",
"@types/react-input-mask": "^3.0.2",
"knip": "^6.38.0",
"oxfmt": "^0.71.0",
"oxlint": "^1.86.0",
"patch-package": "^8.0.1",
"postcss": "^8.5.29",
"tailwindcss": "^3.3.5",
"typescript": "^7.0.2",
"vite": "8.3.4",
"vitest": "^5.0.3"
"patch-package": "^8.0.1"
},
"packageManager": "yarn@1.22.22+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610"
}
+12
View File
@@ -1,5 +1,7 @@
import { describe, expect, test } from "vitest";
import { IClub, filterClubsByManualEntry } from "@/utils/clubFilters";
import { clubData } from "./helpers/clubData";
describe("clubs", () => {
@@ -10,6 +12,11 @@ describe("clubs", () => {
expect(originalLength).toEqual(filteredLength);
});
test("contains manually entered club non-pending", () => {
const containsManuallyEnteredClub = clubData.some((club) => club.manual_entry);
expect(containsManuallyEnteredClub).toBeTruthy;
});
test("manual entered club filters out auto-generated club of same name", () => {
const duplicateClubNames: Set<string> = new Set(clubData.map((club) => club.name));
@@ -22,6 +29,11 @@ describe("clubs", () => {
}
const filteredData: IClub[] = filterClubsByManualEntry(clubData);
const hasManualEnteredClubs = filteredData.some((club) => club.manual_entry && !club.pending);
expect(filteredData.length).toEqual(clubData.length - duplicateClubNames.size);
expect(hasManualEnteredClubs).toBeTruthy;
});
});
@@ -63,7 +63,6 @@ export const ManualEloForm = () => {
storage: window.localStorage,
});
// oxlint-disable-next-line no-unused-vars
const onSubmit = async (data: EloFormValues) => {};
const [currentElo, kFactor, games] = form.watch(["currentElo", "kFactor", "games"]);
+1 -1
View File
@@ -33,7 +33,7 @@ export default function Contact() {
<p>
{t.rich("cookiesInfo", {
link: (str) => (
<a href="https://matomo.org" target="_blank" rel="noopener noreferrer">
<a href="https://tinyanalytics.io" target="_blank" rel="noopener noreferrer">
{str}
</a>
),
@@ -1,50 +0,0 @@
import { useAtom, useAtomValue } from "jotai";
import { useTranslations } from "next-intl";
import { twMerge } from "tailwind-merge";
import {
DurationFilter as DurationFilterValue,
durationFilterAtom,
tournamentsAtom,
} from "@/atoms";
const DurationFilter = () => {
const t = useTranslations("Tournaments");
const tournaments = useAtomValue(tournamentsAtom);
const [durationFilter, setDurationFilter] = useAtom(durationFilterAtom);
const show3Plus = tournaments.some((tt) => tt.durationDays >= 3);
const options: { value: DurationFilterValue; label: string }[] = [
{ value: "any", label: t("durationAny") },
{ value: "1", label: t("duration1Day") },
{ value: "2", label: t("duration2Days") },
...(show3Plus ? [{ value: "3+" as const, label: t("duration3PlusDays") }] : []),
];
return (
<div className="flex flex-wrap items-center gap-1">
{options.map(({ value, label }) => {
const isActive = durationFilter === value;
return (
<button
key={value}
type="button"
aria-pressed={isActive}
onClick={() => setDurationFilter(value)}
className={twMerge(
"rounded-full border px-3 py-1 text-sm transition-colors focus:outline-none",
isActive
? "border-primary bg-primary text-white"
: "border-gray-400 text-gray-600 hover:border-primary hover:text-primary dark:border-gray-600 dark:text-gray-300 dark:hover:text-primary",
)}
>
{label}
</button>
);
})}
</div>
);
};
export default DurationFilter;
@@ -4,6 +4,7 @@ import { forwardRef, useImperativeHandle, useMemo, useRef } from "react";
import { useSetAtom } from "jotai";
import L from "leaflet";
import { last } from "lodash";
import { useTranslations } from "next-intl";
import { FaTrophy } from "react-icons/fa";
import { Marker, MarkerProps, Popup } from "react-leaflet";
@@ -36,7 +37,7 @@ export const TournamentMarker = forwardRef<MarkerRef, TournamentMarkerProps>(
[],
);
const { startDate, endDate, latLng, groupId, timeControl } = tournamentGroup[0];
const { date, latLng, groupId, timeControl } = tournamentGroup[0];
const setHoveredMapId = useSetAtom(debouncedHoveredMapIdAtom);
@@ -57,6 +58,9 @@ export const TournamentMarker = forwardRef<MarkerRef, TournamentMarkerProps>(
[timeControl],
);
const startDate = date;
const endDate = last(tournamentGroup)!.date;
return (
<Marker
ref={markerRef}
@@ -70,7 +74,10 @@ export const TournamentMarker = forwardRef<MarkerRef, TournamentMarkerProps>(
>
<Popup maxWidth={10000}>
<div className="flex max-w-[calc(100vw-80px)] flex-col gap-3 lg:max-w-[calc(100vw/2-80px)]">
<b>{startDate !== endDate ? `${startDate} -> ${endDate}` : startDate}</b>
<b>
{date}
{endDate !== startDate && ` - ${endDate}`}
</b>
<div className="flex flex-col gap-0">
{tournamentGroup.map((tournament) => (
@@ -25,7 +25,6 @@ import { useBreakpoint } from "@/hooks/tailwind";
import useDatePickerWidth from "@/hooks/useDatePickerWidth";
import { DatePickerDirection } from "@/types";
import DurationFilter from "./DurationFilter";
import TimeControlFilters from "./TimeControlFilters";
const TournamentTable = () => {
@@ -76,7 +75,6 @@ const TournamentTable = () => {
<div className="z-10 flex w-full flex-wrap items-center justify-start gap-3 p-3">
<div className="flex w-full flex-col gap-3 sm:flex-row">
<SearchBar className="w-full sm:w-auto" />
<RegionSelect
syncTitle={t("syncWithMapOption")}
classNameOverrides={{
@@ -91,8 +89,6 @@ const TournamentTable = () => {
onClick={handleDatePickerClick}
/>
<DurationFilter />
<div className="flex text-gray-900 dark:text-white">
<label>
<input
+8 -13
View File
@@ -7,7 +7,7 @@ import { unstable_cache } from "next/cache";
import { baseUrl } from "@/constants";
import { tournamentModelSchema } from "@/server/models/tournamentModel";
import { collections, dbConnect } from "@/server/mongodb";
import { tcMap, TimeControl, Tournament } from "@/types";
import { TimeControl, Tournament, tcMap } from "@/types";
import { errorLog } from "@/utils/logger";
import TournamentsDisplay from "./TournamentsDisplay";
@@ -65,7 +65,7 @@ const getTournaments = async () => {
const bad = data.filter((t) => {
const result = tournamentModelSchema.safeParse(t);
if (!result.success) {
if (result.success === false) {
console.log(JSON.stringify(result, null, 2));
console.log(JSON.stringify(t, null, 2));
@@ -93,7 +93,7 @@ const getTournaments = async () => {
}
}
return !result.success;
return result.success === false;
});
const badIds = bad.map((t) => t._id.toString());
@@ -108,7 +108,7 @@ const getTournaments = async () => {
const tournaments = groupedByLocation[location];
// Note that this works since the tournaments are sorted by date
dateRangesByLocation[location] = tournaments.reduce<Date[][]>(
const dateRanges = tournaments.reduce<Date[][]>(
(acc, tournament) => {
const group = acc[acc.length - 1];
const date = parse(tournament.date, "dd/MM/yyyy", new Date());
@@ -122,6 +122,8 @@ const getTournaments = async () => {
},
[[]],
);
dateRangesByLocation[location] = dateRanges;
}
return goodData.map<Tournament>((t) => {
@@ -135,11 +137,6 @@ const getTournaments = async () => {
const timeControl = tcMap[t.time_control] ?? TimeControl.Other;
const groupId = `${location}_${rangeIndex}_${timeControl}`;
// calculate duration of the tournament in days, parsing the French locale date
const startDateISO = parse(t.start_date, "dd/MM/yyyy", new Date());
const endDateISO = parse(t.end_date, "dd/MM/yyyy", new Date());
const durationDays = differenceInDays(endDateISO, startDateISO) + 1;
return {
id: t._id.toString(),
ffeId: t.tournament_id,
@@ -154,9 +151,6 @@ const getTournaments = async () => {
norm: t.norm_tournament ?? false,
pending: t.pending ?? false,
status: t.status,
startDate: t.start_date,
endDate: t.end_date,
durationDays,
};
});
} catch (error) {
@@ -168,7 +162,8 @@ const getTournaments = async () => {
export default async function Tournaments() {
const tournaments = await unstable_cache(
async () => {
return getTournaments();
const data = await getTournaments();
return data;
},
["tournaments"],
{
@@ -12,12 +12,12 @@ import { Zone } from "@/server/myZones";
const center: LatLngLiteral = { lat: 47.0844, lng: 2.3964 };
type ZoneThumbnailProps = {
export type ZoneThumbnailProps = {
features: Zone["features"];
className?: string;
};
const ZoneThumbnail = ({ features, className }: ZoneThumbnailProps) => {
export const ZoneThumbnail = ({ features, className }: ZoneThumbnailProps) => {
return (
<MapContainer
center={center}
+1 -2
View File
@@ -1,4 +1,4 @@
import { type ReactNode, Suspense } from "react";
import { ReactNode, Suspense } from "react";
import { NextIntlClientProvider } from "next-intl";
import { getTranslations } from "next-intl/server";
@@ -54,7 +54,6 @@ export default async function RootLayout({
let messages;
try {
messages = (await import(`@/messages/${locale}.json`)).default;
// oxlint-disable-next-line no-unused-vars
} catch (error) {
notFound();
}
-12
View File
@@ -41,9 +41,6 @@ export const searchStringAtom = atom("");
export const tournamentsAtom = atom<Tournament[]>([]);
export const normsOnlyAtom = atom(false);
export type DurationFilter = "any" | "1" | "2" | "3+";
export const durationFilterAtom = atom<DurationFilter>("any");
export const classicAtom = atom(true);
export const rapidAtom = atom(true);
export const blitzAtom = atom(true);
@@ -72,23 +69,14 @@ export const filteredTournamentsByTimeControlAndZoneAtom = atom((get) => {
const dateRange = get(dateRangeAtom);
const { startDate, endDate } = dateRange[0];
const durationFilter = get(durationFilterAtom);
const filterByTimeControl = tournaments.filter((tournament) => {
const tournamentDate = startOfDay(parse(tournament.date, "dd/MM/yyyy", new Date()));
const durationMatch =
durationFilter === "any" ||
(durationFilter === "1" && tournament.durationDays === 1) ||
(durationFilter === "2" && tournament.durationDays === 2) ||
(durationFilter === "3+" && tournament.durationDays >= 3);
return (
!isBefore(tournamentDate, startDate) &&
(endDate === undefined || !isAfter(tournamentDate, endDate)) &&
!tournament.pending &&
tournament.status === "scheduled" &&
durationMatch &&
((tournament.timeControl === TimeControl.Classic && classic) ||
(tournament.timeControl === TimeControl.Rapid && rapid) ||
(tournament.timeControl === TimeControl.Blitz && blitz) ||
+2 -3
View File
@@ -1,4 +1,3 @@
import { type ComponentProps } from "react";
import { type VariantProps, cva } from "class-variance-authority";
import { twMerge } from "tailwind-merge";
@@ -43,8 +42,8 @@ export const buttonVariants = cva("flex items-center justify-center transition-a
},
});
type ButtonVariants = VariantProps<typeof buttonVariants>;
export type ButtonProps = ComponentProps<"button"> & ButtonVariants;
export type ButtonVariants = VariantProps<typeof buttonVariants>;
export type ButtonProps = React.ComponentProps<"button"> & ButtonVariants;
export const Button = ({
className,
+3
View File
@@ -1,6 +1,9 @@
import { useTranslations } from "next-intl";
import { Spinner } from "./Spinner";
const LoadingMap = () => {
const t = useTranslations("Tournaments");
return (
<div className="mt-20 flex h-content justify-center bg-white pt-20 text-center text-gray-900 dark:bg-gray-800 dark:text-white">
<Spinner />
+3 -1
View File
@@ -29,7 +29,7 @@ export const MapEvents = ({
const t = useTranslations("Map");
const map = useMap();
const setMapBounds = useSetAtom(mapBoundsAtom);
const [_isPending, startTransition] = useTransition();
const [isPending, startTransition] = useTransition();
useMapEvent("moveend", () => {
if (!updateMapBoundsAtom) return;
@@ -46,7 +46,9 @@ export const MapEvents = ({
map.setView(bounds.getCenter(), zoom === Infinity ? 10 : zoom);
map.setMaxBounds(worldBounds);
map.options.maxBoundsViscosity = 1.0; // Prevents going past bounds while dragging
map.addHandler("gestureHandling", GestureHandling);
map.gestureHandling?.enable();
}, [bounds, map]);
+2 -2
View File
@@ -3,6 +3,7 @@ import { useTransition } from "react";
import { useAtom } from "jotai/index";
import { useTranslations } from "next-intl";
import { IoCloseOutline } from "react-icons/io5";
import { twMerge } from "tailwind-merge";
import { searchStringAtom } from "@/atoms";
@@ -13,11 +14,10 @@ type SearchBarProps = {
className?: string;
};
// oxlint-disable-next-line no-unused-vars
const SearchBar = ({ className }: SearchBarProps) => {
const t = useTranslations("Tournaments");
const [searchString, setSearchString] = useAtom(searchStringAtom);
const [_isPending, startTransition] = useTransition();
const [isPending, startTransition] = useTransition();
const updateSearchString = (str: string) => {
startTransition(() => {
+2 -2
View File
@@ -55,7 +55,7 @@ export const AsyncSelectField = <
}: AsyncSelectFieldProps<TFieldValues, TFieldName, IsMulti, T, D>) => {
const t = useTranslations("App");
const [loadingValues, setLoadingValues] = useState(false);
const [_loadedInitialValues, setLoadedInitialValues] = useState(false);
const [loadedInitialValues, setLoadedInitialValues] = useState(false);
const [loadingOptions, setLoadingOptions] = useState(false);
const valueOptions = useRef<BaseOption<T, D>[]>([]);
const searchOptions = useRef<BaseOption<T, D>[]>([]);
@@ -69,7 +69,7 @@ export const AsyncSelectField = <
const values = !value ? [] : isArray(value) ? value : [value];
const unFetchedValues = values.filter(
() => valueOptions.current.find((o) => o.value === value) === undefined,
(v) => valueOptions.current.find((o) => o.value === value) === undefined,
);
if (unFetchedValues.length > 0) {
@@ -21,13 +21,12 @@ export const InputDatePicker = forwardRef<HTMLInputElement, AllProps>(
(
{
error,
// oxlint-disable-next-line no-unused-vars
className,
// oxlint-disable-next-line no-unused-vars
children,
inputContainerClass,
inputClass,
mask,
...props
},
inputRef,
+3 -1
View File
@@ -1,4 +1,4 @@
import { useRef } from "react";
import React, { useRef } from "react";
import { getYear, isValid, parse } from "date-fns";
import fr from "date-fns/locale/fr";
@@ -40,8 +40,10 @@ export const DateField = <
dateFormat = "dd/MM/yyyy",
className,
datePickerPopperClass,
name,
control,
required,
...otherFieldProps
}: DateFieldProps<TFieldValues, TFieldName>) => {
const locale = useLocale();
+11 -3
View File
@@ -1,15 +1,23 @@
import type { ReactNode } from "react";
import React from "react";
import { Switch, SwitchProps } from "@headlessui/react";
import { twMerge } from "tailwind-merge";
export const InlineSwitch = (
props: {
label?: ReactNode;
label?: React.ReactNode;
tooltip?: string;
tooltipId?: string;
} & SwitchProps<"button">,
) => {
const { label, disabled, ...rest } = props;
const {
label,
tooltip,
tooltipId,
disabled,
...rest
} = props;
return (
<Switch.Group>
@@ -1,6 +1,11 @@
import React from "react";
import { SwitchProps } from "@headlessui/react";
import { Controller, FieldPath, FieldValues } from "react-hook-form";
import { twMerge } from "tailwind-merge";
import { Field, GenericFieldProps } from "@/components/form/Field";
import { InlineSwitch } from "./InlineSwitch";
type InlineSwitchFieldProps<
+4 -5
View File
@@ -1,4 +1,3 @@
import type { ComponentProps, ReactNode } from "react";
import { VariantProps, cva } from "class-variance-authority";
import { twMerge } from "tailwind-merge";
@@ -27,12 +26,12 @@ export const inputVariants = cva(
},
);
type InputVariants = VariantProps<typeof inputVariants>;
export type InputProps = Omit<ComponentProps<"input">, "size"> &
export type InputVariants = VariantProps<typeof inputVariants>;
export type InputProps = Omit<React.ComponentProps<"input">, "size"> &
Omit<InputVariants, "state"> & {
hasError?: boolean;
startIcon?: ReactNode;
endIcon?: ReactNode;
startIcon?: React.ReactNode;
endIcon?: React.ReactNode;
};
export const Input = ({
+4 -4
View File
@@ -1,16 +1,16 @@
import type { LabelHTMLAttributes, ReactNode, DetailedHTMLProps } from "react";
import { twMerge } from "tailwind-merge";
import { Prettify } from "@/types";
type LabelProps = Prettify<
DetailedHTMLProps<LabelHTMLAttributes<HTMLLabelElement>, HTMLLabelElement> & {
React.DetailedHTMLProps<React.LabelHTMLAttributes<HTMLLabelElement>, HTMLLabelElement> & {
required?: boolean;
className?: string;
tooltip?: ReactNode;
tooltip?: React.ReactNode;
}
>;
export const Label = ({ required, className, children, ...labelProps }: LabelProps) => {
export const Label = ({ required, className, children, tooltip, ...labelProps }: LabelProps) => {
return (
<label
{...labelProps}
+11 -2
View File
@@ -1,12 +1,16 @@
import React from "react";
import { RadioGroup } from "@headlessui/react";
import { isNil } from "lodash";
import { useTranslations } from "next-intl";
import { Controller, FieldPath, FieldValues, useFormContext } from "react-hook-form";
import { twMerge } from "tailwind-merge";
import { Prettify } from "@/types";
import { Field, GenericFieldProps } from "./Field";
type BaseOption<T = string, D = unknown> = {
export type BaseOption<T = string, D = unknown> = {
value: T;
label: string | React.JSX.Element;
disabled?: boolean;
@@ -42,13 +46,16 @@ export const RadioGroupField = <
options,
}: RadioGroupFieldProps<TFieldValues, TFieldName, T, D>) => {
const t = useTranslations("App");
const form = useFormContext<TFieldValues>();
const {
// oxlint-disable-next-line no-unused-vars
formState: { errors },
} = form;
const valueToOption = (value: T): BaseOption<T, D> =>
options.find((o) => o.value === value) ?? { value, label: "" };
return (
<Field
{...{
@@ -66,6 +73,8 @@ export const RadioGroupField = <
name={name}
control={control}
render={({ field: { onChange, value } }) => {
const optionValue = isNil(value) ? null : valueToOption(value);
return (
<RadioGroup
value={value}
+1 -1
View File
@@ -18,7 +18,7 @@ export type ZoneEditorProps = {
onChange: (geoJson: FeatureCollection) => void;
};
const ZoneEditor = ({ value, onChange }: ZoneEditorProps) => {
export const ZoneEditor = ({ value, onChange }: ZoneEditorProps) => {
const initialFeatures = React.useRef(value?.features);
const featureGroup = React.useRef<L.FeatureGroup | null>(null);
+4 -2
View File
@@ -14,7 +14,7 @@ const isSSR =
const isBrowser = !isSSR;
const useIsomorphicEffect = isBrowser ? useLayoutEffect : useEffect;
type CreatorReturnType = {
export type CreatorReturnType = {
useBreakpoint<B>(breakpoint: B, defaultValue?: boolean): boolean;
useBreakpointEffect<B>(breakpoint: B, effect: (match: boolean) => void): void;
useBreakpointValue<B, T, U>(breakpoint: B, valid: T, invalid: U): T | U;
@@ -76,4 +76,6 @@ function create(screens: object | undefined) {
} as CreatorReturnType;
}
export const { useBreakpoint } = create(config.theme!.screens);
export const { useBreakpoint, useBreakpointEffect, useBreakpointValue } = create(
config.theme!.screens,
);
-1
View File
@@ -13,7 +13,6 @@ const useDatePickerWidth = ({
const updateDatePickerDirection = () => {
const datePickerWidth = datePickerRef.current?.offsetWidth ?? 0;
const isLg = datePickerWidth >= 680;
// oxlint-disable-next-line no-unused-expressions
isLg ? setDateDirectionState("horizontal") : setDateDirectionState("vertical");
};
updateDatePickerDirection();
+1 -1
View File
@@ -2,7 +2,7 @@ import { useCallback, useEffect } from "react";
import { SetFieldValue } from "react-hook-form";
interface FormPersistConfig {
export interface FormPersistConfig {
storage?: Storage;
watch: (names?: string | string[]) => any;
setValue: SetFieldValue<any>;
+3 -7
View File
@@ -82,7 +82,7 @@
"searchLabel": "Search",
"searchPlaceholder": "Search",
"syncWithMapOption": "Only tournaments visible in the map view",
"normsOnly": "Norms tournaments",
"normsOnly": "Only norm tournaments",
"noneFound": "No tournaments found",
"date": "Date",
"town": "Town",
@@ -91,11 +91,7 @@
"timeControl": "Time Control",
"approx": "Geo-location is approximative",
"norm": "Norm Tournament",
"clearButton": "Clear",
"durationAny": "Any",
"duration1Day": "1 day",
"duration2Days": "2 days",
"duration3PlusDays": "3+ days"
"clearButton": "Clear"
},
"Clubs": {
@@ -323,7 +319,7 @@
"shareTitle": "Data Sharing",
"shareInfo": "We do not share, sell, or provide access to your email address to any third parties. Your information is kept strictly confidential and is only used within our project.",
"cookiesTitle": "Cookies and Tracking",
"cookiesInfo": "We do not track users in an intrusive manner. However, we use <link>Matomo</link>, an anonymous, GDPR-friendly analytics tool, to gather anonymized usage statistics. No personally identifiable information is collected by this tool, and its usage is strictly limited to improving user experience.",
"cookiesInfo": "We do not track users in an intrusive manner. However, we use <link>TinyAnalytics.io</link>, an anonymous, GDPR-friendly analytics tool, to gather anonymized usage statistics. No personally identifiable information is collected by this tool, and its usage is strictly limited to improving user experience.",
"changesTitle": "Changes to This Privacy Policy",
"changesInfo": "We may update this privacy policy from time to time. Any changes will be posted on this page, and we encourage you to review this policy periodically."
}
+3 -7
View File
@@ -81,7 +81,7 @@
"searchLabel": "Rechercher",
"searchPlaceholder": "Rechercher",
"syncWithMapOption": "Seuls les tournois visibles dans la vue carte",
"normsOnly": "Tournois à normes",
"normsOnly": "Uniquement tournois à normes",
"noneFound": "Pas de tournois trouvé",
"date": "Date",
"town": "Ville",
@@ -90,11 +90,7 @@
"timeControl": "Cadence",
"approx": "Géolocalisation approximative",
"norm": "Tournoi à norme",
"clearButton": "Effacer",
"durationAny": "Tous",
"duration1Day": "1 jour",
"duration2Days": "2 jours",
"duration3PlusDays": "3+ jours"
"clearButton": "Effacer"
},
"Clubs": {
@@ -324,7 +320,7 @@
"shareTitle": "Partage de Données",
"shareInfo": "Nous ne partageons, ne vendons ni ne fournissons l'accès à votre adresse email à des tiers. Vos informations sont strictement confidentielles et sont utilisées uniquement dans le cadre de notre projet.",
"cookiesTitle": "Cookies et Suivi",
"cookiesInfo": "Nous ne suivons pas les utilisateurs de manière intrusive. Toutefois, nous utilisons <link>Matomo</link>, un outil d'analyse anonyme et conforme au RGPD (Règlement Général sur la Protection des Données), pour obtenir des statistiques d'utilisation anonymisées. Aucune donnée personnelle identifiable n'est collectée par cet outil, et son utilisation est strictement limitée à des fins d'amélioration de l'expérience utilisateur.",
"cookiesInfo": "Nous ne suivons pas les utilisateurs de manière intrusive. Toutefois, nous utilisons <link>TinyAnalytics.io</link>, un outil d'analyse anonyme et conforme au RGPD (Règlement Général sur la Protection des Données), pour obtenir des statistiques d'utilisation anonymisées. Aucune donnée personnelle identifiable n'est collectée par cet outil, et son utilisation est strictement limitée à des fins d'amélioration de l'expérience utilisateur.",
"changesTitle": "Modifications de Cette Politique de Confidentialité",
"changesInfo": "Nous pouvons mettre à jour cette politique de confidentialité de temps à autre. Toutes les modifications seront publiées sur cette page, et nous vous encourageons à consulter régulièrement cette politique."
}
+7 -7
View File
@@ -4,28 +4,28 @@ import { z } from "zod";
import { TimeControl } from "@/types";
export const contactUsSchema = z.object({
email: z.email(),
email: z.string().email(),
subject: z.string().min(1, { message: "FormValidation.required" }),
message: z.string().min(1, { message: "FormValidation.required" }),
});
export const addClubSchema = z.object({
name: z.string().min(1, { message: "FormValidation.required" }),
email: z.email(),
email: z.string().email(),
message: z.string().optional(),
club: z.object({
name: z.string().min(1, { message: "FormValidation.required" }),
email: z.email().optional(),
email: z.string().email().optional(),
address: z.string().min(1, { message: "FormValidation.required" }),
website: z.url({ message: "FormValidation.url" }).optional(),
website: z.string().url({ message: "FormValidation.url" }).optional(),
coordinates: z.array(z.number()).length(2),
}),
});
export const addTournamentSchema = z.object({
name: z.string().min(1, { message: "FormValidation.required" }),
email: z.email(),
email: z.string().email(),
message: z.string().optional(),
tournament: z.object({
@@ -33,8 +33,8 @@ export const addTournamentSchema = z.object({
town: z.string().min(1, { message: "FormValidation.required" }),
department: z.string().min(1, { message: "FormValidation.required" }),
tournament: z.string().min(1, { message: "FormValidation.required" }),
url: z.url({ message: "FormValidation.url" }),
time_control: z.enum(TimeControl),
url: z.string().url({ message: "FormValidation.url" }),
time_control: z.nativeEnum(TimeControl),
norm_tournament: z.boolean(),
date: z.date(),
coordinates: z.array(z.number()).length(2),
+8 -4
View File
@@ -2,7 +2,7 @@ import { LatLngLiteral } from "leaflet";
import { TournamentModel } from "./server/models/tournamentModel";
type Status = "scheduled" | "ongoing" | "finished" | "in-play";
export type Status = "scheduled" | "ongoing" | "finished" | "in-play";
export enum TimeControl {
Classic = "Classic",
@@ -25,9 +25,6 @@ export type Tournament = {
norm: boolean;
pending: boolean;
status: Status;
startDate: string;
endDate: string;
durationDays: number;
};
export const tcMap: Record<TournamentModel["time_control"], TimeControl> = {
@@ -46,8 +43,15 @@ export type Club = {
latLng: LatLngLiteral;
};
export type ResponseMessage = {
isSuccessful: boolean;
message: string;
};
export type DatePickerDirection = "horizontal" | "vertical";
export type ScrollableElement = Window | HTMLElement;
// Prettify takes a type as its argument and returns a new type that has the same properties as the original type,
// but the properties are not intersected. This means that the new type is easier to read and understand.
// https://gist.github.com/palashmon/db68706d4f26d2dbf187e76409905399
+10
View File
@@ -0,0 +1,10 @@
const formatDate = (inputDate: any) => {
// TODO fix type
const date = new Date(inputDate);
const day = String(date.getDate()).padStart(2, "0");
const month = String(date.getMonth() + 1).padStart(2, "0");
const year = date.getFullYear();
return `${day}/${month}/${year}`;
};
export default formatDate;
+3 -3
View File
@@ -1,6 +1,6 @@
// export const infoLog = (...params: any[]) => {
// console.log(...params);
// };
export const infoLog = (...params: any[]) => {
console.log(...params);
};
export const errorLog = (...params: any[]) => {
console.error(...params);
+10 -9
View File
@@ -1,17 +1,18 @@
import { AuthError } from "next-auth";
import { EmailConfig } from "next-auth/providers/email";
import { getTranslations } from "next-intl/server";
import { createTransport } from "nodemailer";
import type { Transport, TransportOptions } from "nodemailer";
import SMTPTransport from "nodemailer/lib/smtp-transport";
import SMTPPool from "nodemailer/lib/smtp-pool";
import SendmailTransport from "nodemailer/lib/sendmail-transport";
import StreamTransport from "nodemailer/lib/stream-transport";
import JSONTransport from "nodemailer/lib/json-transport";
import SESTransport from "nodemailer/lib/ses-transport";
import * as JSONTransport from "nodemailer/lib/json-transport/index.js";
import * as SendmailTransport from "nodemailer/lib/sendmail-transport/index.js";
import * as SESTransport from "nodemailer/lib/ses-transport/index.js";
import * as SMTPPool from "nodemailer/lib/smtp-pool/index.js";
import * as SMTPTransport from "nodemailer/lib/smtp-transport/index.js";
import * as StreamTransport from "nodemailer/lib/stream-transport/index.js";
type Awaitable<T> = T | PromiseLike<T>;
function html(params: {
export function html(params: {
url: string;
host: string;
t: Awaited<ReturnType<typeof getTranslations<"SignIn">>>;
@@ -43,7 +44,7 @@ function html(params: {
</td>
</tr>
<tr>
<td align="center" style="padding: 20px 0px;">
<td align="center" style="padding: 20px 0;">
<table border="0" cellspacing="0" cellpadding="0">
<tr>
<td align="center" style="border-radius: 5px;" bgcolor="${color.buttonBackground}">
@@ -69,7 +70,7 @@ function html(params: {
}
/** Email Text body (fallback for email clients that don't render HTML, e.g. feature phones) */
function text({
export function text({
url,
host,
t,
+1 -1
View File
@@ -61,4 +61,4 @@ export const routing = defineRouting({
export type Pathnames = keyof typeof routing.pathnames;
export type Locale = (typeof routing.locales)[number];
export const { Link, usePathname, useRouter, getPathname } = createNavigation(routing);
export const { Link, redirect, usePathname, useRouter, getPathname } = createNavigation(routing);
+8
View File
@@ -0,0 +1,8 @@
import { ScrollableElement } from "@/types";
const isBrowser = () => typeof window !== "undefined";
export const handleScrollToTop = (element: ScrollableElement | null) => {
if (!isBrowser()) return;
element?.scrollTo({ top: 0, behavior: "smooth" });
};
+1 -1
View File
@@ -1,6 +1,6 @@
{
"compilerOptions": {
"target": "es2022",
"target": "es5",
"lib": ["dom", "dom.iterable", "esnext"],
"allowJs": true,
"skipLibCheck": true,
+3 -3
View File
@@ -2,12 +2,12 @@ import path from "node:path";
import { defineConfig } from "vitest/config";
export default defineConfig({
test: {
exclude: ["**/node_modules/**", "**/dist/**"],
},
resolve: {
alias: {
"@": path.resolve(__dirname, "./src"),
},
},
test: {
exclude: ["**/node_modules/**", "**/dist/**"],
},
});
+713 -577
View File
File diff suppressed because it is too large Load Diff