Merge pull request #11 from RooCodeInc/cte/axe-landing

Author: cte

public/Roo-Code-Logo-Horiz-white.svg public/logo-dark.svgpublic/Roo-Code-Logo-Horiz-white.svg renamed to public/logo-dark.svg

@@ -3,7 +3,7 @@
 import { useTranslations } from 'next-intl';
 
 import { TitleBar } from '@/components/dashboard/TitleBar';
-import { AnalyticsPage } from '@/features/analytics/AnalyticsPage';
+import { AnalyticsPage } from '@/components/analytics/AnalyticsPage';
 
 const AnalyticsPageContainer = () => {
   const t = useTranslations('Analytics');

public/Roo-Code-Logo-Horiz-blk.svg public/logo.svgpublic/Roo-Code-Logo-Horiz-blk.svg renamed to public/logo.svg

@@ -5,10 +5,10 @@ import { useState } from 'react';
 import { Button } from '@/components/ui/button';
 import { Drawer } from '@/components/ui/drawer';
 import { TitleBar } from '@/components/dashboard/TitleBar';
-import { AuditLogDetails } from '@/features/dashboard/AuditLogDetails';
-import { AuditLogEntry } from '@/features/dashboard/AuditLogEntry';
-import type { AuditLog } from '@/features/dashboard/mockAuditLogs';
-import { getFilteredLogs } from '@/features/dashboard/mockAuditLogs';
+import { AuditLogDetails } from '@/components/dashboard/AuditLogDetails';
+import { AuditLogEntry } from '@/components/dashboard/AuditLogEntry';
+import type { AuditLog } from '@/components/dashboard/mockAuditLogs';
+import { getFilteredLogs } from '@/components/dashboard/mockAuditLogs';
 
 type TimePeriod = '7' | '30' | '90';
 

public/placeholder.svg

@@ -5,8 +5,8 @@ import { useTheme } from 'next-themes';
 import { dark } from '@clerk/themes';
 import { OrganizationProfile } from '@clerk/nextjs';
 
-import DefaultParametersPage from '@/features/dashboard/DefaultParametersPage';
-import ProviderWhitelistPage from '@/features/dashboard/ProviderWhitelistPage';
+import DefaultParametersPage from '@/components/dashboard/DefaultParametersPage';
+import ProviderWhitelistPage from '@/components/dashboard/ProviderWhitelistPage';
 
 export const OrgProfile = () => {
   const t = useTranslations('OrganizationProfile');

public/placeholder_pfp.png

@@ -1,8 +1,8 @@
 import { useTranslations } from 'next-intl';
 
 import { TitleBar } from '@/components/dashboard/TitleBar';
-import { AuditLogCard } from '@/features/dashboard/AuditLogCard';
-import { UsageAnalyticsCard } from '@/features/dashboard/UsageAnalyticsCard';
+import { AuditLogCard } from '@/components/dashboard/AuditLogCard';
+import { UsageAnalyticsCard } from '@/components/dashboard/UsageAnalyticsCard';
 
 export default function Page() {
   const t = useTranslations('DashboardIndex');

…c/app/(authenticated)/analytics/page.tsx …henticated)/dashboard/analytics/page.tsxsrc/app/(authenticated)/analytics/page.tsx renamed to src/app/(authenticated)/dashboard/analytics/page.tsx src/app/(authenticated)/analytics/page.tsx renamed to src/app/(authenticated)/dashboard/analytics/page.tsx

@@ -2,7 +2,7 @@ import '@/styles/globals.css';
 
 import type { Metadata } from 'next';
 import { NextIntlClientProvider } from 'next-intl';
-import { getLocale } from 'next-intl/server';
+import { getLocale, getTranslations, setRequestLocale } from 'next-intl/server';
 import { ClerkProvider } from '@clerk/nextjs';
 
 import { getClerkLocale } from '@/lib/locale';
@@ -11,31 +11,39 @@ import { ToastProvider, ToastViewport } from '@/components/ui/toast';
 import { ToastProvider as ToastContextProvider } from '@/components/ui/toast-context';
 import { Toaster } from '@/components/ui/toaster';
 
-export const metadata: Metadata = {
-  icons: [
-    { rel: 'apple-touch-icon', url: '/apple-touch-icon.png' },
-    {
-      rel: 'icon',
-      type: 'image/png',
-      sizes: '32x32',
-      url: '/favicon-32x32.png',
-    },
-    {
-      rel: 'icon',
-      type: 'image/png',
-      sizes: '16x16',
-      url: '/favicon-16x16.png',
-    },
-    { rel: 'icon', url: '/favicon.ico' },
-  ],
-};
+export async function generateMetadata(): Promise<Metadata> {
+  const locale = await getLocale();
+  const t = await getTranslations({ locale, namespace: 'Index' });
+
+  return {
+    title: t('meta_title'),
+    description: t('meta_description'),
+    icons: [
+      { rel: 'apple-touch-icon', url: '/apple-touch-icon.png' },
+      {
+        rel: 'icon',
+        type: 'image/png',
+        sizes: '32x32',
+        url: '/favicon-32x32.png',
+      },
+      {
+        rel: 'icon',
+        type: 'image/png',
+        sizes: '16x16',
+        url: '/favicon-16x16.png',
+      },
+      { rel: 'icon', url: '/favicon.ico' },
+    ],
+  };
+}
 
 export default async function RootLayout({
   children,
 }: {
   children: React.ReactNode;
 }) {
   const locale = await getLocale();
+  setRequestLocale(locale);
 
   return (
     <html lang={locale} suppressHydrationWarning>

…/app/(authenticated)/audit-logs/page.tsx …enticated)/dashboard/audit-logs/page.tsxsrc/app/(authenticated)/audit-logs/page.tsx renamed to src/app/(authenticated)/dashboard/audit-logs/page.tsx src/app/(authenticated)/audit-logs/page.tsx renamed to src/app/(authenticated)/dashboard/audit-logs/page.tsx

@@ -1,31 +1,7 @@
 import { redirect } from 'next/navigation';
 import { auth as clerkAuth } from '@clerk/nextjs/server';
-import { getLocale, getTranslations, setRequestLocale } from 'next-intl/server';
-
-import { Navbar, Footer } from '@/components/layout';
-import { Hero, Features } from '@/components/landing';
-
-export async function generateMetadata() {
-  const locale = await getLocale();
-  const t = await getTranslations({ locale, namespace: 'Index' });
-  return { title: t('meta_title'), description: t('meta_description') };
-}
 
 export default async function Page() {
   const { userId } = await clerkAuth();
-
-  if (userId) {
-    redirect('/dashboard');
-  }
-
-  setRequestLocale(await getLocale());
-
-  return (
-    <>
-      <Navbar />
-      <Hero />
-      <Features />
-      <Footer />
-    </>
-  );
+  redirect(userId ? '/dashboard' : '/sign-in');
 }