- {zones?.map((zone) => {
- const notifications = [
- ...(zone.classicNotifications ? [TimeControl.Classic] : []),
- ...(zone.rapidNotifications ? [TimeControl.Rapid] : []),
- ...(zone.blitzNotifications ? [TimeControl.Blitz] : []),
- ];
+ {isFetching ? (
+
+
+
+ ) : (
+
+ {zones?.map((zone) => {
+ const notifications = [
+ ...(zone.classicNotifications ? [TimeControl.Classic] : []),
+ ...(zone.rapidNotifications ? [TimeControl.Rapid] : []),
+ ...(zone.blitzNotifications ? [TimeControl.Blitz] : []),
+ ];
- const notificationsList = format.list(
- notifications.map((tc) => at("timeControlEnumInline", { tc })),
- { type: "conjunction" },
- );
+ const notificationsList = format.list(
+ notifications.map((tc) => at("timeControlEnumInline", { tc })),
+ { type: "conjunction" },
+ );
- return (
-
-
-
-
- {zone.name}
-
+ return (
+
+
+
+
+ {zone.name}
+
-
- {notifications.length === 0
- ? t("noNotifications")
- : t.rich("withNotifications", {
- list: notificationsList,
- b: (str) => {str},
- })}
-
+
+ {notifications.length === 0
+ ? t("noNotifications")
+ : t.rich("withNotifications", {
+ list: notificationsList,
+ b: (str) => {str},
+ })}
+
-
-
- {t("editButton")}
-
-
+
+
+ {at("editButton")}
+
+
+
-
- );
- })}
-
- )}
+ );
+ })}
+
+ )}
-
-
-
- {t("addZoneButton")}
-
+
+
+
+ {t("addZoneButton")}
+
+
-
+
+
setDeletingZoneId(null)}
+ title={t("deleteZoneTitle")}
+ subTitle={t("deleteZoneInfo")}
+ >
+
+
+
+
+
+
+
+
);
};
diff --git a/src/components/Modal.tsx b/src/components/Modal.tsx
new file mode 100644
index 0000000..69351de
--- /dev/null
+++ b/src/components/Modal.tsx
@@ -0,0 +1,104 @@
+import React, { ComponentProps, Fragment } from "react";
+
+import { Dialog, Transition } from "@headlessui/react";
+import { twMerge } from "tailwind-merge";
+
+type ModalProps = ComponentProps
& {
+ title?: string;
+ subTitle?: string;
+
+ titleClass?: string;
+ subTitleClass?: string;
+ overlayClass?: string;
+ panelClass?: string;
+ children?: React.ReactNode;
+};
+
+export const Modal = ({
+ open,
+ onClose,
+
+ title,
+ subTitle,
+
+ titleClass,
+ subTitleClass,
+ overlayClass,
+ panelClass,
+ children,
+
+ ...dialogProps
+}: ModalProps) => (
+
+
+
+);
diff --git a/src/hooks/useZones.ts b/src/hooks/useZones.ts
new file mode 100644
index 0000000..3e3baf1
--- /dev/null
+++ b/src/hooks/useZones.ts
@@ -0,0 +1,19 @@
+import { useQuery } from "@tanstack/react-query";
+
+import { myZones } from "@/server/myZones";
+
+export const useZones = () => {
+ const query = useQuery({
+ queryKey: ["zones"],
+ queryFn: async () => myZones(),
+ refetchOnWindowFocus: false,
+ staleTime: Infinity,
+ gcTime: 10 * 60 * 1000,
+ retry: false,
+ });
+
+ return {
+ ...query,
+ zones: query.data?.data ?? [],
+ };
+};
diff --git a/src/messages/en.json b/src/messages/en.json
index 1d5115a..91a181b 100644
--- a/src/messages/en.json
+++ b/src/messages/en.json
@@ -17,7 +17,9 @@
"timeControlEnumInline": "{tc, select, Classic {classic} Rapid {rapid} Blitz {blitz} Other {other} other {{tc}}}",
"saveButton": "Save",
- "cancelButton": "Cancel"
+ "cancelButton": "Cancel",
+ "editButton": "Edit",
+ "deleteButton": "Delete"
},
"Errors": {
@@ -241,8 +243,6 @@
"noNotifications": "You have not enabled email notifications for this zone.",
"withNotifications": "You will receive email notifications for new tournaments with {list} time control in this region.",
- "editButton": "Edit",
- "deleteButton": "Delete",
"addZoneButton": "Add a Region",
"createTitle": "Create a new zone",
@@ -252,8 +252,10 @@
"zoneNamePlaceholder": "Name for your zone",
"notificationsLabel": "Notifications",
"notificationsInfo": "You can choose to turn on notifications for the time controls that interest you, and will receive an email when a new tournament is added to this zone.",
- "saveButton": "Save",
- "createFailure": "Oops, something went wrong. Please try again later."
+ "createFailure": "Oops, something went wrong. Please try again later.",
+
+ "deleteZoneTitle": "Delete Zone",
+ "deleteZoneInfo": "Are you sure you want to delete this zone? This action cannot be undone."
}
}
diff --git a/src/messages/fr.json b/src/messages/fr.json
index 933fb70..dfb25ac 100644
--- a/src/messages/fr.json
+++ b/src/messages/fr.json
@@ -17,7 +17,9 @@
"timeControlEnumInline": "{tc, select, Classic {lente} Rapid {rapide} Blitz {blitz} Other {autres} other {{tc}}}",
"saveButton": "Sauvegarder",
- "cancelButton": "Annuler"
+ "cancelButton": "Annuler",
+ "editButton": "Modifier",
+ "deleteButton": "Supprimer"
},
"Errors": {
@@ -241,8 +243,6 @@
"noNotifications": "Vous n'avez pas activé les notifications par email pour cette région.",
"withNotifications": "Vous allez recevoir des notifications par e-mail pour les nouveaux tournois de cadences {list} dans cette région.",
- "editButton": "Modifier",
- "deleteButton": "Supprimer",
"addZoneButton": "Ajouter une région",
"createTitle": "Créer une nouvelle région",
@@ -252,8 +252,10 @@
"zoneNamePlaceholder": "Votre nom pour cette région",
"notificationsLabel": "Notifications",
"notificationsInfo": "Vous pouvez choisir d'activer les notifications pour les cadences qui vous intéressent, et vous recevrez un e-mail lorsqu'un nouveau tournoi est ajouté dans cette zone.",
- "saveButton": "Sauvegarder",
- "createFailure": "Oups, quelque chose s'est mal passé. Veuillez réessayer."
+ "createFailure": "Oups, quelque chose s'est mal passé. Veuillez réessayer.",
+
+ "deleteZoneTitle": "Supprimer la région",
+ "deleteZoneInfo": "Êtes-vous sûr de vouloir supprimer cette région\u00a0?"
}
}
diff --git a/src/server/deleteZone.ts b/src/server/deleteZone.ts
new file mode 100644
index 0000000..d4eee5b
--- /dev/null
+++ b/src/server/deleteZone.ts
@@ -0,0 +1,39 @@
+"use server";
+
+import { ObjectId } from "mongodb";
+import { z } from "zod";
+
+import { auth } from "@/auth";
+import { collections, dbConnect } from "@/server/mongodb";
+import { errorLog } from "@/utils/logger";
+
+import { action } from "./safeAction";
+
+const deleteZoneSchema = z.object({
+ id: z.string(),
+});
+
+export const deleteZone = action(deleteZoneSchema, async ({ id }) => {
+ try {
+ await dbConnect();
+
+ const user = await auth();
+ if (!user?.user) {
+ 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;
+ }
+});
diff --git a/yarn.lock b/yarn.lock
index 2257d4b..8d559d1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1259,7 +1259,7 @@
dependencies:
tslib "^2.4.0"
-"@headlessui/react@^1.7.17":
+"@headlessui/react@^1.7.18":
version "1.7.18"
resolved "https://registry.yarnpkg.com/@headlessui/react/-/react-1.7.18.tgz#30af4634d2215b2ca1aa29d07f33d02bea82d9d7"
integrity sha512-4i5DOrzwN4qSgNsL4Si61VMkUcWbcSKueUV7sFhpHzQcSShdlHENE5+QBntMSRvHt8NyoFO2AGG8si9lq+w4zQ==