From fd5456c027c473af93d8abe13a9008604a0a5335 Mon Sep 17 00:00:00 2001
From: anushka <anushka11@example.com>
Date: Sun, 14 Jun 2026 13:13:26 +0530
Subject: [PATCH 1/2] fix: add custom 404 not-found page (#568)

---
 frontend/src/app/not-found.tsx           | 23 +++++++++++++++++++++++
 frontend/src/components/GoBackButton.tsx | 11 +++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 frontend/src/app/not-found.tsx
 create mode 100644 frontend/src/components/GoBackButton.tsx

diff --git a/frontend/src/app/not-found.tsx b/frontend/src/app/not-found.tsx
new file mode 100644
index 0000000..c7e7302
--- /dev/null
+++ b/frontend/src/app/not-found.tsx
@@ -0,0 +1,23 @@
+import Link from "next/link";
+import { Button } from "@/components/ui/button";
+import { GoBackButton } from "@/components/GoBackButton";
+
+export default function NotFound() {
+  return (
+    <div className="flex min-h-screen flex-col items-center justify-center gap-6 px-4 text-center">
+      <h1 className="text-6xl font-bold tracking-tight">404</h1>
+      <h2 className="text-2xl font-semibold">Page Not Found</h2>
+      <p className="max-w-md text-muted-foreground">
+        The page you&apos;re looking for doesn&apos;t exist or may have been moved.
+      </p>
+
+      <div className="flex flex-wrap items-center justify-center gap-3">
+        <Button asChild>
+          <Link href="/">Return to Home</Link>
+        </Button>
+        
+        <GoBackButton />
+      </div>
+    </div>
+  );
+}
\ No newline at end of file
diff --git a/frontend/src/components/GoBackButton.tsx b/frontend/src/components/GoBackButton.tsx
new file mode 100644
index 0000000..1200e3a
--- /dev/null
+++ b/frontend/src/components/GoBackButton.tsx
@@ -0,0 +1,11 @@
+"use client";
+
+import { Button } from "@/components/ui/button";
+
+export function GoBackButton() {
+  return (
+    <Button variant="outline" onClick={() => window.history.back()}>
+      Go Back
+    </Button>
+  );
+}
\ No newline at end of file

From c877752b6830db28a0e0cb83b4434bb0b00ecacd Mon Sep 17 00:00:00 2001
From: anushka <anushka11@example.com>
Date: Sun, 14 Jun 2026 13:29:46 +0530
Subject: [PATCH 2/2] fix: remove unsupported asChild prop from 404 page
 buttons

---
 frontend/src/app/not-found.tsx | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/frontend/src/app/not-found.tsx b/frontend/src/app/not-found.tsx
index c7e7302..5d06ac5 100644
--- a/frontend/src/app/not-found.tsx
+++ b/frontend/src/app/not-found.tsx
@@ -12,10 +12,11 @@ export default function NotFound() {
       </p>
 
       <div className="flex flex-wrap items-center justify-center gap-3">
-        <Button asChild>
-          <Link href="/">Return to Home</Link>
-        </Button>
-        
+        <Link href="/">
+          <Button>Return to Home</Button>
+        </Link>
+        <Link href="/dashboard">
+        </Link>
         <GoBackButton />
       </div>
     </div>