From 2f79de84832c6e306dcab33a35f91a08bf112232 Mon Sep 17 00:00:00 2001 From: Alexis <35.alexis.pele@gmail.com> Date: Sun, 8 Sep 2024 19:26:38 +0200 Subject: [PATCH] Added toast on deleted entities --- app.vue | 4 ++++ assets/main.css | 8 ++++++++ components/calendar/dialog/Delete.vue | 17 +++++++++++++++-- components/calendar/form/DeleteEvent.vue | 14 +++++++++++++- components/ui/toast/ToastTitle.vue | 2 +- components/ui/toast/index.ts | 6 +++--- components/ui/toast/use-toast.ts | 2 +- i18n.config.ts | 16 ++++++++++++++-- tailwind.config.js | 5 +++++ 9 files changed, 64 insertions(+), 10 deletions(-) diff --git a/app.vue b/app.vue index 6557af5..a8e9e84 100644 --- a/app.vue +++ b/app.vue @@ -43,6 +43,10 @@ const useIdFunction = () => useId() + + + + diff --git a/assets/main.css b/assets/main.css index d457ff6..2cbcd24 100644 --- a/assets/main.css +++ b/assets/main.css @@ -31,6 +31,10 @@ --destructive: 0 84.2% 60.2%; --destructive-foreground: 210 40% 98%; + --success: 156 72% 67%; + --success-muted: 156 72% 90%; + --success-foreground: 222.2 84% 4.9%; + --ring: 222.2 84% 4.9%; --radius: 0.5rem; @@ -64,6 +68,10 @@ --destructive: 0 62.8% 30.6%; --destructive-foreground: 210 40% 98%; + --success: 142 72% 29%; + --success-muted: 142 72% 10%; + --success-foreground: 210 40% 98%; + --ring: 212.7 26.8% 83.9%; } } diff --git a/components/calendar/dialog/Delete.vue b/components/calendar/dialog/Delete.vue index b964236..3d6f4d3 100644 --- a/components/calendar/dialog/Delete.vue +++ b/components/calendar/dialog/Delete.vue @@ -1,7 +1,11 @@ diff --git a/components/ui/toast/index.ts b/components/ui/toast/index.ts index 09d5dd0..1579986 100644 --- a/components/ui/toast/index.ts +++ b/components/ui/toast/index.ts @@ -14,13 +14,13 @@ export { default as ToastProvider } from "./ToastProvider.vue" export { toast, useToast } from "./use-toast" export const toastVariants = cva( - "group pointer-events-auto relative flex w-full items-center justify-between space-x-4 overflow-hidden rounded-md border p-6 pr-8 shadow-lg transition-all data-[swipe=cancel]:translate-x-0 data-[swipe=end]:translate-x-[--radix-toast-swipe-end-x] data-[swipe=move]:translate-x-[--radix-toast-swipe-move-x] data-[swipe=move]:transition-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[swipe=end]:animate-out data-[state=closed]:fade-out-80 data-[state=closed]:slide-out-to-right-full data-[state=open]:slide-in-from-top-full data-[state=open]:sm:slide-in-from-bottom-full", + "group pointer-events-auto relative flex w-full items-center justify-between space-x-4 overflow-hidden rounded-md border p-4 pr-6 shadow-lg transition-all data-[swipe=cancel]:translate-x-0 data-[swipe=end]:translate-x-[--radix-toast-swipe-end-x] data-[swipe=move]:translate-x-[--radix-toast-swipe-move-x] data-[swipe=move]:transition-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[swipe=end]:animate-out data-[state=closed]:fade-out-80 data-[state=closed]:slide-out-to-right-full data-[state=open]:slide-in-from-top-full data-[state=open]:sm:slide-in-from-bottom-full", { variants: { variant: { default: "border bg-background text-foreground", - destructive: - "destructive group border-destructive bg-destructive text-destructive-foreground", + destructive: "destructive group border-destructive bg-destructive text-destructive-foreground", + success: "success group border-success bg-success-muted text-success-foreground" }, }, defaultVariants: { diff --git a/components/ui/toast/use-toast.ts b/components/ui/toast/use-toast.ts index 3ead807..66bb174 100644 --- a/components/ui/toast/use-toast.ts +++ b/components/ui/toast/use-toast.ts @@ -2,7 +2,7 @@ import { computed, ref } from "vue" import type { Component, VNode } from "vue" import type { ToastProps } from "." -const TOAST_LIMIT = 1 +const TOAST_LIMIT = 3 const TOAST_REMOVE_DELAY = 1000000 export type StringOrVNode = diff --git a/i18n.config.ts b/i18n.config.ts index a28dd38..5db15c1 100644 --- a/i18n.config.ts +++ b/i18n.config.ts @@ -107,7 +107,10 @@ export default defineI18nConfig(() => ({ deleteDialog: { title: "Delete this event", subtitle: "Data associated with this event will be lost and you won't be able to retrieve it !", - } + }, + deletedToast: { + title: "The event \"{event}\" has been successfuly deleted.", + }, }, createDialog: { title: "New calendar", @@ -127,6 +130,9 @@ export default defineI18nConfig(() => ({ title: "Are you sure you want to delete this calendar ?", subtitle: "Its events won't be accessible anymore and you won't be able to retrieve the deleted data !", }, + deletedToast: { + title: "Calendar \"{calendar}\" has been successfuly deleted.", + }, millennia: { nameSingular: "Millennia", nextSingular: "Next millennia", @@ -273,7 +279,10 @@ export default defineI18nConfig(() => ({ deleteDialog: { title: "Supprimer l'évènement", subtitle: "Les données associés à cet évènement seront supprimées et vous ne pourrez plus les récupérer !", - } + }, + deletedToast: { + title: "L'évènement \"{event}\" a été supprimé avec succès.", + }, }, createDialog: { title: "Nouveau calendrier", @@ -293,6 +302,9 @@ export default defineI18nConfig(() => ({ title: "Êtes-vous sûr de supprimer ce calendrier ?", subtitle: "Les évènements ne seront plus accessibles et vous ne pourrez plus récupérer les données !", }, + deletedToast: { + title: "Le calendrier \"{calendar}\" a été supprimé avec succès.", + }, millennia: { nameSingular: "Millénaire", nextSingular: "Millénaire suivant", diff --git a/tailwind.config.js b/tailwind.config.js index 230188b..c7ee994 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -41,6 +41,11 @@ module.exports = { DEFAULT: "hsl(var(--destructive))", foreground: "hsl(var(--destructive-foreground))", }, + success: { + DEFAULT: "hsl(var(--success))", + muted: "hsl(var(--success-muted))", + foreground: "hsl(var(--success-foreground))", + }, muted: { DEFAULT: "hsl(var(--muted))", foreground: "hsl(var(--muted-foreground))",