From 10d4616601f8d48d97dedf1eca4ca64124eac720 Mon Sep 17 00:00:00 2001
From: samanhappy <samanhappy@gmail.com>
Date: Fri, 2 May 2025 12:40:11 +0800
Subject: [PATCH] Implement theme switching and enhance dark mode support (#43)

---
 frontend/src/App.tsx                          | 51 +++++++------
 frontend/src/components/AddGroupForm.tsx      |  2 +-
 frontend/src/components/AddServerForm.tsx     |  2 +-
 frontend/src/components/EditGroupForm.tsx     |  2 +-
 frontend/src/components/EditServerForm.tsx    |  2 +-
 .../src/components/MarketServerDetail.tsx     |  2 +-
 frontend/src/components/layout/Content.tsx    |  4 +-
 frontend/src/components/layout/Header.tsx     | 14 ++--
 frontend/src/components/layout/Sidebar.tsx    |  6 +-
 frontend/src/components/ui/ThemeSwitch.tsx    | 51 +++++++++++++
 frontend/src/contexts/ThemeContext.tsx        | 76 +++++++++++++++++++
 frontend/src/index.css                        | 48 +++++++++++-
 frontend/src/layouts/MainLayout.tsx           |  2 +-
 frontend/src/locales/en.json                  |  6 ++
 frontend/src/locales/zh.json                  |  6 ++
 frontend/src/pages/LoginPage.tsx              | 14 ++--
 frontend/src/pages/SettingsPage.tsx           | 14 ++--
 frontend/tailwind.config.js                   | 12 +++
 18 files changed, 261 insertions(+), 53 deletions(-)
 create mode 100644 frontend/src/components/ui/ThemeSwitch.tsx
 create mode 100644 frontend/src/contexts/ThemeContext.tsx
 create mode 100644 frontend/tailwind.config.js

diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 68db2b0..9cc9940 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import { BrowserRouter as Router, Route, Routes, Navigate } from 'react-router-dom';
 import { AuthProvider } from './contexts/AuthContext';
 import { ToastProvider } from './contexts/ToastContext';
+import { ThemeProvider } from './contexts/ThemeContext';
 import MainLayout from './layouts/MainLayout';
 import ProtectedRoute from './components/ProtectedRoute';
 import LoginPage from './pages/LoginPage';
@@ -13,31 +14,33 @@ import MarketPage from './pages/MarketPage';
 
 function App() {
   return (
-    <AuthProvider>
-      <ToastProvider>
-        <Router>
-          <Routes>
-            {/* 公共路由 */}
-            <Route path="/login" element={<LoginPage />} />
-            
-            {/* 受保护的路由，使用 MainLayout 作为布局容器 */}
-            <Route element={<ProtectedRoute />}>
-              <Route element={<MainLayout />}>
-                <Route path="/" element={<DashboardPage />} />
-                <Route path="/servers" element={<ServersPage />} />
-                <Route path="/groups" element={<GroupsPage />} />
-                <Route path="/market" element={<MarketPage />} />
-                <Route path="/market/:serverName" element={<MarketPage />} />
-                <Route path="/settings" element={<SettingsPage />} />
+    <ThemeProvider>
+      <AuthProvider>
+        <ToastProvider>
+          <Router>
+            <Routes>
+              {/* 公共路由 */}
+              <Route path="/login" element={<LoginPage />} />
+              
+              {/* 受保护的路由，使用 MainLayout 作为布局容器 */}
+              <Route element={<ProtectedRoute />}>
+                <Route element={<MainLayout />}>
+                  <Route path="/" element={<DashboardPage />} />
+                  <Route path="/servers" element={<ServersPage />} />
+                  <Route path="/groups" element={<GroupsPage />} />
+                  <Route path="/market" element={<MarketPage />} />
+                  <Route path="/market/:serverName" element={<MarketPage />} />
+                  <Route path="/settings" element={<SettingsPage />} />
+                </Route>
               </Route>
-            </Route>
-            
-            {/* 未匹配的路由重定向到首页 */}
-            <Route path="*" element={<Navigate to="/" />} />
-          </Routes>
-        </Router>
-      </ToastProvider>
-    </AuthProvider>
+              
+              {/* 未匹配的路由重定向到首页 */}
+              <Route path="*" element={<Navigate to="/" />} />
+            </Routes>
+          </Router>
+        </ToastProvider>
+      </AuthProvider>
+    </ThemeProvider>
   );
 }
 
diff --git a/frontend/src/components/AddGroupForm.tsx b/frontend/src/components/AddGroupForm.tsx
index dc94c24..ad40ef6 100644
--- a/frontend/src/components/AddGroupForm.tsx
+++ b/frontend/src/components/AddGroupForm.tsx
@@ -65,7 +65,7 @@ const AddGroupForm = ({ onAdd, onCancel }: AddGroupFormProps) => {
   }
 
   return (
-    <div className="fixed inset-0 bg-black bg-opacity-50 z-50 flex items-center justify-center p-4">
+    <div className="fixed inset-0 bg-black/50 z-50 flex items-center justify-center p-4">
       <div className="bg-white rounded-lg shadow-lg max-w-md w-full">
         <div className="p-6">
           <h2 className="text-xl font-semibold text-gray-800 mb-4">{t('groups.addNew')}</h2>
diff --git a/frontend/src/components/AddServerForm.tsx b/frontend/src/components/AddServerForm.tsx
index 4a2d862..4d84a79 100644
--- a/frontend/src/components/AddServerForm.tsx
+++ b/frontend/src/components/AddServerForm.tsx
@@ -74,7 +74,7 @@ const AddServerForm = ({ onAdd }: AddServerFormProps) => {
       </button>
 
       {modalVisible && (
-        <div className="fixed inset-0 bg-black bg-opacity-50 z-50 flex items-center justify-center p-4">
+        <div className="fixed inset-0 bg-black/50 z-50 flex items-center justify-center p-4">
           <ServerForm
             onSubmit={handleSubmit}
             onCancel={toggleModal}
diff --git a/frontend/src/components/EditGroupForm.tsx b/frontend/src/components/EditGroupForm.tsx
index 847ac28..dcadf3e 100644
--- a/frontend/src/components/EditGroupForm.tsx
+++ b/frontend/src/components/EditGroupForm.tsx
@@ -82,7 +82,7 @@ const EditGroupForm = ({ group, onEdit, onCancel }: EditGroupFormProps) => {
   }
 
   return (
-    <div className="fixed inset-0 bg-black bg-opacity-50 z-50 flex items-center justify-center p-4">
+    <div className="fixed inset-0 bg-black/50 z-50 flex items-center justify-center p-4">
       <div className="bg-white rounded-lg shadow-lg max-w-md w-full">
         <div className="p-6">
           <h2 className="text-xl font-semibold text-gray-800 mb-4">{t('groups.edit')}</h2>
diff --git a/frontend/src/components/EditServerForm.tsx b/frontend/src/components/EditServerForm.tsx
index 04893f7..3078be7 100644
--- a/frontend/src/components/EditServerForm.tsx
+++ b/frontend/src/components/EditServerForm.tsx
@@ -61,7 +61,7 @@ const EditServerForm = ({ server, onEdit, onCancel }: EditServerFormProps) => {
   }
 
   return (
-    <div className="fixed inset-0 bg-black bg-opacity-50 z-50 flex items-center justify-center p-4">
+    <div className="fixed inset-0 bg-black/50 z-50 flex items-center justify-center p-4">
       <ServerForm
         onSubmit={handleSubmit}
         onCancel={onCancel}
diff --git a/frontend/src/components/MarketServerDetail.tsx b/frontend/src/components/MarketServerDetail.tsx
index 2c616c1..ae05496 100644
--- a/frontend/src/components/MarketServerDetail.tsx
+++ b/frontend/src/components/MarketServerDetail.tsx
@@ -270,7 +270,7 @@ const MarketServerDetail: React.FC<MarketServerDetailProps> = ({
       </div>
 
       {modalVisible && (
-        <div className="fixed inset-0 bg-black bg-opacity-50 z-50 flex items-center justify-center p-4">
+        <div className="fixed inset-0 bg-black/50 z-50 flex items-center justify-center p-4">
           <ServerForm
             onSubmit={handleSubmit}
             onCancel={toggleModal}
diff --git a/frontend/src/components/layout/Content.tsx b/frontend/src/components/layout/Content.tsx
index faf4890..4c96c2f 100644
--- a/frontend/src/components/layout/Content.tsx
+++ b/frontend/src/components/layout/Content.tsx
@@ -6,8 +6,8 @@ interface ContentProps {
 
 const Content: React.FC<ContentProps> = ({ children }) => {
   return (
-    <main className="flex-1 p-6 overflow-auto">
-      <div className="max-w-5xl mx-auto">
+    <main className="flex-1 overflow-auto p-6 bg-gray-100 dark:bg-gray-900">
+      <div className="container mx-auto">
         {children}
       </div>
     </main>
diff --git a/frontend/src/components/layout/Header.tsx b/frontend/src/components/layout/Header.tsx
index 103ceba..1a718a8 100644
--- a/frontend/src/components/layout/Header.tsx
+++ b/frontend/src/components/layout/Header.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
 import { useAuth } from '@/contexts/AuthContext';
+import ThemeSwitch from '@/components/ui/ThemeSwitch';
 
 interface HeaderProps {
   onToggleSidebar: () => void;
@@ -18,13 +19,13 @@ const Header: React.FC<HeaderProps> = ({ onToggleSidebar }) => {
   };
 
   return (
-    <header className="bg-white shadow-sm z-10">
+    <header className="bg-white dark:bg-gray-800 shadow-sm z-10">
       <div className="flex justify-between items-center px-4 py-3">
         <div className="flex items-center">
           {/* 侧边栏切换按钮 */}
           <button 
             onClick={onToggleSidebar}
-            className="p-2 rounded-md text-gray-500 hover:text-gray-900 hover:bg-gray-100 focus:outline-none"
+            className="p-2 rounded-md text-gray-500 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-200 hover:bg-gray-100 dark:hover:bg-gray-700 focus:outline-none"
             aria-label={t('app.toggleSidebar')}
           >
             <svg xmlns="http://www.w3.org/2000/svg" className="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
@@ -33,13 +34,16 @@ const Header: React.FC<HeaderProps> = ({ onToggleSidebar }) => {
           </button>
           
           {/* 应用标题 */}
-          <h1 className="ml-4 text-xl font-bold text-gray-900">{t('app.title')}</h1>
+          <h1 className="ml-4 text-xl font-bold text-gray-900 dark:text-white">{t('app.title')}</h1>
         </div>
         
         {/* 用户信息和操作 */}
         <div className="flex items-center space-x-4">
+          {/* Theme Switch */}
+          <ThemeSwitch />
+          
           {auth.user && (
-            <span className="text-sm text-gray-700">
+            <span className="text-sm text-gray-700 dark:text-gray-300">
               {t('app.welcomeUser', { username: auth.user.username })}
             </span>
           )}
@@ -47,7 +51,7 @@ const Header: React.FC<HeaderProps> = ({ onToggleSidebar }) => {
           <div className="flex space-x-2">
             <button
               onClick={handleLogout}
-              className="px-3 py-1.5 bg-red-100 text-red-800 rounded hover:bg-red-200 text-sm"
+              className="px-3 py-1.5 bg-red-100 dark:bg-red-900 text-red-800 dark:text-red-100 rounded hover:bg-red-200 dark:hover:bg-red-800 text-sm"
             >
               {t('app.logout')}
             </button>
diff --git a/frontend/src/components/layout/Sidebar.tsx b/frontend/src/components/layout/Sidebar.tsx
index 50c13b9..96111d8 100644
--- a/frontend/src/components/layout/Sidebar.tsx
+++ b/frontend/src/components/layout/Sidebar.tsx
@@ -68,7 +68,7 @@ const Sidebar: React.FC<SidebarProps> = ({ collapsed }) => {
 
   return (
     <aside 
-      className={`bg-white shadow-sm transition-all duration-300 ease-in-out ${
+      className={`bg-white dark:bg-gray-800 shadow-sm transition-all duration-300 ease-in-out ${
         collapsed ? 'w-16' : 'w-64'
       }`}
     >
@@ -80,8 +80,8 @@ const Sidebar: React.FC<SidebarProps> = ({ collapsed }) => {
             className={({ isActive }) => 
               `flex items-center px-3 py-2 rounded-md transition-colors ${
                 isActive 
-                  ? 'bg-blue-100 text-blue-800' 
-                  : 'text-gray-700 hover:bg-gray-100'
+                  ? 'bg-blue-100 dark:bg-blue-900 text-blue-800 dark:text-blue-200' 
+                  : 'text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700'
               }`
             }
             end={item.path === '/'}
diff --git a/frontend/src/components/ui/ThemeSwitch.tsx b/frontend/src/components/ui/ThemeSwitch.tsx
new file mode 100644
index 0000000..47c2baa
--- /dev/null
+++ b/frontend/src/components/ui/ThemeSwitch.tsx
@@ -0,0 +1,51 @@
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import { useTheme } from '@/contexts/ThemeContext';
+import { Sun, Moon, Monitor } from 'lucide-react';
+
+const ThemeSwitch: React.FC = () => {
+  const { t } = useTranslation();
+  const { theme, setTheme } = useTheme();
+
+  return (
+    <div className="flex items-center space-x-2">
+      <div className="flex bg-gray-200 dark:bg-gray-700 rounded-lg p-1">
+        <button
+          onClick={() => setTheme('light')}
+          className={`flex items-center justify-center rounded-md p-1.5 ${theme === 'light'
+            ? 'bg-white text-yellow-600 shadow'
+            : 'text-black dark:text-gray-300 hover:text-yellow-600 dark:hover:text-yellow-500'
+            }`}
+          title={t('theme.light')}
+          aria-label={t('theme.light')}
+        >
+          <Sun size={18} />
+        </button>
+        <button
+          onClick={() => setTheme('dark')}
+          className={`flex items-center justify-center rounded-md p-1.5 ${theme === 'dark'
+            ? 'bg-gray-800 text-blue-400 shadow'
+            : 'text-gray-600 dark:text-gray-300 hover:text-blue-500 dark:hover:text-blue-400'
+            }`}
+          title={t('theme.dark')}
+          aria-label={t('theme.dark')}
+        >
+          <Moon size={18} />
+        </button>
+        {/* <button
+          onClick={() => setTheme('system')}
+          className={`flex items-center justify-center rounded-md p-1.5 ${theme === 'system'
+              ? 'bg-white dark:bg-gray-800 text-green-600 dark:text-green-400 shadow'
+              : 'text-black dark:text-gray-300 hover:text-green-600 dark:hover:text-green-400'
+            }`}
+          title={t('theme.system')}
+          aria-label={t('theme.system')}
+        >
+          <Monitor size={18} />
+        </button> */}
+      </div>
+    </div>
+  );
+};
+
+export default ThemeSwitch;
\ No newline at end of file
diff --git a/frontend/src/contexts/ThemeContext.tsx b/frontend/src/contexts/ThemeContext.tsx
new file mode 100644
index 0000000..355bfbc
--- /dev/null
+++ b/frontend/src/contexts/ThemeContext.tsx
@@ -0,0 +1,76 @@
+import React, { createContext, useContext, useState, useEffect, ReactNode } from 'react';
+
+type Theme = 'light' | 'dark' | 'system';
+
+interface ThemeContextType {
+  theme: Theme;
+  setTheme: (theme: Theme) => void;
+  resolvedTheme: 'light' | 'dark'; // The actual theme used after resolving system preference
+}
+
+const ThemeContext = createContext<ThemeContextType | undefined>(undefined);
+
+export const useTheme = () => {
+  const context = useContext(ThemeContext);
+  if (!context) {
+    throw new Error('useTheme must be used within a ThemeProvider');
+  }
+  return context;
+};
+
+export const ThemeProvider: React.FC<{ children: ReactNode }> = ({ children }) => {
+  // Get theme from localStorage or default to 'system'
+  const [theme, setTheme] = useState<Theme>(() => {
+    const savedTheme = localStorage.getItem('theme') as Theme;
+    return savedTheme || 'system';
+  });
+  
+  const [resolvedTheme, setResolvedTheme] = useState<'light' | 'dark'>('light');
+
+  // Function to set theme and save to localStorage
+  const handleSetTheme = (newTheme: Theme) => {
+    setTheme(newTheme);
+    localStorage.setItem('theme', newTheme);
+  };
+
+  // Effect to handle system theme changes and apply theme to document
+  useEffect(() => {
+    const updateTheme = () => {
+      const root = window.document.documentElement;
+      const systemTheme = window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';
+      
+      // Determine which theme to use
+      const themeToApply = theme === 'system' ? systemTheme : theme;
+      setResolvedTheme(themeToApply as 'light' | 'dark');
+      
+      // Apply or remove dark class based on theme
+      if (themeToApply === 'dark') {
+        console.log('Applying dark mode to HTML root element'); // 添加日志
+        root.classList.add('dark');
+        document.body.style.backgroundColor = '#111827'; // Force a dark background to ensure visible effect
+      } else {
+        console.log('Removing dark mode from HTML root element'); // 添加日志
+        root.classList.remove('dark');
+        document.body.style.backgroundColor = ''; // Reset background color
+      }
+    };
+
+    // Set up listeners for system theme changes
+    const mediaQuery = window.matchMedia('(prefers-color-scheme: dark)');
+    mediaQuery.addEventListener('change', updateTheme);
+    
+    // Initial theme setup
+    updateTheme();
+
+    // Cleanup
+    return () => {
+      mediaQuery.removeEventListener('change', updateTheme);
+    };
+  }, [theme]);
+
+  return (
+    <ThemeContext.Provider value={{ theme, setTheme: handleSetTheme, resolvedTheme }}>
+      {children}
+    </ThemeContext.Provider>
+  );
+};
\ No newline at end of file
diff --git a/frontend/src/index.css b/frontend/src/index.css
index a965c8f..d804cd4 100644
--- a/frontend/src/index.css
+++ b/frontend/src/index.css
@@ -1,4 +1,4 @@
-/* Use standard Tailwind directives */
+/* Use project's custom Tailwind import */
 @import "tailwindcss";
 
 /* Add some custom styles to verify CSS is working correctly */
@@ -11,6 +11,52 @@ body {
   -moz-osx-font-smoothing: grayscale;
 }
 
+/* Dark mode override styles - these will apply when dark class is on html element */
+.dark body {
+  background-color: #111827;
+  color: #e5e7eb;
+}
+
+.dark .bg-white {
+  background-color: #1f2937 !important;
+}
+
+.dark .text-gray-900 {
+  color: #f9fafb !important;
+}
+
+.dark .text-gray-800 {
+  color: #f3f4f6 !important;
+}
+
+.dark .text-gray-700 {
+  color: #e5e7eb !important;
+}
+
+.dark .text-gray-600 {
+  color: #d1d5db !important;
+}
+
+.dark .text-gray-500 {
+  color: #9ca3af !important;
+}
+
+.dark .border-gray-300 {
+  border-color: #4b5563 !important;
+}
+
+.dark .bg-gray-100 {
+  background-color: #374151 !important;
+}
+
+.dark .bg-gray-50 {
+  background-color: #1f2937 !important;
+}
+
+.dark .shadow {
+  box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.4), 0 1px 2px 0 rgba(0, 0, 0, 0.24) !important;
+}
+
 .bg-custom-blue {
   background-color: #4a90e2; 
 }
diff --git a/frontend/src/layouts/MainLayout.tsx b/frontend/src/layouts/MainLayout.tsx
index fa1f49d..bd314b2 100644
--- a/frontend/src/layouts/MainLayout.tsx
+++ b/frontend/src/layouts/MainLayout.tsx
@@ -13,7 +13,7 @@ const MainLayout: React.FC = () => {
   };
 
   return (
-    <div className="flex flex-col min-h-screen bg-gray-100">
+    <div className="flex flex-col min-h-screen bg-gray-100 dark:bg-gray-900">
       {/* 顶部导航 */}
       <Header onToggleSidebar={toggleSidebar} />
       
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 6fb085c..99aeb0e 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -12,6 +12,12 @@
     "welcomeUser": "Welcome, {{username}}",
     "name": "MCP Hub"
   },
+  "theme": {
+    "title": "Theme",
+    "light": "Light",
+    "dark": "Dark",
+    "system": "System"
+  },
   "auth": {
     "login": "Login",
     "loginTitle": "Login to MCP Hub",
diff --git a/frontend/src/locales/zh.json b/frontend/src/locales/zh.json
index c887d62..62fee52 100644
--- a/frontend/src/locales/zh.json
+++ b/frontend/src/locales/zh.json
@@ -12,6 +12,12 @@
     "welcomeUser": "欢迎, {{username}}",
     "name": "MCP Hub"
   },
+  "theme": {
+    "title": "主题",
+    "light": "浅色",
+    "dark": "深色",
+    "system": "系统"
+  },
   "auth": {
     "login": "登录",
     "loginTitle": "登录 MCP Hub",
diff --git a/frontend/src/pages/LoginPage.tsx b/frontend/src/pages/LoginPage.tsx
index 3420b0c..0e6cfd6 100644
--- a/frontend/src/pages/LoginPage.tsx
+++ b/frontend/src/pages/LoginPage.tsx
@@ -2,6 +2,7 @@ import React, { useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import { useAuth } from '../contexts/AuthContext';
+import ThemeSwitch from '@/components/ui/ThemeSwitch';
 
 const LoginPage: React.FC = () => {
   const { t } = useTranslation();
@@ -39,10 +40,13 @@ const LoginPage: React.FC = () => {
   };
 
   return (
-    <div className="min-h-screen flex items-center justify-center bg-gray-50 py-12 px-4 sm:px-6 lg:px-8">
+    <div className="min-h-screen flex items-center justify-center bg-gray-50 dark:bg-gray-900 py-12 px-4 sm:px-6 lg:px-8">
+      <div className="absolute top-4 right-4">
+        <ThemeSwitch />
+      </div>
       <div className="max-w-md w-full space-y-8">
         <div>
-          <h2 className="mt-6 text-center text-3xl font-extrabold text-gray-900">
+          <h2 className="mt-6 text-center text-3xl font-extrabold text-gray-900 dark:text-white">
             {t('auth.loginTitle')}
           </h2>
         </div>
@@ -58,7 +62,7 @@ const LoginPage: React.FC = () => {
                 type="text"
                 autoComplete="username"
                 required
-                className="appearance-none rounded-none relative block w-full px-3 py-2 border border-gray-300 placeholder-gray-500 text-gray-900 rounded-t-md focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 focus:z-10 sm:text-sm"
+                className="appearance-none rounded-none relative block w-full px-3 py-2 border border-gray-300 dark:border-gray-700 placeholder-gray-500 dark:placeholder-gray-400 text-gray-900 dark:text-white dark:bg-gray-800 rounded-t-md focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 focus:z-10 sm:text-sm"
                 placeholder={t('auth.username')}
                 value={username}
                 onChange={(e) => setUsername(e.target.value)}
@@ -74,7 +78,7 @@ const LoginPage: React.FC = () => {
                 type="password"
                 autoComplete="current-password"
                 required
-                className="appearance-none rounded-none relative block w-full px-3 py-2 border border-gray-300 placeholder-gray-500 text-gray-900 rounded-b-md focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 focus:z-10 sm:text-sm"
+                className="appearance-none rounded-none relative block w-full px-3 py-2 border border-gray-300 dark:border-gray-700 placeholder-gray-500 dark:placeholder-gray-400 text-gray-900 dark:text-white dark:bg-gray-800 rounded-b-md focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 focus:z-10 sm:text-sm"
                 placeholder={t('auth.password')}
                 value={password}
                 onChange={(e) => setPassword(e.target.value)}
@@ -83,7 +87,7 @@ const LoginPage: React.FC = () => {
           </div>
 
           {error && (
-            <div className="text-red-500 text-sm text-center">{error}</div>
+            <div className="text-red-500 dark:text-red-400 text-sm text-center">{error}</div>
           )}
 
           <div>
diff --git a/frontend/src/pages/SettingsPage.tsx b/frontend/src/pages/SettingsPage.tsx
index bdd2b0d..31d341a 100644
--- a/frontend/src/pages/SettingsPage.tsx
+++ b/frontend/src/pages/SettingsPage.tsx
@@ -51,13 +51,13 @@ const SettingsPage: React.FC = () => {
   };
 
   return (
-    <div className="max-w-4xl mx-auto">
+    <div className="container mx-auto">
       <h1 className="text-2xl font-bold text-gray-900 mb-8">{t('pages.settings.title')}</h1>
 
       {/* Language Settings */}
-      <div className="bg-white shadow rounded-lg p-6 mb-6">
+      <div className="bg-white shadow rounded-lg py-4 px-6 mb-6">
         <div className="flex items-center justify-between">
-          <h2 className="text-xl font-semibold text-gray-800">{t('pages.settings.language')}</h2>
+          <h2 className="font-semibold text-gray-800">{t('pages.settings.language')}</h2>
           <div className="flex space-x-3">
             <button
               className={`px-3 py-1.5 rounded-md transition-colors text-sm ${
@@ -84,12 +84,12 @@ const SettingsPage: React.FC = () => {
       </div>
 
       {/* Route Configuration Settings */}
-      <div className="bg-white shadow rounded-lg p-6 mb-6">
+      <div className="bg-white shadow rounded-lg py-4 px-6 mb-6">
         <div
           className="flex justify-between items-center cursor-pointer"
           onClick={() => toggleSection('routingConfig')}
         >
-          <h2 className="text-xl font-semibold text-gray-800">{t('pages.settings.routeConfig')}</h2>
+          <h2 className="font-semibold text-gray-800">{t('pages.settings.routeConfig')}</h2>
           <span className="text-gray-500">
             {sectionsVisible.routingConfig ? '▼' : '►'}
           </span>
@@ -125,12 +125,12 @@ const SettingsPage: React.FC = () => {
       </div>
 
       {/* Change Password */}
-      <div className="bg-white shadow rounded-lg p-6 mb-6">
+      <div className="bg-white shadow rounded-lg py-4 px-6 mb-6">
         <div
           className="flex justify-between items-center cursor-pointer"
           onClick={() => toggleSection('password')}
         >
-          <h2 className="text-xl font-semibold text-gray-800">{t('auth.changePassword')}</h2>
+          <h2 className="font-semibold text-gray-800">{t('auth.changePassword')}</h2>
           <span className="text-gray-500">
             {sectionsVisible.password ? '▼' : '►'}
           </span>
diff --git a/frontend/tailwind.config.js b/frontend/tailwind.config.js
new file mode 100644
index 0000000..9b004be
--- /dev/null
+++ b/frontend/tailwind.config.js
@@ -0,0 +1,12 @@
+/** @type {import('tailwindcss').Config} */
+export default {
+  content: [
+    "./index.html",
+    "./src/**/*.{js,ts,jsx,tsx}",
+  ],
+  darkMode: 'class', // Use class strategy for dark mode
+  theme: {
+    extend: {},
+  },
+  plugins: [],
+}
\ No newline at end of file