Merge branch 'main' into copilot/add-apprise-alerting-capabilities

frontend/src/components/DashboardLayout.tsx

@@ -16,6 +16,8 @@ import {
   Users,
   CreditCard,
   Bell
+  FileText,
+  Activity
 } from 'lucide-react';
 
 interface DashboardLayoutProps {
@@ -37,6 +39,7 @@ export function DashboardLayout({ children }: DashboardLayoutProps) {
     { name: 'Dashboard', href: '/dashboard', icon: LayoutDashboard },
     { name: 'Mail Accounts', href: '/accounts', icon: Mail },
     { name: 'Notifications', href: '/notifications', icon: Bell },
+    { name: 'Logs', href: '/logs', icon: FileText },
     { name: 'Settings', href: '/settings', icon: Settings },
   ];
 
@@ -45,6 +48,7 @@ export function DashboardLayout({ children }: DashboardLayoutProps) {
         { name: 'Admin Overview', href: '/admin', icon: Shield },
         { name: 'Manage Users', href: '/admin/users', icon: Users },
         { name: 'Manage Plans', href: '/admin/plans', icon: CreditCard },
+        { name: 'Activity Logs', href: '/admin/logs', icon: Activity },
       ]
     : [];
 
@@ -56,7 +60,7 @@ export function DashboardLayout({ children }: DashboardLayoutProps) {
       <div className="hidden lg:fixed lg:inset-y-0 lg:flex lg:w-64 lg:flex-col">
         <div className="flex flex-col flex-grow bg-white border-r border-gray-200">
           <div className="flex items-center h-16 flex-shrink-0 px-4 border-b border-gray-200">
-            <h1 className="text-xl font-bold text-gray-900">InboxRescue</h1>
+            <h1 className="text-xl font-bold text-gray-900">InboxConverge</h1>
           </div>
           <nav className="flex-1 px-2 py-4 space-y-1">
             {navigation.map((item) => {
@@ -119,7 +123,7 @@ export function DashboardLayout({ children }: DashboardLayoutProps) {
           <div className="fixed inset-0 bg-gray-600/75" onClick={() => setSidebarOpen(false)} />
           <div className="fixed inset-y-0 left-0 flex w-64 flex-col bg-white">
             <div className="flex items-center justify-between h-16 px-4 border-b border-gray-200">
-              <h1 className="text-xl font-bold text-gray-900">InboxRescue</h1>
+              <h1 className="text-xl font-bold text-gray-900">InboxConverge</h1>
               <button onClick={() => setSidebarOpen(false)} className="text-gray-500 hover:text-gray-700">
                 <X className="h-6 w-6" />
               </button>