From 1119b765bd3507e09cda40846209f2042e5a64a0 Mon Sep 17 00:00:00 2001 From: Jack Andrews Date: Sat, 26 Oct 2024 23:01:34 +0100 Subject: [PATCH] fix: remove mantine & fix notifications --- apps/client/@/shadcn/hooks/use-toast.ts | 194 + apps/client/@/shadcn/ui/toast.tsx | 127 + apps/client/@/shadcn/ui/toaster.tsx | 33 + apps/client/components/BlockEditor/index.tsx | 1 + .../components/CreateTicketModal/index.tsx | 27 +- .../components/MarkdownPreview/index.js | 9 - apps/client/components/ResetPassword/index.js | 26 +- .../client/components/TicketDetails/index.tsx | 8 +- apps/client/components/TipTapEditor/icons.js | 148 - apps/client/components/TipTapEditor/index.js | 108 - .../components/UpdateUserModal/index.tsx | 22 +- apps/client/package.json | 24 +- apps/client/pages/_app.tsx | 190 +- apps/client/pages/admin/clients/new.tsx | 19 +- apps/client/pages/admin/smtp/index.tsx | 16 +- .../pages/admin/smtp/templates/[id].tsx | 9 +- .../client/pages/admin/users/internal/new.tsx | 15 +- apps/client/pages/auth/forgot-password.tsx | 19 +- apps/client/pages/auth/login.tsx | 23 +- apps/client/pages/auth/register.tsx | 14 +- apps/client/pages/auth/reset-password.tsx | 37 +- apps/client/pages/index.tsx | 1 - apps/client/pages/issues/closed.tsx | 1 - apps/client/pages/issues/index.tsx | 1 - apps/client/pages/issues/open.tsx | 1 - apps/client/pages/new.tsx | 276 +- apps/client/pages/portal/new.tsx | 18 +- apps/client/pages/portal/tickets/closed.tsx | 1 - apps/client/pages/portal/tickets/index.tsx | 1 - apps/client/pages/portal/tickets/open.tsx | 1 - apps/client/pages/settings/password.tsx | 23 +- apps/client/pages/submit.tsx | 19 +- yarn.lock | 4809 +++++++---------- 33 files changed, 2660 insertions(+), 3561 deletions(-) create mode 100644 apps/client/@/shadcn/hooks/use-toast.ts create mode 100644 apps/client/@/shadcn/ui/toast.tsx create mode 100644 apps/client/@/shadcn/ui/toaster.tsx delete mode 100644 apps/client/components/MarkdownPreview/index.js delete mode 100644 apps/client/components/TipTapEditor/icons.js delete mode 100644 apps/client/components/TipTapEditor/index.js diff --git a/apps/client/@/shadcn/hooks/use-toast.ts b/apps/client/@/shadcn/hooks/use-toast.ts new file mode 100644 index 000000000..0d23d9981 --- /dev/null +++ b/apps/client/@/shadcn/hooks/use-toast.ts @@ -0,0 +1,194 @@ +"use client" + +// Inspired by react-hot-toast library +import * as React from "react" + +import type { + ToastActionElement, + ToastProps, +} from "@/shadcn//ui/toast" + +const TOAST_LIMIT = 1 +const TOAST_REMOVE_DELAY = 1000000 + +type ToasterToast = ToastProps & { + id: string + title?: React.ReactNode + description?: React.ReactNode + action?: ToastActionElement +} + +const actionTypes = { + ADD_TOAST: "ADD_TOAST", + UPDATE_TOAST: "UPDATE_TOAST", + DISMISS_TOAST: "DISMISS_TOAST", + REMOVE_TOAST: "REMOVE_TOAST", +} as const + +let count = 0 + +function genId() { + count = (count + 1) % Number.MAX_SAFE_INTEGER + return count.toString() +} + +type ActionType = typeof actionTypes + +type Action = + | { + type: ActionType["ADD_TOAST"] + toast: ToasterToast + } + | { + type: ActionType["UPDATE_TOAST"] + toast: Partial + } + | { + type: ActionType["DISMISS_TOAST"] + toastId?: ToasterToast["id"] + } + | { + type: ActionType["REMOVE_TOAST"] + toastId?: ToasterToast["id"] + } + +interface State { + toasts: ToasterToast[] +} + +const toastTimeouts = new Map>() + +const addToRemoveQueue = (toastId: string) => { + if (toastTimeouts.has(toastId)) { + return + } + + const timeout = setTimeout(() => { + toastTimeouts.delete(toastId) + dispatch({ + type: "REMOVE_TOAST", + toastId: toastId, + }) + }, TOAST_REMOVE_DELAY) + + toastTimeouts.set(toastId, timeout) +} + +export const reducer = (state: State, action: Action): State => { + switch (action.type) { + case "ADD_TOAST": + return { + ...state, + toasts: [action.toast, ...state.toasts].slice(0, TOAST_LIMIT), + } + + case "UPDATE_TOAST": + return { + ...state, + toasts: state.toasts.map((t) => + t.id === action.toast.id ? { ...t, ...action.toast } : t + ), + } + + case "DISMISS_TOAST": { + const { toastId } = action + + // ! Side effects ! - This could be extracted into a dismissToast() action, + // but I'll keep it here for simplicity + if (toastId) { + addToRemoveQueue(toastId) + } else { + state.toasts.forEach((toast) => { + addToRemoveQueue(toast.id) + }) + } + + return { + ...state, + toasts: state.toasts.map((t) => + t.id === toastId || toastId === undefined + ? { + ...t, + open: false, + } + : t + ), + } + } + case "REMOVE_TOAST": + if (action.toastId === undefined) { + return { + ...state, + toasts: [], + } + } + return { + ...state, + toasts: state.toasts.filter((t) => t.id !== action.toastId), + } + } +} + +const listeners: Array<(state: State) => void> = [] + +let memoryState: State = { toasts: [] } + +function dispatch(action: Action) { + memoryState = reducer(memoryState, action) + listeners.forEach((listener) => { + listener(memoryState) + }) +} + +type Toast = Omit + +function toast({ ...props }: Toast) { + const id = genId() + + const update = (props: ToasterToast) => + dispatch({ + type: "UPDATE_TOAST", + toast: { ...props, id }, + }) + const dismiss = () => dispatch({ type: "DISMISS_TOAST", toastId: id }) + + dispatch({ + type: "ADD_TOAST", + toast: { + ...props, + id, + open: true, + onOpenChange: (open) => { + if (!open) dismiss() + }, + }, + }) + + return { + id: id, + dismiss, + update, + } +} + +function useToast() { + const [state, setState] = React.useState(memoryState) + + React.useEffect(() => { + listeners.push(setState) + return () => { + const index = listeners.indexOf(setState) + if (index > -1) { + listeners.splice(index, 1) + } + } + }, [state]) + + return { + ...state, + toast, + dismiss: (toastId?: string) => dispatch({ type: "DISMISS_TOAST", toastId }), + } +} + +export { useToast, toast } diff --git a/apps/client/@/shadcn/ui/toast.tsx b/apps/client/@/shadcn/ui/toast.tsx new file mode 100644 index 000000000..216859e53 --- /dev/null +++ b/apps/client/@/shadcn/ui/toast.tsx @@ -0,0 +1,127 @@ +import * as React from "react" +import * as ToastPrimitives from "@radix-ui/react-toast" +import { cva, type VariantProps } from "class-variance-authority" +import { X } from "lucide-react" + +import { cn } from "@/shadcn/lib/utils" + +const ToastProvider = ToastPrimitives.Provider + +const ToastViewport = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ className, ...props }, ref) => ( + +)) +ToastViewport.displayName = ToastPrimitives.Viewport.displayName + +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-[var(--radix-toast-swipe-end-x)] data-[swipe=move]:translate-x-[var(--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", + }, + }, + defaultVariants: { + variant: "default", + }, + } +) + +const Toast = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef & + VariantProps +>(({ className, variant, ...props }, ref) => { + return ( + + ) +}) +Toast.displayName = ToastPrimitives.Root.displayName + +const ToastAction = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ className, ...props }, ref) => ( + +)) +ToastAction.displayName = ToastPrimitives.Action.displayName + +const ToastClose = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ className, ...props }, ref) => ( + + + +)) +ToastClose.displayName = ToastPrimitives.Close.displayName + +const ToastTitle = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ className, ...props }, ref) => ( + +)) +ToastTitle.displayName = ToastPrimitives.Title.displayName + +const ToastDescription = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ className, ...props }, ref) => ( + +)) +ToastDescription.displayName = ToastPrimitives.Description.displayName + +type ToastProps = React.ComponentPropsWithoutRef + +type ToastActionElement = React.ReactElement + +export { + type ToastProps, + type ToastActionElement, + ToastProvider, + ToastViewport, + Toast, + ToastTitle, + ToastDescription, + ToastClose, + ToastAction, +} diff --git a/apps/client/@/shadcn/ui/toaster.tsx b/apps/client/@/shadcn/ui/toaster.tsx new file mode 100644 index 000000000..0fc91fcf3 --- /dev/null +++ b/apps/client/@/shadcn/ui/toaster.tsx @@ -0,0 +1,33 @@ +import { useToast } from "@/shadcn//hooks/use-toast" +import { + Toast, + ToastClose, + ToastDescription, + ToastProvider, + ToastTitle, + ToastViewport, +} from "@/shadcn//ui/toast" + +export function Toaster() { + const { toasts } = useToast() + + return ( + + {toasts.map(function ({ id, title, description, action, ...props }) { + return ( + +
+ {title && {title}} + {description && ( + {description} + )} +
+ {action} + + + ) + })} + + + ) +} diff --git a/apps/client/components/BlockEditor/index.tsx b/apps/client/components/BlockEditor/index.tsx index d91a3a0c7..d76d65169 100644 --- a/apps/client/components/BlockEditor/index.tsx +++ b/apps/client/components/BlockEditor/index.tsx @@ -1,6 +1,7 @@ import { useCreateBlockNote } from "@blocknote/react"; import { BlockNoteView } from "@blocknote/mantine"; + import "@blocknote/core/fonts/inter.css"; import "@blocknote/mantine/style.css"; diff --git a/apps/client/components/CreateTicketModal/index.tsx b/apps/client/components/CreateTicketModal/index.tsx index 2aad77b34..893c0de87 100644 --- a/apps/client/components/CreateTicketModal/index.tsx +++ b/apps/client/components/CreateTicketModal/index.tsx @@ -2,7 +2,6 @@ import React, { useState, useEffect, Fragment, useRef } from "react"; import { Dialog, Transition, Listbox } from "@headlessui/react"; import { CheckIcon } from "@heroicons/react/20/solid"; import useTranslation from "next-translate/useTranslation"; -import { notifications } from "@mantine/notifications"; import { ChevronUpDownIcon, PlusIcon, @@ -14,6 +13,7 @@ import { getCookie } from "cookies-next"; import dynamic from "next/dynamic"; import { ListPlus } from "lucide-react"; +import { toast } from "@/shadcn/hooks/use-toast"; const Editor = dynamic(() => import("../BlockEditor"), { ssr: false }); @@ -117,19 +117,19 @@ export default function CreateTicketModal({ keypress, setKeyPressDown }) { .then((res) => res.json()) .then((res) => { if (res.success === true) { - notifications.show({ - title: "Ticket Created", - message: "Ticket created succesfully", - color: "green", - autoClose: 5000, + + toast({ + variant: "default", + title: "Success", + description: "Ticket created succesfully", }); router.push("/issues"); } else { - notifications.show({ - title: "Error", - message: `Error: ${res.error}`, - color: "red", - autoClose: 5000, + + toast({ + variant: "destructive", + title: `Error`, + description: res.error, }); } }); @@ -214,10 +214,7 @@ export default function CreateTicketModal({ keypress, setKeyPressDown }) { onClick={() => setOpen(false)} > Close -