fix conflicts with ui template

Author: plutack

actions/logout.ts

@@ -1,9 +1,8 @@
-"use server";
-import { signOut } from "@/auth";
+import { signOut } from "next-auth/react";
 import { loginRoute } from "@/routes";
 
 export const logout = async () => {
   await signOut({
-    redirectTo: loginRoute,
+    callbackUrl: loginRoute,
   });
 };

app/api/auth/login/route.ts

@@ -1,4 +1,4 @@
-import { LoginSchema } from "@/schemas";
+import { loginSchema } from "@/schemas";
 import { signIn } from "@/auth";
 import { DEFAULT_LOGIN_REDIRECT } from "@/routes";
 import { AuthError } from "next-auth";
@@ -10,7 +10,7 @@ import sanitizeUser from "@/utils/sanitize-user";
 export async function POST(request: Request, response: Response) {
   try {
     const body = await request.json();
-    const validatedFields = LoginSchema.safeParse(body);
+    const validatedFields = loginSchema.safeParse(body);
     console.log(validatedFields);
     if (!validatedFields.success) {
       return Response.json(

app/api/link/[linkId]/route.ts

@@ -3,7 +3,6 @@ import { db } from "@/lib/db";
 import { decode } from "next-auth/jwt";
 import { changeCustomSuffixSchema } from "@/schemas";
 
-
 export async function GET(
   req: Request,
   { params }: { params: { linkId: string } },
@@ -31,7 +30,7 @@ export async function PATCH(
 ) {
   try {
     let userId;
-    const {linkId} = params
+    const { linkId } = params;
 
     // Check for Bearer token
     const authHeader = request.headers.get("Authorization");
@@ -66,35 +65,40 @@ export async function PATCH(
     const validatedFields = changeCustomSuffixSchema.safeParse(body);
     console.log(validatedFields);
     if (!validatedFields.success) {
-      return Response.json({ error: "Invalid fields" }, { status: 400 });
+      return Response.json({ success:false, message: "Invalid fields" }, { status: 400 });
     }
 
     const { customSuffix } = validatedFields.data;
-   
 
-    const isExisting = !!await db.link.findUnique({
+    const isExisting = !!(await db.link.findUnique({
       where: {
         customSuffix,
       },
-    });
+    }));
 
-    if (isExisting){
-      return Response.json( {success: false, error: "custom suffix in use"}, {status: 409 })
+    if (isExisting) {
+      return Response.json(
+        { success: false, message: "custom suffix in use" },
+        { status: 409 },
+      );
     }
     const data = await db.link.update({
       where: {
         id: linkId,
-        userId
+        userId,
       },
-      data:{
-        customSuffix
-      }
-    })
-    return Response.json({ success: true, data }, { status: 200 });
+      data: {
+        customSuffix,
+      },
+    });
+    return Response.json(
+      { success: true, message: "Custom suffix changed succesfully" },
+      { status: 200 },
+    );
   } catch (error) {
     console.log(error);
     return Response.json(
-      { error: "An unexpected error occurred" },
+      { success: false, message: "An unexpected error occurred" },
       { status: 500 },
     );
   }

app/dashboard/employee/[employeeId]/page.tsx

@@ -1,18 +1,18 @@
 import { Breadcrumbs } from '@/components/breadcrumbs';
 import PageContainer from '@/components/layout/page-container';
-import { UserClient } from '@/components/tables/user-tables/client';
-import { users } from '@/constants/data';
+import { LinkClient } from '@/components/tables/user-tables/client';
+import { links } from '@/constants/data';
 
 const breadcrumbItems = [
   { title: 'Dashboard', link: '/dashboard' },
-  { title: 'User', link: '/dashboard/user' }
+  { title: 'Link', link: '/dashboard/link' }
 ];
 export default function page() {
   return (
     <PageContainer>
       <div className="space-y-2">
         <Breadcrumbs items={breadcrumbItems} />
-        <UserClient data={users} />
+        <LinkClient data={links} />
       </div>
     </PageContainer>
   );