Ems 140 optimize ampq

ems-client/app/dashboard/admin/events/modify/[id]/page.tsx

@@ -77,7 +77,7 @@ function AdminModifyEventPage() {
   const [eventInvitations, setEventInvitations] = useState<SpeakerInvitation[]>([]);
   const [loadingInvitations, setLoadingInvitations] = useState(false);
   const [acceptedSpeakerFromInvitation, setAcceptedSpeakerFromInvitation] = useState<SpeakerProfile | null>(null);
-  
+
   // Sessions and accepted speakers state
   const [sessions, setSessions] = useState<SessionResponse[]>([]);
   const [loadingSessions, setLoadingSessions] = useState(false);
@@ -241,7 +241,7 @@ function AdminModifyEventPage() {
       // Create invitation lookup map by sessionId and speakerId
       const invitationMap = new Map<string, SpeakerInvitation>();
       eventInvitations.forEach(invitation => {
-        const key = invitation.sessionId 
+        const key = invitation.sessionId
           ? `${invitation.sessionId}:${invitation.speakerId}`
           : `event-level:${invitation.speakerId}`;
         invitationMap.set(key, invitation);
@@ -250,12 +250,12 @@ function AdminModifyEventPage() {
       // Create a map to track all session-speaker combinations
       // Key: `${sessionId}:${speakerId}` or `event-level:${speakerId}`
       const sessionSpeakerMap = new Map<string, { speakerId: string; session?: SessionResponse; invitation?: SpeakerInvitation }>();
-      
+
       // Process all session speakers
       allSessionSpeakers.forEach(({ speakerId, session }) => {
         const key = session ? `${session.id}:${speakerId}` : `event-level:${speakerId}`;
         const invitation = invitationMap.get(key);
-        
+
         // Store each session-speaker combination separately
         sessionSpeakerMap.set(key, { speakerId, session, invitation });
       });
@@ -265,7 +265,7 @@ function AdminModifyEventPage() {
         Array.from(sessionSpeakerMap.values()).map(async ({ speakerId, session, invitation }) => {
           try {
             const speaker = await adminApiClient.getSpeakerProfile(speakerId);
-            
+
             return {
               invitation: invitation || null,
               speaker,
@@ -283,7 +283,7 @@ function AdminModifyEventPage() {
 
       // Filter out any null results
       const validSpeakers = speakersWithInfo.filter((item): item is NonNullable<typeof item> => item !== null);
-      
+
       setAcceptedSpeakers(validSpeakers);
 
       logger.info(LOGGER_COMPONENT_NAME, 'Speakers loaded for sessions', {
@@ -767,16 +767,27 @@ function AdminModifyEventPage() {
               {/* Speaker Assignment */}
               <div className="space-y-4">
                 <div className="flex items-center justify-between">
-                  <h3 className="text-lg font-semibold text-slate-900 dark:text-white flex items-center">
-                    <Users className="h-5 w-5 mr-2" />
-                    Speaker Assignment
-                  </h3>
-                  {acceptedSpeakers.length > 0 && (
-                        <Badge variant="outline" className="ml-2">
-                      {acceptedSpeakers.length} accepted speaker{acceptedSpeakers.length !== 1 ? 's' : ''}
-                        </Badge>
-                                          )}
-                                        </div>
+                  <div className="flex items-center gap-2">
+                    <h3 className="text-lg font-semibold text-slate-900 dark:text-white flex items-center">
+                      <Users className="h-5 w-5 mr-2" />
+                      Speaker Assignment
+                    </h3>
+                    {acceptedSpeakers.length > 0 && (
+                      <Badge variant="outline" className="ml-2">
+                        {acceptedSpeakers.length} accepted speaker{acceptedSpeakers.length !== 1 ? 's' : ''}
+                      </Badge>
+                    )}
+                  </div>
+                  <Button
+                    type="button"
+                    size="sm"
+                    onClick={() => setShowSpeakerSearchModal(true)}
+                    className="bg-blue-600 hover:bg-blue-700"
+                  >
+                    <UserPlus className="h-4 w-4 mr-2" />
+                    Invite Speaker
+                  </Button>
+                </div>
 
                 {/* Accepted Speakers List */}
                 {loadingAcceptedSpeakers ? (
@@ -846,8 +857,8 @@ function AdminModifyEventPage() {
                         }
                       };
 
-                      const textColorClass = invitation && invitation.status === 'ACCEPTED' 
-                        ? "text-green-800 dark:text-green-200" 
+                      const textColorClass = invitation && invitation.status === 'ACCEPTED'
+                        ? "text-green-800 dark:text-green-200"
                         : invitation && invitation.status === 'PENDING'
                         ? "text-yellow-800 dark:text-yellow-200"
                         : invitation && invitation.status === 'DECLINED'
@@ -1181,6 +1192,7 @@ function AdminModifyEventPage() {
         eventId={eventId}
         eventName={originalEvent?.name || 'Event'}
         currentSpeakerId={originalEvent?.speakerId}
+        invitedSpeakerIds={eventInvitations.map(inv => inv.speakerId)}
       />
     </div>
   );

ems-client/app/dashboard/admin/layout.tsx

@@ -0,0 +1,37 @@
+'use client';
+
+import React from 'react';
+import { useAuth } from '@/lib/auth-context';
+import { DashboardHeader } from '@/components/dashboard/DashboardHeader';
+import { usePathname } from 'next/navigation';
+
+export default function AdminLayout({
+  children,
+}: {
+  children: React.ReactNode;
+}) {
+  const { user, logout } = useAuth();
+  const pathname = usePathname();
+
+  // Only show layout on root dashboard page (/dashboard/admin)
+  const isRootDashboard = pathname === '/dashboard/admin';
+
+  return (
+    <>
+      {isRootDashboard && (
+        <DashboardHeader
+          user={user}
+          onLogout={logout}
+          title="EventManager"
+          badge={{
+            label: 'Admin Panel',
+            variant: 'secondary',
+            className: 'bg-red-100 text-red-800 dark:bg-red-900 dark:text-red-200'
+          }}
+        />
+      )}
+      {children}
+    </>
+  );
+}
+

ems-client/app/dashboard/admin/messages/page.tsx

@@ -218,16 +218,18 @@ function AdminMessagingCenter() {
 
       // Load all users
       const usersResponse = await adminApiClient.getAllUsers({ limit: 1000 });
-      const users = usersResponse.data.map(user => ({
+      const users = (usersResponse.data || []).map(user => ({
         id: user.id,
         name: user.name || user.email,
         email: user.email,
         type: 'user' as const
       }));
 
-      // Load all speakers
-      const speakers = await speakerApiClient.searchSpeakers({ query: '', limit: 1000 });
-      const speakersList = speakers.map(speaker => ({
+      // Load all speakers - use undefined for query to get all speakers
+      const speakers = await speakerApiClient.searchSpeakers({ limit: 1000 });
+      // Ensure speakers is an array
+      const speakersArray = Array.isArray(speakers) ? speakers : [];
+      const speakersList = speakersArray.map(speaker => ({
         id: speaker.userId,
         name: speaker.name,
         email: speaker.email,
@@ -245,7 +247,7 @@ function AdminMessagingCenter() {
 
       logger.info(LOGGER_COMPONENT_NAME, 'All recipients loaded', {
         usersCount: users.length,
-        speakersCount: speakers.length,
+        speakersCount: speakersArray.length,
         totalCount: allRecipientsList.length
       });
     } catch (error) {

ems-client/app/dashboard/admin/page.tsx

@@ -3,18 +3,16 @@
 import { useAuth } from "@/lib/auth-context";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
-import { Badge } from "@/components/ui/badge";
-import { Avatar, AvatarImage, AvatarFallback } from "@/components/ui/avatar";
 import {
-  LogOut,
   Users,
   Calendar,
   UserCheck,
   BarChart3,
   Plus,
   Eye,
   Ticket,
-  MessageSquare
+  MessageSquare,
+  MapPin
 } from "lucide-react";
 import { useRouter } from "next/navigation";
 import { useEffect, useState } from "react";
@@ -57,50 +55,6 @@ function AdminDashboard() {
 
   return (
     <div className="min-h-screen bg-gradient-to-br from-blue-50 via-white to-indigo-50 dark:from-slate-900 dark:via-slate-800 dark:to-slate-900">
-      {/* Header */}
-      <header className="bg-white/80 dark:bg-slate-800/80 backdrop-blur-sm border-b border-slate-200 dark:border-slate-700">
-        <div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
-          <div className="flex justify-between items-center h-16">
-            <div className="flex items-center space-x-4">
-              <h1 className="text-2xl font-bold bg-gradient-to-r from-blue-600 to-indigo-600 bg-clip-text text-transparent">
-                EventManager
-              </h1>
-              <Badge variant="secondary" className="bg-red-100 text-red-800 dark:bg-red-900 dark:text-red-200">
-                Admin Panel
-              </Badge>
-            </div>
-
-            <div className="flex items-center space-x-4">
-              <div className="flex items-center space-x-3">
-                <Avatar className="h-8 w-8">
-                  <AvatarImage
-                    src={user?.image || `https://api.dicebear.com/7.x/initials/svg?seed=${user?.name || user?.email}`}
-                    alt={user?.name || user?.email}
-                  />
-                  <AvatarFallback className="text-xs">
-                    {user?.name ? user.name.split(' ').map(n => n[0]).join('') : user?.email?.[0]?.toUpperCase()}
-                  </AvatarFallback>
-                </Avatar>
-                <span className="text-sm font-medium text-slate-700 dark:text-slate-300">
-                  {user?.name}
-                </span>
-              </div>
-
-              <Button
-                variant="outline"
-                size="sm"
-                onClick={logout}
-                className="text-slate-600 hover:text-red-600 dark:text-slate-400 dark:hover:text-red-400"
-              >
-                <LogOut className="h-4 w-4 mr-2" />
-                Sign Out
-              </Button>
-            </div>
-          </div>
-        </div>
-      </header>
-
-
       {/* Main Content */}
       <main className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-8">
             {/* Welcome Section */}
@@ -257,6 +211,15 @@ function AdminDashboard() {
                   <MessageSquare className="h-5 w-5" />
                   <span className="text-sm">Messages</span>
                 </Button>
+
+                <Button
+                  variant="outline"
+                  className="h-20 flex flex-col items-center justify-center space-y-2 border-slate-200 dark:border-slate-700"
+                  onClick={() => router.push('/dashboard/admin/venues/create')}
+                >
+                  <MapPin className="h-5 w-5" />
+                  <span className="text-sm">Add New Venue</span>
+                </Button>
               </div>
             </CardContent>
           </Card>