From 290c911c6fe1f00ce7fe573d035b877549fcb6b1 Mon Sep 17 00:00:00 2001
From: Kevin Ingersoll <kingersoll@gmail.com>
Date: Mon, 2 Sep 2024 09:45:24 +0100
Subject: [PATCH] swap middleware for page handlers

---
 packages/explorer/src/app/(explorer)/page.tsx    |  5 +++++
 .../(explorer)/worlds/[worldAddress]/page.tsx    |  5 +++++
 .../explorer/src/app/(explorer)/worlds/page.tsx  |  7 +++++++
 packages/explorer/src/middleware.ts              | 16 ----------------
 4 files changed, 17 insertions(+), 16 deletions(-)
 create mode 100644 packages/explorer/src/app/(explorer)/page.tsx
 create mode 100644 packages/explorer/src/app/(explorer)/worlds/[worldAddress]/page.tsx
 create mode 100644 packages/explorer/src/app/(explorer)/worlds/page.tsx
 delete mode 100644 packages/explorer/src/middleware.ts

diff --git a/packages/explorer/src/app/(explorer)/page.tsx b/packages/explorer/src/app/(explorer)/page.tsx
new file mode 100644
index 0000000000..cd0a8af1d8
--- /dev/null
+++ b/packages/explorer/src/app/(explorer)/page.tsx
@@ -0,0 +1,5 @@
+import { redirect } from "next/navigation";
+
+export default async function IndexPage() {
+  redirect("/worlds");
+}
diff --git a/packages/explorer/src/app/(explorer)/worlds/[worldAddress]/page.tsx b/packages/explorer/src/app/(explorer)/worlds/[worldAddress]/page.tsx
new file mode 100644
index 0000000000..bd72da2c84
--- /dev/null
+++ b/packages/explorer/src/app/(explorer)/worlds/[worldAddress]/page.tsx
@@ -0,0 +1,5 @@
+import { redirect } from "next/navigation";
+
+export default async function WorldPage({ params }: { params: { worldAddress: string } }) {
+  return redirect(`/worlds/${params.worldAddress}/explorer`);
+}
diff --git a/packages/explorer/src/app/(explorer)/worlds/page.tsx b/packages/explorer/src/app/(explorer)/worlds/page.tsx
new file mode 100644
index 0000000000..86e55b18f3
--- /dev/null
+++ b/packages/explorer/src/app/(explorer)/worlds/page.tsx
@@ -0,0 +1,7 @@
+import { notFound, redirect } from "next/navigation";
+
+export default async function WorldsPage() {
+  const worldAddress = process.env.WORLD_ADDRESS;
+  if (worldAddress) return redirect(`/worlds/${worldAddress}`);
+  return notFound();
+}
diff --git a/packages/explorer/src/middleware.ts b/packages/explorer/src/middleware.ts
deleted file mode 100644
index 006a30c617..0000000000
--- a/packages/explorer/src/middleware.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { NextRequest, NextResponse } from "next/server";
-
-export function middleware(request: NextRequest) {
-  const pathname = request.nextUrl.pathname;
-  const worldAddress = process.env.WORLD_ADDRESS;
-
-  if ((pathname === "/" || pathname === "/worlds") && worldAddress) {
-    return NextResponse.redirect(new URL(`/worlds/${worldAddress}/explorer`, request.url));
-  }
-
-  return NextResponse.next();
-}
-
-export const config = {
-  matcher: "/((?!api|_next/static|_next/image|favicon.ico).*)",
-};