From 81bf3fc15ff6fa005bb43d4203e36dd0a39a738e Mon Sep 17 00:00:00 2001 From: Pablo Lara Date: Tue, 6 Aug 2024 12:05:10 +0200 Subject: [PATCH] chore: adding a new index.ts file to improve the way we're exporting components (ui) --- app/(prowler)/compliance/page.tsx | 2 +- app/(prowler)/error.tsx | 2 +- app/(prowler)/findings/page.tsx | 3 ++- app/(prowler)/integration/page.tsx | 2 +- app/(prowler)/layout.tsx | 2 +- app/(prowler)/page.tsx | 4 +--- app/(prowler)/providers/page.tsx | 2 +- app/(prowler)/services/page.tsx | 2 +- app/(prowler)/settings/page.tsx | 2 +- components/index.ts | 8 -------- components/providers/AddProviderModal.tsx | 2 +- components/ui/index.ts | 8 ++++++++ components/ui/modal/ModalWrap.tsx | 2 +- components/ui/toast/Toaster.tsx | 2 +- components/ui/toast/use-toast.ts | 2 +- 15 files changed, 22 insertions(+), 23 deletions(-) create mode 100644 components/ui/index.ts diff --git a/app/(prowler)/compliance/page.tsx b/app/(prowler)/compliance/page.tsx index 2c7a507043..59b39ea737 100644 --- a/app/(prowler)/compliance/page.tsx +++ b/app/(prowler)/compliance/page.tsx @@ -1,6 +1,6 @@ import React from "react"; -import { Header } from "@/components"; +import { Header } from "@/components/ui"; export default function Compliance() { return ( diff --git a/app/(prowler)/error.tsx b/app/(prowler)/error.tsx index fd8468f123..3719b239e3 100644 --- a/app/(prowler)/error.tsx +++ b/app/(prowler)/error.tsx @@ -3,8 +3,8 @@ import Link from "next/link"; import { useEffect } from "react"; -import { Alert, AlertDescription, AlertTitle } from "@/components"; import { RocketIcon } from "@/components/icons"; +import { Alert, AlertDescription, AlertTitle } from "@/components/ui"; export default function Error({ error, diff --git a/app/(prowler)/findings/page.tsx b/app/(prowler)/findings/page.tsx index 93a3e7f1f3..4a5e2f1947 100644 --- a/app/(prowler)/findings/page.tsx +++ b/app/(prowler)/findings/page.tsx @@ -1,8 +1,9 @@ import { Spacer } from "@nextui-org/react"; import React, { Suspense } from "react"; -import { ColumnsFindings, Header, SkeletonTableFindings } from "@/components"; +import { ColumnsFindings, SkeletonTableFindings } from "@/components"; import { DataTable } from "@/components/providers"; +import { Header } from "@/components/ui"; export default async function Findings() { return ( diff --git a/app/(prowler)/integration/page.tsx b/app/(prowler)/integration/page.tsx index 00e83f59ae..576089371b 100644 --- a/app/(prowler)/integration/page.tsx +++ b/app/(prowler)/integration/page.tsx @@ -1,6 +1,6 @@ import React from "react"; -import { Header } from "@/components"; +import { Header } from "@/components/ui"; export default function Integration() { return ( diff --git a/app/(prowler)/layout.tsx b/app/(prowler)/layout.tsx index cf932cfd20..ec533b5892 100644 --- a/app/(prowler)/layout.tsx +++ b/app/(prowler)/layout.tsx @@ -3,7 +3,7 @@ import "@/styles/globals.css"; import { Metadata, Viewport } from "next"; import React from "react"; -import { Toaster } from "@/components"; +import { Toaster } from "@/components/ui"; import { SidebarWrap } from "@/components/ui/sidebar"; import { fontSans } from "@/config/fonts"; import { siteConfig } from "@/config/site"; diff --git a/app/(prowler)/page.tsx b/app/(prowler)/page.tsx index 5d42aacbdb..3882fd7071 100644 --- a/app/(prowler)/page.tsx +++ b/app/(prowler)/page.tsx @@ -1,6 +1,4 @@ -import React from "react"; - -import { Header } from "@/components"; +import { Header } from "@/components/ui"; export default function Home() { return ( diff --git a/app/(prowler)/providers/page.tsx b/app/(prowler)/providers/page.tsx index 9d6ae93758..4653880538 100644 --- a/app/(prowler)/providers/page.tsx +++ b/app/(prowler)/providers/page.tsx @@ -2,13 +2,13 @@ import { Spacer } from "@nextui-org/react"; import { Suspense } from "react"; import { getProvider } from "@/actions"; -import { Header } from "@/components"; import { AddProviderModal, ColumnsProviders, DataTable, SkeletonTableProvider, } from "@/components/providers"; +import { Header } from "@/components/ui"; export default async function Providers() { return ( diff --git a/app/(prowler)/services/page.tsx b/app/(prowler)/services/page.tsx index 69cbf7c019..77c6de68ec 100644 --- a/app/(prowler)/services/page.tsx +++ b/app/(prowler)/services/page.tsx @@ -1,6 +1,6 @@ import React from "react"; -import { Header } from "@/components"; +import { Header } from "@/components/ui"; export default function Services() { return ( diff --git a/app/(prowler)/settings/page.tsx b/app/(prowler)/settings/page.tsx index 526b8c08df..6653c38b1c 100644 --- a/app/(prowler)/settings/page.tsx +++ b/app/(prowler)/settings/page.tsx @@ -1,6 +1,6 @@ import { Spacer } from "@nextui-org/react"; -import { Header } from "@/components"; +import { Header } from "@/components/ui"; export default async function Settings() { return ( diff --git a/components/index.ts b/components/index.ts index 8035582871..df78769815 100644 --- a/components/index.ts +++ b/components/index.ts @@ -1,10 +1,2 @@ export * from "./findings/ColumnsFindings"; export * from "./findings/SkeletonTableFindings"; -export * from "./ui/alert/Alert"; -export * from "./ui/dialog/Dialog"; -export * from "./ui/header/Header"; -export * from "./ui/modal"; -export * from "./ui/sidebar"; -export * from "./ui/table/StatusBadge"; -export * from "./ui/table/Table"; -export * from "./ui/toast"; diff --git a/components/providers/AddProviderModal.tsx b/components/providers/AddProviderModal.tsx index 51fa709a9b..a04c19c7bb 100644 --- a/components/providers/AddProviderModal.tsx +++ b/components/providers/AddProviderModal.tsx @@ -12,7 +12,7 @@ import { DialogTitle, DialogTrigger, useToast, -} from "@/components"; +} from "@/components/ui"; import { ButtonAddProvider } from "./ButtonAddProvider"; import { CustomRadioProvider } from "./CustomRadioProvider"; diff --git a/components/ui/index.ts b/components/ui/index.ts new file mode 100644 index 0000000000..da4f2bfeaf --- /dev/null +++ b/components/ui/index.ts @@ -0,0 +1,8 @@ +export * from "./alert/Alert"; +export * from "./dialog/Dialog"; +export * from "./header/Header"; +export * from "./modal"; +export * from "./sidebar"; +export * from "./table/StatusBadge"; +export * from "./table/Table"; +export * from "./toast"; diff --git a/components/ui/modal/ModalWrap.tsx b/components/ui/modal/ModalWrap.tsx index 42318210bf..15c4be4133 100644 --- a/components/ui/modal/ModalWrap.tsx +++ b/components/ui/modal/ModalWrap.tsx @@ -3,7 +3,7 @@ import { Button, useDisclosure } from "@nextui-org/react"; import React from "react"; -import { Modal } from "@/components"; +import { Modal } from "@/components/ui"; interface ModalWrapProps { modalTitle: string; diff --git a/components/ui/toast/Toaster.tsx b/components/ui/toast/Toaster.tsx index f264ad448b..4287ed5c8b 100644 --- a/components/ui/toast/Toaster.tsx +++ b/components/ui/toast/Toaster.tsx @@ -7,7 +7,7 @@ import { ToastProvider, ToastTitle, ToastViewport, -} from "@/components"; +} from "@/components/ui"; import { useToast } from "./use-toast"; diff --git a/components/ui/toast/use-toast.ts b/components/ui/toast/use-toast.ts index 1a7c514a81..26eda1f3e1 100644 --- a/components/ui/toast/use-toast.ts +++ b/components/ui/toast/use-toast.ts @@ -3,7 +3,7 @@ // Inspired by react-hot-toast library import * as React from "react"; -import type { ToastActionElement, ToastProps } from "@/components"; +import type { ToastActionElement, ToastProps } from "@/components/ui"; const TOAST_LIMIT = 6; const TOAST_REMOVE_DELAY = 1000000;