From d1b47006f4bd1077bb06cb8e4a9f6fe1d9aa67a0 Mon Sep 17 00:00:00 2001
From: Felipe Cardoso <felipe.cardoso@shootify.io>
Date: Tue, 18 Nov 2025 12:41:57 +0100
Subject: [PATCH] Remove all obsolete authentication, settings, admin, and
 demo-related components and pages

- Eliminated redundant components, pages, and layouts related to authentication (`login`, `register`, `password-reset`, etc.), user settings, admin, and demos.
- Simplified the frontend structure by removing unused dynamic imports, forms, and test code.
- Refactored configurations and metadata imports to exclude references to removed features.
- Streamlined the project for future development and improved maintainability by discarding legacy and unused code.
---
 .../src/app/(authenticated)/settings/page.tsx | 10 --
 .../src/app/{ => [locale]}/(auth)/layout.tsx  |  0
 .../app/{ => [locale]}/(auth)/login/page.tsx  |  0
 .../confirm/PasswordResetConfirmContent.tsx   |  5 +-
 .../(auth)/password-reset/confirm/page.tsx    |  0
 .../(auth)/password-reset/page.tsx            |  0
 .../{ => [locale]}/(auth)/register/page.tsx   |  0
 .../{ => [locale]}/(authenticated)/layout.tsx |  0
 .../(authenticated)/settings/layout.tsx       |  4 +-
 .../(authenticated)/settings/page.tsx         | 11 +++
 .../settings/password/page.tsx                |  0
 .../settings/preferences/page.tsx             |  0
 .../(authenticated)/settings/profile/page.tsx |  0
 .../settings/sessions/page.tsx                |  0
 .../src/app/{ => [locale]}/admin/layout.tsx   |  0
 .../admin/organizations/[id]/members/page.tsx |  2 +-
 .../admin/organizations/page.tsx              |  2 +-
 .../src/app/{ => [locale]}/admin/page.tsx     |  2 +-
 .../{ => [locale]}/admin/settings/page.tsx    |  2 +-
 .../app/{ => [locale]}/admin/users/page.tsx   |  2 +-
 .../src/app/{ => [locale]}/demos/page.tsx     |  2 +-
 .../{ => [locale]}/dev/components/page.tsx    |  0
 .../dev/docs/design-system/[...slug]/page.tsx |  0
 .../src/app/{ => [locale]}/dev/docs/page.tsx  |  2 +-
 .../src/app/{ => [locale]}/dev/forms/page.tsx |  2 +-
 .../src/app/{ => [locale]}/dev/layout.tsx     |  0
 .../app/{ => [locale]}/dev/layouts/page.tsx   |  2 +-
 frontend/src/app/{ => [locale]}/dev/page.tsx  |  2 +-
 .../app/{ => [locale]}/dev/spacing/page.tsx   |  2 +-
 .../src/app/{ => [locale]}/forbidden/page.tsx |  2 +-
 frontend/src/app/[locale]/layout.tsx          | 88 +++++++++++++++++
 frontend/src/app/[locale]/page.tsx            | 99 +++++++++++++++++++
 frontend/src/app/layout.tsx                   | 69 ++-----------
 frontend/src/app/page.tsx                     | 99 +------------------
 .../src/components/admin/AdminSidebar.tsx     |  4 +-
 frontend/src/components/admin/Breadcrumbs.tsx |  4 +-
 .../OrganizationManagementContent.tsx         |  3 +-
 .../OrganizationMembersContent.tsx            |  3 +-
 .../admin/users/UserManagementContent.tsx     |  3 +-
 frontend/src/components/auth/AuthGuard.tsx    |  2 +-
 frontend/src/components/auth/LoginForm.tsx    |  2 +-
 .../auth/PasswordResetConfirmForm.tsx         |  2 +-
 .../auth/PasswordResetRequestForm.tsx         |  2 +-
 frontend/src/components/auth/RegisterForm.tsx |  2 +-
 .../src/components/dev/DevBreadcrumbs.tsx     |  2 +-
 frontend/src/components/dev/DevLayout.tsx     |  4 +-
 .../src/components/home/AnimatedTerminal.tsx  |  2 +-
 frontend/src/components/home/CTASection.tsx   |  2 +-
 .../components/home/DemoCredentialsModal.tsx  |  2 +-
 frontend/src/components/home/DemoSection.tsx  |  2 +-
 frontend/src/components/home/FeatureCard.tsx  |  2 +-
 frontend/src/components/home/Header.tsx       |  2 +-
 frontend/src/components/home/HeroSection.tsx  |  2 +-
 frontend/src/components/layout/Footer.tsx     |  2 +-
 frontend/src/components/layout/Header.tsx     |  4 +-
 frontend/src/middleware.ts                    |  5 +-
 56 files changed, 259 insertions(+), 208 deletions(-)
 delete mode 100644 frontend/src/app/(authenticated)/settings/page.tsx
 rename frontend/src/app/{ => [locale]}/(auth)/layout.tsx (100%)
 rename frontend/src/app/{ => [locale]}/(auth)/login/page.tsx (100%)
 rename frontend/src/app/{ => [locale]}/(auth)/password-reset/confirm/PasswordResetConfirmContent.tsx (94%)
 rename frontend/src/app/{ => [locale]}/(auth)/password-reset/confirm/page.tsx (100%)
 rename frontend/src/app/{ => [locale]}/(auth)/password-reset/page.tsx (100%)
 rename frontend/src/app/{ => [locale]}/(auth)/register/page.tsx (100%)
 rename frontend/src/app/{ => [locale]}/(authenticated)/layout.tsx (100%)
 rename frontend/src/app/{ => [locale]}/(authenticated)/settings/layout.tsx (95%)
 create mode 100644 frontend/src/app/[locale]/(authenticated)/settings/page.tsx
 rename frontend/src/app/{ => [locale]}/(authenticated)/settings/password/page.tsx (100%)
 rename frontend/src/app/{ => [locale]}/(authenticated)/settings/preferences/page.tsx (100%)
 rename frontend/src/app/{ => [locale]}/(authenticated)/settings/profile/page.tsx (100%)
 rename frontend/src/app/{ => [locale]}/(authenticated)/settings/sessions/page.tsx (100%)
 rename frontend/src/app/{ => [locale]}/admin/layout.tsx (100%)
 rename frontend/src/app/{ => [locale]}/admin/organizations/[id]/members/page.tsx (96%)
 rename frontend/src/app/{ => [locale]}/admin/organizations/page.tsx (96%)
 rename frontend/src/app/{ => [locale]}/admin/page.tsx (98%)
 rename frontend/src/app/{ => [locale]}/admin/settings/page.tsx (97%)
 rename frontend/src/app/{ => [locale]}/admin/users/page.tsx (96%)
 rename frontend/src/app/{ => [locale]}/demos/page.tsx (99%)
 rename frontend/src/app/{ => [locale]}/dev/components/page.tsx (100%)
 rename frontend/src/app/{ => [locale]}/dev/docs/design-system/[...slug]/page.tsx (100%)
 rename frontend/src/app/{ => [locale]}/dev/docs/page.tsx (99%)
 rename frontend/src/app/{ => [locale]}/dev/forms/page.tsx (99%)
 rename frontend/src/app/{ => [locale]}/dev/layout.tsx (100%)
 rename frontend/src/app/{ => [locale]}/dev/layouts/page.tsx (99%)
 rename frontend/src/app/{ => [locale]}/dev/page.tsx (99%)
 rename frontend/src/app/{ => [locale]}/dev/spacing/page.tsx (99%)
 rename frontend/src/app/{ => [locale]}/forbidden/page.tsx (97%)
 create mode 100644 frontend/src/app/[locale]/layout.tsx
 create mode 100755 frontend/src/app/[locale]/page.tsx
 mode change 100755 => 100644 frontend/src/app/page.tsx

