Fix creating and deleting calendars

This fixes the creation and deletion of calendars to include a color and the proper chosen name.

routes/api/calendar/add.tsx

@@ -2,6 +2,7 @@ import { Handlers } from 'fresh/server.ts';
 
 import { FreshContextState } from '/lib/types.ts';
 import { Calendar, CalendarModel } from '/lib/models/calendar.ts';
+import { getColorAsHex } from '/lib/utils/calendar.ts';
 
 interface Data {}
 
@@ -23,7 +24,7 @@ export const handler: Handlers<Data, FreshContextState> = {
     const requestBody = await request.clone().json() as RequestBody;
 
     if (requestBody.name) {
-      await CalendarModel.create(context.state.user.id, requestBody.name);
+      await CalendarModel.create(context.state.user.id, requestBody.name, getColorAsHex('bg-gray-700'));
     }
 
     const newCalendars = await CalendarModel.list(context.state.user.id);

routes/api/calendar/update.tsx

@@ -3,7 +3,7 @@ import { Handlers } from 'fresh/server.ts';
 import { FreshContextState } from '/lib/types.ts';
 import { Calendar, CalendarModel } from '/lib/models/calendar.ts';
 import { UserModel } from '/lib/models/user.ts';
-import { getColorAsHex } from '/lib/utils/calendar.ts';
+import { CALENDAR_COLOR_OPTIONS, getColorAsHex } from '/lib/utils/calendar.ts';
 
 interface Data {}
 
@@ -37,7 +37,7 @@ export const handler: Handlers<Data, FreshContextState> = {
       calendar.displayName = requestBody.name;
       calendar.calendarColor = requestBody.color?.startsWith('#')
         ? requestBody.color
-        : getColorAsHex(requestBody.color || 'bg-gray-700');
+        : getColorAsHex((requestBody.color || 'bg-gray-700') as typeof CALENDAR_COLOR_OPTIONS[number]);
 
       await CalendarModel.update(context.state.user.id, calendar.url, calendar.displayName, calendar.calendarColor);
 

routes/calendar.tsx

@@ -4,7 +4,7 @@ import { FreshContextState } from '/lib/types.ts';
 import { Calendar, CalendarEvent, CalendarEventModel, CalendarModel } from '/lib/models/calendar.ts';
 import CalendarWrapper from '/islands/calendar/CalendarWrapper.tsx';
 import { AppConfig } from '/lib/config.ts';
-import { getDateRangeForCalendarView } from '/lib/utils/calendar.ts';
+import { getColorAsHex, getDateRangeForCalendarView } from '/lib/utils/calendar.ts';
 
 interface Data {
   userCalendars: Calendar[];
@@ -42,7 +42,7 @@ export const handler: Handlers<Data, FreshContextState> = {
 
     // Create default calendar if none exists
     if (userCalendars.length === 0) {
-      await CalendarModel.create(userId, 'Calendar');
+      await CalendarModel.create(userId, 'Calendar', getColorAsHex('bg-red-700'));
 
       userCalendars = await CalendarModel.list(userId);
     }