mirror of
https://github.com/TheRealOwenRees/echecsfrance.git
synced 2026-11-18 07:22:06 +00:00
Compare commits
17
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
32b98a4da6 | ||
|
|
8269144df9 | ||
|
|
7fb84b5132 | ||
|
|
fefa38fc70 | ||
|
|
06c7418d6f | ||
|
|
63cd7e6de7 | ||
|
|
14e5038ff4 | ||
|
|
3ad0b2779e | ||
|
|
888cd01d7c | ||
|
|
70571a81a2 | ||
|
|
ee854151a3 | ||
|
|
3468d5cd50 | ||
|
|
9662f6d5b0 | ||
|
|
687d335625 | ||
|
|
6f32be40d4 | ||
|
|
6517af51c9 | ||
|
|
9fb78b2f78 |
+1
-1
@@ -1,8 +1,8 @@
|
||||
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
|
||||
|
||||
/.idea/
|
||||
|
||||
/.yarn/
|
||||
/.codegraph/
|
||||
|
||||
# dependencies
|
||||
/node_modules
|
||||
|
||||
+11195
-10337
File diff suppressed because it is too large
Load Diff
+17
-17
@@ -23,9 +23,9 @@
|
||||
"@auth/mongodb-adapter": "^3.5.2",
|
||||
"@headlessui/react": "^2.1.8",
|
||||
"@hookform/resolvers": "^3.9.0",
|
||||
"@infra-blocks/zod-utils": "^0.31.0",
|
||||
"@infra-blocks/zod-utils": "^0.32.0",
|
||||
"@socialgouv/matomo-next": "^1.14.2",
|
||||
"@tanstack/react-query": "^5.29.0",
|
||||
"@tanstack/react-query": "^5.104.2",
|
||||
"@turf/boolean-point-in-polygon": "^7.0.0-alpha.114",
|
||||
"autoprefixer": "^10.4.16",
|
||||
"class-variance-authority": "^0.7.0",
|
||||
@@ -40,16 +40,16 @@
|
||||
"leaflet.smooth_marker_bouncing": "3.0.3",
|
||||
"lodash": "^4.17.21",
|
||||
"mongodb": "^7.0.0",
|
||||
"next": "^16.3.6",
|
||||
"next": "^16.4.4",
|
||||
"next-auth": "^5.0.0-beta.32",
|
||||
"next-intl": "^4.14.7",
|
||||
"next-intl": "^4.14.9",
|
||||
"next-safe-action": "^7.9.3",
|
||||
"nodemailer": "^10.0.12",
|
||||
"react": "^19.3.0",
|
||||
"nodemailer": "^10.1.1",
|
||||
"react": "^19.3.1",
|
||||
"react-date-range": "^2.0.1",
|
||||
"react-datepicker": "^7.4.0",
|
||||
"react-dom": "^19.3.0",
|
||||
"react-hook-form": "^7.46.1",
|
||||
"react-dom": "^19.3.1",
|
||||
"react-hook-form": "^7.90.0",
|
||||
"react-icons": "^5.3.0",
|
||||
"react-input-mask": "^2.0.4",
|
||||
"react-leaflet": "^4.2.1",
|
||||
@@ -57,7 +57,7 @@
|
||||
"react-leaflet-draw": "^0.20.4",
|
||||
"react-select": "^5.7.4",
|
||||
"react-tooltip": "^5.18.0",
|
||||
"serwist": "^9.5.12",
|
||||
"serwist": "^9.5.13",
|
||||
"sharp": "^0.35.5",
|
||||
"superjson": "^2.2.1",
|
||||
"tailwind-merge": "^2.0.0",
|
||||
@@ -65,27 +65,27 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@headlessui/tailwindcss": "^0.2.1",
|
||||
"@next/bundle-analyzer": "^16.3.6",
|
||||
"@serwist/next": "^9.5.12",
|
||||
"@next/bundle-analyzer": "^16.4.4",
|
||||
"@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": "^6.1.2",
|
||||
"@testing-library/jest-dom": "^7.0.1",
|
||||
"@types/leaflet": "^1.9.12",
|
||||
"@types/lodash": "^4.14.195",
|
||||
"@types/node": "^24.19.0",
|
||||
"@types/lodash": "^4.17.26",
|
||||
"@types/node": "^26.6.5",
|
||||
"@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",
|
||||
"oxlint": "^1.89.0",
|
||||
"patch-package": "^8.0.1",
|
||||
"postcss": "^8.4.47",
|
||||
"postcss": "^8.5.29",
|
||||
"tailwindcss": "^3.3.5",
|
||||
"typescript": "^7.0.2",
|
||||
"vite": "8.3.2",
|
||||
"vite": "8.3.4",
|
||||
"vitest": "^5.0.3"
|
||||
},
|
||||
"packageManager": "yarn@1.22.22+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610"
|
||||
|
||||
@@ -33,7 +33,7 @@ export default function Contact() {
|
||||
<p>
|
||||
{t.rich("cookiesInfo", {
|
||||
link: (str) => (
|
||||
<a href="https://tinyanalytics.io" target="_blank" rel="noopener noreferrer">
|
||||
<a href="https://matomo.org" target="_blank" rel="noopener noreferrer">
|
||||
{str}
|
||||
</a>
|
||||
),
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
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,7 +4,6 @@ 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";
|
||||
@@ -37,7 +36,7 @@ export const TournamentMarker = forwardRef<MarkerRef, TournamentMarkerProps>(
|
||||
[],
|
||||
);
|
||||
|
||||
const { date, latLng, groupId, timeControl } = tournamentGroup[0];
|
||||
const { startDate, endDate, latLng, groupId, timeControl } = tournamentGroup[0];
|
||||
|
||||
const setHoveredMapId = useSetAtom(debouncedHoveredMapIdAtom);
|
||||
|
||||
@@ -58,9 +57,6 @@ export const TournamentMarker = forwardRef<MarkerRef, TournamentMarkerProps>(
|
||||
[timeControl],
|
||||
);
|
||||
|
||||
const startDate = date;
|
||||
const endDate = last(tournamentGroup)!.date;
|
||||
|
||||
return (
|
||||
<Marker
|
||||
ref={markerRef}
|
||||
@@ -74,10 +70,7 @@ 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>
|
||||
{date}
|
||||
{endDate !== startDate && ` - ${endDate}`}
|
||||
</b>
|
||||
<b>{startDate !== endDate ? `${startDate} -> ${endDate}` : startDate}</b>
|
||||
|
||||
<div className="flex flex-col gap-0">
|
||||
{tournamentGroup.map((tournament) => (
|
||||
|
||||
@@ -25,6 +25,7 @@ import { useBreakpoint } from "@/hooks/tailwind";
|
||||
import useDatePickerWidth from "@/hooks/useDatePickerWidth";
|
||||
import { DatePickerDirection } from "@/types";
|
||||
|
||||
import DurationFilter from "./DurationFilter";
|
||||
import TimeControlFilters from "./TimeControlFilters";
|
||||
|
||||
const TournamentTable = () => {
|
||||
@@ -75,6 +76,7 @@ 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={{
|
||||
@@ -89,6 +91,8 @@ const TournamentTable = () => {
|
||||
onClick={handleDatePickerClick}
|
||||
/>
|
||||
|
||||
<DurationFilter />
|
||||
|
||||
<div className="flex text-gray-900 dark:text-white">
|
||||
<label>
|
||||
<input
|
||||
|
||||
@@ -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 { TimeControl, Tournament, tcMap } from "@/types";
|
||||
import { tcMap, TimeControl, Tournament } 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 === false) {
|
||||
if (!result.success) {
|
||||
console.log(JSON.stringify(result, null, 2));
|
||||
console.log(JSON.stringify(t, null, 2));
|
||||
|
||||
@@ -93,7 +93,7 @@ const getTournaments = async () => {
|
||||
}
|
||||
}
|
||||
|
||||
return result.success === false;
|
||||
return !result.success;
|
||||
});
|
||||
|
||||
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
|
||||
const dateRanges = tournaments.reduce<Date[][]>(
|
||||
dateRangesByLocation[location] = tournaments.reduce<Date[][]>(
|
||||
(acc, tournament) => {
|
||||
const group = acc[acc.length - 1];
|
||||
const date = parse(tournament.date, "dd/MM/yyyy", new Date());
|
||||
@@ -122,8 +122,6 @@ const getTournaments = async () => {
|
||||
},
|
||||
[[]],
|
||||
);
|
||||
|
||||
dateRangesByLocation[location] = dateRanges;
|
||||
}
|
||||
|
||||
return goodData.map<Tournament>((t) => {
|
||||
@@ -137,6 +135,11 @@ 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,
|
||||
@@ -151,6 +154,9 @@ 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) {
|
||||
@@ -162,8 +168,7 @@ const getTournaments = async () => {
|
||||
export default async function Tournaments() {
|
||||
const tournaments = await unstable_cache(
|
||||
async () => {
|
||||
const data = await getTournaments();
|
||||
return data;
|
||||
return getTournaments();
|
||||
},
|
||||
["tournaments"],
|
||||
{
|
||||
|
||||
@@ -41,6 +41,9 @@ 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);
|
||||
@@ -69,14 +72,23 @@ 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) ||
|
||||
|
||||
@@ -82,7 +82,7 @@
|
||||
"searchLabel": "Search",
|
||||
"searchPlaceholder": "Search",
|
||||
"syncWithMapOption": "Only tournaments visible in the map view",
|
||||
"normsOnly": "Only norm tournaments",
|
||||
"normsOnly": "Norms tournaments",
|
||||
"noneFound": "No tournaments found",
|
||||
"date": "Date",
|
||||
"town": "Town",
|
||||
@@ -91,7 +91,11 @@
|
||||
"timeControl": "Time Control",
|
||||
"approx": "Geo-location is approximative",
|
||||
"norm": "Norm Tournament",
|
||||
"clearButton": "Clear"
|
||||
"clearButton": "Clear",
|
||||
"durationAny": "Any",
|
||||
"duration1Day": "1 day",
|
||||
"duration2Days": "2 days",
|
||||
"duration3PlusDays": "3+ days"
|
||||
},
|
||||
|
||||
"Clubs": {
|
||||
@@ -319,7 +323,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>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.",
|
||||
"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.",
|
||||
"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."
|
||||
}
|
||||
|
||||
@@ -81,7 +81,7 @@
|
||||
"searchLabel": "Rechercher",
|
||||
"searchPlaceholder": "Rechercher",
|
||||
"syncWithMapOption": "Seuls les tournois visibles dans la vue carte",
|
||||
"normsOnly": "Uniquement tournois à normes",
|
||||
"normsOnly": "Tournois à normes",
|
||||
"noneFound": "Pas de tournois trouvé",
|
||||
"date": "Date",
|
||||
"town": "Ville",
|
||||
@@ -90,7 +90,11 @@
|
||||
"timeControl": "Cadence",
|
||||
"approx": "Géolocalisation approximative",
|
||||
"norm": "Tournoi à norme",
|
||||
"clearButton": "Effacer"
|
||||
"clearButton": "Effacer",
|
||||
"durationAny": "Tous",
|
||||
"duration1Day": "1 jour",
|
||||
"duration2Days": "2 jours",
|
||||
"duration3PlusDays": "3+ jours"
|
||||
},
|
||||
|
||||
"Clubs": {
|
||||
@@ -320,7 +324,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>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.",
|
||||
"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.",
|
||||
"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."
|
||||
}
|
||||
|
||||
@@ -25,6 +25,9 @@ export type Tournament = {
|
||||
norm: boolean;
|
||||
pending: boolean;
|
||||
status: Status;
|
||||
startDate: string;
|
||||
endDate: string;
|
||||
durationDays: number;
|
||||
};
|
||||
|
||||
export const tcMap: Record<TournamentModel["time_control"], TimeControl> = {
|
||||
|
||||
Reference in New Issue
Block a user