merge complete

2 files changed, 10 insertions, 9 deletions

diff --git a/components/data-table/data-table-view-options.tsx b/components/data-table/data-table-view-options.tsx
index 6120fff9..c55617ec 100644
--- a/components/data-table/data-table-view-options.tsx
+++ b/components/data-table/data-table-view-options.tsx
@@ -1,7 +1,7 @@
 "use client"
 
 import * as React from "react"
-import { type Table } from "@tanstack/react-table"
+import { RowData, type Table } from "@tanstack/react-table"
 import {
   Check,
   ChevronsUpDown,
@@ -41,12 +41,12 @@ interface DataTableViewOptionsProps<TData> {
   table: Table<TData>
 }
 
-declare module "@tanstack/react-table" {
-  interface ColumnMeta<TData, TValue> {
+declare module "@tanstack/table-core" {
+  interface ColumnMeta<TData extends RowData, TValue> {
     excelHeader?: string
     group?: string
     type?: string
-    // or whatever other fields you actually use
+    // ...anything else you want
   }
 }
 /**
diff --git a/components/login/login-form.tsx b/components/login/login-form.tsx
index 2a51f2e2..41d232f8 100644
--- a/components/login/login-form.tsx
+++ b/components/login/login-form.tsx
@@ -27,11 +27,12 @@ export function LoginForm({
     ...props
 }: React.ComponentProps<"div">) {
 
-    const params = useParams();
-    const pathname = usePathname();
+    const params = useParams() || {};
+    const pathname = usePathname() || '';
     const router = useRouter();
     const searchParams = useSearchParams();
-    const token = searchParams.get('token');
+    const token = searchParams?.get('token') || null;
+    
 
     const lng = params.lng as string;
     const { t, i18n } = useTranslation(lng, 'login');
@@ -104,9 +105,9 @@ export function LoginForm({
                 console.log(session)
                 
                 if (userDomain === 'evcp') {
-                    router.push(`/${lng}/evcp`);
+                    router.push(`/${lng}/evcp/report`);
                 } else if (userDomain === 'partners') {
-                    router.push(`/${lng}/partners`);
+                    router.push(`/${lng}/partners/dashboard`);
                 } else {
                     // 기본 리다이렉션 경로
                     router.push(`/${lng}/dashboard`);