@@ -624,7 +624,9 @@ function CardSkeleton() {
}
export default async function DashboardPage() {
- const session = await auth();
+ const session = await auth.api.getSession({
+ headers: await headers(),
+ });
const firstName = session?.user?.name?.split(" ")[0] ?? "User";
return (
diff --git a/src/app/dashboard/settings/_components/settings-content.tsx b/src/app/dashboard/settings/_components/settings-content.tsx
index b8d83db..d9bcdc3 100644
--- a/src/app/dashboard/settings/_components/settings-content.tsx
+++ b/src/app/dashboard/settings/_components/settings-content.tsx
@@ -18,7 +18,7 @@ import {
User,
Users,
} from "lucide-react";
-import { useSession } from "next-auth/react";
+import { authClient } from "~/lib/auth-client";
import * as React from "react";
import { useState } from "react";
@@ -66,7 +66,7 @@ import { AppearanceSettings } from "./appearance-settings";
import { useAnimationPreferences } from "~/components/providers/animation-preferences-provider";
export function SettingsContent() {
- const { data: session } = useSession();
+ const { data: session } = authClient.useSession();
const [name, setName] = useState("");
const [deleteConfirmText, setDeleteConfirmText] = useState("");
const [importData, setImportData] = useState("");
diff --git a/src/app/dashboard/settings/_components/theme-selector.tsx b/src/app/dashboard/settings/_components/theme-selector.tsx
index 13be2fa..418677d 100644
--- a/src/app/dashboard/settings/_components/theme-selector.tsx
+++ b/src/app/dashboard/settings/_components/theme-selector.tsx
@@ -41,6 +41,7 @@ export function ThemeSelector() {
"h-8 w-8 rounded-full border-2",
colorTheme === t.name && "border-primary",
)}
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument
onClick={() => setColorTheme(t.name as any)}
style={{ backgroundColor: t.hex }}
>
diff --git a/src/components/AuthRedirect.tsx b/src/components/AuthRedirect.tsx
index 7d4b08e..57e7f6d 100644
--- a/src/components/AuthRedirect.tsx
+++ b/src/components/AuthRedirect.tsx
@@ -1,19 +1,19 @@
"use client";
-import { useSession } from "next-auth/react";
+import { authClient } from "~/lib/auth-client";
import { useRouter } from "next/navigation";
import { useEffect } from "react";
export function AuthRedirect() {
- const { data: session, status } = useSession();
+ const { data: session, isPending } = authClient.useSession();
const router = useRouter();
useEffect(() => {
// Only redirect if we're sure the user is authenticated
- if (status === "authenticated" && session?.user) {
+ if (!isPending && session?.user) {
router.push("/dashboard");
}
- }, [session, status, router]);
+ }, [session, isPending, router]);
// This component doesn't render anything
return null;
diff --git a/src/components/branding/logo.tsx b/src/components/branding/logo.tsx
index 9ecaba1..3912b9d 100644
--- a/src/components/branding/logo.tsx
+++ b/src/components/branding/logo.tsx
@@ -17,19 +17,12 @@ export function Logo({ className, size = "md", animated = true }: LogoProps) {
xl: "text-4xl",
};
- const LogoContent = () => (
-
- $
-
- been
- voice
-
- );
-
if (!animated) {
- return
;
+ return
;
}
+
+
return (
);
}
+
+function LogoContent({
+ className,
+ size,
+ sizeClasses,
+}: {
+ className?: string;
+ size: "sm" | "md" | "lg" | "xl";
+ sizeClasses: Record;
+}) {
+ return (
+
+ $
+
+ been
+ voice
+
+ );
+}
diff --git a/src/components/data/data-table.tsx b/src/components/data/data-table.tsx
index 10d0023..fea0c49 100644
--- a/src/components/data/data-table.tsx
+++ b/src/components/data/data-table.tsx
@@ -140,6 +140,7 @@ export function DataTable({
}));
}, [columns]);
+ // eslint-disable-next-line react-hooks/incompatible-library
const table = useReactTable({
data,
columns: responsiveColumns,
@@ -359,9 +360,9 @@ export function DataTable({
{header.isPlaceholder
? null
: flexRender(
- header.column.columnDef.header,
- header.getContext(),
- )}
+ header.column.columnDef.header,
+ header.getContext(),
+ )}
);
})}
@@ -427,28 +428,26 @@ export function DataTable({
{table.getFilteredRowModel().rows.length === 0
? "No entries"
- : `Showing ${
- table.getState().pagination.pageIndex *
- table.getState().pagination.pageSize +
- 1
- } to ${Math.min(
- (table.getState().pagination.pageIndex + 1) *
- table.getState().pagination.pageSize,
- table.getFilteredRowModel().rows.length,
- )} of ${table.getFilteredRowModel().rows.length} entries`}
+ : `Showing ${table.getState().pagination.pageIndex *
+ table.getState().pagination.pageSize +
+ 1
+ } to ${Math.min(
+ (table.getState().pagination.pageIndex + 1) *
+ table.getState().pagination.pageSize,
+ table.getFilteredRowModel().rows.length,
+ )} of ${table.getFilteredRowModel().rows.length} entries`}
{table.getFilteredRowModel().rows.length === 0
? "0"
- : `${
- table.getState().pagination.pageIndex *
- table.getState().pagination.pageSize +
- 1
- }-${Math.min(
- (table.getState().pagination.pageIndex + 1) *
- table.getState().pagination.pageSize,
- table.getFilteredRowModel().rows.length,
- )} of ${table.getFilteredRowModel().rows.length}`}
+ : `${table.getState().pagination.pageIndex *
+ table.getState().pagination.pageSize +
+ 1
+ }-${Math.min(
+ (table.getState().pagination.pageIndex + 1) *
+ table.getState().pagination.pageSize,
+ table.getFilteredRowModel().rows.length,
+ )} of ${table.getFilteredRowModel().rows.length}`}