mirror of
https://github.com/versia-pub/frontend.git
synced 2026-03-13 03:29:16 +01:00
refactor: ♻️ Refactor toaster code for more accessibility and better UI
This commit is contained in:
Jesse Wierzbinski
parent
2b14813555
commit
5e6e881b98
14 changed files with 96 additions and 151 deletions
|
|
@ -10,15 +10,7 @@
|
|||
|
||||
<script lang="ts" setup>
|
||||
const loading = ref(true);
|
||||
const oidcError = useRequestURL().searchParams.get(
|
||||
"oidc_account_linking_error",
|
||||
);
|
||||
const oidcErrorDesc = useRequestURL().searchParams.get(
|
||||
"oidc_account_linking_error_message",
|
||||
);
|
||||
const oidcAccountLinked = useRequestURL().searchParams.get(
|
||||
"oidc_account_linked",
|
||||
);
|
||||
const params = useUrlSearchParams();
|
||||
|
||||
const estimatedProgress = (duration: number, elapsed: number) =>
|
||||
(2 / Math.PI) * 100 * Math.atan(((elapsed / duration) * 100) / 50);
|
||||
|
|
@ -39,39 +31,41 @@ app.hook("page:finish", async () => {
|
|||
await new Promise((resolve) => setTimeout(resolve, 300));
|
||||
loading.value = false;
|
||||
|
||||
if (oidcError) {
|
||||
if (params.oidc_account_linking_error) {
|
||||
useEvent("notification:new", {
|
||||
type: "error",
|
||||
title: oidcError,
|
||||
message: oidcErrorDesc ?? undefined,
|
||||
persistent: true,
|
||||
onDismiss: () => {
|
||||
// Remove data from URL
|
||||
window.history.replaceState(
|
||||
{},
|
||||
document.title,
|
||||
window.location.pathname,
|
||||
);
|
||||
title: params.oidc_account_linking_error,
|
||||
description: params.oidc_account_linking_error_message ?? undefined,
|
||||
duration: 999999,
|
||||
onStatusChange: (details) => {
|
||||
if (details.status === "dismissing") {
|
||||
// Remove data from URL
|
||||
window.history.replaceState(
|
||||
{},
|
||||
document.title,
|
||||
window.location.pathname,
|
||||
);
|
||||
}
|
||||
},
|
||||
});
|
||||
|
||||
// Remove the error from the URL
|
||||
}
|
||||
|
||||
if (oidcAccountLinked) {
|
||||
if (params.oidc_account_linked) {
|
||||
useEvent("notification:new", {
|
||||
type: "success",
|
||||
title: "Account linked",
|
||||
message:
|
||||
description:
|
||||
"Your account has been successfully linked to your OpenID Connect provider.",
|
||||
persistent: true,
|
||||
onDismiss: () => {
|
||||
// Remove data from URL
|
||||
window.history.replaceState(
|
||||
{},
|
||||
document.title,
|
||||
window.location.pathname,
|
||||
);
|
||||
duration: 999999,
|
||||
onStatusChange: (details) => {
|
||||
if (details.status === "dismissing") {
|
||||
// Remove data from URL
|
||||
window.history.replaceState(
|
||||
{},
|
||||
document.title,
|
||||
window.location.pathname,
|
||||
);
|
||||
}
|
||||
},
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,71 +1,42 @@
|
|||
<template>
|
||||
<Teleport to="body">
|
||||
<div aria-live="assertive"
|
||||
class="pointer-events-none fixed inset-0 flex items-end px-4 pt-6 pb-24 sm:pb-6 sm:items-start sm:p-6 z-50">
|
||||
<div class="flex w-full flex-col items-center space-y-4 sm:items-end">
|
||||
<!-- Notification panel, dynamically insert this into the live region when it needs to be displayed -->
|
||||
<TransitionGroup enter-active-class="transform ease-out duration-300 transition"
|
||||
enter-from-class="translate-y-2 opacity-0 sm:translate-y-0 sm:translate-x-2"
|
||||
enter-to-class="translate-y-0 opacity-100 sm:translate-x-0"
|
||||
leave-active-class="transition transform ease-in duration-100"
|
||||
leave-from-class="translate-y-0 opacity-100 sm:translate-x-0"
|
||||
leave-to-class="translate-y-2 opacity-0 sm:translate-y-0 sm:translate-x-2">
|
||||
<div v-for="notification in notifications" :key="notification.id"
|
||||
class="pointer-events-auto w-full max-w-sm overflow-hidden rounded-lg bg-dark-500 shadow-lg ring-1 ring-white/10">
|
||||
<div class="p-4">
|
||||
<div class="flex items-start">
|
||||
<div class="shrink-0 h-6 w-6">
|
||||
<iconify-icon v-if="notification.type === 'success'" icon="tabler:check"
|
||||
height="none" class="h-6 w-6 text-green-400" aria-hidden="true" />
|
||||
<iconify-icon v-else-if="notification.type === 'error'" icon="tabler:alert-triangle"
|
||||
height="none" class="h-6 w-6 text-red-400" aria-hidden="true" />
|
||||
<iconify-icon v-else-if="notification.type === 'progress'" icon="tabler:loader"
|
||||
height="none" class="h-6 w-6 text-primary-500 animate-spin"
|
||||
aria-hidden="true" />
|
||||
</div>
|
||||
<div class="ml-3 w-0 flex-1 pt-0.5">
|
||||
<p class="text-sm font-semibold text-gray-50">{{ notification.title }}</p>
|
||||
<p class="mt-1 text-sm text-gray-400" v-if="notification.message">{{
|
||||
notification.message }}</p>
|
||||
</div>
|
||||
<div class="ml-4 flex flex-shrink-0">
|
||||
<button type="button" title="Close this notification"
|
||||
@click="notifications.splice(notifications.indexOf(notification), 1); notification.onDismiss?.()"
|
||||
class="inline-flex rounded-md text-gray-400 hover:text-gray-300 duration-200">
|
||||
<iconify-icon icon="tabler:x" class="h-5 w-5" aria-hidden="true" />
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<Toaster :toaster="toaster" v-slot="toast">
|
||||
<Toast.Root
|
||||
class="rounded-lg w-[calc(100vw-2rem)] sm:w-80 bg-dark-500 duration-200 shadow-lg ring-1 ring-white/10 p-4 [&:nth-child(n+5)]:opacity-0 data-[stack]:!opacity-100 scale-[--scale,100%] translate-x-[--x] translate-y-[--y] z-[--z-index] will-change-transform">
|
||||
<div class="grid grid-cols-[auto_1fr_auto]">
|
||||
<div class="shrink-0 h-6 w-6">
|
||||
<iconify-icon v-if="toast.type === 'success'" icon="tabler:check" height="none"
|
||||
class="h-6 w-6 text-green-400" aria-hidden="true" />
|
||||
<iconify-icon v-else-if="toast.type === 'error'" icon="tabler:alert-triangle" height="none"
|
||||
class="h-6 w-6 text-red-400" aria-hidden="true" />
|
||||
<iconify-icon v-else-if="toast.type === 'progress'" icon="tabler:loader" height="none"
|
||||
class="h-6 w-6 text-primary-500 animate-spin" aria-hidden="true" />
|
||||
<iconify-icon v-else-if="toast.type === 'info'" icon="tabler:info-circle" height="none"
|
||||
class="h-6 w-6 text-blue-500" aria-hidden="true" />
|
||||
</div>
|
||||
</TransitionGroup>
|
||||
</div>
|
||||
</div>
|
||||
<div class="ml-3 flex-1 pt-0.5 shrink-0 min-w-48">
|
||||
<Toast.Title class="text-sm font-semibold text-gray-50">{{ toast.title }}</Toast.Title>
|
||||
<Toast.Description class="mt-1 text-sm text-gray-400">{{
|
||||
toast.description }}</Toast.Description>
|
||||
</div>
|
||||
<div class="ml-4 flex shrink-0">
|
||||
<Toast.CloseTrigger type="button" title="Close this notification"
|
||||
class="inline-flex rounded-md text-gray-400 hover:text-gray-300 duration-200">
|
||||
<iconify-icon icon="tabler:x" class="h-5 w-5" aria-hidden="true" />
|
||||
</Toast.CloseTrigger>
|
||||
</div>
|
||||
</div>
|
||||
</Toast.Root>
|
||||
</Toaster>
|
||||
</Teleport>
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
const notifications = ref<
|
||||
(NotificationEvent & {
|
||||
id: string;
|
||||
})[]
|
||||
>([]);
|
||||
<script setup lang="tsx">
|
||||
import { Toast, Toaster, createToaster } from "@ark-ui/vue";
|
||||
|
||||
useListen("notification:new", (n) => {
|
||||
const newNotification = {
|
||||
...n,
|
||||
id: Math.random().toString(36).substring(7),
|
||||
};
|
||||
const toaster = createToaster({ placement: "top-end", overlap: true, gap: 24 });
|
||||
|
||||
notifications.value.push(newNotification);
|
||||
|
||||
!newNotification.persistent &&
|
||||
setTimeout(() => {
|
||||
notifications.value.splice(
|
||||
notifications.value.indexOf(newNotification),
|
||||
1,
|
||||
);
|
||||
newNotification.onDismiss?.();
|
||||
}, 5000);
|
||||
useListen("notification:new", (notification) => {
|
||||
toaster.create(notification);
|
||||
});
|
||||
</script>
|
||||
|
|
@ -51,7 +51,7 @@ const link = async (providerId: string) => {
|
|||
|
||||
useEvent("notification:new", {
|
||||
title: "Failed to link account",
|
||||
message: e.response.data.error,
|
||||
description: e.response.data.error,
|
||||
type: "error",
|
||||
});
|
||||
}
|
||||
|
|
@ -78,7 +78,7 @@ const unlink = async (providerId: string) => {
|
|||
|
||||
useEvent("notification:new", {
|
||||
title: "Failed to unlink account",
|
||||
message: e.response.data.error,
|
||||
description: e.response.data.error,
|
||||
type: "error",
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ const save = async () => {
|
|||
|
||||
useEvent("notification:new", {
|
||||
title: "Failed to update profile",
|
||||
message: error.response.data.error,
|
||||
description: error.response.data.error,
|
||||
type: "error",
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -222,7 +222,7 @@ const signOut = async (id?: string) => {
|
|||
await useEvent("notification:new", {
|
||||
type: "success",
|
||||
title: "Signed out",
|
||||
message: "Account signed out successfully",
|
||||
description: "Account signed out successfully",
|
||||
});
|
||||
};
|
||||
</script>
|
||||
Loading…
Add table
Add a link
Reference in a new issue