Skip to content

Commit 4fcf084

Browse files
authored
Merge pull request #41 from Buffden/EMS-143-Core-Speaker-Assignment-User-Stories
EMS-143: Implement Speaker Management System with Invitations, Messaging, and Material Uploads
2 parents a2dde32 + d9a9ab0 commit 4fcf084

42 files changed

Lines changed: 14422 additions & 274 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

docker-compose.yaml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ services:
2929
- auth-service
3030
- event-service
3131
- booking-service
32+
- speaker-service
3233
- notification-service
3334

3435
#########################################
@@ -121,6 +122,24 @@ services:
121122
rabbitmq:
122123
condition: service_started
123124

125+
speaker-service:
126+
<<: *base-service
127+
build:
128+
context: ./ems-services/speaker-service
129+
dockerfile: Dockerfile
130+
args:
131+
- DATABASE_URL=postgresql://admin:password@speaker-service-db:5432/speaker_db
132+
container_name: speaker-service
133+
env_file:
134+
./ems-services/speaker-service/.env.production
135+
networks:
136+
- event-net
137+
depends_on:
138+
speaker-service-db:
139+
condition: service_healthy
140+
rabbitmq:
141+
condition: service_started
142+
124143
#########################################
125144
# DATABASES FOR MICROSERVICES
126145
#########################################
@@ -172,6 +191,16 @@ services:
172191
volumes:
173192
- feedback-service-data:/var/lib/postgresql/data
174193

194+
speaker-service-db:
195+
<<: *base-service-db
196+
container_name: speaker-service-db
197+
environment:
198+
- POSTGRES_USER=admin
199+
- POSTGRES_PASSWORD=password
200+
- POSTGRES_DB=speaker_db
201+
volumes:
202+
- speaker-service-data:/var/lib/postgresql/data
203+
175204
#########################################
176205
# INFRASTRUCTURE SERVICES
177206
#########################################
@@ -207,5 +236,6 @@ volumes:
207236
event-service-data:
208237
booking-service-data:
209238
feedback-service-data:
239+
speaker-service-data:
210240
rabbitmq_data:
211241
rabbitmq_log:

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

Lines changed: 338 additions & 1 deletion
Large diffs are not rendered by default.

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -140,17 +140,18 @@ function AdminDashboard() {
140140
</div>
141141
</header>
142142

143+
143144
{/* Main Content */}
144145
<main className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-8">
145-
{/* Welcome Section */}
146-
<div className="mb-8">
147-
<h2 className="text-3xl font-bold text-slate-900 dark:text-white mb-2">
148-
Admin Dashboard 👑
149-
</h2>
150-
<p className="text-slate-600 dark:text-slate-400">
151-
Manage users, events, and system operations from here.
152-
</p>
153-
</div>
146+
{/* Welcome Section */}
147+
<div className="mb-8">
148+
<h2 className="text-3xl font-bold text-slate-900 dark:text-white mb-2">
149+
Admin Dashboard 👑
150+
</h2>
151+
<p className="text-slate-600 dark:text-slate-400">
152+
Manage users, events, and system operations from here.
153+
</p>
154+
</div>
154155

155156
{/* Stats Cards */}
156157
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-6 mb-8">

0 commit comments

Comments
 (0)