Skip to content

AutoGPT is the vision of accessible AI for everyone, to use and to build on. Our mission is to provide the tools, so that you can focus on what matters.

feat(frontend): Use route groups (#9855)

Krzysztof Czerwinskic80d35714913
diff --git a/autogpt_platform/frontend/src/app/onboarding/1-welcome/page.tsx b/autogpt_platform/frontend/src/app/(no-navbar)/onboarding/1-welcome/page.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/onboarding/1-welcome/page.tsx
rename to autogpt_platform/frontend/src/app/(no-navbar)/onboarding/1-welcome/page.tsx
diff --git a/autogpt_platform/frontend/src/app/onboarding/2-reason/page.tsx b/autogpt_platform/frontend/src/app/(no-navbar)/onboarding/2-reason/page.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/onboarding/2-reason/page.tsx
rename to autogpt_platform/frontend/src/app/(no-navbar)/onboarding/2-reason/page.tsx
diff --git a/autogpt_platform/frontend/src/app/onboarding/3-services/page.tsx b/autogpt_platform/frontend/src/app/(no-navbar)/onboarding/3-services/page.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/onboarding/3-services/page.tsx
rename to autogpt_platform/frontend/src/app/(no-navbar)/onboarding/3-services/page.tsx
diff --git a/autogpt_platform/frontend/src/app/onboarding/4-agent/page.tsx b/autogpt_platform/frontend/src/app/(no-navbar)/onboarding/4-agent/page.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/onboarding/4-agent/page.tsx
rename to autogpt_platform/frontend/src/app/(no-navbar)/onboarding/4-agent/page.tsx
diff --git a/autogpt_platform/frontend/src/app/onboarding/5-run/page.tsx b/autogpt_platform/frontend/src/app/(no-navbar)/onboarding/5-run/page.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/onboarding/5-run/page.tsx
rename to autogpt_platform/frontend/src/app/(no-navbar)/onboarding/5-run/page.tsx
diff --git a/autogpt_platform/frontend/src/app/onboarding/6-congrats/actions.ts b/autogpt_platform/frontend/src/app/(no-navbar)/onboarding/6-congrats/actions.ts
similarity index 100%
rename from autogpt_platform/frontend/src/app/onboarding/6-congrats/actions.ts
rename to autogpt_platform/frontend/src/app/(no-navbar)/onboarding/6-congrats/actions.ts
diff --git a/autogpt_platform/frontend/src/app/onboarding/6-congrats/page.tsx b/autogpt_platform/frontend/src/app/(no-navbar)/onboarding/6-congrats/page.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/onboarding/6-congrats/page.tsx
rename to autogpt_platform/frontend/src/app/(no-navbar)/onboarding/6-congrats/page.tsx
diff --git a/autogpt_platform/frontend/src/app/onboarding/layout.tsx b/autogpt_platform/frontend/src/app/(no-navbar)/onboarding/layout.tsx
similarity index 76%
rename from autogpt_platform/frontend/src/app/onboarding/layout.tsx
rename to autogpt_platform/frontend/src/app/(no-navbar)/onboarding/layout.tsx
index c39762b00c..8875d5f37c 100644
--- a/autogpt_platform/frontend/src/app/onboarding/layout.tsx
+++ b/autogpt_platform/frontend/src/app/(no-navbar)/onboarding/layout.tsx
@@ -7,9 +7,9 @@ export default function OnboardingLayout({
}) {
return (
<div className="flex min-h-screen w-full items-center justify-center bg-gray-100">
- <div className="mx-auto flex w-full flex-col items-center">
+ <main className="mx-auto flex w-full flex-col items-center">
{children}
- </div>
+ </main>
</div>
);
}
diff --git a/autogpt_platform/frontend/src/app/onboarding/page.tsx b/autogpt_platform/frontend/src/app/(no-navbar)/onboarding/page.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/onboarding/page.tsx
rename to autogpt_platform/frontend/src/app/(no-navbar)/onboarding/page.tsx
diff --git a/autogpt_platform/frontend/src/app/onboarding/reset/page.ts b/autogpt_platform/frontend/src/app/(no-navbar)/onboarding/reset/page.ts
similarity index 100%
rename from autogpt_platform/frontend/src/app/onboarding/reset/page.ts
rename to autogpt_platform/frontend/src/app/(no-navbar)/onboarding/reset/page.ts
diff --git a/autogpt_platform/frontend/src/app/admin/dashboard/page.tsx b/autogpt_platform/frontend/src/app/(platform)/admin/dashboard/page.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/admin/dashboard/page.tsx
rename to autogpt_platform/frontend/src/app/(platform)/admin/dashboard/page.tsx
diff --git a/autogpt_platform/frontend/src/app/admin/layout.tsx b/autogpt_platform/frontend/src/app/(platform)/admin/layout.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/admin/layout.tsx
rename to autogpt_platform/frontend/src/app/(platform)/admin/layout.tsx
diff --git a/autogpt_platform/frontend/src/app/admin/marketplace/actions.ts b/autogpt_platform/frontend/src/app/(platform)/admin/marketplace/actions.ts
similarity index 100%
rename from autogpt_platform/frontend/src/app/admin/marketplace/actions.ts
rename to autogpt_platform/frontend/src/app/(platform)/admin/marketplace/actions.ts
diff --git a/autogpt_platform/frontend/src/app/admin/marketplace/page.tsx b/autogpt_platform/frontend/src/app/(platform)/admin/marketplace/page.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/admin/marketplace/page.tsx
rename to autogpt_platform/frontend/src/app/(platform)/admin/marketplace/page.tsx
diff --git a/autogpt_platform/frontend/src/app/admin/settings/page.tsx b/autogpt_platform/frontend/src/app/(platform)/admin/settings/page.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/admin/settings/page.tsx
rename to autogpt_platform/frontend/src/app/(platform)/admin/settings/page.tsx
diff --git a/autogpt_platform/frontend/src/app/admin/users/page.tsx b/autogpt_platform/frontend/src/app/(platform)/admin/users/page.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/admin/users/page.tsx
rename to autogpt_platform/frontend/src/app/(platform)/admin/users/page.tsx
diff --git a/autogpt_platform/frontend/src/app/auth/auth-code-error/page.tsx b/autogpt_platform/frontend/src/app/(platform)/auth/auth-code-error/page.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/auth/auth-code-error/page.tsx
rename to autogpt_platform/frontend/src/app/(platform)/auth/auth-code-error/page.tsx
diff --git a/autogpt_platform/frontend/src/app/auth/callback/route.ts b/autogpt_platform/frontend/src/app/(platform)/auth/callback/route.ts
similarity index 100%
rename from autogpt_platform/frontend/src/app/auth/callback/route.ts
rename to autogpt_platform/frontend/src/app/(platform)/auth/callback/route.ts
diff --git a/autogpt_platform/frontend/src/app/auth/confirm/route.ts b/autogpt_platform/frontend/src/app/(platform)/auth/confirm/route.ts
similarity index 100%
rename from autogpt_platform/frontend/src/app/auth/confirm/route.ts
rename to autogpt_platform/frontend/src/app/(platform)/auth/confirm/route.ts
diff --git a/autogpt_platform/frontend/src/app/auth/integrations/oauth_callback/route.ts b/autogpt_platform/frontend/src/app/(platform)/auth/integrations/oauth_callback/route.ts
similarity index 100%
rename from autogpt_platform/frontend/src/app/auth/integrations/oauth_callback/route.ts
rename to autogpt_platform/frontend/src/app/(platform)/auth/integrations/oauth_callback/route.ts
diff --git a/autogpt_platform/frontend/src/app/build/actions.ts b/autogpt_platform/frontend/src/app/(platform)/build/actions.ts
similarity index 100%
rename from autogpt_platform/frontend/src/app/build/actions.ts
rename to autogpt_platform/frontend/src/app/(platform)/build/actions.ts
diff --git a/autogpt_platform/frontend/src/app/build/page.tsx b/autogpt_platform/frontend/src/app/(platform)/build/page.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/build/page.tsx
rename to autogpt_platform/frontend/src/app/(platform)/build/page.tsx
diff --git a/autogpt_platform/frontend/src/app/dictionaries/en.json b/autogpt_platform/frontend/src/app/(platform)/dictionaries/en.json
similarity index 100%
rename from autogpt_platform/frontend/src/app/dictionaries/en.json
rename to autogpt_platform/frontend/src/app/(platform)/dictionaries/en.json
diff --git a/autogpt_platform/frontend/src/app/dictionaries/es.json b/autogpt_platform/frontend/src/app/(platform)/dictionaries/es.json
similarity index 100%
rename from autogpt_platform/frontend/src/app/dictionaries/es.json
rename to autogpt_platform/frontend/src/app/(platform)/dictionaries/es.json
diff --git a/autogpt_platform/frontend/src/app/health/page.tsx b/autogpt_platform/frontend/src/app/(platform)/health/page.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/health/page.tsx
rename to autogpt_platform/frontend/src/app/(platform)/health/page.tsx
diff --git a/autogpt_platform/frontend/src/app/(platform)/layout.tsx b/autogpt_platform/frontend/src/app/(platform)/layout.tsx
new file mode 100644
index 0000000000..10a278f5f7
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/layout.tsx
@@ -0,0 +1,68 @@
+import { ReactNode } from "react";
+import { Navbar } from "@/components/agptui/Navbar";
+import { IconType } from "@/components/ui/icons";
+
+export default function PlatformLayout({ children }: { children: ReactNode }) {
+ return (
+ <>
+ <Navbar
+ links={[
+ {
+ name: "Marketplace",
+ href: "/marketplace",
+ },
+ {
+ name: "Library",
+ href: "/library",
+ },
+ {
+ name: "Build",
+ href: "/build",
+ },
+ ]}
+ menuItemGroups={[
+ {
+ items: [
+ {
+ icon: IconType.Edit,
+ text: "Edit profile",
+ href: "/profile",
+ },
+ ],
+ },
+ {
+ items: [
+ {
+ icon: IconType.LayoutDashboard,
+ text: "Creator Dashboard",
+ href: "/profile/dashboard",
+ },
+ {
+ icon: IconType.UploadCloud,
+ text: "Publish an agent",
+ },
+ ],
+ },
+ {
+ items: [
+ {
+ icon: IconType.Settings,
+ text: "Settings",
+ href: "/profile/settings",
+ },
+ ],
+ },
+ {
+ items: [
+ {
+ icon: IconType.LogOut,
+ text: "Log out",
+ },
+ ],
+ },
+ ]}
+ />
+ <main>{children}</main>
+ </>
+ );
+}
diff --git a/autogpt_platform/frontend/src/app/library/agents/[id]/loading.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/loading.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/library/agents/[id]/loading.tsx
rename to autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/loading.tsx
diff --git a/autogpt_platform/frontend/src/app/library/agents/[id]/page.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/page.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/library/agents/[id]/page.tsx
rename to autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/page.tsx
diff --git a/autogpt_platform/frontend/src/app/library/page.tsx b/autogpt_platform/frontend/src/app/(platform)/library/page.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/library/page.tsx
rename to autogpt_platform/frontend/src/app/(platform)/library/page.tsx
diff --git a/autogpt_platform/frontend/src/app/library/state-provider.tsx b/autogpt_platform/frontend/src/app/(platform)/library/state-provider.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/library/state-provider.tsx
rename to autogpt_platform/frontend/src/app/(platform)/library/state-provider.tsx
diff --git a/autogpt_platform/frontend/src/app/login/actions.ts b/autogpt_platform/frontend/src/app/(platform)/login/actions.ts
similarity index 100%
rename from autogpt_platform/frontend/src/app/login/actions.ts
rename to autogpt_platform/frontend/src/app/(platform)/login/actions.ts
diff --git a/autogpt_platform/frontend/src/app/login/page.tsx b/autogpt_platform/frontend/src/app/(platform)/login/page.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/login/page.tsx
rename to autogpt_platform/frontend/src/app/(platform)/login/page.tsx
diff --git a/autogpt_platform/frontend/src/app/marketplace/agent/[creator]/[slug]/page.tsx b/autogpt_platform/frontend/src/app/(platform)/marketplace/agent/[creator]/[slug]/page.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/marketplace/agent/[creator]/[slug]/page.tsx
rename to autogpt_platform/frontend/src/app/(platform)/marketplace/agent/[creator]/[slug]/page.tsx
diff --git a/autogpt_platform/frontend/src/app/marketplace/creator/[creator]/page.tsx b/autogpt_platform/frontend/src/app/(platform)/marketplace/creator/[creator]/page.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/marketplace/creator/[creator]/page.tsx
rename to autogpt_platform/frontend/src/app/(platform)/marketplace/creator/[creator]/page.tsx
diff --git a/autogpt_platform/frontend/src/app/marketplace/page.tsx b/autogpt_platform/frontend/src/app/(platform)/marketplace/page.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/marketplace/page.tsx
rename to autogpt_platform/frontend/src/app/(platform)/marketplace/page.tsx
diff --git a/autogpt_platform/frontend/src/app/marketplace/search/page.tsx b/autogpt_platform/frontend/src/app/(platform)/marketplace/search/page.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/marketplace/search/page.tsx
rename to autogpt_platform/frontend/src/app/(platform)/marketplace/search/page.tsx
diff --git a/autogpt_platform/frontend/src/app/monitoring/loading.tsx b/autogpt_platform/frontend/src/app/(platform)/monitoring/loading.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/monitoring/loading.tsx
rename to autogpt_platform/frontend/src/app/(platform)/monitoring/loading.tsx
diff --git a/autogpt_platform/frontend/src/app/monitoring/page.tsx b/autogpt_platform/frontend/src/app/(platform)/monitoring/page.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/monitoring/page.tsx
rename to autogpt_platform/frontend/src/app/(platform)/monitoring/page.tsx
diff --git a/autogpt_platform/frontend/src/app/profile/(user)/api_keys/page.tsx b/autogpt_platform/frontend/src/app/(platform)/profile/(user)/api_keys/page.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/profile/(user)/api_keys/page.tsx
rename to autogpt_platform/frontend/src/app/(platform)/profile/(user)/api_keys/page.tsx
diff --git a/autogpt_platform/frontend/src/app/profile/(user)/credits/RefundModal.tsx b/autogpt_platform/frontend/src/app/(platform)/profile/(user)/credits/RefundModal.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/profile/(user)/credits/RefundModal.tsx
rename to autogpt_platform/frontend/src/app/(platform)/profile/(user)/credits/RefundModal.tsx
diff --git a/autogpt_platform/frontend/src/app/profile/(user)/credits/page.tsx b/autogpt_platform/frontend/src/app/(platform)/profile/(user)/credits/page.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/profile/(user)/credits/page.tsx
rename to autogpt_platform/frontend/src/app/(platform)/profile/(user)/credits/page.tsx
diff --git a/autogpt_platform/frontend/src/app/profile/(user)/dashboard/page.tsx b/autogpt_platform/frontend/src/app/(platform)/profile/(user)/dashboard/page.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/profile/(user)/dashboard/page.tsx
rename to autogpt_platform/frontend/src/app/(platform)/profile/(user)/dashboard/page.tsx
diff --git a/autogpt_platform/frontend/src/app/profile/(user)/integrations/page.tsx b/autogpt_platform/frontend/src/app/(platform)/profile/(user)/integrations/page.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/profile/(user)/integrations/page.tsx
rename to autogpt_platform/frontend/src/app/(platform)/profile/(user)/integrations/page.tsx
diff --git a/autogpt_platform/frontend/src/app/profile/(user)/layout.tsx b/autogpt_platform/frontend/src/app/(platform)/profile/(user)/layout.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/profile/(user)/layout.tsx
rename to autogpt_platform/frontend/src/app/(platform)/profile/(user)/layout.tsx
diff --git a/autogpt_platform/frontend/src/app/profile/(user)/page.tsx b/autogpt_platform/frontend/src/app/(platform)/profile/(user)/page.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/profile/(user)/page.tsx
rename to autogpt_platform/frontend/src/app/(platform)/profile/(user)/page.tsx
diff --git a/autogpt_platform/frontend/src/app/profile/(user)/settings/actions.ts b/autogpt_platform/frontend/src/app/(platform)/profile/(user)/settings/actions.ts
similarity index 100%
rename from autogpt_platform/frontend/src/app/profile/(user)/settings/actions.ts
rename to autogpt_platform/frontend/src/app/(platform)/profile/(user)/settings/actions.ts
diff --git a/autogpt_platform/frontend/src/app/profile/(user)/settings/loading.tsx b/autogpt_platform/frontend/src/app/(platform)/profile/(user)/settings/loading.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/profile/(user)/settings/loading.tsx
rename to autogpt_platform/frontend/src/app/(platform)/profile/(user)/settings/loading.tsx
diff --git a/autogpt_platform/frontend/src/app/profile/(user)/settings/page.tsx b/autogpt_platform/frontend/src/app/(platform)/profile/(user)/settings/page.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/profile/(user)/settings/page.tsx
rename to autogpt_platform/frontend/src/app/(platform)/profile/(user)/settings/page.tsx
diff --git a/autogpt_platform/frontend/src/app/reset_password/actions.ts b/autogpt_platform/frontend/src/app/(platform)/reset_password/actions.ts
similarity index 100%
rename from autogpt_platform/frontend/src/app/reset_password/actions.ts
rename to autogpt_platform/frontend/src/app/(platform)/reset_password/actions.ts
diff --git a/autogpt_platform/frontend/src/app/reset_password/page.tsx b/autogpt_platform/frontend/src/app/(platform)/reset_password/page.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/reset_password/page.tsx
rename to autogpt_platform/frontend/src/app/(platform)/reset_password/page.tsx
diff --git a/autogpt_platform/frontend/src/app/signup/actions.ts b/autogpt_platform/frontend/src/app/(platform)/signup/actions.ts
similarity index 100%
rename from autogpt_platform/frontend/src/app/signup/actions.ts
rename to autogpt_platform/frontend/src/app/(platform)/signup/actions.ts
diff --git a/autogpt_platform/frontend/src/app/signup/page.tsx b/autogpt_platform/frontend/src/app/(platform)/signup/page.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/signup/page.tsx
rename to autogpt_platform/frontend/src/app/(platform)/signup/page.tsx
diff --git a/autogpt_platform/frontend/src/app/unauthorized/page.tsx b/autogpt_platform/frontend/src/app/(platform)/unauthorized/page.tsx
similarity index 100%
rename from autogpt_platform/frontend/src/app/unauthorized/page.tsx
rename to autogpt_platform/frontend/src/app/(platform)/unauthorized/page.tsx
diff --git a/autogpt_platform/frontend/src/app/layout.tsx b/autogpt_platform/frontend/src/app/layout.tsx
index 7e00514e25..999d23516f 100644
--- a/autogpt_platform/frontend/src/app/layout.tsx
+++ b/autogpt_platform/frontend/src/app/layout.tsx
@@ -1,17 +1,14 @@
-import React from "react";
+import React, { Suspense } from "react";
import type { Metadata } from "next";
import { Inter, Poppins } from "next/font/google";
import { GoogleAnalytics } from "@next/third-parties/google";
import { GeistSans } from "geist/font/sans";
import { GeistMono } from "geist/font/mono";
-import { headers } from "next/headers";
import { cn } from "@/lib/utils";
import "./globals.css";
-import { Navbar } from "@/components/agptui/Navbar";
import { Toaster } from "@/components/ui/toaster";
-import { IconType } from "@/components/ui/icons";
import { Providers } from "@/app/providers";
import TallyPopupSimple from "@/components/TallyPopup";
import OttoChatWidget from "@/components/OttoChatWidget";
@@ -34,9 +31,6 @@ export default async function RootLayout({
}: Readonly<{
children: React.ReactNode;
}>) {
- const pathname = headers().get("x-current-path");
- const isOnboarding = pathname?.startsWith("/onboarding");
-
return (
<html
lang="en"
@@ -56,68 +50,11 @@ export default async function RootLayout({
disableTransitionOnChange
>
<div className="flex min-h-screen flex-col items-stretch justify-items-stretch">
- {!isOnboarding && (
- <Navbar
- links={[
- {
- name: "Marketplace",
- href: "/marketplace",
- },
- {
- name: "Library",
- href: "/library",
- },
- {
- name: "Build",
- href: "/build",
- },
- ]}
- menuItemGroups={[
- {
- items: [
- {
- icon: IconType.Edit,
- text: "Edit profile",
- href: "/profile",
- },
- ],
- },
- {
- items: [
- {
- icon: IconType.LayoutDashboard,
- text: "Creator Dashboard",
- href: "/profile/dashboard",
- },
- {
- icon: IconType.UploadCloud,
- text: "Publish an agent",
- },
- ],
- },
- {
- items: [
- {
- icon: IconType.Settings,
- text: "Settings",
- href: "/profile/settings",
- },
- ],
- },
- {
- items: [
- {
- icon: IconType.LogOut,
- text: "Log out",
- },
- ],
- },
- ]}
- />
- )}
- <main className="w-full flex-grow">{children}</main>
+ {children}
<TallyPopupSimple />
- <OttoChatWidget />
+ <Suspense fallback={null}>
+ <OttoChatWidget />
+ </Suspense>
</div>
<Toaster />
</Providers>
diff --git a/autogpt_platform/frontend/src/components/OttoChatWidget.tsx b/autogpt_platform/frontend/src/components/OttoChatWidget.tsx
index e03fcfbf62..13e6252fa9 100644
--- a/autogpt_platform/frontend/src/components/OttoChatWidget.tsx
+++ b/autogpt_platform/frontend/src/components/OttoChatWidget.tsx
@@ -6,7 +6,7 @@ import { useToast } from "@/components/ui/use-toast";
import useAgentGraph from "../hooks/useAgentGraph";
import ReactMarkdown from "react-markdown";
import { GraphID } from "@/lib/autogpt-server-api/types";
-import { askOtto } from "@/app/build/actions";
+import { askOtto } from "@/app/(platform)/build/actions";
interface Message {
type: "user" | "assistant";
diff --git a/autogpt_platform/frontend/src/components/admin/marketplace/admin-agents-data-table.tsx b/autogpt_platform/frontend/src/components/admin/marketplace/admin-agents-data-table.tsx
index bbbc94c4a2..6605452654 100644
--- a/autogpt_platform/frontend/src/components/admin/marketplace/admin-agents-data-table.tsx
+++ b/autogpt_platform/frontend/src/components/admin/marketplace/admin-agents-data-table.tsx
@@ -11,7 +11,7 @@ import {
SubmissionStatus,
} from "@/lib/autogpt-server-api/types";
import { PaginationControls } from "../../ui/pagination-controls";
-import { getAdminListingsWithVersions } from "@/app/admin/marketplace/actions";
+import { getAdminListingsWithVersions } from "@/app/(platform)/admin/marketplace/actions";
import { ExpandableRow } from "./expandable-row";
import { SearchAndFilterAdminMarketplace } from "./search-filter-form";
diff --git a/autogpt_platform/frontend/src/components/admin/marketplace/approve-reject-buttons.tsx b/autogpt_platform/frontend/src/components/admin/marketplace/approve-reject-buttons.tsx
index ab309225b4..b0e6b1d9d6 100644
--- a/autogpt_platform/frontend/src/components/admin/marketplace/approve-reject-buttons.tsx
+++ b/autogpt_platform/frontend/src/components/admin/marketplace/approve-reject-buttons.tsx
@@ -15,7 +15,10 @@ import { Label } from "@/components/ui/label";
import { Textarea } from "@/components/ui/textarea";
import type { StoreSubmission } from "@/lib/autogpt-server-api/types";
import { useRouter } from "next/navigation";
-import { approveAgent, rejectAgent } from "@/app/admin/marketplace/actions";
+import {
+ approveAgent,
+ rejectAgent,
+} from "@/app/(platform)/admin/marketplace/actions";
export function ApproveRejectButtons({
version,
diff --git a/autogpt_platform/frontend/src/components/agptui/Navbar.tsx b/autogpt_platform/frontend/src/components/agptui/Navbar.tsx
index 61bcce4836..ff188888e7 100644
--- a/autogpt_platform/frontend/src/components/agptui/Navbar.tsx
+++ b/autogpt_platform/frontend/src/components/agptui/Navbar.tsx
@@ -48,7 +48,7 @@ export const Navbar = async ({ links, menuItemGroups }: NavbarProps) => {
return (
<>
- <nav className="sticky top-0 z-50 mx-[16px] hidden h-16 items-center justify-between rounded-bl-2xl rounded-br-2xl border border-white/50 bg-white/5 py-3 pl-6 pr-3 backdrop-blur-[26px] dark:border-gray-700 dark:bg-gray-900 md:inline-flex">
+ <nav className="sticky top-0 z-40 mx-[16px] hidden h-16 items-center justify-between rounded-bl-2xl rounded-br-2xl border border-white/50 bg-white/5 py-3 pl-6 pr-3 backdrop-blur-[26px] dark:border-gray-700 dark:bg-gray-900 md:inline-flex">
<div className="flex items-center gap-11">
<div className="relative h-10 w-[88.87px]">
<IconAutoGPTLogo className="h-full w-full" />
diff --git a/autogpt_platform/frontend/src/components/agptui/ProfilePopoutMenuLogoutButton.tsx b/autogpt_platform/frontend/src/components/agptui/ProfilePopoutMenuLogoutButton.tsx
index 9b5c36d7d9..954cfc2024 100644
--- a/autogpt_platform/frontend/src/components/agptui/ProfilePopoutMenuLogoutButton.tsx
+++ b/autogpt_platform/frontend/src/components/agptui/ProfilePopoutMenuLogoutButton.tsx
@@ -1,6 +1,6 @@
"use client";
-import { logout } from "@/app/login/actions";
+import { logout } from "@/app/(platform)/login/actions";
import { IconLogOut } from "@/components/ui/icons";
export const ProfilePopoutMenuLogoutButton = () => {
diff --git a/autogpt_platform/frontend/src/components/library/library-action-sub-header.tsx b/autogpt_platform/frontend/src/components/library/library-action-sub-header.tsx
index b11cd42e64..05fe6d48af 100644
--- a/autogpt_platform/frontend/src/components/library/library-action-sub-header.tsx
+++ b/autogpt_platform/frontend/src/components/library/library-action-sub-header.tsx
@@ -1,6 +1,6 @@
"use client";
-import { useLibraryPageContext } from "@/app/library/state-provider";
+import { useLibraryPageContext } from "@/app/(platform)/library/state-provider";
import LibrarySortMenu from "./library-sort-menu";
export default function LibraryActionSubHeader(): React.ReactNode {
diff --git a/autogpt_platform/frontend/src/components/library/library-agent-list.tsx b/autogpt_platform/frontend/src/components/library/library-agent-list.tsx
index 165415af38..d98b4077f8 100644
--- a/autogpt_platform/frontend/src/components/library/library-agent-list.tsx
+++ b/autogpt_platform/frontend/src/components/library/library-agent-list.tsx
@@ -3,7 +3,7 @@ import { useEffect, useState, useCallback } from "react";
import { useBackendAPI } from "@/lib/autogpt-server-api/context";
-import { useLibraryPageContext } from "@/app/library/state-provider";
+import { useLibraryPageContext } from "@/app/(platform)/library/state-provider";
import { useScrollThreshold } from "@/hooks/useScrollThreshold";
import LibraryAgentCard from "./library-agent-card";
diff --git a/autogpt_platform/frontend/src/components/library/library-search-bar.tsx b/autogpt_platform/frontend/src/components/library/library-search-bar.tsx
index 0c5343bf82..a33bd63c9f 100644
--- a/autogpt_platform/frontend/src/components/library/library-search-bar.tsx
+++ b/autogpt_platform/frontend/src/components/library/library-search-bar.tsx
@@ -4,7 +4,7 @@ import debounce from "lodash/debounce";
import { Input } from "@/components/ui/input";
import { Search, X } from "lucide-react";
import { useBackendAPI } from "@/lib/autogpt-server-api/context";
-import { useLibraryPageContext } from "@/app/library/state-provider";
+import { useLibraryPageContext } from "@/app/(platform)/library/state-provider";
export default function LibrarySearchBar(): React.ReactNode {
const inputRef = useRef<HTMLInputElement>(null);
diff --git a/autogpt_platform/frontend/src/components/library/library-sort-menu.tsx b/autogpt_platform/frontend/src/components/library/library-sort-menu.tsx
index e13ef989e4..3e47aa114d 100644
--- a/autogpt_platform/frontend/src/components/library/library-sort-menu.tsx
+++ b/autogpt_platform/frontend/src/components/library/library-sort-menu.tsx
@@ -1,6 +1,6 @@
import { useBackendAPI } from "@/lib/autogpt-server-api/context";
import { LibraryAgentSortEnum } from "@/lib/autogpt-server-api/types";
-import { useLibraryPageContext } from "@/app/library/state-provider";
+import { useLibraryPageContext } from "@/app/(platform)/library/state-provider";
import { ArrowDownNarrowWideIcon } from "lucide-react";
import {
Select,
diff --git a/autogpt_platform/frontend/src/components/profile/settings/SettingsForm.tsx b/autogpt_platform/frontend/src/components/profile/settings/SettingsForm.tsx
index 5215da52e3..9ae19e654f 100644
--- a/autogpt_platform/frontend/src/components/profile/settings/SettingsForm.tsx
+++ b/autogpt_platform/frontend/src/components/profile/settings/SettingsForm.tsx
@@ -18,7 +18,7 @@ import {
import { Input } from "@/components/ui/input";
import { Switch } from "@/components/ui/switch";
import { Separator } from "@/components/ui/separator";
-import { updateSettings } from "@/app/profile/(user)/settings/actions";
+import { updateSettings } from "@/app/(platform)/profile/(user)/settings/actions";
import { toast } from "@/components/ui/use-toast";
import {
NotificationPreference,
diff --git a/autogpt_platform/frontend/src/middleware.ts b/autogpt_platform/frontend/src/middleware.ts
index 597332e477..65edec41d7 100644
--- a/autogpt_platform/frontend/src/middleware.ts
+++ b/autogpt_platform/frontend/src/middleware.ts
@@ -2,7 +2,6 @@ import { updateSession } from "@/lib/supabase/middleware";
import { type NextRequest } from "next/server";
export async function middleware(request: NextRequest) {
- request.headers.set("x-current-path", request.nextUrl.pathname);
return await updateSession(request);
}