Merge dev into main

prisma/schema.prisma

@@ -17,7 +17,6 @@ model User {
   emailVerified            DateTime?
   verifiedAt               DateTime?
   emailVerificationToken   String?
-  emailVerificationCode    String?
   emailVerificationExpires DateTime?
   passwordResetToken       String?
   passwordResetExpires     DateTime?
@@ -39,7 +38,6 @@ model User {
   showSomeday              Boolean               @default(true)
   showAllDayEvents         Boolean               @default(true)
   showSchedule             Boolean               @default(true)
-  showTaskCheckboxes       Boolean               @default(false)
   cellDuration             Int                   @default(30)
   viewStyle                String                @default("grid")
   viewDays                 Int                   @default(7)
@@ -87,6 +85,8 @@ model User {
   yearFontFamily           String?               @default("Inter")
   yearFontSize             String?               @default("1.125rem")
   yearFontWeight           String?               @default("700")
+  showTaskCheckboxes       Boolean               @default(false)
+  emailVerificationCode    String?
   accounts                 Account[]
   cachedCalendarEvents     CachedCalendarEvent[]
   calendarConnections      CalendarConnection[]
@@ -142,7 +142,6 @@ model Task {
   dayOfWeek          Int?
   scheduledDate      DateTime?
   somedayListId      String?
-  somedaySlotIndex   Int?
   originalDate       DateTime?
   startTime          String?
   endTime            String?
@@ -159,6 +158,7 @@ model Task {
   lastSyncedAt       DateTime?
   deletedAt          DateTime?
   parentTaskId       String?
+  somedaySlotIndex   Int?
   parent             Task?        @relation("SubTasks", fields: [parentTaskId], references: [id], onDelete: Cascade)
   subTasks           Task[]       @relation("SubTasks")
   somedayList        SomedayList? @relation(fields: [somedayListId], references: [id])