auto apply oxfmt rules

This commit is contained in:
2026-09-29 09:03:49 +02:00
parent 3fde18106d
commit 216dc70605
102 changed files with 36939 additions and 27387 deletions
+2 -8
View File
@@ -1,13 +1,7 @@
{ {
"$schema": "./node_modules/oxlint/configuration_schema.json", "$schema": "./node_modules/oxlint/configuration_schema.json",
"ignorePatterns": [ "ignorePatterns": ["**/leaflet.d.ts"],
"**/leaflet.d.ts" "plugins": ["typescript", "unicorn", "oxc"],
],
"plugins": [
"typescript",
"unicorn",
"oxc"
],
"categories": { "categories": {
"correctness": "error" "correctness": "error"
}, },
+4
View File
@@ -5,10 +5,12 @@ When contributing to this repository, please first discuss the change you wish t
## Development Environment Setup ## Development Environment Setup
### Prerequisites ### Prerequisites
- [Yarn](https://classic.yarnpkg.com/lang/en/docs/install/#debian-stable) - [Yarn](https://classic.yarnpkg.com/lang/en/docs/install/#debian-stable)
- [Docker](https://docs.docker.com/engine/install/) - [Docker](https://docs.docker.com/engine/install/)
### Setup ### Setup
1. Fork the repository 1. Fork the repository
2. Clone your fork locally 2. Clone your fork locally
3. Run `yarn` to install dependencies 3. Run `yarn` to install dependencies
@@ -18,11 +20,13 @@ When contributing to this repository, please first discuss the change you wish t
The test data is not persisted between restarts. Create a Docker volume if you wish for this to be the case. The test data is not persisted between restarts. Create a Docker volume if you wish for this to be the case.
### Branching ### Branching
- We use the [GitHub Flow](https://www.gitkraken.com/learn/git/best-practices/git-branch-strategy#github-flow-considerations) branching strategy. - We use the [GitHub Flow](https://www.gitkraken.com/learn/git/best-practices/git-branch-strategy#github-flow-considerations) branching strategy.
- Use `feature/feature-name` as your branch name. - Use `feature/feature-name` as your branch name.
- Non-feature branches are allowed, but please give a clear name to your branch such as `hotfix/fix-bug` - Non-feature branches are allowed, but please give a clear name to your branch such as `hotfix/fix-bug`
## Pull Request Process ## Pull Request Process
1. Squash all your commits into a single commit before pushing your branch 1. Squash all your commits into a single commit before pushing your branch
2. Give a clear overview of your changes in the commit message 2. Give a clear overview of your changes in the commit message
3. When opening a PR, give a clear overview of what your changes are and why 3. When opening a PR, give a clear overview of what your changes are and why
+1 -1
View File
@@ -6,4 +6,4 @@ services:
ports: ports:
- "27017:27017" - "27017:27017"
volumes: volumes:
- ./mongo/init:/docker-entrypoint-initdb.d - ./mongo/init:/docker-entrypoint-initdb.d
+4 -4
View File
@@ -1,6 +1,6 @@
{ {
"$schema": "https://unpkg.com/knip@6/schema.json", "$schema": "https://unpkg.com/knip@6/schema.json",
"ignore": [], "ignore": [],
"ignoreDependencies": [], "ignoreDependencies": [],
"tags": ["-lintignore"] "tags": ["-lintignore"]
} }
+10650 -13552
View File
File diff suppressed because it is too large Load Diff
+11002 -12500
View File
File diff suppressed because it is too large Load Diff
+29 -29
View File
@@ -1,31 +1,31 @@
{ {
"theme_color": "#00A1F0", "theme_color": "#00A1F0",
"background_color": "#00A1F0", "background_color": "#00A1F0",
"display": "standalone", "display": "standalone",
"scope": "/", "scope": "/",
"start_url": "/", "start_url": "/",
"name": "Echecs France", "name": "Echecs France",
"short_name": "Echecs France", "short_name": "Echecs France",
"icons": [ "icons": [
{ {
"src": "/icon-192x192.png", "src": "/icon-192x192.png",
"sizes": "192x192", "sizes": "192x192",
"type": "image/png" "type": "image/png"
}, },
{ {
"src": "/icon-256x256.png", "src": "/icon-256x256.png",
"sizes": "256x256", "sizes": "256x256",
"type": "image/png" "type": "image/png"
}, },
{ {
"src": "/icon-384x384.png", "src": "/icon-384x384.png",
"sizes": "384x384", "sizes": "384x384",
"type": "image/png" "type": "image/png"
}, },
{ {
"src": "/icon-512x512.png", "src": "/icon-512x512.png",
"sizes": "512x512", "sizes": "512x512",
"type": "image/png" "type": "image/png"
} }
] ]
} }
+4 -12
View File
@@ -13,16 +13,12 @@ describe("clubs", () => {
}); });
test("contains manually entered club non-pending", () => { test("contains manually entered club non-pending", () => {
const containsManuallyEnteredClub = clubData.some( const containsManuallyEnteredClub = clubData.some((club) => club.manual_entry);
(club) => club.manual_entry,
);
expect(containsManuallyEnteredClub).toBeTruthy; expect(containsManuallyEnteredClub).toBeTruthy;
}); });
test("manual entered club filters out auto-generated club of same name", () => { test("manual entered club filters out auto-generated club of same name", () => {
const duplicateClubNames: Set<string> = new Set( const duplicateClubNames: Set<string> = new Set(clubData.map((club) => club.name));
clubData.map((club) => club.name),
);
for (const club of clubData) { for (const club of clubData) {
if (duplicateClubNames.has(club.name)) { if (duplicateClubNames.has(club.name)) {
@@ -34,13 +30,9 @@ describe("clubs", () => {
const filteredData: IClub[] = filterClubsByManualEntry(clubData); const filteredData: IClub[] = filterClubsByManualEntry(clubData);
const hasManualEnteredClubs = filteredData.some( const hasManualEnteredClubs = filteredData.some((club) => club.manual_entry && !club.pending);
(club) => club.manual_entry && !club.pending,
);
expect(filteredData.length).toEqual( expect(filteredData.length).toEqual(clubData.length - duplicateClubNames.size);
clubData.length - duplicateClubNames.size,
);
expect(hasManualEnteredClubs).toBeTruthy; expect(hasManualEnteredClubs).toBeTruthy;
}); });
+12 -24
View File
@@ -5,8 +5,7 @@ export const clubData = [
_id: new ObjectId("690586c9e06ce80de6cd7315"), _id: new ObjectId("690586c9e06ce80de6cd7315"),
name: '"Le Gambit "de Muret', name: '"Le Gambit "de Muret',
url: "http://www.echecs.asso.fr/FicheClub.aspx?Ref=1264", url: "http://www.echecs.asso.fr/FicheClub.aspx?Ref=1264",
address: address: "Maison des Associations 5 Sq des Combattants d'Afrique du Nord Salle B3 31600 MURET",
"Maison des Associations 5 Sq des Combattants d'Afrique du Nord Salle B3 31600 MURET",
email: "gambitdemuret@gmail.com", email: "gambitdemuret@gmail.com",
website: "http://www.gambit-de-muret.webou.net", website: "http://www.gambit-de-muret.webou.net",
coordinates: [43.46106289999999, 1.3218611], coordinates: [43.46106289999999, 1.3218611],
@@ -191,8 +190,7 @@ export const clubData = [
_id: new ObjectId("690586c9e06ce80de6cd7336"), _id: new ObjectId("690586c9e06ce80de6cd7336"),
name: "ASSM - Ass sportive St Medard en Jalles", name: "ASSM - Ass sportive St Medard en Jalles",
url: "http://www.echecs.asso.fr/FicheClub.aspx?Ref=3104", url: "http://www.echecs.asso.fr/FicheClub.aspx?Ref=3104",
address: address: "Complexe Sportif R. Monseau rue Charles Capsec 33160 ST MEDARD EN JALLES",
"Complexe Sportif R. Monseau rue Charles Capsec 33160 ST MEDARD EN JALLES",
email: "stephane.bastin1805@gmail.com", email: "stephane.bastin1805@gmail.com",
website: "", website: "",
coordinates: [44.8839858, -0.7063288999999999], coordinates: [44.8839858, -0.7063288999999999],
@@ -255,8 +253,7 @@ export const clubData = [
_id: new ObjectId("690586c9e06ce80de6cd74c5"), _id: new ObjectId("690586c9e06ce80de6cd74c5"),
name: "Albertville Savoie Echecs", name: "Albertville Savoie Echecs",
url: "http://www.echecs.asso.fr/FicheClub.aspx?Ref=3200", url: "http://www.echecs.asso.fr/FicheClub.aspx?Ref=3200",
address: address: "Maison des Associations 21 rue Georges Lamarque 73200 ALBERTVILLE",
"Maison des Associations 21 rue Georges Lamarque 73200 ALBERTVILLE",
email: "albertville.savoie.echecs@gmail.com", email: "albertville.savoie.echecs@gmail.com",
website: "https://www.albertville-savoie-echecs.fr", website: "https://www.albertville-savoie-echecs.fr",
coordinates: [45.6680374, 6.377434999999999], coordinates: [45.6680374, 6.377434999999999],
@@ -302,8 +299,7 @@ export const clubData = [
_id: new ObjectId("690586c9e06ce80de6cd7241"), _id: new ObjectId("690586c9e06ce80de6cd7241"),
name: "Amicale Echecs de Divonne les Bains", name: "Amicale Echecs de Divonne les Bains",
url: "http://www.echecs.asso.fr/FicheClub.aspx?Ref=3410", url: "http://www.echecs.asso.fr/FicheClub.aspx?Ref=3410",
address: address: "Bet Adonide Res Divona Park 268 Bld des Epinettes 01220 DIVONNE LES BAINS",
"Bet Adonide Res Divona Park 268 Bld des Epinettes 01220 DIVONNE LES BAINS",
email: "echecs@lalieu.com", email: "echecs@lalieu.com",
website: "", website: "",
coordinates: [46.3464497, 6.1342244], coordinates: [46.3464497, 6.1342244],
@@ -321,8 +317,7 @@ export const clubData = [
_id: new ObjectId("690586c9e06ce80de6cd7324"), _id: new ObjectId("690586c9e06ce80de6cd7324"),
name: "Arcachon Echecs", name: "Arcachon Echecs",
url: "http://www.echecs.asso.fr/FicheClub.aspx?Ref=98", url: "http://www.echecs.asso.fr/FicheClub.aspx?Ref=98",
address: address: "Nouveau Cercle Arcachonnais 195 boulevard de la Plage 33120 ARCACHON",
"Nouveau Cercle Arcachonnais 195 boulevard de la Plage 33120 ARCACHON",
email: "regislegendre@free.fr", email: "regislegendre@free.fr",
website: "http://www.ncarcachon.fr/", website: "http://www.ncarcachon.fr/",
coordinates: [44.6626304, -1.1692262], coordinates: [44.6626304, -1.1692262],
@@ -340,8 +335,7 @@ export const clubData = [
_id: new ObjectId("690586c9e06ce80de6cd75b8"), _id: new ObjectId("690586c9e06ce80de6cd75b8"),
name: "Arcueil Chessland", name: "Arcueil Chessland",
url: "http://www.echecs.asso.fr/FicheClub.aspx?Ref=678", url: "http://www.echecs.asso.fr/FicheClub.aspx?Ref=678",
address: address: "1-2 rue Fernand Forest groupe Scolaire Jean Mace Cote Gardienne 94110 ARCUEIL",
"1-2 rue Fernand Forest groupe Scolaire Jean Mace Cote Gardienne 94110 ARCUEIL",
email: "matoz@wanadoo.fr", email: "matoz@wanadoo.fr",
website: "http://www.arcueil-chessland.fr/", website: "http://www.arcueil-chessland.fr/",
coordinates: [48.79920260000001, 2.3391093], coordinates: [48.79920260000001, 2.3391093],
@@ -458,8 +452,7 @@ export const clubData = [
_id: new ObjectId("690586c9e06ce80de6cd726a"), _id: new ObjectId("690586c9e06ce80de6cd726a"),
name: "Aubenas Vals Echiquier Cévenol", name: "Aubenas Vals Echiquier Cévenol",
url: "http://www.echecs.asso.fr/FicheClub.aspx?Ref=505", url: "http://www.echecs.asso.fr/FicheClub.aspx?Ref=505",
address: address: "Centre Socio Culturel Le palabre 6 rue Albert Seibel 07200 AUBENAS",
"Centre Socio Culturel Le palabre 6 rue Albert Seibel 07200 AUBENAS",
email: "jean.louis.bourquard@free.fr", email: "jean.louis.bourquard@free.fr",
website: "http://aubenasvals-echecs.fr", website: "http://aubenasvals-echecs.fr",
coordinates: [44.6173697, 4.388114], coordinates: [44.6173697, 4.388114],
@@ -522,8 +515,7 @@ export const clubData = [
_id: new ObjectId("690586c9e06ce80de6cd7262"), _id: new ObjectId("690586c9e06ce80de6cd7262"),
name: "Azur Chess Club", name: "Azur Chess Club",
url: "http://www.echecs.asso.fr/FicheClub.aspx?Ref=2680", url: "http://www.echecs.asso.fr/FicheClub.aspx?Ref=2680",
address: address: "Res le Marco Polo Ketch D 2e Etage 312 Bld des Ecureuils 06210 MANDELIEU LA NAPOULE",
"Res le Marco Polo Ketch D 2e Etage 312 Bld des Ecureuils 06210 MANDELIEU LA NAPOULE",
email: "eric.sighirdjian@sfr.fr", email: "eric.sighirdjian@sfr.fr",
website: "http://azurchessclub.fr", website: "http://azurchessclub.fr",
coordinates: [43.5420528, 6.9443551], coordinates: [43.5420528, 6.9443551],
@@ -749,8 +741,7 @@ export const clubData = [
_id: new ObjectId("690586c9e06ce80de6cd7524"), _id: new ObjectId("690586c9e06ce80de6cd7524"),
name: 'C.E. Fontenay le Fleury "Les Fous Furieux"', name: 'C.E. Fontenay le Fleury "Les Fous Furieux"',
url: "http://www.echecs.asso.fr/FicheClub.aspx?Ref=819", url: "http://www.echecs.asso.fr/FicheClub.aspx?Ref=819",
address: address: "Maison des Associations 5 rue Jean Jaures 78330 FONTENAY LE FLEURY",
"Maison des Associations 5 rue Jean Jaures 78330 FONTENAY LE FLEURY",
email: "poutoune@club-internet.fr", email: "poutoune@club-internet.fr",
website: "https://echecs-fontenaylefleury.org", website: "https://echecs-fontenaylefleury.org",
coordinates: [48.8147484, 2.048536], coordinates: [48.8147484, 2.048536],
@@ -804,8 +795,7 @@ export const clubData = [
_id: new ObjectId("690586c9e06ce80de6cd7594"), _id: new ObjectId("690586c9e06ce80de6cd7594"),
name: "C.E. de Bois-Colombes", name: "C.E. de Bois-Colombes",
url: "http://www.echecs.asso.fr/FicheClub.aspx?Ref=689", url: "http://www.echecs.asso.fr/FicheClub.aspx?Ref=689",
address: address: "Espace Associations 26 rue d'Estienne d'Orves 92270 BOIS COLOMBES",
"Espace Associations 26 rue d'Estienne d'Orves 92270 BOIS COLOMBES",
email: "contact@bois-colombes-echecs.com", email: "contact@bois-colombes-echecs.com",
website: "https://www.bois-colombes-echecs.com", website: "https://www.bois-colombes-echecs.com",
coordinates: [48.9156126, 2.2716207], coordinates: [48.9156126, 2.2716207],
@@ -896,8 +886,7 @@ export const clubData = [
_id: new ObjectId("690586c9e06ce80de6cd7312"), _id: new ObjectId("690586c9e06ce80de6cd7312"),
name: "C.L. Léo Lagrange - Colomiers", name: "C.L. Léo Lagrange - Colomiers",
url: "http://www.echecs.asso.fr/FicheClub.aspx?Ref=1239", url: "http://www.echecs.asso.fr/FicheClub.aspx?Ref=1239",
address: address: "Salle Municipale 1 place Leo Lagrange ex place du Val d'Aran 31770 COLOMIERS",
"Salle Municipale 1 place Leo Lagrange ex place du Val d'Aran 31770 COLOMIERS",
email: "colomiersclubdechecs@gmail.com", email: "colomiersclubdechecs@gmail.com",
website: "http://colomiers.chess.free.fr", website: "http://colomiers.chess.free.fr",
coordinates: [43.6117764, 1.3285075], coordinates: [43.6117764, 1.3285075],
@@ -906,8 +895,7 @@ export const clubData = [
_id: new ObjectId("690586c9e06ce80de6cd759f"), _id: new ObjectId("690586c9e06ce80de6cd759f"),
name: "C.S.M. Puteaux Echecs", name: "C.S.M. Puteaux Echecs",
url: "http://www.echecs.asso.fr/FicheClub.aspx?Ref=928", url: "http://www.echecs.asso.fr/FicheClub.aspx?Ref=928",
address: address: "Palais des Sports ile de Puteaux 2 Voie Georges Hassoux 92800 PUTEAUX",
"Palais des Sports ile de Puteaux 2 Voie Georges Hassoux 92800 PUTEAUX",
email: "csmpe@free.fr", email: "csmpe@free.fr",
website: "http://csmpe.free.fr", website: "http://csmpe.free.fr",
coordinates: [48.8788229, 2.2457232], coordinates: [48.8788229, 2.2457232],
+4 -2
View File
@@ -7,7 +7,9 @@ export default function AddClubPage() {
return ( return (
<section className="grid place-items-center bg-white pb-20 dark:bg-gray-800"> <section className="grid place-items-center bg-white pb-20 dark:bg-gray-800">
<div className="mx-auto max-w-screen-md px-4 py-8 lg:py-16"> <div className="mx-auto max-w-screen-md px-4 py-8 lg:py-16">
<h2 className="mb-4 text-center text-4xl font-extrabold tracking-tight text-gray-900 dark:text-white">{t("title")}</h2> <h2 className="mb-4 text-center text-4xl font-extrabold tracking-tight text-gray-900 dark:text-white">
{t("title")}
</h2>
<p className="mb-8 text-center font-light text-gray-500 dark:text-gray-400 sm:text-xl lg:mb-16"> <p className="mb-8 text-center font-light text-gray-500 dark:text-gray-400 sm:text-xl lg:mb-16">
{t("info")} {t("info")}
@@ -16,5 +18,5 @@ export default function AddClubPage() {
<ClubForm /> <ClubForm />
</div> </div>
</section> </section>
) );
} }
@@ -101,11 +101,7 @@ const TournamentForm = () => {
name="tournament.time_control" name="tournament.time_control"
control={form.control} control={form.control}
label={t("tcLabel")} label={t("tcLabel")}
options={[ options={[TimeControl.Classic, TimeControl.Rapid, TimeControl.Blitz].map((tc) => ({
TimeControl.Classic,
TimeControl.Rapid,
TimeControl.Blitz,
].map((tc) => ({
value: tc, value: tc,
label: at("timeControlEnum", { tc }), label: at("timeControlEnum", { tc }),
}))} }))}
@@ -11,10 +11,7 @@ export async function generateMetadata({
const { locale } = await params; const { locale } = await params;
return { return {
alternates: { alternates: {
canonical: canonical: locale === "fr" ? `${baseUrl}/auth/sign-in` : `${baseUrl}/${locale}/auth/sign-in`,
locale === "fr"
? `${baseUrl}/auth/sign-in`
: `${baseUrl}/${locale}/auth/sign-in`,
languages: { languages: {
fr: `${baseUrl}/auth/sign-in`, fr: `${baseUrl}/auth/sign-in`,
en: `${baseUrl}/en/auth/sign-in`, en: `${baseUrl}/en/auth/sign-in`,
+1 -4
View File
@@ -94,10 +94,7 @@ export const ClubMarker = forwardRef<MarkerRef, ClubMarkerProps>(
)} )}
{club.email && ( {club.email && (
<div> <div>
<a <a href={`mailto:${club.email}`} className="text-primary hover:text-primary-800">
href={`mailto:${club.email}`}
className="text-primary hover:text-primary-800"
>
{club.email} {club.email}
</a> </a>
</div> </div>
+2 -6
View File
@@ -29,9 +29,7 @@ const ClubTable = () => {
useEffect(() => { useEffect(() => {
if (!isLg || debouncedHoveredMapId === null) return; if (!isLg || debouncedHoveredMapId === null) return;
const clubRow = document.querySelector( const clubRow = document.querySelector(`[data-group-id="${debouncedHoveredMapId}"]`);
`[data-group-id="${debouncedHoveredMapId}"]`,
);
clubRow?.scrollIntoView({ behavior: "smooth" }); clubRow?.scrollIntoView({ behavior: "smooth" });
}, [debouncedHoveredMapId, isLg]); }, [debouncedHoveredMapId, isLg]);
@@ -87,9 +85,7 @@ const ClubTable = () => {
hoveredMapId === club.id && "bg-gray-200 dark:bg-gray-900", hoveredMapId === club.id && "bg-gray-200 dark:bg-gray-900",
)} )}
> >
<td className="px-1 py-2 sm:px-3 sm:py-3 lg:px-3 lg:py-3"> <td className="px-1 py-2 sm:px-3 sm:py-3 lg:px-3 lg:py-3">{club.name}</td>
{club.name}
</td>
<td className="px-1 py-2 text-left sm:px-3 sm:py-3 lg:px-3 lg:py-3"> <td className="px-1 py-2 text-left sm:px-3 sm:py-3 lg:px-3 lg:py-3">
{club.address && <div>{club.address}</div>} {club.address && <div>{club.address}</div>}
{club.website && ( {club.website && (
@@ -44,14 +44,10 @@ export default function ClubsDisplay({ clubs }: ClubsDisplayProps) {
.replace(/[\u0300-\u036f]/g, "") === regionSearchParam.toLowerCase(), .replace(/[\u0300-\u036f]/g, "") === regionSearchParam.toLowerCase(),
); );
const regionData = regionGeoJson.features.find( const regionData = regionGeoJson.features.find((f) => f.properties.nom === matchedRegion);
(f) => f.properties.nom === matchedRegion,
);
if (regionData) { if (regionData) {
setRegionFilter( setRegionFilter(regionData as Feature<Polygon | MultiPolygon, GeoJsonProperties>);
regionData as Feature<Polygon | MultiPolygon, GeoJsonProperties>,
);
} }
} }
+1 -2
View File
@@ -19,8 +19,7 @@ export async function generateMetadata({
const { locale } = await params; const { locale } = await params;
return { return {
alternates: { alternates: {
canonical: canonical: locale === "fr" ? `${baseUrl}/clubs` : `${baseUrl}/${locale}/clubs`,
locale === "fr" ? `${baseUrl}/clubs` : `${baseUrl}/${locale}/clubs`,
languages: { languages: {
fr: `${baseUrl}/clubs`, fr: `${baseUrl}/clubs`,
en: `${baseUrl}/en/clubs`, en: `${baseUrl}/en/clubs`,
@@ -49,11 +49,7 @@ export default function Footer() {
<Link href="/contact-us" aria-label={t("contactAria")} className="mr-4"> <Link href="/contact-us" aria-label={t("contactAria")} className="mr-4">
<FaRegEnvelope /> <FaRegEnvelope />
</Link> </Link>
<Link <Link href="/privacy" aria-label={t("privacyPolicyAria")} className="mr-4">
href="/privacy"
aria-label={t("privacyPolicyAria")}
className="mr-4"
>
<MdOutlinePrivacyTip /> <MdOutlinePrivacyTip />
</Link> </Link>
<div className="mr-4 space-x-2 text-xs"> <div className="mr-4 space-x-2 text-xs">
@@ -20,8 +20,7 @@ const Hamburger = () => {
<div <div
className={twMerge( className={twMerge(
"h-0.5 w-8 bg-gray-600 transition-all duration-300 ease-in-out dark:bg-white", "h-0.5 w-8 bg-gray-600 transition-all duration-300 ease-in-out dark:bg-white",
burgerMenuIsOpen && burgerMenuIsOpen && "translate-x-[1px] translate-y-2.5 rotate-45 bg-white",
"translate-x-[1px] translate-y-2.5 rotate-45 bg-white",
)} )}
></div> ></div>
<div <div
@@ -15,7 +15,7 @@ import { MapEvents } from "@/components/MapEvents";
const center: LatLngLiteral = { lat: 47.0844, lng: 2.3964 }; const center: LatLngLiteral = { lat: 47.0844, lng: 2.3964 };
const MapCoordinateSelection = ( { page }: {page: "club" | "tournament"}) => { const MapCoordinateSelection = ({ page }: { page: "club" | "tournament" }) => {
const { control, setValue } = useFormContext(); const { control, setValue } = useFormContext();
const latValue = useWatch({ control, name: `${page}.coordinates.0` }); const latValue = useWatch({ control, name: `${page}.coordinates.0` });
@@ -21,9 +21,7 @@ export default function Navbar() {
className="font-extrabold text-gray-900 no-underline hover:no-underline dark:text-white" className="font-extrabold text-gray-900 no-underline hover:no-underline dark:text-white"
href="/" href="/"
> >
<span className="font-title text-2xl text-gray-800 dark:text-white"> <span className="font-title text-2xl text-gray-800 dark:text-white">{t("title")}</span>
{t("title")}
</span>
</Link> </Link>
<div className="md:hidden" data-test="mobile-menu"> <div className="md:hidden" data-test="mobile-menu">
@@ -57,28 +57,14 @@ export default function Contact() {
{t("info")} {t("info")}
</p> </p>
{error && ( {error && <InfoMessage className="mb-8" type="error" message={t("failure")} />}
<InfoMessage
className="mb-8"
type="error"
message={t("failure")}
/>
)}
<div className="flex items-center justify-center space-x-4 text-sm font-bold"> <div className="flex items-center justify-center space-x-4 text-sm font-bold">
<Button <Button type="button" onClick={() => router.back()} intent="secondary">
type="button"
onClick={() => router.back()}
intent="secondary"
>
{at("cancelButton")} {at("cancelButton")}
</Button> </Button>
<Button <Button onClick={() => onDeleteAccount()} disabled={deleting} intent="primary">
onClick={() => onDeleteAccount()}
disabled={deleting}
intent="primary"
>
{t("deleteButton")} {t("deleteButton")}
</Button> </Button>
</div> </div>
+15 -46
View File
@@ -53,8 +53,7 @@ export default function EloClient() {
const kFactorParam = searchParams.get("k"); const kFactorParam = searchParams.get("k");
const player = searchParams.get("player") ?? ""; const player = searchParams.get("player") ?? "";
const kFactor = const kFactor = kFactorParam && kFactors.includes(kFactorParam) ? kFactorParam : "20";
kFactorParam && kFactors.includes(kFactorParam) ? kFactorParam : "20";
const hasTournamentId = !isEmpty(tournamentId.trim()); const hasTournamentId = !isEmpty(tournamentId.trim());
@@ -109,11 +108,7 @@ export default function EloClient() {
const subscription = form.watch((value, { name, type }) => { const subscription = form.watch((value, { name, type }) => {
let update = false; let update = false;
if (type === "change") { if (type === "change") {
if ( if (name === "tournamentId" && value.tournamentId !== tournamentId && value.tournamentId) {
name === "tournamentId" &&
value.tournamentId !== tournamentId &&
value.tournamentId
) {
current.set("tId", value.tournamentId); current.set("tId", value.tournamentId);
update = true; update = true;
} else if ( } else if (
@@ -122,18 +117,10 @@ export default function EloClient() {
value.tournamentId === null value.tournamentId === null
) { ) {
clearForm(); clearForm();
} else if ( } else if (name === "player" && value.player !== player && value.player) {
name === "player" &&
value.player !== player &&
value.player
) {
current.set("player", value.player); current.set("player", value.player);
update = true; update = true;
} else if ( } else if (name === "kFactor" && value.kFactor !== kFactor && value.kFactor) {
name === "kFactor" &&
value.kFactor !== kFactor &&
value.kFactor
) {
current.set("k", value.kFactor); current.set("k", value.kFactor);
update = true; update = true;
} }
@@ -146,17 +133,7 @@ export default function EloClient() {
} }
}); });
return () => subscription.unsubscribe(); return () => subscription.unsubscribe();
}, [ }, [clearForm, current, form, form.watch, kFactor, pathname, player, router, tournamentId]);
clearForm,
current,
form,
form.watch,
kFactor,
pathname,
player,
router,
tournamentId,
]);
useEffect(() => { useEffect(() => {
// When the URL changes, we update the form values // When the URL changes, we update the form values
@@ -184,9 +161,7 @@ export default function EloClient() {
> >
{t("title")} {t("title")}
</h2> </h2>
<p className="mb-8 text-center font-light text-gray-500 dark:text-gray-400"> <p className="mb-8 text-center font-light text-gray-500 dark:text-gray-400">{t("info")}</p>
{t("info")}
</p>
{hasTournamentId && !isFetching && !error && ( {hasTournamentId && !isFetching && !error && (
<div className="mx-auto mb-8 flex justify-center"> <div className="mx-auto mb-8 flex justify-center">
@@ -251,23 +226,17 @@ export default function EloClient() {
</form> </form>
</FormProvider> </FormProvider>
{hasTournamentId && {hasTournamentId && !isFetching && player && playerResults && !error && (
!isFetching && <TournamentResults
player && playerId={player}
playerResults && kFactor={parseInt(kFactor)}
!error && ( results={allResults?.data ?? []}
<TournamentResults tournament={tournament}
playerId={player} />
kFactor={parseInt(kFactor)} )}
results={allResults?.data ?? []}
tournament={tournament}
/>
)}
{(!!error || allResults?.serverError) && ( {(!!error || allResults?.serverError) && (
<ErrorBox <ErrorBox error={<TranslatedError err={error ?? allResults?.serverError} />} />
error={<TranslatedError err={error ?? allResults?.serverError} />}
/>
)} )}
{((!hasTournamentId && !isFetching) || !!error) && ( {((!hasTournamentId && !isFetching) || !!error) && (
+9 -21
View File
@@ -23,29 +23,17 @@ export const KFactor = ({ className }: KFactorProps) => {
</Disclosure.Button> </Disclosure.Button>
<Disclosure.Panel className="mt-4"> <Disclosure.Panel className="mt-4">
<p className="text-sm text-gray-500 dark:text-neutral-400"> <p className="text-sm text-gray-500 dark:text-neutral-400">{t("kFactorInfo1")}</p>
{t("kFactorInfo1")} <p className="mt-4 text-sm text-gray-500 dark:text-neutral-400">{t("kFactorInfo2")}</p>
</p>
<p className="mt-4 text-sm text-gray-500 dark:text-neutral-400">
{t("kFactorInfo2")}
</p>
<ul className="mb-8 ml-4 mt-3 list-outside list-disc"> <ul className="mb-8 ml-4 mt-3 list-outside list-disc">
{( {(["kFactorInfo3", "kFactorInfo4", "kFactorInfo5", "kFactorInfo6"] as const).map(
[ (key) => (
"kFactorInfo3", <li key={key} className="mt-2 text-sm text-gray-500 dark:text-neutral-400">
"kFactorInfo4", {t.rich(key, { b: (str) => <b>{str}</b> })}
"kFactorInfo5", </li>
"kFactorInfo6", ),
] as const )}
).map((key) => (
<li
key={key}
className="mt-2 text-sm text-gray-500 dark:text-neutral-400"
>
{t.rich(key, { b: (str) => <b>{str}</b> })}
</li>
))}
</ul> </ul>
</Disclosure.Panel> </Disclosure.Panel>
</Disclosure> </Disclosure>
+6 -20
View File
@@ -65,18 +65,13 @@ export const ManualEloForm = () => {
const onSubmit = async (data: EloFormValues) => {}; const onSubmit = async (data: EloFormValues) => {};
const [currentElo, kFactor, games] = form.watch([ const [currentElo, kFactor, games] = form.watch(["currentElo", "kFactor", "games"]);
"currentElo",
"kFactor",
"games",
]);
const isDefault = const isDefault =
isEmpty(currentElo) && isEmpty(currentElo) &&
kFactor === "20" && kFactor === "20" &&
games?.length === 1 && games?.length === 1 &&
(isEmpty(games[0]) || (isEmpty(games[0]) || (isEmpty(games[0]?.opponentElo) && isEmpty(games[0]?.result)));
(isEmpty(games[0]?.opponentElo) && isEmpty(games[0]?.result)));
type Deltas = { type Deltas = {
rating: number; rating: number;
@@ -86,13 +81,8 @@ export const ManualEloForm = () => {
const calculations = !Number.isNaN(currentElo) const calculations = !Number.isNaN(currentElo)
? (games ?? []).reduce<Deltas>( ? (games ?? []).reduce<Deltas>(
(acc, game) => { (acc, game) => {
if ( if (!isNil(game?.opponentElo) && !Number.isNaN(game?.opponentElo) && game?.result) {
!isNil(game?.opponentElo) && const result = game?.result === "win" ? 1 : game?.result === "loss" ? 0 : 0.5;
!Number.isNaN(game?.opponentElo) &&
game?.result
) {
const result =
game?.result === "win" ? 1 : game?.result === "loss" ? 0 : 0.5;
const { delta } = getNewRating( const { delta } = getNewRating(
currentElo!, currentElo!,
@@ -117,9 +107,7 @@ export const ManualEloForm = () => {
const deltas = calculations.deltas; const deltas = calculations.deltas;
const hasDeltas = deltas.some((d) => d.delta !== undefined); const hasDeltas = deltas.some((d) => d.delta !== undefined);
const totalDelta = Math.round( const totalDelta = Math.round(deltas.reduce((acc, delta) => acc + (delta.delta ?? 0), 0));
deltas.reduce((acc, delta) => acc + (delta.delta ?? 0), 0),
);
return ( return (
<FormProvider {...form}> <FormProvider {...form}>
@@ -149,9 +137,7 @@ export const ManualEloForm = () => {
<KFactor className="mt-2" /> <KFactor className="mt-2" />
<h3 className="my-4 text-lg text-gray-900 dark:text-white"> <h3 className="my-4 text-lg text-gray-900 dark:text-white">{t("resultsTitle")}</h3>
{t("resultsTitle")}
</h3>
<div className="flex w-full flex-col gap-6 sm:gap-2"> <div className="flex w-full flex-col gap-6 sm:gap-2">
{gameFields.map((game, i) => { {gameFields.map((game, i) => {
@@ -78,19 +78,13 @@ export const TournamentResults = ({
return { return {
rating: acc.rating + delta, rating: acc.rating + delta,
deltas: [ deltas: [...acc.deltas, { rating: acc.rating + delta, delta, ...info }],
...acc.deltas,
{ rating: acc.rating + delta, delta, ...info },
],
}; };
} }
return { return {
rating: acc.rating, rating: acc.rating,
deltas: [ deltas: [...acc.deltas, { rating: acc.rating, delta: undefined, ...info }],
...acc.deltas,
{ rating: acc.rating, delta: undefined, ...info },
],
}; };
}, },
{ rating: currentElo!, deltas: [] }, { rating: currentElo!, deltas: [] },
@@ -98,9 +92,7 @@ export const TournamentResults = ({
: { rating: currentElo!, deltas: [] }; : { rating: currentElo!, deltas: [] };
const deltas = calculations.deltas; const deltas = calculations.deltas;
const totalDelta = Math.round( const totalDelta = Math.round(deltas.reduce((acc, delta) => acc + (delta.delta ?? 0), 0));
deltas.reduce((acc, delta) => acc + (delta.delta ?? 0), 0),
);
const noChangeCount = (deltas ?? []).filter( const noChangeCount = (deltas ?? []).filter(
({ wonByForfeit, lostByForfeit, estimated, national }) => ({ wonByForfeit, lostByForfeit, estimated, national }) =>
@@ -121,16 +113,12 @@ export const TournamentResults = ({
{deltas.map((delta, i) => { {deltas.map((delta, i) => {
const { estimated, national, lostByForfeit, wonByForfeit } = delta; const { estimated, national, lostByForfeit, wonByForfeit } = delta;
const opponentElo = delta.opponentElo const opponentElo = delta.opponentElo
? ` (${delta.opponentElo} ${ ? ` (${delta.opponentElo} ${estimated ? "E" : national ? "N" : "F"})`
estimated ? "E" : national ? "N" : "F"
})`
: ""; : "";
const opponentName = delta.opponentName ? ( const opponentName = delta.opponentName ? (
<span> <span>
<span className="whitespace-nowrap font-bold"> <span className="whitespace-nowrap font-bold">{delta.opponentName}</span>
{delta.opponentName}
</span>
{opponentElo} {opponentElo}
</span> </span>
) : ( ) : (
@@ -140,11 +128,8 @@ export const TournamentResults = ({
const playedWhite = delta.colour === "white"; const playedWhite = delta.colour === "white";
const whitePlayer = playedWhite ? playerResults.name : opponentName; const whitePlayer = playedWhite ? playerResults.name : opponentName;
const blackPlayer = !playedWhite const blackPlayer = !playedWhite ? playerResults.name : opponentName;
? playerResults.name const noChange = wonByForfeit || lostByForfeit || estimated || national;
: opponentName;
const noChange =
wonByForfeit || lostByForfeit || estimated || national;
const forfeit = delta.opponentName === null; const forfeit = delta.opponentName === null;
@@ -173,9 +158,7 @@ export const TournamentResults = ({
{blackPlayer} {blackPlayer}
</td> </td>
)} )}
<td className="whitespace-nowrap px-2 pb-2 text-center"> <td className="whitespace-nowrap px-2 pb-2 text-center">{!forfeit && result}</td>
{!forfeit && result}
</td>
<td className="pb-2 text-right"> <td className="pb-2 text-right">
{noChange ? ( {noChange ? (
"-" "-"
+1 -2
View File
@@ -11,8 +11,7 @@ export async function generateMetadata({
const { locale } = await params; const { locale } = await params;
return { return {
alternates: { alternates: {
canonical: canonical: locale === "fr" ? `${baseUrl}/elo` : `${baseUrl}/${locale}/elo`,
locale === "fr" ? `${baseUrl}/elo` : `${baseUrl}/${locale}/elo`,
languages: { languages: {
fr: `${baseUrl}/elo`, fr: `${baseUrl}/elo`,
en: `${baseUrl}/en/elo`, en: `${baseUrl}/en/elo`,
+1 -5
View File
@@ -3,11 +3,7 @@ import { ReactNode } from "react";
import Footer from "./components/Footer"; import Footer from "./components/Footer";
import Navbar from "./components/Navbar"; import Navbar from "./components/Navbar";
export default async function MainLayout({ export default async function MainLayout({ children }: { children: ReactNode }) {
children,
}: {
children: ReactNode;
}) {
return ( return (
<> <>
<Navbar /> <Navbar />
+1 -5
View File
@@ -33,11 +33,7 @@ export default function Contact() {
<p> <p>
{t.rich("cookiesInfo", { {t.rich("cookiesInfo", {
link: (str) => ( link: (str) => (
<a <a href="https://tinyanalytics.io" target="_blank" rel="noopener noreferrer">
href="https://tinyanalytics.io"
target="_blank"
rel="noopener noreferrer"
>
{str} {str}
</a> </a>
), ),
@@ -8,11 +8,7 @@ import "react-date-range/dist/theme/default.css";
import { dateRangeAtom, maxDateAtom } from "@/atoms"; import { dateRangeAtom, maxDateAtom } from "@/atoms";
import { DatePickerDirection } from "@/types"; import { DatePickerDirection } from "@/types";
const DatePicker = ({ const DatePicker = ({ datePickerDirection }: { datePickerDirection: DatePickerDirection }) => {
datePickerDirection,
}: {
datePickerDirection: DatePickerDirection;
}) => {
const [dateRange, setDateRange] = useAtom(dateRangeAtom); const [dateRange, setDateRange] = useAtom(dateRangeAtom);
const maxDate = useAtomValue(maxDateAtom); const maxDate = useAtomValue(maxDateAtom);
@@ -16,12 +16,9 @@ const Legend = () => {
const timeControls = useMemo( const timeControls = useMemo(
() => () =>
[ [TimeControl.Classic, TimeControl.Rapid, TimeControl.Blitz, TimeControl.Other].filter((tc) =>
TimeControl.Classic, tournaments.some((t) => t.timeControl === tc),
TimeControl.Rapid, ),
TimeControl.Blitz,
TimeControl.Other,
].filter((tc) => tournaments.some((t) => t.timeControl === tc)),
[tournaments], [tournaments],
); );
@@ -1,13 +1,7 @@
import { useAtom, useAtomValue } from "jotai"; import { useAtom, useAtomValue } from "jotai";
import { useTranslations } from "next-intl"; import { useTranslations } from "next-intl";
import { import { blitzAtom, classicAtom, otherAtom, rapidAtom, tournamentsAtom } from "@/atoms";
blitzAtom,
classicAtom,
otherAtom,
rapidAtom,
tournamentsAtom,
} from "@/atoms";
import { TimeControl } from "@/types"; import { TimeControl } from "@/types";
const TimeControlFilters = () => { const TimeControlFilters = () => {
@@ -10,10 +10,7 @@ import "leaflet.smooth_marker_bouncing";
import "leaflet/dist/leaflet.css"; import "leaflet/dist/leaflet.css";
import { countBy, groupBy } from "lodash"; import { countBy, groupBy } from "lodash";
import { import { filteredTournamentsByTimeControlAndZoneAtom, normsOnlyAtom } from "@/atoms";
filteredTournamentsByTimeControlAndZoneAtom,
normsOnlyAtom,
} from "@/atoms";
import { Map, MapMarker } from "@/components/Map"; import { Map, MapMarker } from "@/components/Map";
import { TimeControlColours } from "@/constants"; import { TimeControlColours } from "@/constants";
import { TimeControl } from "@/types"; import { TimeControl } from "@/types";
@@ -49,15 +46,12 @@ const TournamentMap = () => {
${generatePieSVG( ${generatePieSVG(
"absolute w-[30px]", "absolute w-[30px]",
15, 15,
[ [TimeControl.Classic, TimeControl.Rapid, TimeControl.Blitz, TimeControl.Other].map(
TimeControl.Classic, (tc) => ({
TimeControl.Rapid, value: timeControlCounts[tc] ?? 0,
TimeControl.Blitz, colour: TimeControlColours[tc],
TimeControl.Other, }),
].map((tc) => ({ ),
value: timeControlCounts[tc] ?? 0,
colour: TimeControlColours[tc],
})),
)} )}
<span class="text-white font-semibold relative z-[300]">${childCount}</span> <span class="text-white font-semibold relative z-[300]">${childCount}</span>
</div> </div>
@@ -77,9 +71,7 @@ const TournamentMap = () => {
return { return {
markerId: groupId, markerId: groupId,
tableIds: tournamentGroup.map((t) => t.id), tableIds: tournamentGroup.map((t) => t.id),
component: ( component: <TournamentMarker key={groupId} tournamentGroup={tournamentGroup} />,
<TournamentMarker key={groupId} tournamentGroup={tournamentGroup} />
),
}; };
}), }),
[groupedTournaments], [groupedTournaments],
@@ -43,19 +43,14 @@ const TournamentTable = () => {
const setDateRange = useSetAtom(dateRangeAtom); const setDateRange = useSetAtom(dateRangeAtom);
const [datePickerIsOpen, setDatePickerIsOpen] = useAtom(datePickerIsOpenAtom); const [datePickerIsOpen, setDatePickerIsOpen] = useAtom(datePickerIsOpenAtom);
const [dateDirectionState, setDateDirectionState] = const [dateDirectionState, setDateDirectionState] = useState<DatePickerDirection>("horizontal");
useState<DatePickerDirection>("horizontal"); const datePickerColour = datePickerIsOpen ? "text-primary-600" : "text-gray-500";
const datePickerColour = datePickerIsOpen
? "text-primary-600"
: "text-gray-500";
useDatePickerWidth({ datePickerRef, setDateDirectionState }); useDatePickerWidth({ datePickerRef, setDateDirectionState });
useEffect(() => { useEffect(() => {
if (!isLg || debouncedHoveredMapId === null) return; if (!isLg || debouncedHoveredMapId === null) return;
const tournamentRow = document.querySelector( const tournamentRow = document.querySelector(`[data-group-id="${debouncedHoveredMapId}"]`);
`[data-group-id="${debouncedHoveredMapId}"]`,
);
tournamentRow?.scrollIntoView({ behavior: "smooth" }); tournamentRow?.scrollIntoView({ behavior: "smooth" });
}, [debouncedHoveredMapId, isLg]); }, [debouncedHoveredMapId, isLg]);
@@ -112,9 +107,7 @@ const TournamentTable = () => {
</div> </div>
<div className="flex justify-center" ref={datePickerRef}> <div className="flex justify-center" ref={datePickerRef}>
{datePickerIsOpen && ( {datePickerIsOpen && <DatePicker datePickerDirection={dateDirectionState} />}
<DatePicker datePickerDirection={dateDirectionState} />
)}
</div> </div>
<div className="overflow-x-scroll"> <div className="overflow-x-scroll">
@@ -156,23 +149,15 @@ const TournamentTable = () => {
onMouseLeave={() => setHoveredListId(null)} onMouseLeave={() => setHoveredListId(null)}
className={twMerge( className={twMerge(
"scroll-m-20 bg-white text-gray-900 hover:bg-gray-200 dark:bg-gray-800 dark:text-white dark:hover:bg-gray-900", "scroll-m-20 bg-white text-gray-900 hover:bg-gray-200 dark:bg-gray-800 dark:text-white dark:hover:bg-gray-900",
hoveredMapId === tournament.groupId && hoveredMapId === tournament.groupId && "bg-gray-200 dark:bg-gray-900",
"bg-gray-200 dark:bg-gray-900",
)} )}
> >
<td className="px-1 py-2 sm:px-3 sm:py-3 lg:px-3 lg:py-3"> <td className="px-1 py-2 sm:px-3 sm:py-3 lg:px-3 lg:py-3">{tournament.date}</td>
{tournament.date} <td className="px-1 py-2 sm:px-3 sm:py-3 lg:px-3 lg:py-3">{tournament.town}</td>
</td>
<td className="px-1 py-2 sm:px-3 sm:py-3 lg:px-3 lg:py-3">
{tournament.town}
</td>
<td className="px-1 py-2 text-left sm:px-3 sm:py-3 lg:px-3 lg:py-3"> <td className="px-1 py-2 text-left sm:px-3 sm:py-3 lg:px-3 lg:py-3">
<span> <span>
{tournament.norm && ( {tournament.norm && (
<FaTrophy <FaTrophy className="mr-2 inline-block h-4 w-4" data-norm="norm" />
className="mr-2 inline-block h-4 w-4"
data-norm="norm"
/>
)} )}
{tournament.tournament} {tournament.tournament}
</span> </span>
@@ -22,9 +22,7 @@ const TournamentMap = dynamic(() => import("./TournamentMap"), {
loading: LoadingMap, loading: LoadingMap,
}); });
export default function TournamentsDisplay({ export default function TournamentsDisplay({ tournaments }: TournamentsDisplayProps) {
tournaments,
}: TournamentsDisplayProps) {
useHydrateAtoms([[tournamentsAtom, tournaments]]); useHydrateAtoms([[tournamentsAtom, tournaments]]);
return ( return (
+4 -17
View File
@@ -1,9 +1,4 @@
import { import { differenceInDays, isSameDay, parse, setDefaultOptions } from "date-fns";
differenceInDays,
isSameDay,
parse,
setDefaultOptions,
} from "date-fns";
import { fr } from "date-fns/locale"; import { fr } from "date-fns/locale";
import { groupBy } from "lodash"; import { groupBy } from "lodash";
import { Metadata } from "next"; import { Metadata } from "next";
@@ -27,10 +22,7 @@ export async function generateMetadata({
const { locale } = await params; const { locale } = await params;
return { return {
alternates: { alternates: {
canonical: canonical: locale === "fr" ? `${baseUrl}/tournois` : `${baseUrl}/${locale}/tournaments`,
locale === "fr"
? `${baseUrl}/tournois`
: `${baseUrl}/${locale}/tournaments`,
languages: { languages: {
fr: `${baseUrl}/tournois`, fr: `${baseUrl}/tournois`,
en: `${baseUrl}/en/tournaments`, en: `${baseUrl}/en/tournaments`,
@@ -108,10 +100,7 @@ const getTournaments = async () => {
const goodData = data.filter((t) => !badIds.includes(t._id.toString())); const goodData = data.filter((t) => !badIds.includes(t._id.toString()));
// Group the tournaments by their location // Group the tournaments by their location
const groupedByLocation = groupBy( const groupedByLocation = groupBy(goodData, (t) => `${t.coordinates[0]}_${t.coordinates[1]}`);
goodData,
(t) => `${t.coordinates[0]}_${t.coordinates[1]}`,
);
// For each location, create an array of arrays of contiguous dates for this location // For each location, create an array of arrays of contiguous dates for this location
const dateRangesByLocation: Record<string, Date[][]> = {}; const dateRangesByLocation: Record<string, Date[][]> = {};
@@ -141,9 +130,7 @@ const getTournaments = async () => {
const location = `${t.coordinates[0]}_${t.coordinates[1]}`; const location = `${t.coordinates[0]}_${t.coordinates[1]}`;
const date = parse(t.date, "dd/MM/yyyy", new Date()); const date = parse(t.date, "dd/MM/yyyy", new Date());
const dateRanges = dateRangesByLocation[location]; const dateRanges = dateRangesByLocation[location];
const rangeIndex = dateRanges.findIndex((ranges) => const rangeIndex = dateRanges.findIndex((ranges) => ranges.some((d) => isSameDay(d, date)));
ranges.some((d) => isSameDay(d, date)),
);
// We place each tournament into a group based on location and date and time control, so that // We place each tournament into a group based on location and date and time control, so that
// we can display a single map marker. // we can display a single map marker.
@@ -46,11 +46,7 @@ const CreateZone = () => {
{t("createTitle")} {t("createTitle")}
</h2> </h2>
<ZoneForm <ZoneForm withInfo onSubmit={onSubmit} onCancel={() => router.push("/zones")} />
withInfo
onSubmit={onSubmit}
onCancel={() => router.push("/zones")}
/>
{responseMessage && ( {responseMessage && (
<InfoMessage <InfoMessage
@@ -66,11 +66,7 @@ const EditZone = () => {
{t("editTitle")} {t("editTitle")}
</h2> </h2>
<ZoneForm <ZoneForm onSubmit={onSubmit} onCancel={() => router.push("/zones")} zone={zone} />
onSubmit={onSubmit}
onCancel={() => router.push("/zones")}
zone={zone}
/>
{responseMessage && ( {responseMessage && (
<InfoMessage <InfoMessage
+1 -5
View File
@@ -160,11 +160,7 @@ const Zones = () => {
)} )}
<div className="flex items-center justify-between space-x-4 text-sm font-bold"> <div className="flex items-center justify-between space-x-4 text-sm font-bold">
<Button <Button intent="secondary" type="button" onClick={() => setDeletingZoneId(null)}>
intent="secondary"
type="button"
onClick={() => setDeletingZoneId(null)}
>
{at("cancelButton")} {at("cancelButton")}
</Button> </Button>
+1 -5
View File
@@ -20,11 +20,7 @@ const title = Julius_Sans_One({
variable: "--font-title", variable: "--font-title",
}); });
export async function generateMetadata({ export async function generateMetadata({ params }: { params: Promise<{ locale?: string }> }) {
params,
}: {
params: Promise<{ locale?: string }>;
}) {
// While the `locale` is required, the namespace is optional and // While the `locale` is required, the namespace is optional and
// identical to the parameter that `useTranslations` accepts. // identical to the parameter that `useTranslations` accepts.
const { locale } = await params; const { locale } = await params;
+5 -18
View File
@@ -45,18 +45,11 @@ export default function Home() {
> >
{t("title")} {t("title")}
</h1> </h1>
<p className={twMerge("text-sm", "sm:text-lg", "md:text-xl")}> <p className={twMerge("text-sm", "sm:text-lg", "md:text-xl")}>{t("purpose")}</p>
{t("purpose")}
</p>
</div> </div>
<div className="absolute -bottom-[2px] w-full text-white dark:text-gray-800"> <div className="absolute -bottom-[2px] w-full text-white dark:text-gray-800">
<svg <svg xmlns="http://www.w3.org/2000/svg" width="100%" height="auto" viewBox="0 0 1440 128">
xmlns="http://www.w3.org/2000/svg"
width="100%"
height="auto"
viewBox="0 0 1440 128"
>
<path <path
fill="currentColor" fill="currentColor"
d="M0,471 L1440,471 L1440,386.338583 C1331.33333,357.446194 1239,343 1163,343 C821.995497,343 821.995497,463.944882 426,463.944882 C262.447846,463.944882 120.447846,438.076115 0,386.338583 L0,471 Z" d="M0,471 L1440,471 L1440,386.338583 C1331.33333,357.446194 1239,343 1163,343 C821.995497,343 821.995497,463.944882 426,463.944882 C262.447846,463.944882 120.447846,438.076115 0,386.338583 L0,471 Z"
@@ -85,9 +78,7 @@ export default function Home() {
<div className="flex items-center justify-center text-5xl"> <div className="flex items-center justify-center text-5xl">
<GiTrophyCup /> <GiTrophyCup />
</div> </div>
<h2 className="text-center text-2xl font-semibold"> <h2 className="text-center text-2xl font-semibold">{t("tournamentsTitle")}</h2>
{t("tournamentsTitle")}
</h2>
<p className="">{t("tournamentsInfo")}</p> <p className="">{t("tournamentsInfo")}</p>
@@ -110,9 +101,7 @@ export default function Home() {
<div className="flex items-center justify-center text-5xl"> <div className="flex items-center justify-center text-5xl">
<HiUserGroup /> <HiUserGroup />
</div> </div>
<h2 className="text-center text-2xl font-semibold"> <h2 className="text-center text-2xl font-semibold">{t("clubsTitle")}</h2>
{t("clubsTitle")}
</h2>
<p className="">{t("clubsInfo")}</p> <p className="">{t("clubsInfo")}</p>
<Link <Link
@@ -134,9 +123,7 @@ export default function Home() {
<div className="flex items-center justify-center text-5xl"> <div className="flex items-center justify-center text-5xl">
<GrLineChart /> <GrLineChart />
</div> </div>
<h2 className="text-center text-2xl font-semibold"> <h2 className="text-center text-2xl font-semibold">{t("eloTitle")}</h2>
{t("eloTitle")}
</h2>
<p className="">{t("eloInfo")}</p> <p className="">{t("eloInfo")}</p>
<Link <Link
+1 -3
View File
@@ -4,9 +4,7 @@ import { Pathnames, routing } from "@/utils/routing";
export default function sitemap(): MetadataRoute.Sitemap { export default function sitemap(): MetadataRoute.Sitemap {
return routing.locales.flatMap((locale) => { return routing.locales.flatMap((locale) => {
const prefix = `https://echecsfrance.com${ const prefix = `https://echecsfrance.com${locale === "fr" ? "" : `/${locale}`}`;
locale === "fr" ? "" : `/${locale}`
}`;
const paths = Object.keys(routing.pathnames) as Array<Pathnames>; const paths = Object.keys(routing.pathnames) as Array<Pathnames>;
+18 -55
View File
@@ -1,20 +1,7 @@
import booleanPointInPolygon from "@turf/boolean-point-in-polygon"; import booleanPointInPolygon from "@turf/boolean-point-in-polygon";
import { import { endOfDay, isAfter, isBefore, parse, setDefaultOptions, startOfDay } from "date-fns";
endOfDay,
isAfter,
isBefore,
parse,
setDefaultOptions,
startOfDay,
} from "date-fns";
import { fr } from "date-fns/locale"; import { fr } from "date-fns/locale";
import { import { Feature, FeatureCollection, GeoJsonProperties, MultiPolygon, Polygon } from "geojson";
Feature,
FeatureCollection,
GeoJsonProperties,
MultiPolygon,
Polygon,
} from "geojson";
import { atom } from "jotai"; import { atom } from "jotai";
import { LatLngBounds } from "leaflet"; import { LatLngBounds } from "leaflet";
@@ -61,13 +48,14 @@ export const otherAtom = atom(true);
export const clubsAtom = atom<Club[]>([]); export const clubsAtom = atom<Club[]>([]);
export const { export const { currentValueAtom: hoveredMapIdAtom, debouncedValueAtom: debouncedHoveredMapIdAtom } =
currentValueAtom: hoveredMapIdAtom, atomWithDebounce<string | null>(null);
debouncedValueAtom: debouncedHoveredMapIdAtom,
} = atomWithDebounce<string | null>(null);
export const { debouncedValueAtom: debouncedHoveredListIdAtom } = export const { debouncedValueAtom: debouncedHoveredListIdAtom } = atomWithDebounce<string | null>(
atomWithDebounce<string | null>(null, 1000, 100); null,
1000,
100,
);
export const filteredTournamentsByTimeControlAndZoneAtom = atom((get) => { export const filteredTournamentsByTimeControlAndZoneAtom = atom((get) => {
const tournaments = get(tournamentsAtom); const tournaments = get(tournamentsAtom);
@@ -82,9 +70,7 @@ export const filteredTournamentsByTimeControlAndZoneAtom = atom((get) => {
const { startDate, endDate } = dateRange[0]; const { startDate, endDate } = dateRange[0];
const filterByTimeControl = tournaments.filter((tournament) => { const filterByTimeControl = tournaments.filter((tournament) => {
const tournamentDate = startOfDay( const tournamentDate = startOfDay(parse(tournament.date, "dd/MM/yyyy", new Date()));
parse(tournament.date, "dd/MM/yyyy", new Date()),
);
return ( return (
!isBefore(tournamentDate, startDate) && !isBefore(tournamentDate, startDate) &&
@@ -98,11 +84,7 @@ export const filteredTournamentsByTimeControlAndZoneAtom = atom((get) => {
); );
}); });
if ( if (regionFilter === "all" || regionFilter === "map" || regionFilter === "region")
regionFilter === "all" ||
regionFilter === "map" ||
regionFilter === "region"
)
return filterByTimeControl; return filterByTimeControl;
if (isFeature(regionFilter)) { if (isFeature(regionFilter)) {
@@ -118,10 +100,7 @@ export const filteredTournamentsByTimeControlAndZoneAtom = atom((get) => {
return regionFilter.features?.features?.some( return regionFilter.features?.features?.some(
(feature) => (feature) =>
feature.geometry.type === "Polygon" && feature.geometry.type === "Polygon" &&
booleanPointInPolygon( booleanPointInPolygon([tournament.latLng.lng, tournament.latLng.lat], feature.geometry),
[tournament.latLng.lng, tournament.latLng.lat],
feature.geometry,
),
); );
}); });
}); });
@@ -133,16 +112,13 @@ export const filteredTournamentsListAtom = atom((get) => {
const normsOnly = get(normsOnlyAtom); const normsOnly = get(normsOnlyAtom);
const searchString = get(searchStringAtom).trim(); const searchString = get(searchStringAtom).trim();
const filteredByNorm = normsOnly const filteredByNorm = normsOnly ? tournaments.filter((t) => t.norm) : tournaments;
? tournaments.filter((t) => t.norm)
: tournaments;
// When searching, we search all the tournament, regardless of the map display // When searching, we search all the tournament, regardless of the map display
if (searchString !== "") { if (searchString !== "") {
return filteredByNorm.filter( return filteredByNorm.filter(
(t) => (t) =>
normalizedContains(t.town, searchString) || normalizedContains(t.town, searchString) || normalizedContains(t.tournament, searchString),
normalizedContains(t.tournament, searchString),
); );
} }
@@ -150,28 +126,18 @@ export const filteredTournamentsListAtom = atom((get) => {
if (mapBounds === null || regionFilter !== "map") return filteredByNorm; if (mapBounds === null || regionFilter !== "map") return filteredByNorm;
// Filter by the map bounds // Filter by the map bounds
return filteredByNorm.filter((tournament) => return filteredByNorm.filter((tournament) => mapBounds.contains(tournament.latLng));
mapBounds.contains(tournament.latLng),
);
}); });
export const filteredClubsByZoneAtom = atom((get) => { export const filteredClubsByZoneAtom = atom((get) => {
const clubs = get(clubsAtom); const clubs = get(clubsAtom);
const regionFilter = get(regionFilterAtom); const regionFilter = get(regionFilterAtom);
if ( if (regionFilter === "all" || regionFilter === "map" || regionFilter === "region") return clubs;
regionFilter === "all" ||
regionFilter === "map" ||
regionFilter === "region"
)
return clubs;
if (isFeature(regionFilter)) { if (isFeature(regionFilter)) {
return clubs.filter((club) => { return clubs.filter((club) => {
return booleanPointInPolygon( return booleanPointInPolygon([club.latLng.lng, club.latLng.lat], regionFilter.geometry);
[club.latLng.lng, club.latLng.lat],
regionFilter.geometry,
);
}); });
} }
@@ -179,10 +145,7 @@ export const filteredClubsByZoneAtom = atom((get) => {
return regionFilter.features?.features?.some( return regionFilter.features?.features?.some(
(feature) => (feature) =>
feature.geometry.type === "Polygon" && feature.geometry.type === "Polygon" &&
booleanPointInPolygon( booleanPointInPolygon([club.latLng.lng, club.latLng.lat], feature.geometry),
[club.latLng.lng, club.latLng.lat],
feature.geometry,
),
); );
}); });
}); });
+36 -42
View File
@@ -1,49 +1,46 @@
import { type VariantProps, cva } from "class-variance-authority"; import { type VariantProps, cva } from "class-variance-authority";
import { twMerge } from "tailwind-merge"; import { twMerge } from "tailwind-merge";
export const buttonVariants = cva( export const buttonVariants = cva("flex items-center justify-center transition-all duration-200", {
"flex items-center justify-center transition-all duration-200", variants: {
{ intent: {
variants: { primary: [
intent: { "text-center",
primary: [ "text-white",
"text-center", "focus:outline-none focus:ring-2 focus:ring-primary-500",
"text-white", "bg-primary-600",
"focus:outline-none focus:ring-2 focus:ring-primary-500", "hover:bg-primary-800",
"bg-primary-600", "disabled:opacity-25",
"hover:bg-primary-800", "dark:text-white dark:hover:bg-primary-700",
"disabled:opacity-25", ],
"dark:text-white dark:hover:bg-primary-700",
],
secondary: [ secondary: [
"text-primary dark:text-white", "text-primary dark:text-white",
"hover:text-white dark:hover:text-white", "hover:text-white dark:hover:text-white",
"hover:bg-primary hover:text-white", "hover:bg-primary hover:text-white",
"border border-primary", "border border-primary",
"focus:outline-none focus:ring-2 focus:ring-primary-500", "focus:outline-none focus:ring-2 focus:ring-primary-500",
"disabled:opacity-25", "disabled:opacity-25",
], ],
tertiary: [ tertiary: [
"text-gray-900 dark:text-neutral-400", "text-gray-900 dark:text-neutral-400",
"hover:text-primary dark:hover:text-white", "hover:text-primary dark:hover:text-white",
"focus:outline-none focus:ring-2 focus:ring-primary-500", "focus:outline-none focus:ring-2 focus:ring-primary-500",
"disabled:opacity-25", "disabled:opacity-25",
], ],
},
size: {
small: ["text-sm font-medium", "px-3 py-2", "sm:w-fit", "rounded-lg"],
medium: ["text-sm font-medium", "px-5 py-3", "sm:w-fit", "rounded-lg"],
compacted: ["rounded-none", "px-0 py-0"],
},
}, },
defaultVariants: { size: {
intent: "primary", small: ["text-sm font-medium", "px-3 py-2", "sm:w-fit", "rounded-lg"],
size: "medium", medium: ["text-sm font-medium", "px-5 py-3", "sm:w-fit", "rounded-lg"],
compacted: ["rounded-none", "px-0 py-0"],
}, },
}, },
); defaultVariants: {
intent: "primary",
size: "medium",
},
});
export type ButtonVariants = VariantProps<typeof buttonVariants>; export type ButtonVariants = VariantProps<typeof buttonVariants>;
export type ButtonProps = React.ComponentProps<"button"> & ButtonVariants; export type ButtonProps = React.ComponentProps<"button"> & ButtonVariants;
@@ -54,8 +51,5 @@ export const Button = ({
size, size,
...props ...props
}: ButtonProps & { className?: string }) => ( }: ButtonProps & { className?: string }) => (
<button <button className={twMerge(buttonVariants({ intent, size, className }))} {...props} />
className={twMerge(buttonVariants({ intent, size, className }))}
{...props}
/>
); );
+1 -5
View File
@@ -17,11 +17,7 @@ type DropdownMenuProps = {
containerClassName?: string; containerClassName?: string;
}; };
export const DropdownMenu = ({ export const DropdownMenu = ({ items, buttonComponent, containerClassName }: DropdownMenuProps) => {
items,
buttonComponent,
containerClassName,
}: DropdownMenuProps) => {
return ( return (
<Menu as="div" className={twMerge("relative", containerClassName)}> <Menu as="div" className={twMerge("relative", containerClassName)}>
{buttonComponent ?? ( {buttonComponent ?? (
+2 -11
View File
@@ -1,11 +1,6 @@
import { type ReactNode } from "react"; import { type ReactNode } from "react";
import { import { HiCheckCircle, HiInformationCircle, HiXCircle, HiXMark } from "react-icons/hi2";
HiCheckCircle,
HiInformationCircle,
HiXCircle,
HiXMark,
} from "react-icons/hi2";
import { twMerge } from "tailwind-merge"; import { twMerge } from "tailwind-merge";
export type InfoMessageType = "success" | "error" | "info"; export type InfoMessageType = "success" | "error" | "info";
@@ -74,11 +69,7 @@ const InfoMessage = ({
button, button,
)} )}
> >
<HiXMark <HiXMark aria-hidden="true" className="h-5 w-5" onClick={onDismiss} />
aria-hidden="true"
className="h-5 w-5"
onClick={onDismiss}
/>
</button> </button>
</div> </div>
</div> </div>
+2 -11
View File
@@ -30,23 +30,14 @@ export const LocaleChecker = ({ children }: LocaleCheckerProps) => {
// If the user is authenticated and has a preferred locale that is different from the user's locale, // If the user is authenticated and has a preferred locale that is different from the user's locale,
// then we update redirect to the user's preference // then we update redirect to the user's preference
if ( if (status === "authenticated" && userLocale !== undefined && userLocale !== locale) {
status === "authenticated" &&
userLocale !== undefined &&
userLocale !== locale
) {
router.push({ pathname, params: params as any }, { locale: userLocale }); router.push({ pathname, params: params as any }, { locale: userLocale });
} }
}, [locale, sessionData, status, params, pathname, router, userLocale]); }, [locale, sessionData, status, params, pathname, router, userLocale]);
// To avoid flickering, we don't render the children until we have the user's locale // To avoid flickering, we don't render the children until we have the user's locale
if (status === "loading") return null; if (status === "loading") return null;
if ( if (status === "authenticated" && userLocale !== undefined && userLocale !== locale) return null;
status === "authenticated" &&
userLocale !== undefined &&
userLocale !== locale
)
return null;
return children; return children;
}; };
+7 -25
View File
@@ -59,12 +59,7 @@ type MapProps = {
iconCreateFunction?: L.MarkerClusterGroupOptions["iconCreateFunction"]; iconCreateFunction?: L.MarkerClusterGroupOptions["iconCreateFunction"];
}; };
export const Map = ({ export const Map = ({ filters, legend, markers, iconCreateFunction }: MapProps) => {
filters,
legend,
markers,
iconCreateFunction,
}: MapProps) => {
const setMapBounds = useSetAtom(mapBoundsAtom); const setMapBounds = useSetAtom(mapBoundsAtom);
const hoveredListTournamentId = useAtomValue(debouncedHoveredListIdAtom); const hoveredListTournamentId = useAtomValue(debouncedHoveredListIdAtom);
@@ -82,17 +77,13 @@ export const Map = ({
const expandAndBounceIfNeeded = useCallback(() => { const expandAndBounceIfNeeded = useCallback(() => {
if (hoveredListTournamentId) { if (hoveredListTournamentId) {
const marker = markers.find((m) => const marker = markers.find((m) => m.tableIds.includes(hoveredListTournamentId));
m.tableIds.includes(hoveredListTournamentId),
);
if (marker) { if (marker) {
const markerRef = markerRefs.current[marker.markerId]; const markerRef = markerRefs.current[marker.markerId];
if (markerRef) { if (markerRef) {
if (clusterRef.current) { if (clusterRef.current) {
const visibleMarker = clusterRef.current.getVisibleParent( const visibleMarker = clusterRef.current.getVisibleParent(markerRef.getMarker());
markerRef.getMarker(),
);
if (!visibleMarker) return; if (!visibleMarker) return;
// @ts-ignore // @ts-ignore
@@ -140,9 +131,7 @@ export const Map = ({
// Once expanded, bounce the appropriate marker // Once expanded, bounce the appropriate marker
if (hoveredListTournamentId) { if (hoveredListTournamentId) {
const marker = markers.find((m) => const marker = markers.find((m) => m.tableIds.includes(hoveredListTournamentId));
m.tableIds.includes(hoveredListTournamentId),
);
if (!marker) return; if (!marker) return;
expandedClusterMarkerRef.current = e.cluster; expandedClusterMarkerRef.current = e.cluster;
@@ -159,8 +148,7 @@ export const Map = ({
const onUnSpiderified = useCallback( const onUnSpiderified = useCallback(
(e: L.MarkerClusterSpiderfyEvent) => { (e: L.MarkerClusterSpiderfyEvent) => {
if (expandedClusterMarkerRef.current === e.cluster) if (expandedClusterMarkerRef.current === e.cluster) expandedClusterMarkerRef.current = null;
expandedClusterMarkerRef.current = null;
// Once closed, we can expand the next group if needed // Once closed, we can expand the next group if needed
expandAndBounceIfNeeded(); expandAndBounceIfNeeded();
@@ -188,8 +176,7 @@ export const Map = ({
// Expand/contract as hoveredListTournamentId changes // Expand/contract as hoveredListTournamentId changes
if (expandAndBounceIfNeeded()) return; if (expandAndBounceIfNeeded()) return;
if (expandedClusterMarkerRef.current) if (expandedClusterMarkerRef.current) expandedClusterMarkerRef.current.unspiderfy();
expandedClusterMarkerRef.current.unspiderfy();
}, [expandAndBounceIfNeeded, hoveredListTournamentId]); }, [expandAndBounceIfNeeded, hoveredListTournamentId]);
const referencedMarkers = useMemo( const referencedMarkers = useMemo(
@@ -247,12 +234,7 @@ export const Map = ({
</MapContainer> </MapContainer>
<div className="flex items-center justify-center lg:hidden"> <div className="flex items-center justify-center lg:hidden">
<Button <Button intent="tertiary" size="compacted" className="p-3" onClick={onScrollToTable}>
intent="tertiary"
size="compacted"
className="p-3"
onClick={onScrollToTable}
>
<FaAngleDoubleDown /> <FaAngleDoubleDown />
</Button> </Button>
</div> </div>
+2 -8
View File
@@ -14,10 +14,7 @@ import { mapBoundsAtom } from "@/atoms";
L.Map.addInitHook("addHandler", "gestureHandling", GestureHandling); L.Map.addInitHook("addHandler", "gestureHandling", GestureHandling);
const worldBounds = L.latLngBounds(L.latLng(-90, -180), L.latLng(90, 180)); const worldBounds = L.latLngBounds(L.latLng(-90, -180), L.latLng(90, 180));
const franceBounds = L.latLngBounds( const franceBounds = L.latLngBounds(L.latLng(42.08, -5.12), L.latLng(51.17, 9.53));
L.latLng(42.08, -5.12),
L.latLng(51.17, 9.53),
);
type MapEventsProps = { type MapEventsProps = {
bounds?: L.LatLngBounds; bounds?: L.LatLngBounds;
@@ -56,10 +53,7 @@ export const MapEvents = ({
}, [bounds, map]); }, [bounds, map]);
useEffect(() => { useEffect(() => {
if ( if ("gestureHandlingOptions" in map.options && map.options.gestureHandlingOptions) {
"gestureHandlingOptions" in map.options &&
map.options.gestureHandlingOptions
) {
map.options.gestureHandlingOptions.text = { map.options.gestureHandlingOptions.text = {
touch: t("touch"), touch: t("touch"),
scroll: t("scroll"), scroll: t("scroll"),
+2 -9
View File
@@ -30,12 +30,7 @@ export const Modal = ({
...dialogProps ...dialogProps
}: ModalProps) => ( }: ModalProps) => (
<Transition appear show={open} as={Fragment}> <Transition appear show={open} as={Fragment}>
<Dialog <Dialog as="div" className="relative z-[2000]" onClose={onClose} {...dialogProps}>
as="div"
className="relative z-[2000]"
onClose={onClose}
{...dialogProps}
>
<Transition.Child <Transition.Child
as={Fragment} as={Fragment}
enter="ease-out duration-300" enter="ease-out duration-300"
@@ -45,9 +40,7 @@ export const Modal = ({
leaveFrom="opacity-100" leaveFrom="opacity-100"
leaveTo="opacity-0" leaveTo="opacity-0"
> >
<div <div className={twMerge("fixed inset-0 bg-neutral-900/50", overlayClass)} />
className={twMerge("fixed inset-0 bg-neutral-900/50", overlayClass)}
/>
</Transition.Child> </Transition.Child>
<div className="fixed inset-0 overflow-y-auto"> <div className="fixed inset-0 overflow-y-auto">
+3 -12
View File
@@ -22,10 +22,7 @@ type RegionSelectProps = Omit<
type RegionOption = BaseOption<string, Zone | null>; type RegionOption = BaseOption<string, Zone | null>;
type GroupedOption = GroupBase<RegionOption>; type GroupedOption = GroupBase<RegionOption>;
export const RegionSelect = ({ export const RegionSelect = ({ syncTitle, ...selectProps }: RegionSelectProps) => {
syncTitle,
...selectProps
}: RegionSelectProps) => {
const t = useTranslations("Zones"); const t = useTranslations("Zones");
const router = useRouter(); const router = useRouter();
const [regionFilter, setRegionFilter] = useAtom(regionFilterAtom); const [regionFilter, setRegionFilter] = useAtom(regionFilterAtom);
@@ -67,9 +64,7 @@ export const RegionSelect = ({
}, },
]; ];
const onChange = ( const onChange = (option: OnChangeValue<BaseOption<string, Zone | null>, false>) => {
option: OnChangeValue<BaseOption<string, Zone | null>, false>,
) => {
if (!option) return; if (!option) return;
if (option.value === "create") { if (option.value === "create") {
@@ -114,11 +109,7 @@ export const RegionSelect = ({
); );
const getValue = () => { const getValue = () => {
if ( if (regionFilter === "all" || regionFilter === "map" || regionFilter === "region") {
regionFilter === "all" ||
regionFilter === "map" ||
regionFilter === "region"
) {
return allOptions.find((o) => o.value === regionFilter); return allOptions.find((o) => o.value === regionFilter);
} }
+4 -16
View File
@@ -1,11 +1,6 @@
import type { Dispatch, SetStateAction } from "react"; import type { Dispatch, SetStateAction } from "react";
import { import { type Feature, GeoJsonProperties, MultiPolygon, Polygon } from "geojson";
type Feature,
GeoJsonProperties,
MultiPolygon,
Polygon,
} from "geojson";
import { useSetAtom } from "jotai"; import { useSetAtom } from "jotai";
import { useTranslations } from "next-intl"; import { useTranslations } from "next-intl";
import { IoClose } from "react-icons/io5"; import { IoClose } from "react-icons/io5";
@@ -20,10 +15,7 @@ interface IProps {
setIsRegionModalOpen: Dispatch<SetStateAction<boolean>>; setIsRegionModalOpen: Dispatch<SetStateAction<boolean>>;
} }
export const RegionSelectModal = ({ export const RegionSelectModal = ({ isRegionModalOpen, setIsRegionModalOpen }: IProps) => {
isRegionModalOpen,
setIsRegionModalOpen,
}: IProps) => {
const t = useTranslations("Zones"); const t = useTranslations("Zones");
const setRegionFilter = useSetAtom(regionFilterAtom); const setRegionFilter = useSetAtom(regionFilterAtom);
@@ -32,13 +24,9 @@ export const RegionSelectModal = ({
}; };
const handleRegionSelect = (region: string) => { const handleRegionSelect = (region: string) => {
const regionData = regionGeoJson.features.find( const regionData = regionGeoJson.features.find((f) => f.properties.nom === region);
(f) => f.properties.nom === region,
);
if (regionData) { if (regionData) {
setRegionFilter( setRegionFilter(regionData as Feature<Polygon | MultiPolygon, GeoJsonProperties>);
regionData as Feature<Polygon | MultiPolygon, GeoJsonProperties>,
);
handleCloseModal(); handleCloseModal();
} }
}; };
+1 -5
View File
@@ -53,11 +53,7 @@ const SearchBar = ({ className }: SearchBarProps) => {
} }
endIcon={ endIcon={
searchString !== "" && ( searchString !== "" && (
<Button <Button intent="tertiary" size="compacted" onClick={() => setSearchString("")}>
intent="tertiary"
size="compacted"
onClick={() => setSearchString("")}
>
<IoCloseOutline className="h-5 w-5" /> <IoCloseOutline className="h-5 w-5" />
</Button> </Button>
) )
+1 -4
View File
@@ -97,10 +97,7 @@ export const SignInForm = ({ callbackPath }: SignInFormProps) => {
</Button> </Button>
{responseMessage && ( {responseMessage && (
<InfoMessage <InfoMessage message={responseMessage.message} type={responseMessage.type} />
message={responseMessage.message}
type={responseMessage.type}
/>
)} )}
</form> </form>
</FormProvider> </FormProvider>
+10 -15
View File
@@ -2,13 +2,7 @@ import React, { useEffect, useRef, useState } from "react";
import { get, isArray, isNil } from "lodash"; import { get, isArray, isNil } from "lodash";
import { useTranslations } from "next-intl"; import { useTranslations } from "next-intl";
import { import { Controller, FieldPath, FieldValues, useFormContext, useWatch } from "react-hook-form";
Controller,
FieldPath,
FieldValues,
useFormContext,
useWatch,
} from "react-hook-form";
import { ActionMeta, GroupBase, OnChangeValue, Props } from "react-select"; import { ActionMeta, GroupBase, OnChangeValue, Props } from "react-select";
import AsyncSelect from "react-select/async"; import AsyncSelect from "react-select/async";
@@ -75,8 +69,7 @@ export const AsyncSelectField = <
const values = !value ? [] : isArray(value) ? value : [value]; const values = !value ? [] : isArray(value) ? value : [value];
const unFetchedValues = values.filter( const unFetchedValues = values.filter(
(v) => (v) => valueOptions.current.find((o) => o.value === value) === undefined,
valueOptions.current.find((o) => o.value === value) === undefined,
); );
if (unFetchedValues.length > 0) { if (unFetchedValues.length > 0) {
@@ -95,9 +88,10 @@ export const AsyncSelectField = <
setLoadingValues(false); setLoadingValues(false);
onInformChange?.( onInformChange?.(
values.map( values.map((v) => valueOptions.current.find((o) => o.value === v)!) as BaseOption<
(v) => valueOptions.current.find((o) => o.value === v)!, T,
) as BaseOption<T, D>[], D
>[],
); );
// This forced a state update, which enures that the select is updated once the query has finished // This forced a state update, which enures that the select is updated once the query has finished
@@ -119,9 +113,10 @@ export const AsyncSelectField = <
const hasError = !!get(errors, name)?.message; const hasError = !!get(errors, name)?.message;
const valueToOption = (value: T) => const valueToOption = (value: T) =>
[...valueOptions.current, ...searchOptions.current].find( [...valueOptions.current, ...searchOptions.current].find((o) => o.value === value) ?? {
(o) => o.value === value, value,
) ?? { value, label: "" }; label: "",
};
const fetchOptions = async (searchString?: string) => { const fetchOptions = async (searchString?: string) => {
setLoadingOptions(true); setLoadingOptions(true);
@@ -12,10 +12,7 @@ interface InputProps {
} }
type AllProps = Omit< type AllProps = Omit<
React.DetailedHTMLProps< React.DetailedHTMLProps<React.InputHTMLAttributes<HTMLInputElement>, HTMLInputElement>,
React.InputHTMLAttributes<HTMLInputElement>,
HTMLInputElement
>,
"ref" "ref"
> & > &
InputProps; InputProps;
+3 -14
View File
@@ -5,12 +5,7 @@ import fr from "date-fns/locale/fr";
import { get } from "lodash"; import { get } from "lodash";
import { useLocale, useTranslations } from "next-intl"; import { useLocale, useTranslations } from "next-intl";
import DatePicker, { registerLocale } from "react-datepicker"; import DatePicker, { registerLocale } from "react-datepicker";
import { import { Controller, FieldPath, FieldValues, useFormContext } from "react-hook-form";
Controller,
FieldPath,
FieldValues,
useFormContext,
} from "react-hook-form";
import { twMerge } from "tailwind-merge"; import { twMerge } from "tailwind-merge";
import { Prettify } from "@/types"; import { Prettify } from "@/types";
@@ -93,11 +88,7 @@ export const DateField = <
// Called when the user types in the input // Called when the user types in the input
if (e?.currentTarget && "value" in e.currentTarget) { if (e?.currentTarget && "value" in e.currentTarget) {
const value = e.currentTarget.value; const value = e.currentTarget.value;
const date = parse( const date = parse(value as string, at("dateParseFormat"), new Date());
value as string,
at("dateParseFormat"),
new Date(),
);
if ( if (
isValid(date) && isValid(date) &&
date.getFullYear() >= min && date.getFullYear() >= min &&
@@ -124,9 +115,7 @@ export const DateField = <
minDate={minDate} minDate={minDate}
showFullMonthYearPicker showFullMonthYearPicker
maxDate={maxDate} maxDate={maxDate}
renderCustomHeader={(props) => ( renderCustomHeader={(props) => <DatePickerCustomHeader {...props} />}
<DatePickerCustomHeader {...props} />
)}
customInput={ customInput={
<InputDatePicker <InputDatePicker
mask={at("dateMask")} mask={at("dateMask")}
+2 -13
View File
@@ -1,12 +1,7 @@
import { ReactNode } from "react"; import { ReactNode } from "react";
import { get } from "lodash"; import { get } from "lodash";
import { import { Control, FieldPath, FieldValues, useFormContext } from "react-hook-form";
Control,
FieldPath,
FieldValues,
useFormContext,
} from "react-hook-form";
import { twMerge } from "tailwind-merge"; import { twMerge } from "tailwind-merge";
import { Prettify } from "@/types"; import { Prettify } from "@/types";
@@ -70,13 +65,7 @@ export const Field = <
</Label> </Label>
) : null} ) : null}
<div <div className={twMerge("flex w-full", label && "mt-2", childrenWrapperClassName)}>
className={twMerge(
"flex w-full",
label && "mt-2",
childrenWrapperClassName,
)}
>
{children} {children}
</div> </div>
+1 -2
View File
@@ -11,8 +11,7 @@ import { InlineSwitch } from "./InlineSwitch";
type InlineSwitchFieldProps< type InlineSwitchFieldProps<
TFieldValues extends FieldValues = FieldValues, TFieldValues extends FieldValues = FieldValues,
TFieldName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>, TFieldName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>,
> = GenericFieldProps<TFieldValues, TFieldName> & > = GenericFieldProps<TFieldValues, TFieldName> & Omit<SwitchProps<"button">, "name">;
Omit<SwitchProps<"button">, "name">;
export const InlineSwitchField = < export const InlineSwitchField = <
TFieldValues extends FieldValues = FieldValues, TFieldValues extends FieldValues = FieldValues,
+2 -11
View File
@@ -3,23 +3,14 @@ import { twMerge } from "tailwind-merge";
import { Prettify } from "@/types"; import { Prettify } from "@/types";
type LabelProps = Prettify< type LabelProps = Prettify<
React.DetailedHTMLProps< React.DetailedHTMLProps<React.LabelHTMLAttributes<HTMLLabelElement>, HTMLLabelElement> & {
React.LabelHTMLAttributes<HTMLLabelElement>,
HTMLLabelElement
> & {
required?: boolean; required?: boolean;
className?: string; className?: string;
tooltip?: React.ReactNode; tooltip?: React.ReactNode;
} }
>; >;
export const Label = ({ export const Label = ({ required, className, children, tooltip, ...labelProps }: LabelProps) => {
required,
className,
children,
tooltip,
...labelProps
}: LabelProps) => {
return ( return (
<label <label
{...labelProps} {...labelProps}
+1 -6
View File
@@ -3,12 +3,7 @@ import React from "react";
import { RadioGroup } from "@headlessui/react"; import { RadioGroup } from "@headlessui/react";
import { isNil } from "lodash"; import { isNil } from "lodash";
import { useTranslations } from "next-intl"; import { useTranslations } from "next-intl";
import { import { Controller, FieldPath, FieldValues, useFormContext } from "react-hook-form";
Controller,
FieldPath,
FieldValues,
useFormContext,
} from "react-hook-form";
import { twMerge } from "tailwind-merge"; import { twMerge } from "tailwind-merge";
import { Prettify } from "@/types"; import { Prettify } from "@/types";
+6 -24
View File
@@ -14,11 +14,7 @@ export type BaseOption<T = string, D = unknown> = {
}; };
export const createSelectClassNamesFn = export const createSelectClassNamesFn =
<Option, IsMulti extends boolean = false>({ <Option, IsMulti extends boolean = false>({ size }: { size?: "small" | "medium" }) =>
size,
}: {
size?: "small" | "medium";
}) =>
( (
hasError: boolean, hasError: boolean,
separators: boolean, separators: boolean,
@@ -26,8 +22,7 @@ export const createSelectClassNamesFn =
container: () => "w-full", container: () => "w-full",
valueContainer: () => "text-gray-900 dark:text-white", valueContainer: () => "text-gray-900 dark:text-white",
indicatorsContainer: () => "flex items-center self-stretch shrink-0", indicatorsContainer: () => "flex items-center self-stretch shrink-0",
clearIndicator: () => clearIndicator: () => "flex items-center pr-2 text-gray-900 dark:text-white",
"flex items-center pr-2 text-gray-900 dark:text-white",
dropdownIndicator: () => dropdownIndicator: () =>
"pointer-events-none flex items-center pr-2 text-gray-900 dark:text-white", "pointer-events-none flex items-center pr-2 text-gray-900 dark:text-white",
indicatorSeparator: () => "w-px text-gray-900 dark:text-white", indicatorSeparator: () => "w-px text-gray-900 dark:text-white",
@@ -45,8 +40,7 @@ export const createSelectClassNamesFn =
multiValue: () => "bg-fieldGray border rounded-lg flex space-x-1 pl-1 m-1", multiValue: () => "bg-fieldGray border rounded-lg flex space-x-1 pl-1 m-1",
multiValueLabel: () => "", multiValueLabel: () => "",
multiValueRemove: () => "items-center px-1 hover:text-primary", multiValueRemove: () => "items-center px-1 hover:text-primary",
placeholder: () => placeholder: () => "block truncate pr-2 placeholder-gray dark:placeholder-gray-400",
"block truncate pr-2 placeholder-gray dark:placeholder-gray-400",
menu: () => menu: () =>
twMerge( twMerge(
"!z-30 mt-2 rounded-lg border border-gray-200 bg-white p-1", "!z-30 mt-2 rounded-lg border border-gray-200 bg-white p-1",
@@ -65,29 +59,17 @@ export const createSelectClassNamesFn =
"text-textGray p-2 bg-gray-50 border border-dashed border-gray-200 rounded-sm", "text-textGray p-2 bg-gray-50 border border-dashed border-gray-200 rounded-sm",
}); });
export type SelectProps< export type SelectProps<IsMulti extends boolean = false, T = string, D = unknown> = Prettify<
IsMulti extends boolean = false,
T = string,
D = unknown,
> = Prettify<
Omit<Props<BaseOption<T, D>, IsMulti>, "classNames"> & { Omit<Props<BaseOption<T, D>, IsMulti>, "classNames"> & {
required?: boolean; required?: boolean;
separators?: boolean; separators?: boolean;
hasError?: boolean; hasError?: boolean;
size?: "small" | "medium"; size?: "small" | "medium";
classNameOverrides?: ClassNamesConfig< classNameOverrides?: ClassNamesConfig<BaseOption<T, D>, IsMulti, GroupBase<BaseOption<T, D>>>;
BaseOption<T, D>,
IsMulti,
GroupBase<BaseOption<T, D>>
>;
} }
>; >;
export const Select = < export const Select = <IsMulti extends boolean = false, T = string, D = unknown>({
IsMulti extends boolean = false,
T = string,
D = unknown,
>({
size, size,
placeholder, placeholder,
separators, separators,
+4 -15
View File
@@ -1,10 +1,5 @@
import { flatMap, get, isArray, isNil, isObject } from "lodash"; import { flatMap, get, isArray, isNil, isObject } from "lodash";
import { import { Controller, FieldPath, FieldValues, useFormContext } from "react-hook-form";
Controller,
FieldPath,
FieldValues,
useFormContext,
} from "react-hook-form";
import { GroupBase, OnChangeValue } from "react-select"; import { GroupBase, OnChangeValue } from "react-select";
import { BaseOption, Select, SelectProps } from "@/components/form/Select"; import { BaseOption, Select, SelectProps } from "@/components/form/Select";
@@ -20,10 +15,7 @@ export type SelectFieldProps<
D = unknown, D = unknown,
> = Prettify< > = Prettify<
GenericFieldProps<TFieldValues, TFieldName> & GenericFieldProps<TFieldValues, TFieldName> &
Omit< Omit<SelectProps<IsMulti, T, D>, "onChange" | "value" | "classNames" | "name"> & {
SelectProps<IsMulti, T, D>,
"onChange" | "value" | "classNames" | "name"
> & {
required?: boolean; required?: boolean;
separators?: boolean; separators?: boolean;
} }
@@ -57,8 +49,7 @@ export const SelectField = <
const isGroup = ( const isGroup = (
option: BaseOption<T, D> | GroupBase<BaseOption<T, D>>, option: BaseOption<T, D> | GroupBase<BaseOption<T, D>>,
): option is GroupBase<BaseOption<T, D>> => ): option is GroupBase<BaseOption<T, D>> => isObject(option) && "options" in option;
isObject(option) && "options" in option;
const flattenedOptions = flatMap(options, (option) => { const flattenedOptions = flatMap(options, (option) => {
return isGroup(option) ? option.options : option; return isGroup(option) ? option.options : option;
@@ -84,9 +75,7 @@ export const SelectField = <
name={name} name={name}
control={control} control={control}
render={({ field: { onChange, value } }) => { render={({ field: { onChange, value } }) => {
const onSelectChange = ( const onSelectChange = (newValue: OnChangeValue<BaseOption<T, D>, IsMulti>) => {
newValue: OnChangeValue<BaseOption<T, D>, IsMulti>,
) => {
if (isNil(newValue)) onChange(null); if (isNil(newValue)) onChange(null);
else if (isArray(newValue)) { else if (isArray(newValue)) {
onChange(newValue.map((option) => option.value)); onChange(newValue.map((option) => option.value));
+4 -19
View File
@@ -1,11 +1,7 @@
import React from "react"; import React from "react";
import { Switch, SwitchProps } from "@headlessui/react"; import { Switch, SwitchProps } from "@headlessui/react";
import { import { Controller, FieldPath, FieldValues } from "react-hook-form";
Controller,
FieldPath,
FieldValues,
} from "react-hook-form";
import { twMerge } from "tailwind-merge"; import { twMerge } from "tailwind-merge";
import { Prettify } from "@/types"; import { Prettify } from "@/types";
@@ -15,10 +11,7 @@ import { Field, GenericFieldProps } from "./Field";
type SwitchFieldProps< type SwitchFieldProps<
TFieldValues extends FieldValues = FieldValues, TFieldValues extends FieldValues = FieldValues,
TFieldName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>, TFieldName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>,
> = Prettify< > = Prettify<GenericFieldProps<TFieldValues, TFieldName> & Omit<SwitchProps<"button">, "name">>;
GenericFieldProps<TFieldValues, TFieldName> &
Omit<SwitchProps<"button">, "name">
>;
export const SwitchField = < export const SwitchField = <
TFieldValues extends FieldValues = FieldValues, TFieldValues extends FieldValues = FieldValues,
@@ -26,16 +19,8 @@ export const SwitchField = <
>( >(
props: SwitchFieldProps<TFieldValues, TFieldName>, props: SwitchFieldProps<TFieldValues, TFieldName>,
) => { ) => {
const { const { name, control, label, disabled, className, labelClassName, ...rest } = props;
name, return (
control,
label,
disabled,
className,
labelClassName,
...rest
} = props;
return (
<Field <Field
{...{ {...{
name, name,
+2 -7
View File
@@ -1,12 +1,7 @@
import type {HTMLProps, ReactNode} from 'react' import type { HTMLProps, ReactNode } from "react";
import { get } from "lodash"; import { get } from "lodash";
import { import { Controller, FieldPath, FieldValues, useFormContext } from "react-hook-form";
Controller,
FieldPath,
FieldValues,
useFormContext,
} from "react-hook-form";
import { twMerge } from "tailwind-merge"; import { twMerge } from "tailwind-merge";
import { Prettify } from "@/types"; import { Prettify } from "@/types";
+2 -11
View File
@@ -1,12 +1,7 @@
import React from "react"; import React from "react";
import { get } from "lodash"; import { get } from "lodash";
import { import { Controller, FieldPath, FieldValues, useFormContext } from "react-hook-form";
Controller,
FieldPath,
FieldValues,
useFormContext,
} from "react-hook-form";
import { twMerge } from "tailwind-merge"; import { twMerge } from "tailwind-merge";
import { Prettify } from "@/types"; import { Prettify } from "@/types";
@@ -57,11 +52,7 @@ export const TextField = <
const hasError = !!get(errors, name)?.message; const hasError = !!get(errors, name)?.message;
const input = (value: string | number) => { const input = (value: string | number) => {
return typeof value === "number" return typeof value === "number" ? (isNaN(value) ? "" : value.toString()) : (value ?? "");
? isNaN(value)
? ""
: value.toString()
: (value ?? "");
}; };
const output = const output =
+3 -13
View File
@@ -6,10 +6,7 @@ import { FaExternalLinkAlt } from "react-icons/fa";
import { TimeControlColours } from "@/constants"; import { TimeControlColours } from "@/constants";
import { getTournamentDetails } from "@/server/getTournamentDetails"; import { getTournamentDetails } from "@/server/getTournamentDetails";
import { import { SearchedTournament, searchTournaments } from "@/server/searchTournaments";
SearchedTournament,
searchTournaments,
} from "@/server/searchTournaments";
import { AsyncSelectField, AsyncSelectFieldProps } from "./AsyncSelectField"; import { AsyncSelectField, AsyncSelectFieldProps } from "./AsyncSelectField";
@@ -17,13 +14,7 @@ type TournamentSelectFieldProps<
TFieldValues extends FieldValues = FieldValues, TFieldValues extends FieldValues = FieldValues,
TFieldName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>, TFieldName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>,
> = Omit< > = Omit<
AsyncSelectFieldProps< AsyncSelectFieldProps<TFieldValues, TFieldName, false, string, SearchedTournament>,
TFieldValues,
TFieldName,
false,
string,
SearchedTournament
>,
"loadOptions" | "loadOption" | "separators" "loadOptions" | "loadOption" | "separators"
>; >;
@@ -35,8 +26,7 @@ export const TournamentSelectField = <
...rest ...rest
}: TournamentSelectFieldProps<TFieldValues, TFieldName>) => { }: TournamentSelectFieldProps<TFieldValues, TFieldName>) => {
const at = useTranslations("App"); const at = useTranslations("App");
const [selectedTournament, setSelectedTournament] = const [selectedTournament, setSelectedTournament] = useState<SearchedTournament | null>(null);
useState<SearchedTournament | null>(null);
const loadOption = async (ffeId: string) => { const loadOption = async (ffeId: string) => {
const result = await getTournamentDetails({ ffeId }); const result = await getTournamentDetails({ ffeId });
+1 -5
View File
@@ -52,11 +52,7 @@ export const ZoneEditor = ({ value, onChange }: ZoneEditorProps) => {
}; };
return ( return (
<MapContainer <MapContainer center={center} zoom={5} style={{ height: "600px", flexGrow: 1 }}>
center={center}
zoom={5}
style={{ height: "600px", flexGrow: 1 }}
>
<MapEvents <MapEvents
bounds={ bounds={
(initialFeatures.current ?? []).length > 0 (initialFeatures.current ?? []).length > 0
+1 -2
View File
@@ -20,8 +20,7 @@ type ZoneEditorFieldProps<
TFieldValues extends FieldValues = FieldValues, TFieldValues extends FieldValues = FieldValues,
TFieldName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>, TFieldName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>,
> = Prettify< > = Prettify<
GenericFieldProps<TFieldValues, TFieldName> & GenericFieldProps<TFieldValues, TFieldName> & Omit<ZoneEditorProps, "value" | "onChange">
Omit<ZoneEditorProps, "value" | "onChange">
>; >;
export const ZoneEditorField = < export const ZoneEditorField = <
+1 -5
View File
@@ -18,11 +18,7 @@
body { body {
color: rgb(var(--foreground-rgb)); color: rgb(var(--foreground-rgb));
background: linear-gradient( background: linear-gradient(to bottom, transparent, rgb(var(--background-end-rgb)))
to bottom,
transparent,
rgb(var(--background-end-rgb))
)
rgb(var(--background-start-rgb)); rgb(var(--background-start-rgb));
} }
+5 -9
View File
@@ -22,9 +22,7 @@ export type CreatorReturnType = {
function create(screens: object | undefined) { function create(screens: object | undefined) {
if (!screens) { if (!screens) {
throw new Error( throw new Error("Failed to create breakpoint hooks, given `screens` value is invalid.");
"Failed to create breakpoint hooks, given `screens` value is invalid.",
);
} }
function useBreakpoint(breakpoint: string, defaultValue: boolean = false) { function useBreakpoint(breakpoint: string, defaultValue: boolean = false) {
@@ -67,10 +65,7 @@ function create(screens: object | undefined) {
invalid: U, invalid: U,
) { ) {
const match = useBreakpoint(breakpoint); const match = useBreakpoint(breakpoint);
const value = useMemo( const value = useMemo(() => (match ? valid : invalid), [invalid, match, valid]);
() => (match ? valid : invalid),
[invalid, match, valid],
);
return value; return value;
} }
@@ -81,5 +76,6 @@ function create(screens: object | undefined) {
} as CreatorReturnType; } as CreatorReturnType;
} }
export const { useBreakpoint, useBreakpointEffect, useBreakpointValue } = export const { useBreakpoint, useBreakpointEffect, useBreakpointValue } = create(
create(config.theme!.screens); config.theme!.screens,
);
+1 -2
View File
@@ -2,8 +2,7 @@ import { Dispatch, SetStateAction, useEffect, useState } from "react";
function useDarkMode(): [string, Dispatch<SetStateAction<string>>] { function useDarkMode(): [string, Dispatch<SetStateAction<string>>] {
const prefersDarkMode = const prefersDarkMode =
typeof window !== "undefined" && typeof window !== "undefined" && window.matchMedia("(prefers-color-scheme: dark)").matches;
window.matchMedia("(prefers-color-scheme: dark)").matches;
const [theme, setTheme] = useState( const [theme, setTheme] = useState(
typeof window !== "undefined" typeof window !== "undefined"
+1 -3
View File
@@ -13,9 +13,7 @@ const useDatePickerWidth = ({
const updateDatePickerDirection = () => { const updateDatePickerDirection = () => {
const datePickerWidth = datePickerRef.current?.offsetWidth ?? 0; const datePickerWidth = datePickerRef.current?.offsetWidth ?? 0;
const isLg = datePickerWidth >= 680; const isLg = datePickerWidth >= 680;
isLg isLg ? setDateDirectionState("horizontal") : setDateDirectionState("vertical");
? setDateDirectionState("horizontal")
: setDateDirectionState("vertical");
}; };
updateDatePickerDirection(); updateDatePickerDirection();
+1 -3
View File
@@ -9,9 +9,7 @@ export const useDynamicViewportUnits = () => {
const isMobile = function () { const isMobile = function () {
if ( if (
/Android|iPhone|iPad|iPod/i.test(navigator.userAgent) || /Android|iPhone|iPad|iPod/i.test(navigator.userAgent) ||
(navigator.userAgent.match(/Mac/) && (navigator.userAgent.match(/Mac/) && navigator.maxTouchPoints && navigator.maxTouchPoints > 2)
navigator.maxTouchPoints &&
navigator.maxTouchPoints > 2)
) { ) {
return true; return true;
} }
+3 -19
View File
@@ -26,15 +26,9 @@ const useFormPersist = (
) => { ) => {
const watchedValues = watch(); const watchedValues = watch();
const getStorage = useCallback( const getStorage = useCallback(() => storage || window.sessionStorage, [storage]);
() => storage || window.sessionStorage,
[storage],
);
const clearStorage = useCallback( const clearStorage = useCallback(() => getStorage().removeItem(name), [getStorage, name]);
() => getStorage().removeItem(name),
[getStorage, name],
);
useEffect(() => { useEffect(() => {
const storedValuesJSON = getStorage().getItem(name); const storedValuesJSON = getStorage().getItem(name);
@@ -58,17 +52,7 @@ const useFormPersist = (
return () => getStorage().setItem(name, JSON.stringify(dataRestored)); return () => getStorage().setItem(name, JSON.stringify(dataRestored));
} }
}, [ }, [storage, name, setValue, clearStorage, dirty, exclude, touch, validate, getStorage]);
storage,
name,
setValue,
clearStorage,
dirty,
exclude,
touch,
validate,
getStorage,
]);
useEffect(() => { useEffect(() => {
const values = const values =
+1 -3
View File
@@ -14,9 +14,7 @@ export default function Providers({ children }: { children: React.ReactNode }) {
return ( return (
<SessionProvider> <SessionProvider>
<JotaiProvider> <JotaiProvider>
<QueryClientProvider client={queryClient}> <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
{children}
</QueryClientProvider>
</JotaiProvider> </JotaiProvider>
</SessionProvider> </SessionProvider>
); );
File diff suppressed because one or more lines are too long
+2 -2
View File
@@ -20,8 +20,8 @@ export const addClubSchema = z.object({
address: z.string().min(1, { message: "FormValidation.required" }), address: z.string().min(1, { message: "FormValidation.required" }),
website: z.string().url({ message: "FormValidation.url" }).optional(), website: z.string().url({ message: "FormValidation.url" }).optional(),
coordinates: z.array(z.number()).length(2), coordinates: z.array(z.number()).length(2),
}) }),
}) });
export const addTournamentSchema = z.object({ export const addTournamentSchema = z.object({
name: z.string().min(1, { message: "FormValidation.required" }), name: z.string().min(1, { message: "FormValidation.required" }),
+44 -46
View File
@@ -5,55 +5,53 @@ import { collections, dbConnect } from "@/server/mongodb";
import { actionClient } from "@/server/safeAction"; import { actionClient } from "@/server/safeAction";
import { errorLog } from "@/utils/logger"; import { errorLog } from "@/utils/logger";
export const addClub = actionClient export const addClub = actionClient.schema(addClubSchema).action(async (input) => {
.schema(addClubSchema) try {
.action(async (input) => { const { name, email, message, club } = input.parsedInput;
try {
const { name, email, message, club } = input.parsedInput;
console.log(club); console.log(club);
const clubData = { const clubData = {
name: club.name ?? "", name: club.name ?? "",
address: club.address ?? "", address: club.address ?? "",
email: club.email ?? "", email: club.email ?? "",
website: club.website ?? "", website: club.website ?? "",
coordinates: club.coordinates as [number, number], coordinates: club.coordinates as [number, number],
manual_entry: true, manual_entry: true,
pending: true, pending: true,
}; };
await dbConnect(); await dbConnect();
const result = await collections.clubs!.insertOne(clubData); const result = await collections.clubs!.insertOne(clubData);
if (result.insertedId) { if (result.insertedId) {
await fetch(process.env.DISCORD_WEBHOOK_ADD_CLUB_URL as string, { await fetch(process.env.DISCORD_WEBHOOK_ADD_CLUB_URL as string, {
method: "POST", method: "POST",
headers: { headers: {
"Content-Type": "application/json", "Content-Type": "application/json",
}, },
body: JSON.stringify({ body: JSON.stringify({
embeds: [ embeds: [
{ {
title: "Club Submitted", title: "Club Submitted",
fields: [ fields: [
{ name: "Name", value: club.name ?? "" }, { name: "Name", value: club.name ?? "" },
{ name: "Email", value: club.email ?? "" }, { name: "Email", value: club.email ?? "" },
{ name: "Address", value: club.address ?? "" }, { name: "Address", value: club.address ?? "" },
{ name: "Website", value: club.website ?? "" }, { name: "Website", value: club.website ?? "" },
{ name: "Sender", value: name ?? "" }, { name: "Sender", value: name ?? "" },
{ name: "Sender Email", value: email ?? "" }, { name: "Sender Email", value: email ?? "" },
{ name: "Message", value: message ?? "" }, { name: "Message", value: message ?? "" },
{ name: "ID", value: result.insertedId ?? "" }, { name: "ID", value: result.insertedId ?? "" },
], ],
}, },
], ],
}), }),
}); });
}
} catch (error) {
errorLog(error);
throw error;
} }
}); } catch (error) {
errorLog(error);
throw error;
}
});
+48 -55
View File
@@ -17,68 +17,61 @@ const tcMap: Record<TimeControl, TournamentModel["time_control"]> = {
[TimeControl.Other]: "Other", [TimeControl.Other]: "Other",
}; };
export const addTournament = actionClient export const addTournament = actionClient.schema(addTournamentSchema).action(async (input) => {
.schema(addTournamentSchema) try {
.action(async (input) => { await dbConnect();
try {
await dbConnect();
const { name, email, message, tournament } = input.parsedInput; const { name, email, message, tournament } = input.parsedInput;
const tournamentData: Omit<TournamentModel, "_id" | "tournament_id"> = { const tournamentData: Omit<TournamentModel, "_id" | "tournament_id"> = {
...tournament, ...tournament,
date: format(tournament.date, "dd/MM/yyyy"), date: format(tournament.date, "dd/MM/yyyy"),
start_date: format(tournament.date, "dd/MM/yyyy"), start_date: format(tournament.date, "dd/MM/yyyy"),
end_date: format(tournament.date, "dd/MM/yyyy"), end_date: format(tournament.date, "dd/MM/yyyy"),
time_control: tcMap[tournament.time_control], time_control: tcMap[tournament.time_control],
coordinates: tournament.coordinates as [number, number], coordinates: tournament.coordinates as [number, number],
entry_method: "manual", entry_method: "manual",
pending: true, pending: true,
status: "scheduled", status: "scheduled",
}; };
const result = await collections.tournaments!.insertOne(tournamentData); const result = await collections.tournaments!.insertOne(tournamentData);
if (result.insertedId) { if (result.insertedId) {
const { tournament, country, date, time_control } = tournamentData; const { tournament, country, date, time_control } = tournamentData;
if ( if (typeof process.env.DISCORD_WEBHOOK_ADD_TOURNAMENT_URL === "string") {
typeof process.env.DISCORD_WEBHOOK_ADD_TOURNAMENT_URL === "string" await fetch(process.env.DISCORD_WEBHOOK_ADD_TOURNAMENT_URL as string, {
) { method: "POST",
await fetch( headers: {
process.env.DISCORD_WEBHOOK_ADD_TOURNAMENT_URL as string, "Content-Type": "application/json",
{ },
method: "POST", body: JSON.stringify({
headers: { embeds: [
"Content-Type": "application/json", {
}, title: "Tournament Submitted",
body: JSON.stringify({ fields: [
embeds: [ { name: "Tournament", value: tournament },
{ name: "Country", value: country },
{ name: "Date", value: date },
{ {
title: "Tournament Submitted", name: "Time Control",
fields: [ value: time_control,
{ name: "Tournament", value: tournament },
{ name: "Country", value: country },
{ name: "Date", value: date },
{
name: "Time Control",
value: time_control,
},
{ name: "Sender", value: name },
{ name: "Sender Email", value: email },
{ name: "Message", value: message ?? "" },
],
}, },
{ name: "Sender", value: name },
{ name: "Sender Email", value: email },
{ name: "Message", value: message ?? "" },
], ],
}), },
}, ],
); }),
} });
return true;
} }
} catch (error) {
errorLog(error); return true;
throw error;
} }
}); } catch (error) {
errorLog(error);
throw error;
}
});
+27 -29
View File
@@ -5,32 +5,30 @@ import { errorLog } from "@/utils/logger";
import { actionClient } from "./safeAction"; import { actionClient } from "./safeAction";
export const contactUs = actionClient export const contactUs = actionClient.schema(contactUsSchema).action(async (input) => {
.schema(contactUsSchema) try {
.action(async (input) => { const { email, subject, message } = input.parsedInput;
try { await fetch(process.env.DISCORD_WEBHOOK_CONTACT_URL as string, {
const { email, subject, message } = input.parsedInput; method: "POST",
await fetch(process.env.DISCORD_WEBHOOK_CONTACT_URL as string, { headers: {
method: "POST", "Content-Type": "application/json",
headers: { },
"Content-Type": "application/json", body: JSON.stringify({
}, embeds: [
body: JSON.stringify({ {
embeds: [ title: "Contact",
{ fields: [
title: "Contact", { name: "Email", value: email },
fields: [ { name: "Subject", value: subject },
{ name: "Email", value: email }, { name: "Message", value: message },
{ name: "Subject", value: subject }, ],
{ name: "Message", value: message }, },
], ],
}, }),
], });
}), return true;
}); } catch (error) {
return true; errorLog(error);
} catch (error) { throw error;
errorLog(error); }
throw error; });
}
});
+24 -26
View File
@@ -10,31 +10,29 @@ import { errorLog } from "@/utils/logger";
import { ZoneModel } from "./models/zoneModel"; import { ZoneModel } from "./models/zoneModel";
import { actionClient } from "./safeAction"; import { actionClient } from "./safeAction";
export const createZone = actionClient export const createZone = actionClient.schema(zoneSchema).action(async (input) => {
.schema(zoneSchema) try {
.action(async (input) => { await dbConnect();
try {
await dbConnect();
const user = await auth(); const user = await auth();
if (!user?.user) { if (!user?.user) {
throw new Error("You must be logged in to create a zone"); throw new Error("You must be logged in to create a zone");
}
const zoneData: ZoneModel = {
...input.parsedInput,
userId: new ObjectId(user.user!.id!),
};
const result = await collections.zones!.insertOne(zoneData);
if (!result.acknowledged) {
throw new Error("ERR_ZONE_INSERT_FAILED");
}
return true;
} catch (error) {
errorLog(error);
throw error;
} }
});
const zoneData: ZoneModel = {
...input.parsedInput,
userId: new ObjectId(user.user!.id!),
};
const result = await collections.zones!.insertOne(zoneData);
if (!result.acknowledged) {
throw new Error("ERR_ZONE_INSERT_FAILED");
}
return true;
} catch (error) {
errorLog(error);
throw error;
}
});
+23 -25
View File
@@ -13,31 +13,29 @@ const deleteZoneSchema = z.object({
id: z.string(), id: z.string(),
}); });
export const deleteZone = actionClient export const deleteZone = actionClient.schema(deleteZoneSchema).action(async (input) => {
.schema(deleteZoneSchema) const { id } = input.parsedInput;
.action(async (input) => {
const { id } = input.parsedInput;
try { try {
await dbConnect(); await dbConnect();
const user = await auth(); const user = await auth();
if (!user?.user) { if (!user?.user) {
throw new Error("You must be logged in to create a zone"); throw new Error("You must be logged in to create a zone");
}
const result = await collections.zones!.deleteOne({
_id: new ObjectId(id),
userId: new ObjectId(user.user!.id!),
});
if (!result || result.deletedCount !== 1) {
throw new Error("ERR_ZONE_DELETE_FAILED");
}
return true;
} catch (error) {
errorLog(error);
throw error;
} }
});
const result = await collections.zones!.deleteOne({
_id: new ObjectId(id),
userId: new ObjectId(user.user!.id!),
});
if (!result || result.deletedCount !== 1) {
throw new Error("ERR_ZONE_DELETE_FAILED");
}
return true;
} catch (error) {
errorLog(error);
throw error;
}
});
+32 -34
View File
@@ -17,39 +17,37 @@ const editZoneSchema = z.object({
zone: zoneSchema, zone: zoneSchema,
}); });
export const editZone = actionClient export const editZone = actionClient.schema(editZoneSchema).action(async (input) => {
.schema(editZoneSchema) const { id, zone } = input.parsedInput;
.action(async (input) => { try {
const { id, zone } = input.parsedInput; await dbConnect();
try {
await dbConnect();
const user = await auth(); const user = await auth();
if (!user?.user) { if (!user?.user) {
throw new Error("You must be logged in to create a zone"); throw new Error("You must be logged in to create a zone");
}
const zoneData: ZoneModel = {
...zone,
userId: new ObjectId(user.user!.id!),
};
const result = await collections.zones!.findOneAndUpdate(
{ _id: new ObjectId(id), userId: new ObjectId(user.user!.id!) },
{ $set: { _id: new ObjectId(id), ...zoneData } },
);
if (!result) {
throw new Error("ERR_ZONE_UPDATE_FAILED");
}
return {
...omit(result, ["_id"]),
id: result._id.toString(),
userId: result.userId.toString(),
};
} catch (error) {
errorLog(error);
throw error;
} }
});
const zoneData: ZoneModel = {
...zone,
userId: new ObjectId(user.user!.id!),
};
const result = await collections.zones!.findOneAndUpdate(
{ _id: new ObjectId(id), userId: new ObjectId(user.user!.id!) },
{ $set: { _id: new ObjectId(id), ...zoneData } },
);
if (!result) {
throw new Error("ERR_ZONE_UPDATE_FAILED");
}
return {
...omit(result, ["_id"]),
id: result._id.toString(),
userId: result.userId.toString(),
};
} catch (error) {
errorLog(error);
throw error;
}
});
+6 -19
View File
@@ -58,9 +58,7 @@ const getEloDetails = (elo: string | null) => {
}; };
}; };
const getResultDetails = ( const getResultDetails = (results: z.infer<typeof dbSchema>[number]["results"][number]) => {
results: z.infer<typeof dbSchema>[number]["results"][number],
) => {
if (results.opponent_name === null) { if (results.opponent_name === null) {
return { result: 0, lostByForfeit: true, wonByForfeit: false }; return { result: 0, lostByForfeit: true, wonByForfeit: false };
} }
@@ -118,12 +116,9 @@ export const fetchTournamentResults = actionClient
headers.append("api-key", apiKey); headers.append("api-key", apiKey);
} }
const rawResults = await fetch( const rawResults = await fetch(`${process.env.RESULTS_SCRAPER_URL}${id}`, {
`${process.env.RESULTS_SCRAPER_URL}${id}`, headers: headers,
{ });
headers: headers,
},
);
if (rawResults.status >= 500) { if (rawResults.status >= 500) {
throw new Error("ERR_TOURNAMENT_RESULTS_NOT_AVAILABLE"); throw new Error("ERR_TOURNAMENT_RESULTS_NOT_AVAILABLE");
@@ -143,12 +138,7 @@ export const fetchTournamentResults = actionClient
name: player.name, name: player.name,
...getEloDetails(player.elo), ...getEloDetails(player.elo),
results: player.results.map((result) => ({ results: player.results.map((result) => ({
colour: colour: result.colour === "B" ? "white" : result.colour === "N" ? "black" : "",
result.colour === "B"
? "white"
: result.colour === "N"
? "black"
: "",
opponent: result.opponent_name, opponent: result.opponent_name,
...getResultDetails(result), ...getResultDetails(result),
...getEloDetails(result.opponent_elo), ...getEloDetails(result.opponent_elo),
@@ -156,10 +146,7 @@ export const fetchTournamentResults = actionClient
})), })),
); );
} catch (error: any) { } catch (error: any) {
if ( if (!("message" in error) || error.message !== "ERR_TOURNAMENT_NOT_FOUND") {
!("message" in error) ||
error.message !== "ERR_TOURNAMENT_NOT_FOUND"
) {
reportFetchError(id, error); reportFetchError(id, error);
errorLog(JSON.stringify(error, null, 2)); errorLog(JSON.stringify(error, null, 2));
} }
+28 -30
View File
@@ -12,35 +12,33 @@ const inputSchema = z.object({
ffeId: z.string(), ffeId: z.string(),
}); });
export const getTournamentDetails = actionClient export const getTournamentDetails = actionClient.schema(inputSchema).action(async (input) => {
.schema(inputSchema) const { ffeId } = input.parsedInput;
.action(async (input) => { try {
const { ffeId } = input.parsedInput; await dbConnect();
try { const t = await collections.tournaments!.findOne({
await dbConnect(); tournament_id: ffeId,
const t = await collections.tournaments!.findOne({ });
tournament_id: ffeId,
});
if (t === null) { if (t === null) {
return null; return null;
}
const timeControl = tcMap[t.time_control] ?? TimeControl.Other;
return {
id: t._id.toString(),
ffeId: t.tournament_id!,
tournament: t.tournament,
town: t.town,
department: t.department,
date: t.date,
url: t.url,
timeControl,
status: t.status,
};
} catch (error) {
errorLog(JSON.stringify(error, null, 2));
throw error;
} }
});
const timeControl = tcMap[t.time_control] ?? TimeControl.Other;
return {
id: t._id.toString(),
ffeId: t.tournament_id!,
tournament: t.tournament,
town: t.town,
department: t.department,
date: t.date,
url: t.url,
timeControl,
status: t.status,
};
} catch (error) {
errorLog(JSON.stringify(error, null, 2));
throw error;
}
});
+1 -3
View File
@@ -23,9 +23,7 @@ export const myZones = actionClient.action(async () => {
throw new Error("You must be logged in to fetch your zones"); throw new Error("You must be logged in to fetch your zones");
} }
const zones = await collections const zones = await collections.zones!.find({ userId: new ObjectId(user.user!.id!) }).toArray();
.zones!.find({ userId: new ObjectId(user.user!.id!) })
.toArray();
const result: Zone[] = zones.map((zone) => ({ const result: Zone[] = zones.map((zone) => ({
...omit(zone, ["_id", "userId"]), ...omit(zone, ["_id", "userId"]),
+56 -66
View File
@@ -17,80 +17,70 @@ const inputSchema = z.object({
export type SearchedTournament = Pick< export type SearchedTournament = Pick<
Tournament, Tournament,
| "id" "id" | "ffeId" | "date" | "department" | "status" | "timeControl" | "tournament" | "town" | "url"
| "ffeId"
| "date"
| "department"
| "status"
| "timeControl"
| "tournament"
| "town"
| "url"
>; >;
export const searchTournaments = actionClient export const searchTournaments = actionClient.schema(inputSchema).action(async (input) => {
.schema(inputSchema) const { searchValue, limit } = input.parsedInput;
.action(async (input) => { try {
const { searchValue, limit } = input.parsedInput; await dbConnect();
try {
await dbConnect();
const searchTerms = searchValue const searchTerms = searchValue
.split(" ") .split(" ")
.map((s) => removeDiacritics(s.trim())) .map((s) => removeDiacritics(s.trim()))
.filter((s) => s !== "") .filter((s) => s !== "")
.map((s) => ({ tournament_index: { $regex: s, $options: "i" } })); .map((s) => ({ tournament_index: { $regex: s, $options: "i" } }));
const data = await collections const data = await collections
.tournaments!.aggregate([ .tournaments!.aggregate([
{ {
$addFields: { $addFields: {
dateParts: { dateParts: {
$dateFromString: { $dateFromString: {
dateString: "$start_date", dateString: "$start_date",
format: "%d/%m/%Y", format: "%d/%m/%Y",
},
}, },
}, },
}, },
{ },
$match: { {
$and: [ $match: {
{ federation: { $eq: "FFE" } }, $and: [
{ dateParts: { $lte: endOfDay(new Date()) } }, { federation: { $eq: "FFE" } },
...searchTerms, { dateParts: { $lte: endOfDay(new Date()) } },
], ...searchTerms,
}, ],
}, },
{ },
$sort: { {
dateParts: -1, $sort: {
}, dateParts: -1,
}, },
{ $limit: limit ?? 20 }, },
{ { $limit: limit ?? 20 },
$unset: "dateParts", {
}, $unset: "dateParts",
]) },
.toArray(); ])
.toArray();
return data.map<SearchedTournament>((t) => { return data.map<SearchedTournament>((t) => {
const timeControl = tcMap[t.time_control] ?? TimeControl.Other; const timeControl = tcMap[t.time_control] ?? TimeControl.Other;
return { return {
id: t._id.toString(), id: t._id.toString(),
ffeId: t.tournament_id, ffeId: t.tournament_id,
tournament: t.tournament, tournament: t.tournament,
town: t.town, town: t.town,
department: t.department, department: t.department,
date: t.start_date, date: t.start_date,
url: t.url, url: t.url,
timeControl, timeControl,
status: t.status, status: t.status,
}; };
}); });
} catch (error) { } catch (error) {
errorLog(JSON.stringify(error, null, 2)); errorLog(JSON.stringify(error, null, 2));
throw error; throw error;
} }
}); });
+18 -20
View File
@@ -9,25 +9,23 @@ import { errorLog } from "@/utils/logger";
import { actionClient } from "./safeAction"; import { actionClient } from "./safeAction";
export const setUserLocale = actionClient export const setUserLocale = actionClient.schema(z.string()).action(async (input) => {
.schema(z.string()) try {
.action(async (input) => { await dbConnect();
try {
await dbConnect();
const user = await auth(); const user = await auth();
if (!user?.user) { if (!user?.user) {
throw new Error("You must be logged update your locale"); throw new Error("You must be logged update your locale");
}
await collections.users!.findOneAndUpdate(
{ _id: new ObjectId(user.user.id) },
{ $set: { locale: input.parsedInput } },
);
return true;
} catch (error) {
errorLog(error);
throw error;
} }
});
await collections.users!.findOneAndUpdate(
{ _id: new ObjectId(user.user.id) },
{ $set: { locale: input.parsedInput } },
);
return true;
} catch (error) {
errorLog(error);
throw error;
}
});
-1
View File
@@ -64,5 +64,4 @@ export type Path<T, K extends keyof T = keyof T> = K extends string
? T[K] extends Record<string, unknown> ? T[K] extends Record<string, unknown>
? `${K}.${Path<T[K], keyof T[K]>}` ? `${K}.${Path<T[K], keyof T[K]>}`
: K : K
: never; : never;
+23 -33
View File
@@ -5,51 +5,41 @@ export default function atomWithDebounce<T>(
delayMilliseconds = 500, delayMilliseconds = 500,
delayOnResetMilliseconds = 500, delayOnResetMilliseconds = 500,
) { ) {
const prevTimeoutAtom = atom<ReturnType<typeof setTimeout> | undefined>( const prevTimeoutAtom = atom<ReturnType<typeof setTimeout> | undefined>(undefined);
undefined,
);
// DO NOT EXPORT currentValueAtom as using this atom to set state can cause // DO NOT EXPORT currentValueAtom as using this atom to set state can cause
// inconsistent state between currentValueAtom and debouncedValueAtom // inconsistent state between currentValueAtom and debouncedValueAtom
const _currentValueAtom = atom(initialValue); const _currentValueAtom = atom(initialValue);
const isDebouncingAtom = atom(false); const isDebouncingAtom = atom(false);
const debouncedValueAtom = atom( const debouncedValueAtom = atom(initialValue, (get, set, update: SetStateAction<T>) => {
initialValue, clearTimeout(get(prevTimeoutAtom));
(get, set, update: SetStateAction<T>) => {
clearTimeout(get(prevTimeoutAtom));
const prevValue = get(_currentValueAtom); const prevValue = get(_currentValueAtom);
const nextValue = const nextValue = typeof update === "function" ? (update as (prev: T) => T)(prevValue) : update;
typeof update === "function"
? (update as (prev: T) => T)(prevValue)
: update;
const onDebounceStart = () => { const onDebounceStart = () => {
set(_currentValueAtom, nextValue); set(_currentValueAtom, nextValue);
set(isDebouncingAtom, true); set(isDebouncingAtom, true);
}; };
const onDebounceEnd = () => { const onDebounceEnd = () => {
set(debouncedValueAtom, nextValue); set(debouncedValueAtom, nextValue);
set(isDebouncingAtom, false); set(isDebouncingAtom, false);
}; };
onDebounceStart(); onDebounceStart();
const nextTimeoutId = setTimeout( const nextTimeoutId = setTimeout(
() => { () => {
onDebounceEnd(); onDebounceEnd();
}, },
nextValue === initialValue nextValue === initialValue ? delayOnResetMilliseconds : delayMilliseconds,
? delayOnResetMilliseconds );
: delayMilliseconds,
);
// set previous timeout atom in case it needs to get cleared // set previous timeout atom in case it needs to get cleared
set(prevTimeoutAtom, nextTimeoutId); set(prevTimeoutAtom, nextTimeoutId);
}, });
);
// exported atom setter to clear timeout if needed // exported atom setter to clear timeout if needed
const clearTimeoutAtom = atom(null, (get, set) => { const clearTimeoutAtom = atom(null, (get, set) => {
+1 -5
View File
@@ -21,11 +21,7 @@ export const filterClubsByManualEntry = (clubData: IClub[]): IClub[] =>
const existing = acc[key]; const existing = acc[key];
if ( if (club.manual_entry === true && existing.manual_entry !== true && club.pending !== true) {
club.manual_entry === true &&
existing.manual_entry !== true &&
club.pending !== true
) {
acc[key] = club; acc[key] = club;
} }
+3 -11
View File
@@ -3,11 +3,7 @@ import { clamp, last } from "lodash";
// Fide uses the following table to establish the chance of winning based on the difference in elo. // Fide uses the following table to establish the chance of winning based on the difference in elo.
// https://handbook.fide.com/chapter/B022017 // https://handbook.fide.com/chapter/B022017
const differenceToProbability: [ const differenceToProbability: [start: number, end: number, winChance: number][] = [
start: number,
end: number,
winChance: number,
][] = [
[0, 3, 0.5], [0, 3, 0.5],
[4, 10, 0.51], [4, 10, 0.51],
[11, 17, 0.52], [11, 17, 0.52],
@@ -69,15 +65,11 @@ export const getNewRating = (
) => { ) => {
const differenceInElo = clamp(opponentRating - rating, -400, Infinity); const differenceInElo = clamp(opponentRating - rating, -400, Infinity);
const tableRow = (differenceToProbability.find( const tableRow = (differenceToProbability.find(
([start, end]) => ([start, end]) => Math.abs(differenceInElo) >= start && Math.abs(differenceInElo) <= end,
Math.abs(differenceInElo) >= start && Math.abs(differenceInElo) <= end,
) ?? last(differenceToProbability)!)[2]; ) ?? last(differenceToProbability)!)[2];
const probabilityOfWinning = differenceInElo < 0 ? tableRow : 1 - tableRow; const probabilityOfWinning = differenceInElo < 0 ? tableRow : 1 - tableRow;
const delta = const delta = Math.round(kFactor * (result - probabilityOfWinning + Number.EPSILON) * 100) / 100;
Math.round(
kFactor * (result - probabilityOfWinning + Number.EPSILON) * 100,
) / 100;
return { return {
delta, delta,
+2 -7
View File
@@ -113,14 +113,9 @@ export interface NodemailerConfig extends EmailConfig {
options?: NodemailerUserConfig; options?: NodemailerUserConfig;
} }
export type NodemailerUserConfig = Omit< export type NodemailerUserConfig = Omit<Partial<NodemailerConfig>, "options" | "type">;
Partial<NodemailerConfig>,
"options" | "type"
>;
export default function Nodemailer( export default function Nodemailer(config: NodemailerUserConfig): NodemailerConfig {
config: NodemailerUserConfig,
): NodemailerConfig {
return { return {
id: "nodemailer", id: "nodemailer",
type: "email", type: "email",
+2 -18
View File
@@ -20,19 +20,7 @@ function getDAttribute(radius: number, startAngle: number, endAngle: number) {
const end = polarToCartesian(radius, endAngle); const end = polarToCartesian(radius, endAngle);
const largeArcFlag = endAngle - startAngle <= 180 ? 0 : 1; const largeArcFlag = endAngle - startAngle <= 180 ? 0 : 1;
const d = [ const d = ["M", start.x, start.y, "A", radius, radius, 0, largeArcFlag, 1, end.x, end.y];
"M",
start.x,
start.y,
"A",
radius,
radius,
0,
largeArcFlag,
1,
end.x,
end.y,
];
if (isCircle) { if (isCircle) {
d.push("Z"); d.push("Z");
@@ -55,11 +43,7 @@ type PieSlice = {
colour: string; colour: string;
}; };
export function generatePieSVG( export function generatePieSVG(className: string, radius: number, values: PieSlice[]) {
className: string,
radius: number,
values: PieSlice[],
) {
type Sector = { type Sector = {
colour: string; colour: string;
degrees: number; degrees: number;
+1 -2
View File
@@ -61,5 +61,4 @@ export const routing = defineRouting({
export type Pathnames = keyof typeof routing.pathnames; export type Pathnames = keyof typeof routing.pathnames;
export type Locale = (typeof routing.locales)[number]; export type Locale = (typeof routing.locales)[number];
export const { Link, redirect, usePathname, useRouter, getPathname } = export const { Link, redirect, usePathname, useRouter, getPathname } = createNavigation(routing);
createNavigation(routing);
+2 -8
View File
@@ -40,16 +40,10 @@ module.exports = {
// We use 100svh, falling back to the the --1svh var that we add as a polyfill for older browsers. // We use 100svh, falling back to the the --1svh var that we add as a polyfill for older browsers.
// The 7rem is for the header and footer. // The 7rem is for the header and footer.
// In the event that the polyfill fails, we fall back to 0.9vh as a guess of how much 1svh is. // In the event that the polyfill fails, we fall back to 0.9vh as a guess of how much 1svh is.
content: [ content: ["calc(var(--1svh, 0.9vh) * 100 - 7rem)", "calc(100svh - 7rem)"],
"calc(var(--1svh, 0.9vh) * 100 - 7rem)",
"calc(100svh - 7rem)",
],
}, },
height: { height: {
content: [ content: ["calc(var(--1svh, 0.9vh) * 100 - 7rem)", "calc(100svh - 7rem)"],
"calc(var(--1svh, 0.9vh) * 100 - 7rem)",
"calc(100svh - 7rem)",
],
}, },
}, },
}, },
+3 -11
View File
@@ -1,11 +1,7 @@
{ {
"compilerOptions": { "compilerOptions": {
"target": "es5", "target": "es5",
"lib": [ "lib": ["dom", "dom.iterable", "esnext"],
"dom",
"dom.iterable",
"esnext"
],
"allowJs": true, "allowJs": true,
"skipLibCheck": true, "skipLibCheck": true,
"strict": true, "strict": true,
@@ -24,9 +20,7 @@
} }
], ],
"paths": { "paths": {
"@/*": [ "@/*": ["./src/*"]
"./src/*"
]
} }
}, },
"include": [ "include": [
@@ -39,7 +33,5 @@
"next-auth.d.ts", "next-auth.d.ts",
".next/dev/types/**/*.ts" ".next/dev/types/**/*.ts"
], ],
"exclude": [ "exclude": ["node_modules"]
"node_modules"
]
} }