From 436fb7459ac678486231c2e595311faa607d7cda Mon Sep 17 00:00:00 2001
From: Javan Otieno <javan.o.otieno@gmail.com>
Date: Thu, 30 May 2024 21:53:18 +0300
Subject: [PATCH] refactor(app): change route structure

---
 src/app/dashboard/innovation/[id]/page.tsx           | 12 +++++-------
 .../dashboard/{new => innovation/edit}/[id]/page.tsx |  0
 src/app/dashboard/{ => innovation}/new/page.tsx      |  0
 src/components/sidebarNav.tsx                        |  2 +-
 src/components/ui/projectcard.tsx                    | 10 +---------
 5 files changed, 7 insertions(+), 17 deletions(-)
 rename src/app/dashboard/{new => innovation/edit}/[id]/page.tsx (100%)
 rename src/app/dashboard/{ => innovation}/new/page.tsx (100%)

diff --git a/src/app/dashboard/innovation/[id]/page.tsx b/src/app/dashboard/innovation/[id]/page.tsx
index 7c597f4..be4a449 100644
--- a/src/app/dashboard/innovation/[id]/page.tsx
+++ b/src/app/dashboard/innovation/[id]/page.tsx
@@ -156,9 +156,8 @@ const InnovationDetailPage = ({ params }: InnovationDetailPageProps) => {
 						<DropdownMenuContent className="w-56">
 							<DropdownMenuItem>
 								<SquarePen className="mr-2 h-4 w-4" />
-								<Link href={""}>
-									{" "}
-									{/*TODO: Add edit page link */}
+								{/* TODO: URL generator */}
+								<Link href={`/dashboard/innovation/edit/${id}`}>
 									<span>Edit</span>
 								</Link>
 							</DropdownMenuItem>
@@ -301,14 +300,13 @@ const InnovationDetailPage = ({ params }: InnovationDetailPageProps) => {
 									</div>
 								</DropdownMenuTrigger>
 								<DropdownMenuContent className="w-56">
-									<DropdownMenuItem>
+									{/* <DropdownMenuItem>
 										<SquarePen className="mr-2 h-4 w-4" />
+										// TODO: Comment Editing
 										<Link href={""}>
-											{" "}
-											{/*TODO: Add edit page link */}
 											<span>Edit</span>
 										</Link>
-									</DropdownMenuItem>
+									</DropdownMenuItem> */}
 									<DropdownMenuItem className="hover:bg-destructive active:bg-destructive focus:bg-destructive hover:text-white active:text-white focus:text-white">
 										<Trash2 className="mr-2 h-4 w-4" />
 										<span>Delete</span>
diff --git a/src/app/dashboard/new/[id]/page.tsx b/src/app/dashboard/innovation/edit/[id]/page.tsx
similarity index 100%
rename from src/app/dashboard/new/[id]/page.tsx
rename to src/app/dashboard/innovation/edit/[id]/page.tsx
diff --git a/src/app/dashboard/new/page.tsx b/src/app/dashboard/innovation/new/page.tsx
similarity index 100%
rename from src/app/dashboard/new/page.tsx
rename to src/app/dashboard/innovation/new/page.tsx
diff --git a/src/components/sidebarNav.tsx b/src/components/sidebarNav.tsx
index 1971858..998e81b 100644
--- a/src/components/sidebarNav.tsx
+++ b/src/components/sidebarNav.tsx
@@ -24,7 +24,7 @@ const SidebarNav = () => {
             label: "Home"
         },
         {
-            href: "/dashboard/new",
+            href: "/dashboard/innovation/new",
             icon: Plus,
             label: "New Project"
         },
diff --git a/src/components/ui/projectcard.tsx b/src/components/ui/projectcard.tsx
index caf249c..f867b1a 100644
--- a/src/components/ui/projectcard.tsx
+++ b/src/components/ui/projectcard.tsx
@@ -195,16 +195,8 @@ const ProjectCard = ({
 						<DropdownMenuItem onSelect={handleEditClick}>
 							<SquarePen className="mr-2 h-4 w-4" />
 							<Link
-								href={{
-									pathname: "/dashboard/new",
-									query: {
-										id: innovationId,
-									},
-								}}
+								href={`/dashboard/innovation/edit/${innovationId}`}
 							>
-								{" "}
-								{/*TODO: Add edit page link */}
-								{/* <span>Edit</span> */}
 								Edit
 							</Link>
 						</DropdownMenuItem>