diff --git a/frontend/src/app/(authenticated)/settings/page.tsx b/frontend/src/app/(authenticated)/settings/page.tsx
deleted file mode 100644
index a5392e0..0000000
--- a/frontend/src/app/(authenticated)/settings/page.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Settings Index Page
- * Redirects to /settings/profile
- */
-
-import { redirect } from 'next/navigation';
-
-export default function SettingsPage() {
-  redirect('/settings/profile');
-}
diff --git a/frontend/src/app/(auth)/layout.tsx b/frontend/src/app/[locale]/(auth)/layout.tsx
similarity index 100%
rename from frontend/src/app/(auth)/layout.tsx
rename to frontend/src/app/[locale]/(auth)/layout.tsx
diff --git a/frontend/src/app/(auth)/login/page.tsx b/frontend/src/app/[locale]/(auth)/login/page.tsx
similarity index 100%
rename from frontend/src/app/(auth)/login/page.tsx
rename to frontend/src/app/[locale]/(auth)/login/page.tsx
diff --git a/frontend/src/app/(auth)/password-reset/confirm/PasswordResetConfirmContent.tsx b/frontend/src/app/[locale]/(auth)/password-reset/confirm/PasswordResetConfirmContent.tsx
similarity index 94%
rename from frontend/src/app/(auth)/password-reset/confirm/PasswordResetConfirmContent.tsx
rename to frontend/src/app/[locale]/(auth)/password-reset/confirm/PasswordResetConfirmContent.tsx
index 2aebae7..bf71b3b 100644
--- a/frontend/src/app/(auth)/password-reset/confirm/PasswordResetConfirmContent.tsx
+++ b/frontend/src/app/[locale]/(auth)/password-reset/confirm/PasswordResetConfirmContent.tsx
@@ -5,11 +5,12 @@
 
 'use client';
 
-import { useSearchParams, useRouter } from 'next/navigation';
+import { useSearchParams } from 'next/navigation';
+import { useRouter } from '@/lib/i18n/routing';
 import { useEffect, useRef } from 'react';
 import dynamic from 'next/dynamic';
 import { Alert } from '@/components/ui/alert';
