mikicv/tt-booking
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

additional features, refinement and more control over the app from admin side, better bookings UX

Browse Source
This commit is contained in:
mikicvi
2025-09-25 20:23:18 +01:00
parent 6d3202e385
commit b89d91ade2
20 changed files with 1358 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/api/admin/stats/route.ts
+68
View File
@@ -0,0 +1,68 @@
import { NextRequest, NextResponse } from 'next/server';
import { getSession } from '@/lib/session';
import { db } from '@/lib/db';
import { users, courts, bookings, metrics } from '@/lib/db/schema';
import { eq, and, gte, lte, desc, count } from 'drizzle-orm';
export async function GET(request: NextRequest) {
try {
const session = await getSession();
if (!session || session.role !== 'admin') {
return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
}
// Get real stats from database
const totalUsers = await db.select({ count: count() }).from(users);
const activeCourts = await db.select({ count: count() }).from(courts).where(eq(courts.isActive, true));
// Get today's bookings count
const today = new Date().toISOString().split('T')[0];
const todaysBookings = await db
.select({ count: count() })
.from(bookings)
.where(and(eq(bookings.date, today), eq(bookings.status, 'active')));
// Get current month's bookings from metrics table
const currentMonth = new Date().toISOString().substring(0, 7); // "2025-09"
const monthlyBookings = await db
.select()
.from(metrics)
.where(and(eq(metrics.metricType, 'monthly_bookings'), eq(metrics.period, currentMonth)))
.limit(1);
// Get recent bookings with user names
const recentBookings = await db
.select({
id: bookings.id,
date: bookings.date,
startTime: bookings.startTime,
endTime: bookings.endTime,
courtName: courts.name,
userName: users.name,
userSurname: users.surname,
status: bookings.status,
createdAt: bookings.createdAt,
})
.from(bookings)
.leftJoin(users, eq(bookings.userId, users.id))
.leftJoin(courts, eq(bookings.courtId, courts.id))
.orderBy(desc(bookings.createdAt))
.limit(10);
return NextResponse.json({
stats: {
totalUsers: totalUsers[0]?.count || 0,
activeCourts: activeCourts[0]?.count || 0,
todaysBookings: todaysBookings[0]?.count || 0,
monthlyBookings: monthlyBookings[0]?.value || 0,
},
recentBookings: recentBookings.map((booking) => ({
...booking,
userName: `${booking.userName} ${booking.userSurname}`,
})),
});
} catch (error) {
console.error('Error fetching admin stats:', error);
return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
}
}
app/api/admin/time-slots/[id]/route.ts
+2 -8
View File
@@ -31,17 +31,11 @@ export async function PUT(request: NextRequest, { params }: { params: { id: stri
const timeRegex = /^([0-1]?[0-9]|2[0-3]):[0-5][0-9]$/;
if (startTime && !timeRegex.test(startTime)) {
return NextResponse.json(
{ error: 'Invalid startTime format. Use HH:MM format' },
{ status: 400 }
);
return NextResponse.json({ error: 'Invalid startTime format. Use HH:MM format' }, { status: 400 });
}
if (endTime && !timeRegex.test(endTime)) {
return NextResponse.json(
{ error: 'Invalid endTime format. Use HH:MM format' },
{ status: 400 }
);
return NextResponse.json({ error: 'Invalid endTime format. Use HH:MM format' }, { status: 400 });
}
const updatedTimeSlot = await db
app/api/admin/time-slots/route.ts
+2 -8
View File
@@ -12,10 +12,7 @@ export async function GET(request: NextRequest) {
return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
}
const allTimeSlots = await db
.select()
.from(timeSlots)
.orderBy(timeSlots.dayOfWeek, timeSlots.startTime);
const allTimeSlots = await db.select().from(timeSlots).orderBy(timeSlots.dayOfWeek, timeSlots.startTime);
return NextResponse.json({
timeSlots: allTimeSlots,
@@ -53,10 +50,7 @@ export async function POST(request: NextRequest) {
// Validate time format (HH:MM)
const timeRegex = /^([0-1]?[0-9]|2[0-3]):[0-5][0-9]$/;
if (!timeRegex.test(startTime) || !timeRegex.test(endTime)) {
return NextResponse.json(
{ error: 'Invalid time format. Use HH:MM format' },
{ status: 400 }
);
return NextResponse.json({ error: 'Invalid time format. Use HH:MM format' }, { status: 400 });
}
const newTimeSlot = await db
app/api/bookings/all/route.ts
+1 -1
View File
@@ -17,7 +17,7 @@ export async function GET(request: NextRequest) {
// Build query conditions
const whereConditions = [];
whereConditions.push(eq(bookings.status, 'active'));
if (date) {
whereConditions.push(eq(bookings.date, date));
}
app/api/bookings/route.ts
+77 -12
View File
@@ -1,6 +1,6 @@
import { NextRequest, NextResponse } from 'next/server';
import { db } from '@/lib/db';
import { bookings, courts, timeSlots } from '@/lib/db/schema';
import { bookings, courts, timeSlots, settings, metrics } from '@/lib/db/schema';
import { eq, and } from 'drizzle-orm';
import { getSession } from '@/lib/session';
import { logActivity, ACTIONS, ENTITY_TYPES } from '@/lib/activity-logger';
@@ -45,7 +45,7 @@ export async function POST(request: NextRequest) {
return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
}
const { courtId, date, timeSlot } = await request.json();
const { courtId, date, timeSlot, notes } = await request.json();
if (!courtId || !date || !timeSlot) {
return NextResponse.json(
@@ -91,18 +91,15 @@ export async function POST(request: NextRequest) {
const availableTimeSlots = await db
.select()
.from(timeSlots)
.where(
and(
eq(timeSlots.dayOfWeek, dayOfWeek),
eq(timeSlots.isActive, true)
)
);
.where(and(eq(timeSlots.dayOfWeek, dayOfWeek), eq(timeSlots.isActive, true)));
// Check if any time slots are configured for this day
if (availableTimeSlots.length === 0) {
return NextResponse.json(
{
error: `No bookings are allowed on ${['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'][dayOfWeek]}s. The facility is closed on this day.`,
error: `No bookings are allowed on ${
['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'][dayOfWeek]
}s. The facility is closed on this day.`,
},
{ status: 400 }
);
@@ -110,17 +107,50 @@ export async function POST(request: NextRequest) {
// Check if the requested time slot is within any of the allowed time ranges
const requestedHour = parseInt(startTime.split(':')[0]);
const isTimeSlotValid = availableTimeSlots.some(slot => {
const isTimeSlotValid = availableTimeSlots.some((slot) => {
const slotStartHour = parseInt(slot.startTime.split(':')[0]);
const slotEndHour = parseInt(slot.endTime.split(':')[0]);
return requestedHour >= slotStartHour && requestedHour < slotEndHour;
});
if (!isTimeSlotValid) {
const allowedRanges = availableTimeSlots.map(slot => `${slot.startTime}-${slot.endTime}`).join(', ');
const allowedRanges = availableTimeSlots.map((slot) => `${slot.startTime}-${slot.endTime}`).join(', ');
return NextResponse.json(
{
error: `Time slot ${startTime} is not available on ${['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'][dayOfWeek]}s. Available times: ${allowedRanges}`,
error: `Time slot ${startTime} is not available on ${
['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'][dayOfWeek]
}s. Available times: ${allowedRanges}`,
},
{ status: 400 }
);
}
// Check booking restrictions per user per hour per day
const maxBookingsSetting = await db
.select()
.from(settings)
.where(eq(settings.key, 'max_bookings_per_user_per_hour_per_day'))
.limit(1);
const maxBookingsPerHour = maxBookingsSetting.length > 0 ? parseInt(maxBookingsSetting[0].value) : 1; // Default to 1 if setting not found
// Count user's existing bookings for this hour on this day
const userBookingsThisHour = await db
.select()
.from(bookings)
.where(
and(
eq(bookings.userId, session.userId),
eq(bookings.date, date),
eq(bookings.startTime, startTime),
eq(bookings.status, 'active')
)
);
if (userBookingsThisHour.length >= maxBookingsPerHour) {
return NextResponse.json(
{
error: `You have reached the maximum limit of ${maxBookingsPerHour} booking(s) per hour. You already have ${userBookingsThisHour.length} booking(s) at ${startTime} on this date.`,
},
{ status: 400 }
);
@@ -160,6 +190,7 @@ export async function POST(request: NextRequest) {
startTime,
endTime,
status: 'active',
notes: notes || null, // Include notes from the request
createdAt: new Date(),
updatedAt: new Date(),
})
@@ -181,6 +212,40 @@ export async function POST(request: NextRequest) {
request,
});
// Update monthly metrics
const currentMonth = new Date().toISOString().substring(0, 7); // "2025-09"
try {
const existingMetric = await db
.select()
.from(metrics)
.where(and(eq(metrics.metricType, 'monthly_bookings'), eq(metrics.period, currentMonth)))
.limit(1);
if (existingMetric.length > 0) {
// Increment existing metric
await db
.update(metrics)
.set({
value: existingMetric[0].value + 1,
updatedAt: new Date(),
})
.where(eq(metrics.id, existingMetric[0].id));
} else {
// Create new metric for this month
await db.insert(metrics).values({
id: crypto.randomUUID(),
metricType: 'monthly_bookings',
period: currentMonth,
value: 1,
createdAt: new Date(),
updatedAt: new Date(),
});
}
} catch (error) {
console.error('Error updating monthly metrics:', error);
// Don't fail the booking if metrics update fails
}
return NextResponse.json({
booking: newBooking,
message: 'Booking created successfully',
app/dashboard/page.tsx
+30 -2
View File
@@ -1,5 +1,8 @@
import { redirect } from 'next/navigation';
import { getSession } from '@/lib/session';
import { db } from '@/lib/db';
import { users } from '@/lib/db/schema';
import { eq } from 'drizzle-orm';
import { DashboardHeader } from '@/components/dashboard/dashboard-header';
import { EnhancedBookingCalendar } from '@/components/booking/enhanced-booking-calendar';
import { UserBookingManagement } from '@/components/booking/user-booking-management';
@@ -11,9 +14,32 @@ export default async function DashboardPage() {
redirect('/login');
}
// Get full user information
const [user] = await db
.select({
id: users.id,
email: users.email,
name: users.name,
surname: users.surname,
role: users.role,
})
.from(users)
.where(eq(users.id, session.userId))
.limit(1);
if (!user) {
redirect('/login');
}
const userWithSession = {
...session,
name: user.name,
surname: user.surname,
};
return (
<div className='min-h-screen bg-gradient-to-br from-blue-50 to-indigo-100'>
<DashboardHeader user={session} />
<DashboardHeader user={userWithSession} />
<main className='container mx-auto px-4 py-8'>
<div className='grid gap-8 lg:grid-cols-3'>
@@ -21,7 +47,9 @@ export default async function DashboardPage() {
<div className='lg:col-span-2 space-y-6'>
<div>
<h1 className='text-3xl font-bold text-gray-900 mb-2'>
Welcome back, {session.email.split('@')[0]}! 🏓
Welcome back,{' '}
{user.name && user.surname ? `${user.name} ${user.surname}` : user.email.split('@')[0]}!
🏓
</h1>
<p className='text-gray-600'>Book your table tennis court and enjoy your game</p>
</div>