diff --git a/.eslintrc.json b/.eslintrc.json index 55e9d2d..49cfe06 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -4,12 +4,9 @@ "extends": [ "next/core-web-vitals", "next/typescript", - "prettier", - "plugin:tailwindcss/recommended" + "prettier" ], - "plugins": ["tailwindcss"], "rules": { - "tailwindcss/no-custom-classname": "off", "@typescript-eslint/no-unused-vars": [ "error", { @@ -23,12 +20,6 @@ } ] }, - "settings": { - "tailwindcss": { - "callees": ["cn", "cva"], - "config": "tailwind.config.ts" - } - }, "overrides": [ { "files": ["*.ts", "*.tsx"], diff --git a/app/(app)/_components/header.tsx b/app/(app)/_components/header.tsx index e396a2a..e66934e 100644 --- a/app/(app)/_components/header.tsx +++ b/app/(app)/_components/header.tsx @@ -6,7 +6,7 @@ import { MobileNav } from "./nav" export function Header({ children }: Readonly<{ children?: React.ReactNode }>) { return ( -
+
{/* this allows you to optionally pass in other components like a breadcrumb or a search component from the page */} {children} diff --git a/app/(app)/_components/nav/link.tsx b/app/(app)/_components/nav/link.tsx index 03ca2e8..5f84544 100644 --- a/app/(app)/_components/nav/link.tsx +++ b/app/(app)/_components/nav/link.tsx @@ -20,7 +20,7 @@ export function DesktopNavLink({ ({ } setHasMore(responseToPaginate?.hasMore || false) - }, [cursor]) + }, [cursor, responseToPaginate]) const handleNextPage = () => { if (responseToPaginate?.data.length) { diff --git a/app/(app)/account/_components/payment-method-card.tsx b/app/(app)/account/_components/payment-method-card.tsx index 2d0c986..d1ae33a 100644 --- a/app/(app)/account/_components/payment-method-card.tsx +++ b/app/(app)/account/_components/payment-method-card.tsx @@ -32,7 +32,7 @@ function PaymentMethodCardSkeleton() { function PaymentMethodCardErrorFallback() { return ( <> - +
We are sorry.
An error occurred while fetching payment methods. diff --git a/app/(app)/account/_components/subscription-plan-card.tsx b/app/(app)/account/_components/subscription-plan-card.tsx index ef42205..f9dbed8 100644 --- a/app/(app)/account/_components/subscription-plan-card.tsx +++ b/app/(app)/account/_components/subscription-plan-card.tsx @@ -45,7 +45,7 @@ function SubscriptionPlanSkeleton() { function SubscriptionPlanErrorFallback() { return ( <> - +
We are sorry.
An error occurred while fetching subscription plan. diff --git a/app/(app)/account/page.tsx b/app/(app)/account/page.tsx index 9f55a4d..7ae5eac 100644 --- a/app/(app)/account/page.tsx +++ b/app/(app)/account/page.tsx @@ -36,7 +36,7 @@ export default async function AccountPage(props: {
-
+
diff --git a/app/(app)/dashboard/_components/customers-card.tsx b/app/(app)/dashboard/_components/customers-card.tsx index 3a6088c..5da1ef1 100644 --- a/app/(app)/dashboard/_components/customers-card.tsx +++ b/app/(app)/dashboard/_components/customers-card.tsx @@ -54,7 +54,7 @@ export async function LoadCustomersCard() { return ( <>
{customersData.current}
-

+

{customersData.percentageChange >= 0 ? "+" : ""} {customersData.percentageChange.toFixed(1)}% from last month

@@ -82,7 +82,7 @@ export function CustomersCard() { Customers - + }> diff --git a/app/(app)/dashboard/_components/gross-card.tsx b/app/(app)/dashboard/_components/gross-card.tsx index fd32496..983b4a9 100644 --- a/app/(app)/dashboard/_components/gross-card.tsx +++ b/app/(app)/dashboard/_components/gross-card.tsx @@ -55,7 +55,7 @@ async function LoadGrossCard() { return ( <>
${grossData.current}
-

+

{grossData.percentageChange >= 0 ? "+" : ""} {grossData.percentageChange.toFixed(1)}% from last month

@@ -83,7 +83,7 @@ export function GrossCard() { Gross - + }> diff --git a/app/(app)/dashboard/_components/mrr-card.tsx b/app/(app)/dashboard/_components/mrr-card.tsx index 8131e59..5d6f4a1 100644 --- a/app/(app)/dashboard/_components/mrr-card.tsx +++ b/app/(app)/dashboard/_components/mrr-card.tsx @@ -54,7 +54,7 @@ export async function LoadMRRCard() { return ( <>
${mrrData.current}
-

+

{mrrData.percentageChange >= 0 ? "+" : ""} {mrrData.percentageChange.toFixed(1)}% from last month

@@ -82,7 +82,7 @@ export function MRRCard() { MRR - + }> diff --git a/app/(app)/dashboard/_components/newsletter-contacts-card.tsx b/app/(app)/dashboard/_components/newsletter-contacts-card.tsx index 6f8d54d..57fcd4b 100644 --- a/app/(app)/dashboard/_components/newsletter-contacts-card.tsx +++ b/app/(app)/dashboard/_components/newsletter-contacts-card.tsx @@ -57,7 +57,7 @@ async function LoadNewsletterContactsCard() { return ( <>
{data.current}
-

+

{data.percentageChange >= 0 ? "+" : ""} {data.percentageChange.toFixed(1)}% from last month

@@ -97,7 +97,7 @@ export function NewsletterContactsCard() { Newsletter Contacts - + }> diff --git a/app/(app)/dashboard/page.tsx b/app/(app)/dashboard/page.tsx index f867c1e..6d1ab61 100644 --- a/app/(app)/dashboard/page.tsx +++ b/app/(app)/dashboard/page.tsx @@ -33,7 +33,7 @@ export default function DashboardPage() {
-
+
diff --git a/app/(app)/error.tsx b/app/(app)/error.tsx index df0116f..e4d6ec7 100644 --- a/app/(app)/error.tsx +++ b/app/(app)/error.tsx @@ -18,12 +18,12 @@ export default function ErrorPage({ }, [error]) return ( -
+

Something went wrong

-

+

We experienced an error while processing your request. Our team has been notified and will investigate the issue.

diff --git a/app/(app)/layout.tsx b/app/(app)/layout.tsx index 659a947..fa09913 100644 --- a/app/(app)/layout.tsx +++ b/app/(app)/layout.tsx @@ -44,7 +44,7 @@ export default function RootLayout({ @@ -56,8 +56,8 @@ export default function RootLayout({ disableTransitionOnChange > -
-