From d6dd76021226802adf5295b3243d6f2ae4fa5cc2 Mon Sep 17 00:00:00 2001 From: MohamedBassem Date: Sun, 10 Mar 2024 17:59:58 +0000 Subject: refactor: Move all components to the top level directory --- packages/web/app/dashboard/components/AllLists.tsx | 60 -------- .../web/app/dashboard/components/ModileSidebar.tsx | 24 --- .../app/dashboard/components/ModileSidebarItem.tsx | 27 ---- .../web/app/dashboard/components/NewListModal.tsx | 170 --------------------- packages/web/app/dashboard/components/Sidebar.tsx | 66 -------- .../web/app/dashboard/components/SidebarItem.tsx | 33 ---- .../dashboard/components/SidebarProfileOptions.tsx | 35 ----- 7 files changed, 415 deletions(-) delete mode 100644 packages/web/app/dashboard/components/AllLists.tsx delete mode 100644 packages/web/app/dashboard/components/ModileSidebar.tsx delete mode 100644 packages/web/app/dashboard/components/ModileSidebarItem.tsx delete mode 100644 packages/web/app/dashboard/components/NewListModal.tsx delete mode 100644 packages/web/app/dashboard/components/Sidebar.tsx delete mode 100644 packages/web/app/dashboard/components/SidebarItem.tsx delete mode 100644 packages/web/app/dashboard/components/SidebarProfileOptions.tsx (limited to 'packages/web/app/dashboard/components') diff --git a/packages/web/app/dashboard/components/AllLists.tsx b/packages/web/app/dashboard/components/AllLists.tsx deleted file mode 100644 index a77252d0..00000000 --- a/packages/web/app/dashboard/components/AllLists.tsx +++ /dev/null @@ -1,60 +0,0 @@ -"use client"; - -import { api } from "@/lib/trpc"; -import SidebarItem from "./SidebarItem"; -import NewListModal, { useNewListModal } from "./NewListModal"; -import { Plus } from "lucide-react"; -import Link from "next/link"; -import { ZBookmarkList } from "@hoarder/trpc/types/lists"; - -export default function AllLists({ - initialData, -}: { - initialData: { lists: ZBookmarkList[] }; -}) { - let { data: lists } = api.lists.list.useQuery(undefined, { - initialData, - }); - // TODO: This seems to be a bug in react query - lists ||= initialData; - const { setOpen } = useNewListModal(); - - return ( - - ); -} diff --git a/packages/web/app/dashboard/components/ModileSidebar.tsx b/packages/web/app/dashboard/components/ModileSidebar.tsx deleted file mode 100644 index 4bd6a347..00000000 --- a/packages/web/app/dashboard/components/ModileSidebar.tsx +++ /dev/null @@ -1,24 +0,0 @@ -import MobileSidebarItem from "./ModileSidebarItem"; -import { - Tag, - PackageOpen, - Settings, - Search, - ClipboardList, -} from "lucide-react"; -import SidebarProfileOptions from "./SidebarProfileOptions"; - -export default async function MobileSidebar() { - return ( - - ); -} diff --git a/packages/web/app/dashboard/components/ModileSidebarItem.tsx b/packages/web/app/dashboard/components/ModileSidebarItem.tsx deleted file mode 100644 index 9389d2e4..00000000 --- a/packages/web/app/dashboard/components/ModileSidebarItem.tsx +++ /dev/null @@ -1,27 +0,0 @@ -"use client"; - -import { cn } from "@/lib/utils"; -import Link from "next/link"; -import { usePathname } from "next/navigation"; - -export default function MobileSidebarItem({ - logo, - path, -}: { - logo: React.ReactNode; - path: string; -}) { - const currentPath = usePathname(); - return ( -
  • - - {logo} - -
  • - ); -} diff --git a/packages/web/app/dashboard/components/NewListModal.tsx b/packages/web/app/dashboard/components/NewListModal.tsx deleted file mode 100644 index f51616ed..00000000 --- a/packages/web/app/dashboard/components/NewListModal.tsx +++ /dev/null @@ -1,170 +0,0 @@ -"use client"; - -import data from "@emoji-mart/data"; -import Picker from "@emoji-mart/react"; - -import { - Popover, - PopoverContent, - PopoverTrigger, -} from "@/components/ui/popover"; - -import { ActionButton } from "@/components/ui/action-button"; -import { Button } from "@/components/ui/button"; -import { - Dialog, - DialogClose, - DialogContent, - DialogFooter, - DialogHeader, - DialogTitle, - DialogTrigger, -} from "@/components/ui/dialog"; -import { - Form, - FormControl, - FormField, - FormItem, - FormMessage, -} from "@/components/ui/form"; - -import { toast } from "@/components/ui/use-toast"; -import { api } from "@/lib/trpc"; - -import { z } from "zod"; -import { useForm } from "react-hook-form"; -import { zodResolver } from "@hookform/resolvers/zod"; -import { Input } from "@/components/ui/input"; - -import { create } from "zustand"; - -export const useNewListModal = create<{ - open: boolean; - setOpen: (v: boolean) => void; -}>((set) => ({ - open: false, - setOpen: (open: boolean) => set(() => ({ open })), -})); - -export default function NewListModal() { - const { open, setOpen } = useNewListModal(); - - const formSchema = z.object({ - name: z.string(), - icon: z.string(), - }); - const form = useForm>({ - resolver: zodResolver(formSchema), - defaultValues: { - name: "", - icon: "💡", - }, - }); - - const listsInvalidationFunction = api.useUtils().lists.list.invalidate; - - const { mutate: createList, isPending } = api.lists.create.useMutation({ - onSuccess: () => { - toast({ - description: "List has been created!", - }); - listsInvalidationFunction(); - setOpen(false); - }, - onError: (e) => { - if (e.data?.code == "BAD_REQUEST") { - toast({ - variant: "destructive", - description: e.message, - }); - } else { - toast({ - variant: "destructive", - title: "Something went wrong", - }); - } - }, - }); - - return ( - { - form.reset(); - setOpen(s); - }} - > - -
    - { - createList(value); - })} - > - - New List - -
    - { - return ( - - - - - {field.value} - - - - field.onChange(e.native) - } - /> - - - - - - ); - }} - /> - - { - return ( - - - - - - - ); - }} - /> -
    - - - - - - Create - - -
    - -
    -
    - ); -} diff --git a/packages/web/app/dashboard/components/Sidebar.tsx b/packages/web/app/dashboard/components/Sidebar.tsx deleted file mode 100644 index a5c1d7a5..00000000 --- a/packages/web/app/dashboard/components/Sidebar.tsx +++ /dev/null @@ -1,66 +0,0 @@ -import { Tag, Home, PackageOpen, Settings, Search, Shield } from "lucide-react"; -import { redirect } from "next/navigation"; -import SidebarItem from "./SidebarItem"; -import { getServerAuthSession } from "@/server/auth"; -import Link from "next/link"; -import SidebarProfileOptions from "./SidebarProfileOptions"; -import { Separator } from "@/components/ui/separator"; -import AllLists from "./AllLists"; -import serverConfig from "@hoarder/shared/config"; -import { api } from "@/server/api/client"; - -export default async function Sidebar() { - const session = await getServerAuthSession(); - if (!session) { - redirect("/"); - } - - const lists = await api.lists.list(); - - return ( - - ); -} diff --git a/packages/web/app/dashboard/components/SidebarItem.tsx b/packages/web/app/dashboard/components/SidebarItem.tsx deleted file mode 100644 index 856bdffd..00000000 --- a/packages/web/app/dashboard/components/SidebarItem.tsx +++ /dev/null @@ -1,33 +0,0 @@ -"use client"; - -import { cn } from "@/lib/utils"; -import Link from "next/link"; -import { usePathname } from "next/navigation"; - -export default function SidebarItem({ - name, - logo, - path, - className, -}: { - name: string; - logo: React.ReactNode; - path: string; - className?: string; -}) { - const currentPath = usePathname(); - return ( -
  • - - {logo} - {name} - -
  • - ); -} diff --git a/packages/web/app/dashboard/components/SidebarProfileOptions.tsx b/packages/web/app/dashboard/components/SidebarProfileOptions.tsx deleted file mode 100644 index f931b63e..00000000 --- a/packages/web/app/dashboard/components/SidebarProfileOptions.tsx +++ /dev/null @@ -1,35 +0,0 @@ -"use client"; - -import { Button } from "@/components/ui/button"; -import { - DropdownMenu, - DropdownMenuContent, - DropdownMenuItem, - DropdownMenuTrigger, -} from "@/components/ui/dropdown-menu"; -import { LogOut, MoreHorizontal } from "lucide-react"; -import { signOut } from "next-auth/react"; - -export default function SidebarProfileOptions() { - return ( - - - - - - - signOut({ - callbackUrl: "/", - }) - } - > - - Sign Out - - - - ); -} -- cgit v1.2.3-70-g09d2