-import Link from 'next/link';
+import { Link } from '@/lib/i18n/routing';
 
 // Code-split PasswordResetConfirmForm (319 lines)
 const PasswordResetConfirmForm = dynamic(
diff --git a/frontend/src/app/(auth)/password-reset/confirm/page.tsx b/frontend/src/app/[locale]/(auth)/password-reset/confirm/page.tsx
similarity index 100%
rename from frontend/src/app/(auth)/password-reset/confirm/page.tsx
rename to frontend/src/app/[locale]/(auth)/password-reset/confirm/page.tsx
diff --git a/frontend/src/app/(auth)/password-reset/page.tsx b/frontend/src/app/[locale]/(auth)/password-reset/page.tsx
similarity index 100%
rename from frontend/src/app/(auth)/password-reset/page.tsx
rename to frontend/src/app/[locale]/(auth)/password-reset/page.tsx
diff --git a/frontend/src/app/(auth)/register/page.tsx b/frontend/src/app/[locale]/(auth)/register/page.tsx
similarity index 100%
rename from frontend/src/app/(auth)/register/page.tsx
rename to frontend/src/app/[locale]/(auth)/register/page.tsx
diff --git a/frontend/src/app/(authenticated)/layout.tsx b/frontend/src/app/[locale]/(authenticated)/layout.tsx
similarity index 100%
rename from frontend/src/app/(authenticated)/layout.tsx
rename to frontend/src/app/[locale]/(authenticated)/layout.tsx
diff --git a/frontend/src/app/(authenticated)/settings/layout.tsx b/frontend/src/app/[locale]/(authenticated)/settings/layout.tsx
similarity index 95%
rename from frontend/src/app/(authenticated)/settings/layout.tsx
rename to frontend/src/app/[locale]/(authenticated)/settings/layout.tsx
index dfe65d2..0300f81 100644
--- a/frontend/src/app/(authenticated)/settings/layout.tsx
+++ b/frontend/src/app/[locale]/(authenticated)/settings/layout.tsx
@@ -5,8 +5,8 @@
 
 'use client';
 
-import { usePathname } from 'next/navigation';
-import Link from 'next/link';
+import { usePathname } from '@/lib/i18n/routing';
+import { Link } from '@/lib/i18n/routing';
 import { Tabs, TabsList, TabsTrigger } from '@/components/ui/tabs';
 import { User, Lock, Monitor, Settings as SettingsIcon } from 'lucide-react';
 
diff --git a/frontend/src/app/[locale]/(authenticated)/settings/page.tsx b/frontend/src/app/[locale]/(authenticated)/settings/page.tsx
new file mode 100644
index 0000000..30aef36
--- /dev/null
+++ b/frontend/src/app/[locale]/(authenticated)/settings/page.tsx
@@ -0,0 +1,11 @@
+/**
+ * Settings Index Page
+ * Redirects to /settings/profile
+ */
+
+import { redirect } from 'next/navigation';
+
+export default async function SettingsPage({ params }: { params: Promise<{ locale: string }> }) {
+  const { locale } = await params;
+  redirect(`/${locale}/settings/profile`);
+}
diff --git a/frontend/src/app/(authenticated)/settings/password/page.tsx b/frontend/src/app/[locale]/(authenticated)/settings/password/page.tsx
similarity index 100%
rename from frontend/src/app/(authenticated)/settings/password/page.tsx
rename to frontend/src/app/[locale]/(authenticated)/settings/password/page.tsx
diff --git a/frontend/src/app/(authenticated)/settings/preferences/page.tsx b/frontend/src/app/[locale]/(authenticated)/settings/preferences/page.tsx
similarity index 100%
rename from frontend/src/app/(authenticated)/settings/preferences/page.tsx
rename to frontend/src/app/[locale]/(authenticated)/settings/preferences/page.tsx
diff --git a/frontend/src/app/(authenticated)/settings/profile/page.tsx b/frontend/src/app/[locale]/(authenticated)/settings/profile/page.tsx
similarity index 100%
rename from frontend/src/app/(authenticated)/settings/profile/page.tsx
rename to frontend/src/app/[locale]/(authenticated)/settings/profile/page.tsx
diff --git a/frontend/src/app/(authenticated)/settings/sessions/page.tsx b/frontend/src/app/[locale]/(authenticated)/settings/sessions/page.tsx
similarity index 100%
rename from frontend/src/app/(authenticated)/settings/sessions/page.tsx
rename to frontend/src/app/[locale]/(authenticated)/settings/sessions/page.tsx
diff --git a/frontend/src/app/admin/layout.tsx b/frontend/src/app/[locale]/admin/layout.tsx
similarity index 100%
rename from frontend/src/app/admin/layout.tsx
rename to frontend/src/app/[locale]/admin/layout.tsx
diff --git a/frontend/src/app/admin/organizations/[id]/members/page.tsx b/frontend/src/app/[locale]/admin/organizations/[id]/members/page.tsx
similarity index 96%
rename from frontend/src/app/admin/organizations/[id]/members/page.tsx
rename to frontend/src/app/[locale]/admin/organizations/[id]/members/page.tsx
index c189381..cf46144 100644
--- a/frontend/src/app/admin/organizations/[id]/members/page.tsx
+++ b/frontend/src/app/[locale]/admin/organizations/[id]/members/page.tsx
@@ -6,7 +6,7 @@
 
 /* istanbul ignore next - Next.js type import for metadata */
 import type { Metadata } from 'next';
-import Link from 'next/link';
+import { Link } from '@/lib/i18n/routing';
 import { ArrowLeft } from 'lucide-react';
 import { Button } from '@/components/ui/button';
 import { OrganizationMembersContent } from '@/components/admin/organizations/OrganizationMembersContent';
diff --git a/frontend/src/app/admin/organizations/page.tsx b/frontend/src/app/[locale]/admin/organizations/page.tsx
similarity index 96%
rename from frontend/src/app/admin/organizations/page.tsx
rename to frontend/src/app/[locale]/admin/organizations/page.tsx
index eaefd8b..422bf14 100644
--- a/frontend/src/app/admin/organizations/page.tsx
+++ b/frontend/src/app/[locale]/admin/organizations/page.tsx
@@ -6,7 +6,7 @@
 
 /* istanbul ignore next - Next.js type import for metadata */
 import type { Metadata } from 'next';
-import Link from 'next/link';
+import { Link } from '@/lib/i18n/routing';
 import { ArrowLeft } from 'lucide-react';
 import { Button } from '@/components/ui/button';
 import { OrganizationManagementContent } from '@/components/admin/organizations/OrganizationManagementContent';
diff --git a/frontend/src/app/admin/page.tsx b/frontend/src/app/[locale]/admin/page.tsx
similarity index 98%
rename from frontend/src/app/admin/page.tsx
rename to frontend/src/app/[locale]/admin/page.tsx
index 63aafec..95c6952 100644
--- a/frontend/src/app/admin/page.tsx
+++ b/frontend/src/app/[locale]/admin/page.tsx
@@ -6,7 +6,7 @@
 
 /* istanbul ignore next - Next.js type import for metadata */
 import type { Metadata } from 'next';
-import Link from 'next/link';
+import { Link } from '@/lib/i18n/routing';
 import { DashboardStats } from '@/components/admin';
 import {
   UserGrowthChart,
diff --git a/frontend/src/app/admin/settings/page.tsx b/frontend/src/app/[locale]/admin/settings/page.tsx
similarity index 97%
rename from frontend/src/app/admin/settings/page.tsx
rename to frontend/src/app/[locale]/admin/settings/page.tsx
index 5aa3a32..74bb903 100644
--- a/frontend/src/app/admin/settings/page.tsx
+++ b/frontend/src/app/[locale]/admin/settings/page.tsx
@@ -6,7 +6,7 @@
 
 /* istanbul ignore next - Next.js type import for metadata */
 import type { Metadata } from 'next';
-import Link from 'next/link';
+import { Link } from '@/lib/i18n/routing';
 import { ArrowLeft } from 'lucide-react';
 import { Button } from '@/components/ui/button';
 
diff --git a/frontend/src/app/admin/users/page.tsx b/frontend/src/app/[locale]/admin/users/page.tsx
similarity index 96%
rename from frontend/src/app/admin/users/page.tsx
rename to frontend/src/app/[locale]/admin/users/page.tsx
index aed5f45..968e919 100644
--- a/frontend/src/app/admin/users/page.tsx
+++ b/frontend/src/app/[locale]/admin/users/page.tsx
@@ -6,7 +6,7 @@
 
 /* istanbul ignore next - Next.js type import for metadata */
 import type { Metadata } from 'next';
-import Link from 'next/link';
+import { Link } from '@/lib/i18n/routing';
 import { ArrowLeft } from 'lucide-react';
 import { Button } from '@/components/ui/button';
 import { UserManagementContent } from '@/components/admin/users/UserManagementContent';
diff --git a/frontend/src/app/demos/page.tsx b/frontend/src/app/[locale]/demos/page.tsx
similarity index 99%
rename from frontend/src/app/demos/page.tsx
rename to frontend/src/app/[locale]/demos/page.tsx
index fb7760b..e21da2e 100644
--- a/frontend/src/app/demos/page.tsx
+++ b/frontend/src/app/[locale]/demos/page.tsx
@@ -4,7 +4,7 @@
  */
 
 import type { Metadata } from 'next';
-import Link from 'next/link';
+import { Link } from '@/lib/i18n/routing';
 import {
   Palette,
   ShieldCheck,
diff --git a/frontend/src/app/dev/components/page.tsx b/frontend/src/app/[locale]/dev/components/page.tsx
similarity index 100%
rename from frontend/src/app/dev/components/page.tsx
rename to frontend/src/app/[locale]/dev/components/page.tsx
diff --git a/frontend/src/app/dev/docs/design-system/[...slug]/page.tsx b/frontend/src/app/[locale]/dev/docs/design-system/[...slug]/page.tsx
similarity index 100%
rename from frontend/src/app/dev/docs/design-system/[...slug]/page.tsx
rename to frontend/src/app/[locale]/dev/docs/design-system/[...slug]/page.tsx
diff --git a/frontend/src/app/dev/docs/page.tsx b/frontend/src/app/[locale]/dev/docs/page.tsx
similarity index 99%
rename from frontend/src/app/dev/docs/page.tsx
rename to frontend/src/app/[locale]/dev/docs/page.tsx
index f783121..b1f324f 100644
--- a/frontend/src/app/dev/docs/page.tsx
+++ b/frontend/src/app/[locale]/dev/docs/page.tsx
@@ -4,7 +4,7 @@
  * Access: /dev/docs
  */
 
-import Link from 'next/link';
+import { Link } from '@/lib/i18n/routing';
 import {
   BookOpen,
   Sparkles,
diff --git a/frontend/src/app/dev/forms/page.tsx b/frontend/src/app/[locale]/dev/forms/page.tsx
similarity index 99%
rename from frontend/src/app/dev/forms/page.tsx
rename to frontend/src/app/[locale]/dev/forms/page.tsx
index 869d2a2..f4a40ce 100644
--- a/frontend/src/app/dev/forms/page.tsx
+++ b/frontend/src/app/[locale]/dev/forms/page.tsx
@@ -7,7 +7,7 @@
 'use client';
 
 import { useState } from 'react';
-import Link from 'next/link';
+import { Link } from '@/lib/i18n/routing';
 import { useForm } from 'react-hook-form';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { z } from 'zod';
diff --git a/frontend/src/app/dev/layout.tsx b/frontend/src/app/[locale]/dev/layout.tsx
similarity index 100%
rename from frontend/src/app/dev/layout.tsx
rename to frontend/src/app/[locale]/dev/layout.tsx
diff --git a/frontend/src/app/dev/layouts/page.tsx b/frontend/src/app/[locale]/dev/layouts/page.tsx
similarity index 99%
rename from frontend/src/app/dev/layouts/page.tsx
rename to frontend/src/app/[locale]/dev/layouts/page.tsx
index c697a4f..6f13295 100644
--- a/frontend/src/app/dev/layouts/page.tsx
+++ b/frontend/src/app/[locale]/dev/layouts/page.tsx
@@ -5,7 +5,7 @@
  */
 
 import type { Metadata } from 'next';
-import Link from 'next/link';
+import { Link } from '@/lib/i18n/routing';
 import { Grid3x3 } from 'lucide-react';
 import { DevBreadcrumbs } from '@/components/dev/DevBreadcrumbs';
 import { Button } from '@/components/ui/button';
diff --git a/frontend/src/app/dev/page.tsx b/frontend/src/app/[locale]/dev/page.tsx
similarity index 99%
rename from frontend/src/app/dev/page.tsx
rename to frontend/src/app/[locale]/dev/page.tsx
index 7224472..df0155b 100644
--- a/frontend/src/app/dev/page.tsx
+++ b/frontend/src/app/[locale]/dev/page.tsx
@@ -5,7 +5,7 @@
  */
 
 import type { Metadata } from 'next';
-import Link from 'next/link';
+import { Link } from '@/lib/i18n/routing';
 import { Palette, Layout, Ruler, FileText, BookOpen, ArrowRight, Sparkles } from 'lucide-react';
 import { Button } from '@/components/ui/button';
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
diff --git a/frontend/src/app/dev/spacing/page.tsx b/frontend/src/app/[locale]/dev/spacing/page.tsx
similarity index 99%
rename from frontend/src/app/dev/spacing/page.tsx
rename to frontend/src/app/[locale]/dev/spacing/page.tsx
index af4cc07..9e00b9c 100644
--- a/frontend/src/app/dev/spacing/page.tsx
+++ b/frontend/src/app/[locale]/dev/spacing/page.tsx
@@ -6,7 +6,7 @@
 
 import type { Metadata } from 'next';
 import dynamic from 'next/dynamic';
-import Link from 'next/link';
+import { Link } from '@/lib/i18n/routing';
 import { Ruler } from 'lucide-react';
 import { DevBreadcrumbs } from '@/components/dev/DevBreadcrumbs';
 import { Button } from '@/components/ui/button';
diff --git a/frontend/src/app/forbidden/page.tsx b/frontend/src/app/[locale]/forbidden/page.tsx
similarity index 97%
rename from frontend/src/app/forbidden/page.tsx
rename to frontend/src/app/[locale]/forbidden/page.tsx
index bcbb208..c9899fc 100644
--- a/frontend/src/app/forbidden/page.tsx
+++ b/frontend/src/app/[locale]/forbidden/page.tsx
@@ -5,7 +5,7 @@
 
 /* istanbul ignore next - Next.js type import for metadata */
 import type { Metadata } from 'next';
-import Link from 'next/link';
+import { Link } from '@/lib/i18n/routing';
 import { ShieldAlert } from 'lucide-react';
 import { Button } from '@/components/ui/button';
 
diff --git a/frontend/src/app/[locale]/layout.tsx b/frontend/src/app/[locale]/layout.tsx
new file mode 100644
index 0000000..98c98d2
--- /dev/null
+++ b/frontend/src/app/[locale]/layout.tsx
@@ -0,0 +1,88 @@
+import type { Metadata } from 'next';
+import { Geist, Geist_Mono } from 'next/font/google';
+import { notFound } from 'next/navigation';
+import { routing } from '@/lib/i18n/routing';
+import { NextIntlClientProvider } from 'next-intl';
+import { getMessages } from 'next-intl/server';
+import '../globals.css';
+import { Providers } from '../providers';
+import { AuthProvider } from '@/lib/auth/AuthContext';
+import { AuthInitializer } from '@/components/auth';
+
+const geistSans = Geist({
+  variable: '--font-geist-sans',
+  subsets: ['latin'],
+  display: 'swap', // Prevent font from blocking render
+  preload: true,
+});
+
+const geistMono = Geist_Mono({
+  variable: '--font-geist-mono',
+  subsets: ['latin'],
+  display: 'swap', // Prevent font from blocking render
+  preload: false, // Only preload primary font
+});
+
+export const metadata: Metadata = {
+  title: 'FastNext Template',
+  description: 'FastAPI + Next.js Template',
+};
+
+export default async function LocaleLayout({
+  children,
+  params,
+}: Readonly<{
+  children: React.ReactNode;
+  params: Promise<{ locale: string }>;
+}>) {
+  // Await params in Next.js 15
+  const { locale } = await params;
+
+  // Ensure that the incoming `locale` is valid
+  if (!routing.locales.includes(locale as 'en' | 'it')) {
+    notFound();
+  }
+
+  // Providing all messages to the client
+  // side is the easiest way to get started
+  const messages = await getMessages();
+
+  return (
+    <html lang={locale} suppressHydrationWarning>
+      <head>
+        {/* Theme initialization script - runs before React hydrates to prevent FOUC */}
+        <script
+          dangerouslySetInnerHTML={{
+            __html: `
+              (function() {
+                try {
+                  const theme = localStorage.getItem('theme') || 'system';
+                  let resolved;
+
+                  if (theme === 'system') {
+                    resolved = window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';
+                  } else {
+                    resolved = theme;
+                  }
+
+                  document.documentElement.classList.remove('light', 'dark');
+                  document.documentElement.classList.add(resolved);
+                } catch (e) {
+                  // Silently fail - theme will be set by ThemeProvider
+                }
+              })();
+            `,
+          }}
+        />
+      </head>
+      <body className={`${geistSans.variable} ${geistMono.variable} antialiased`}>
+        <NextIntlClientProvider messages={messages}>
+          <AuthProvider>
+            <AuthInitializer />
+            <Providers>{children}</Providers>
+          </AuthProvider>
+        </NextIntlClientProvider>
+      </body>
+    </html>
+  );
+}
diff --git a/frontend/src/app/[locale]/page.tsx b/frontend/src/app/[locale]/page.tsx
new file mode 100755
index 0000000..9d0749a
--- /dev/null
+++ b/frontend/src/app/[locale]/page.tsx
@@ -0,0 +1,99 @@
+/**
+ * Homepage / Landing Page
+ * Main landing page for the FastNext Template project
+ * Showcases features, tech stack, and provides demos for developers
+ */
+
+'use client';
+
+import { useState } from 'react';
+import { Link } from '@/lib/i18n/routing';
+import { Header } from '@/components/home/Header';
+import { HeroSection } from '@/components/home/HeroSection';
+import { ContextSection } from '@/components/home/ContextSection';
+import { AnimatedTerminal } from '@/components/home/AnimatedTerminal';
+import { FeatureGrid } from '@/components/home/FeatureGrid';
+import { DemoSection } from '@/components/home/DemoSection';
+import { StatsSection } from '@/components/home/StatsSection';
+import { TechStackSection } from '@/components/home/TechStackSection';
+import { PhilosophySection } from '@/components/home/PhilosophySection';
+import { QuickStartCode } from '@/components/home/QuickStartCode';
+import { CTASection } from '@/components/home/CTASection';
+import { DemoCredentialsModal } from '@/components/home/DemoCredentialsModal';
+
+export default function Home() {
+  const [demoModalOpen, setDemoModalOpen] = useState(false);
+
+  return (
+    <div className="min-h-screen">
+      {/* Header Navigation */}
+      <Header onOpenDemoModal={() => setDemoModalOpen(true)} />
+
+      {/* Main Content */}
+      <main>
+        {/* Hero Section with CTAs */}
+        <HeroSection onOpenDemoModal={() => setDemoModalOpen(true)} />
+
+        {/* What is this template? */}
+        <ContextSection />
+
+        {/* Animated Terminal with Quick Start */}
+        <AnimatedTerminal />
+
+        {/* 6 Feature Cards Grid */}
+        <FeatureGrid />
+
+        {/* Interactive Demo Cards */}
+        <DemoSection />
+
+        {/* Statistics with Animated Counters */}
+        <StatsSection />
+
+        {/* Tech Stack Grid */}
+        <TechStackSection />
+
+        {/* For Developers, By Developers */}
+        <PhilosophySection />
+
+        {/* Quick Start Code Block */}
+        <QuickStartCode />
+
+        {/* Final CTA Section */}
+        <CTASection onOpenDemoModal={() => setDemoModalOpen(true)} />
+      </main>
+
+      {/* Footer */}
+      <footer className="border-t bg-muted/30">
+        <div className="container mx-auto px-6 py-8">
+          <div className="flex flex-col md:flex-row items-center justify-between gap-4">
+            <div className="text-sm text-muted-foreground">
+              © {new Date().getFullYear()} FastNext Template. MIT Licensed.
+            </div>
+            <div className="flex items-center gap-6 text-sm text-muted-foreground">
+              <Link href="/demos" className="hover:text-foreground transition-colors">
+                Demo Tour
+              </Link>
+              <Link href="/dev" className="hover:text-foreground transition-colors">
+                Design System
+              </Link>
+              <a
+                href="https://github.com"
+                target="_blank"
+                rel="noopener noreferrer"
+                className="hover:text-foreground transition-colors"
+              >
+                GitHub
+              </a>
+              <Link href="/dev/docs" className="hover:text-foreground transition-colors">
+                Documentation
+              </Link>
+            </div>
+          </div>
+        </div>
+      </footer>
+
+      {/* Shared Demo Credentials Modal */}
+      <DemoCredentialsModal open={demoModalOpen} onClose={() => setDemoModalOpen(false)} />
+    </div>
+  );
+}
diff --git a/frontend/src/app/layout.tsx b/frontend/src/app/layout.tsx
index 4d975a6..87acd65 100755
--- a/frontend/src/app/layout.tsx
+++ b/frontend/src/app/layout.tsx
@@ -1,68 +1,15 @@
-import type { Metadata } from 'next';
-import { Geist, Geist_Mono } from 'next/font/google';
-import './globals.css';
-import { Providers } from './providers';
-import { AuthProvider } from '@/lib/auth/AuthContext';
-import { AuthInitializer } from '@/components/auth';
-
-const geistSans = Geist({
-  variable: '--font-geist-sans',
-  subsets: ['latin'],
-  display: 'swap', // Prevent font from blocking render
-  preload: true,
-});
-
-const geistMono = Geist_Mono({
-  variable: '--font-geist-mono',
-  subsets: ['latin'],
-  display: 'swap', // Prevent font from blocking render
-  preload: false, // Only preload primary font
-});
-
-export const metadata: Metadata = {
-  title: 'FastNext Template',
-  description: 'FastAPI + Next.js Template',
-};
+/**
+ * Root Layout
+ *
+ * Minimal root layout that passes through to locale-specific layouts.
+ * The actual HTML structure and providers are in [locale]/layout.tsx
+ * to properly handle locale-specific rendering.
+ */
 
 export default function RootLayout({
   children,
 }: Readonly<{
   children: React.ReactNode;
 }>) {
-  return (
-    <html lang="en" suppressHydrationWarning>
-      <head>
-        {/* Theme initialization script - runs before React hydrates to prevent FOUC */}
-        <script
-          dangerouslySetInnerHTML={{
-            __html: `
-              (function() {
-                try {
-                  const theme = localStorage.getItem('theme') || 'system';
-                  let resolved;
-
-                  if (theme === 'system') {
-                    resolved = window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';
-                  } else {
-                    resolved = theme;
-                  }
-
-                  document.documentElement.classList.remove('light', 'dark');
-                  document.documentElement.classList.add(resolved);
-                } catch (e) {
-                  // Silently fail - theme will be set by ThemeProvider
-                }
-              })();
-            `,
-          }}
-        />
-      </head>
-      <body className={`${geistSans.variable} ${geistMono.variable} antialiased`}>
-        <AuthProvider>
-          <AuthInitializer />
-          <Providers>{children}</Providers>
-        </AuthProvider>
-      </body>
-    </html>
-  );
+  return children;
 }
diff --git a/frontend/src/app/page.tsx b/frontend/src/app/page.tsx
old mode 100755
new mode 100644
index e18f32e..0b37332
--- a/frontend/src/app/page.tsx
+++ b/frontend/src/app/page.tsx
@@ -1,99 +1,10 @@
 /**
- * Homepage / Landing Page
- * Main landing page for the FastNext Template project
- * Showcases features, tech stack, and provides demos for developers
+ * Root page - redirects to default locale
  */
 
-'use client';
+import { redirect } from 'next/navigation';
 
-import { useState } from 'react';
-import Link from 'next/link';
-import { Header } from '@/components/home/Header';
-import { HeroSection } from '@/components/home/HeroSection';
-import { ContextSection } from '@/components/home/ContextSection';
-import { AnimatedTerminal } from '@/components/home/AnimatedTerminal';
-import { FeatureGrid } from '@/components/home/FeatureGrid';
-import { DemoSection } from '@/components/home/DemoSection';
-import { StatsSection } from '@/components/home/StatsSection';
-import { TechStackSection } from '@/components/home/TechStackSection';
-import { PhilosophySection } from '@/components/home/PhilosophySection';
-import { QuickStartCode } from '@/components/home/QuickStartCode';
-import { CTASection } from '@/components/home/CTASection';
-import { DemoCredentialsModal } from '@/components/home/DemoCredentialsModal';
-
-export default function Home() {
-  const [demoModalOpen, setDemoModalOpen] = useState(false);
-
-  return (
-    <div className="min-h-screen">
-      {/* Header Navigation */}
-      <Header onOpenDemoModal={() => setDemoModalOpen(true)} />
-
-      {/* Main Content */}
-      <main>
-        {/* Hero Section with CTAs */}
-        <HeroSection onOpenDemoModal={() => setDemoModalOpen(true)} />
-
-        {/* What is this template? */}
-        <ContextSection />
-
-        {/* Animated Terminal with Quick Start */}
-        <AnimatedTerminal />
-
-        {/* 6 Feature Cards Grid */}
-        <FeatureGrid />
-
-        {/* Interactive Demo Cards */}
-        <DemoSection />
-
-        {/* Statistics with Animated Counters */}
-        <StatsSection />
-
-        {/* Tech Stack Grid */}
-        <TechStackSection />
-
-        {/* For Developers, By Developers */}
-        <PhilosophySection />
-
-        {/* Quick Start Code Block */}
-        <QuickStartCode />
-
-        {/* Final CTA Section */}
-        <CTASection onOpenDemoModal={() => setDemoModalOpen(true)} />
-      </main>
-
-      {/* Footer */}
-      <footer className="border-t bg-muted/30">
-        <div className="container mx-auto px-6 py-8">
-          <div className="flex flex-col md:flex-row items-center justify-between gap-4">
-            <div className="text-sm text-muted-foreground">
-              © {new Date().getFullYear()} FastNext Template. MIT Licensed.
-            </div>
-            <div className="flex items-center gap-6 text-sm text-muted-foreground">
-              <Link href="/demos" className="hover:text-foreground transition-colors">
-                Demo Tour
-              </Link>
-              <Link href="/dev" className="hover:text-foreground transition-colors">
-                Design System
-              </Link>
-              <a
-                href="https://github.com"
-                target="_blank"
-                rel="noopener noreferrer"
-                className="hover:text-foreground transition-colors"
-              >
-                GitHub
-              </a>
-              <Link href="/dev/docs" className="hover:text-foreground transition-colors">
-                Documentation
-              </Link>
-            </div>
-          </div>
-        </div>
-      </footer>
-
-      {/* Shared Demo Credentials Modal */}
-      <DemoCredentialsModal open={demoModalOpen} onClose={() => setDemoModalOpen(false)} />
-    </div>
-  );
+export default function RootPage() {
+  // Redirect to default locale (en)
+  redirect('/en');
 }
diff --git a/frontend/src/components/admin/AdminSidebar.tsx b/frontend/src/components/admin/AdminSidebar.tsx
index 7a952d7..5b91634 100644
--- a/frontend/src/components/admin/AdminSidebar.tsx
+++ b/frontend/src/components/admin/AdminSidebar.tsx
@@ -5,8 +5,8 @@
 
 'use client';
 
-import Link from 'next/link';
-import { usePathname } from 'next/navigation';
+import { Link } from '@/lib/i18n/routing';
+import { usePathname } from '@/lib/i18n/routing';
 import { cn } from '@/lib/utils';
 import {
   LayoutDashboard,
diff --git a/frontend/src/components/admin/Breadcrumbs.tsx b/frontend/src/components/admin/Breadcrumbs.tsx
index 73f1c24..53e58fc 100644
--- a/frontend/src/components/admin/Breadcrumbs.tsx
+++ b/frontend/src/components/admin/Breadcrumbs.tsx
@@ -5,8 +5,8 @@
 
 'use client';
 
-import Link from 'next/link';
-import { usePathname } from 'next/navigation';
+import { Link } from '@/lib/i18n/routing';
+import { usePathname } from '@/lib/i18n/routing';
 import { ChevronRight } from 'lucide-react';
 
 interface BreadcrumbItem {
diff --git a/frontend/src/components/admin/organizations/OrganizationManagementContent.tsx b/frontend/src/components/admin/organizations/OrganizationManagementContent.tsx
index d200f15..d505457 100644
--- a/frontend/src/components/admin/organizations/OrganizationManagementContent.tsx
+++ b/frontend/src/components/admin/organizations/OrganizationManagementContent.tsx
@@ -6,7 +6,8 @@
 'use client';
 
 import { useState, useCallback } from 'react';
-import { useSearchParams, useRouter } from 'next/navigation';
+import { useSearchParams } from 'next/navigation';
+import { useRouter } from '@/lib/i18n/routing';
 import { Plus } from 'lucide-react';
 import { Button } from '@/components/ui/button';
 import {
diff --git a/frontend/src/components/admin/organizations/OrganizationMembersContent.tsx b/frontend/src/components/admin/organizations/OrganizationMembersContent.tsx
index b3a6665..a1f030c 100644
--- a/frontend/src/components/admin/organizations/OrganizationMembersContent.tsx
+++ b/frontend/src/components/admin/organizations/OrganizationMembersContent.tsx
@@ -6,7 +6,8 @@
 'use client';
 
 import { useState, useCallback } from 'react';
-import { useSearchParams, useRouter } from 'next/navigation';
+import { useSearchParams } from 'next/navigation';
+import { useRouter } from '@/lib/i18n/routing';
 import { UserPlus } from 'lucide-react';
 import { Button } from '@/components/ui/button';
 import {
diff --git a/frontend/src/components/admin/users/UserManagementContent.tsx b/frontend/src/components/admin/users/UserManagementContent.tsx
index 8e5a226..3b50fb9 100644
--- a/frontend/src/components/admin/users/UserManagementContent.tsx
+++ b/frontend/src/components/admin/users/UserManagementContent.tsx
@@ -6,7 +6,8 @@
 'use client';
 
 import { useState, useCallback } from 'react';
-import { useSearchParams, useRouter } from 'next/navigation';
+import { useSearchParams } from 'next/navigation';
+import { useRouter } from '@/lib/i18n/routing';
 import { Plus } from 'lucide-react';
 import { Button } from '@/components/ui/button';
 import { useAuth } from '@/lib/auth/AuthContext';
diff --git a/frontend/src/components/auth/AuthGuard.tsx b/frontend/src/components/auth/AuthGuard.tsx
index 8cb08c0..c7fdd77 100644
--- a/frontend/src/components/auth/AuthGuard.tsx
+++ b/frontend/src/components/auth/AuthGuard.tsx
@@ -7,7 +7,7 @@
 'use client';
 
 import { useEffect, useState } from 'react';
-import { useRouter, usePathname } from 'next/navigation';
+import { useRouter, usePathname } from '@/lib/i18n/routing';
 import { useAuth } from '@/lib/auth/AuthContext';
 import { useMe } from '@/lib/api/hooks/useAuth';
 import { AuthLoadingSkeleton } from '@/components/layout';
diff --git a/frontend/src/components/auth/LoginForm.tsx b/frontend/src/components/auth/LoginForm.tsx
index 0b5cb63..2c8de97 100644
--- a/frontend/src/components/auth/LoginForm.tsx
+++ b/frontend/src/components/auth/LoginForm.tsx
@@ -7,7 +7,7 @@
 'use client';
 
 import { useState } from 'react';
-import Link from 'next/link';
+import { Link } from '@/lib/i18n/routing';
 import { useForm } from 'react-hook-form';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { z } from 'zod';
diff --git a/frontend/src/components/auth/PasswordResetConfirmForm.tsx b/frontend/src/components/auth/PasswordResetConfirmForm.tsx
index 034a66a..a0f2450 100644
--- a/frontend/src/components/auth/PasswordResetConfirmForm.tsx
+++ b/frontend/src/components/auth/PasswordResetConfirmForm.tsx
@@ -7,7 +7,7 @@
 'use client';
 
 import { useState } from 'react';
-import Link from 'next/link';
+import { Link } from '@/lib/i18n/routing';
 import { useForm } from 'react-hook-form';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { z } from 'zod';
diff --git a/frontend/src/components/auth/PasswordResetRequestForm.tsx b/frontend/src/components/auth/PasswordResetRequestForm.tsx
index c78a49e..5eec5e3 100644
--- a/frontend/src/components/auth/PasswordResetRequestForm.tsx
+++ b/frontend/src/components/auth/PasswordResetRequestForm.tsx
@@ -7,7 +7,7 @@
 'use client';
 
 import { useState } from 'react';
-import Link from 'next/link';
+import { Link } from '@/lib/i18n/routing';
 import { useForm } from 'react-hook-form';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { z } from 'zod';
diff --git a/frontend/src/components/auth/RegisterForm.tsx b/frontend/src/components/auth/RegisterForm.tsx
index 2da85d9..2703aee 100644
--- a/frontend/src/components/auth/RegisterForm.tsx
+++ b/frontend/src/components/auth/RegisterForm.tsx
@@ -7,7 +7,7 @@
 'use client';
 
 import { useState } from 'react';
-import Link from 'next/link';
+import { Link } from '@/lib/i18n/routing';
 import { useForm } from 'react-hook-form';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { z } from 'zod';
diff --git a/frontend/src/components/dev/DevBreadcrumbs.tsx b/frontend/src/components/dev/DevBreadcrumbs.tsx
index 4782cca..7f777ec 100644
--- a/frontend/src/components/dev/DevBreadcrumbs.tsx
+++ b/frontend/src/components/dev/DevBreadcrumbs.tsx
@@ -8,7 +8,7 @@
 
 'use client';
 
-import Link from 'next/link';
+import { Link } from '@/lib/i18n/routing';
 import { ChevronRight, Home } from 'lucide-react';
 import { cn } from '@/lib/utils';
 
diff --git a/frontend/src/components/dev/DevLayout.tsx b/frontend/src/components/dev/DevLayout.tsx
index e24ff5b..c847775 100644
--- a/frontend/src/components/dev/DevLayout.tsx
+++ b/frontend/src/components/dev/DevLayout.tsx
@@ -8,8 +8,8 @@
 
 'use client';
 
-import Link from 'next/link';
-import { usePathname } from 'next/navigation';
+import { Link } from '@/lib/i18n/routing';
+import { usePathname } from '@/lib/i18n/routing';
 import {
   Code2,
   Palette,
diff --git a/frontend/src/components/home/AnimatedTerminal.tsx b/frontend/src/components/home/AnimatedTerminal.tsx
index f1c62bf..2d8417b 100644
--- a/frontend/src/components/home/AnimatedTerminal.tsx
+++ b/frontend/src/components/home/AnimatedTerminal.tsx
@@ -9,7 +9,7 @@ import { useEffect, useState, useRef } from 'react';
 import { motion } from 'framer-motion';
 import { Terminal, Play } from 'lucide-react';
 import { Button } from '@/components/ui/button';
-import Link from 'next/link';
+import { Link } from '@/lib/i18n/routing';
 
 const commands = [
   { text: '# Clone the repository', delay: 0 },
diff --git a/frontend/src/components/home/CTASection.tsx b/frontend/src/components/home/CTASection.tsx
index 8c15328..b810b7d 100644
--- a/frontend/src/components/home/CTASection.tsx
+++ b/frontend/src/components/home/CTASection.tsx
@@ -5,7 +5,7 @@
 
 'use client';
 
-import Link from 'next/link';
+import { Link } from '@/lib/i18n/routing';
 import { motion } from 'framer-motion';
 import { Github, Star, Play, ArrowRight } from 'lucide-react';
 import { Button } from '@/components/ui/button';
diff --git a/frontend/src/components/home/DemoCredentialsModal.tsx b/frontend/src/components/home/DemoCredentialsModal.tsx
index 2c82d58..197e55a 100644
--- a/frontend/src/components/home/DemoCredentialsModal.tsx
+++ b/frontend/src/components/home/DemoCredentialsModal.tsx
@@ -6,7 +6,7 @@
 'use client';
 
 import { useState } from 'react';
-import Link from 'next/link';
+import { Link } from '@/lib/i18n/routing';
 import { Copy, Check } from 'lucide-react';
 import {
   Dialog,
diff --git a/frontend/src/components/home/DemoSection.tsx b/frontend/src/components/home/DemoSection.tsx
index aebd3ef..cefca07 100644
--- a/frontend/src/components/home/DemoSection.tsx
+++ b/frontend/src/components/home/DemoSection.tsx
@@ -5,7 +5,7 @@
 
 'use client';
 
-import Link from 'next/link';
+import { Link } from '@/lib/i18n/routing';
 import { motion } from 'framer-motion';
 import { Play, Layers, ShieldCheck, UserCircle } from 'lucide-react';
 import { Button } from '@/components/ui/button';
diff --git a/frontend/src/components/home/FeatureCard.tsx b/frontend/src/components/home/FeatureCard.tsx
index b6dbebc..7efccb2 100644
--- a/frontend/src/components/home/FeatureCard.tsx
+++ b/frontend/src/components/home/FeatureCard.tsx
@@ -5,7 +5,7 @@
 
 'use client';
 
-import Link from 'next/link';
+import { Link } from '@/lib/i18n/routing';
 import { motion } from 'framer-motion';
 import { ArrowRight, LucideIcon } from 'lucide-react';
 
diff --git a/frontend/src/components/home/Header.tsx b/frontend/src/components/home/Header.tsx
index 3a6b2fb..a2b6f5f 100644
--- a/frontend/src/components/home/Header.tsx
+++ b/frontend/src/components/home/Header.tsx
@@ -6,7 +6,7 @@
 'use client';
 
 import { useState } from 'react';
-import Link from 'next/link';
+import { Link } from '@/lib/i18n/routing';
 import { Menu, X, Github, Star } from 'lucide-react';
 import { Button } from '@/components/ui/button';
 import { Sheet, SheetContent, SheetTrigger } from '@/components/ui/sheet';
diff --git a/frontend/src/components/home/HeroSection.tsx b/frontend/src/components/home/HeroSection.tsx
index 0abe65d..cd3ba94 100644
--- a/frontend/src/components/home/HeroSection.tsx
+++ b/frontend/src/components/home/HeroSection.tsx
@@ -5,7 +5,7 @@
 
 'use client';
 
-import Link from 'next/link';
+import { Link } from '@/lib/i18n/routing';
 import { motion } from 'framer-motion';
 import { ArrowRight, Github, Play } from 'lucide-react';
 import { Button } from '@/components/ui/button';
diff --git a/frontend/src/components/layout/Footer.tsx b/frontend/src/components/layout/Footer.tsx
index e481287..2c5cab4 100644
--- a/frontend/src/components/layout/Footer.tsx
+++ b/frontend/src/components/layout/Footer.tsx
@@ -5,7 +5,7 @@
 
 'use client';
 
-import Link from 'next/link';
+import { Link } from '@/lib/i18n/routing';
 
 export function Footer() {
   const currentYear = new Date().getFullYear();
diff --git a/frontend/src/components/layout/Header.tsx b/frontend/src/components/layout/Header.tsx
index ed69375..14475cb 100644
--- a/frontend/src/components/layout/Header.tsx
+++ b/frontend/src/components/layout/Header.tsx
@@ -6,8 +6,8 @@
 
 'use client';
 
-import Link from 'next/link';
-import { usePathname } from 'next/navigation';
+import { Link } from '@/lib/i18n/routing';
+import { usePathname } from '@/lib/i18n/routing';
 import { useAuth } from '@/lib/auth/AuthContext';
 import { useLogout } from '@/lib/api/hooks/useAuth';
 import {
diff --git a/frontend/src/middleware.ts b/frontend/src/middleware.ts
index 33054ab..f801a26 100644
--- a/frontend/src/middleware.ts
+++ b/frontend/src/middleware.ts
@@ -9,8 +9,9 @@ const intlMiddleware = createMiddleware(routing);
 export function middleware(request: NextRequest) {
   const { pathname } = request.nextUrl;
 
-  // Block access to /dev routes in production (before locale handling)
-  if (pathname.startsWith('/dev')) {
+  // Block access to /dev routes in production (handles both /dev and /[locale]/dev)
+  // Match: /dev, /en/dev, /it/dev, etc.
+  if (pathname === '/dev' || pathname.match(/^\/[a-z]{2}\/dev($|\/)/)) {
     const isProduction = process.env.NODE_ENV === 'production';
 
     if (isProduction) {