@bash-app/bash-common 30.42.0 → 30.45.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bash-app/bash-common",
-  "version": "30.42.0",
+  "version": "30.45.0",
   "description": "Common data and scripts to use on the frontend and backend",
   "type": "module",
   "main": "src/index.ts",

package/prisma/schema.prisma

@@ -274,6 +274,7 @@ model BashEvent {
   isApproved                      Boolean?                  @default(false)
   description                     String?
   eventType                       String                    @default("Other")
+  timezone                        String?
   startDateTime                   DateTime?                 @default(now())
   endDateTime                     DateTime?                 @default(now())
   waiverUrl                       String?
@@ -1005,6 +1006,7 @@ model User {
   googleCalendarAccess          String?
   givenName                     String?
   familyName                    String?
+  nameChangeCount               Int                  @default(0)
   hash                          String?
   emailVerified                 DateTime?
   image                         String?
@@ -1067,9 +1069,7 @@ model User {
   contactlist                   ContactList[]
 
   bashEventPromoCodesIUsed BashEventPromoCode[]
-  // bookingForMe                  Booking[]
   userSubscription         UserSubscription?
-  // serviceSubscriptions           ServiceSubscription[]
   volunteerService         VolunteerService[]
   stripeAccounts           StripeAccount[]
   userPromoCodeRedemption  UserPromoCodeRedemption[]
@@ -1092,13 +1092,11 @@ model User {
   preferences UserPreferences?
   userStats   UserStats?
 
-  // Add fields for user suspension
   suspendedUntil DateTime?
   suspendedById  String?
   suspendedBy    User?     @relation("SuspendedUsers", fields: [suspendedById], references: [id], onDelete: SetNull)
   suspendedUsers User[]    @relation("SuspendedUsers")
 
-  // Add relations for reports and demerits
   reportsMade      UserReport[] @relation("ReportsMade")
   reportsReceived  UserReport[] @relation("ReportsReceived")
   reportsReviewed  UserReport[] @relation("ReportsReviewed")
@@ -1109,6 +1107,12 @@ model User {
   notification Notification[]  @relation("NotificationsReceivedByMe")
   followers    UserFollowing[] @relation("Following")
   following    UserFollowing[] @relation("Follower")
+
+  // For lightweight sign-up
+  isLightweightAccount    Boolean         @default(false)
+  notifyForTrendingBashes Boolean         @default(false)
+  trendingBashThreshold   Int             @default(10) // Min attendees to trigger notification
+  organizerUser           UserFollowing[] @relation("FollowingOrganizers")
 }
 
 model UserPreferences {
@@ -1127,6 +1131,8 @@ model UserPreferences {
   invitationNotify        Boolean @default(true)
   eventUpdatesNotify      Boolean @default(true)
   servicePromotionsNotify Boolean @default(true)
+  trendingBashesNotify    Boolean @default(false) // New field
+  organizerUpdatesNotify  Boolean @default(false) // New field
 
   // Privacy Settings
   profileVisibility      String   @default("PUBLIC") // PUBLIC, FRIENDS, PRIVATE
@@ -1186,9 +1192,12 @@ model UserFollowing {
   isFollowing  Boolean   @default(true)
   followedAt   DateTime?
   unfollowedAt DateTime?
+  isOrganizer  Boolean   @default(false) // Flag if following as organizer
+  lastNotified DateTime? // For organizer notifications
 
-  user      User @relation("Follower", fields: [userId], references: [id], onDelete: Cascade)
-  following User @relation("Following", fields: [followingId], references: [id], onDelete: Cascade)
+  user          User  @relation("Follower", fields: [userId], references: [id], onDelete: Cascade, map: "UserFollowing_follower_fkey")
+  following     User  @relation("Following", fields: [followingId], references: [id], onDelete: Cascade)
+  organizerUser User? @relation("FollowingOrganizers", fields: [userId], references: [id], onDelete: Cascade, map: "UserFollowing_organizer_fkey")
 
   @@unique([userId, followingId])
 }
@@ -1558,6 +1567,8 @@ model Vendor {
   id                  String            @id @default(cuid())
   serviceRangeId      String?
   serviceRange        ServiceRange?     @relation(fields: [serviceRangeId], references: [id])
+  vendorServiceTypes  VendorServiceType[]
+  vendorServiceSubType String?
   yearsOfExperience   YearsOfExperience
   crowdSizeId         String?           @unique
   crowdSize           AmountOfGuests?   @relation(fields: [crowdSizeId], references: [id], onDelete: Cascade)
@@ -1672,7 +1683,9 @@ enum EventServiceType {
   InteriorDesigner
   RentalEquipmentProvider
   FoodAndBeverageProvider
-  MediaCapture
+  Photographer
+  Videographer
+  MediaEditor
   AVTechnician
   GraphicDesigner
   Influencer
@@ -1683,6 +1696,7 @@ enum EventServiceType {
   VirtualAssistant
   Consulting
   Transportation
+  Other
 }
 
 enum EntertainmentServiceType {
@@ -1699,8 +1713,54 @@ enum EntertainmentServiceType {
   Impersonators
   Speakers
   Auctioneers
+  Other
+}
+
+enum VendedProductType {
+  Art
+  Books
+  BakedGoods
+  Beverages
+  BodyCareProducts
+  Candles
+  Clothing
+  Crystals
+  FoodItems
+  HandcraftedItems
+  HerbalRemedies
+  HomeDecor
+  HoneyAndJams
+  Jewelry
+  PetProducts
+  PhotographyPrints
+  PopcornAndSnacks
+  SkincareProducts
+  SpiritualItems
+  StickersAndStationery
+  SweetTreats
+  TShirtsAndApparel
+  Other
 }
 
+enum VendorServiceType {
+  BalloonArt
+  CaricatureDrawings
+  ChairMassages
+  FacePainting
+  HairBraiding
+  HennaArt
+  KidsCraftBooths
+  LivePainting
+  PettingZoos
+  PhotoBooths
+  PsychicOrTarotReadings
+  TemporaryTattoos
+  WellnessDemos
+  YogaOrMovementClasses
+  Other
+}
+
+
 enum OrganizationType {
   Church
   GreekLife
@@ -1720,6 +1780,7 @@ enum OrganizationType {
   Conference
   FoodAndBeverage
   TechAndStartups
+  Other
 }
 
 enum YearsOfExperience {

package/src/utils/luxonUtils.ts

@@ -196,14 +196,22 @@ export function dateTimeFormat(dateTime?: DateTime | null) {
   return dateTime?.toFormat(LUXON_DATETIME_FORMAT_STANDARD) ?? "";
 }
 
-export function dateTimeFormatTime(dateTime?: DateTime | null) {
-  return dateTime?.toFormat(LUXON_TIME_FORMAT_AM_PM) ?? "";
+export function dateTimeFormatLong(dateTime?: DateTime | null) {
+  return `${dateTime?.weekdayLong} ${dateTimeFormatWeek(dateTime)}`;
+}
+
+export function dateTimeFormatWeek(dateTime?: DateTime | null) {
+  return dateTime?.toFormat(LUXON_DATETIME_FORMAT_STANDARD) ?? "";
 }
 
 export function dateTimeFormatDate(dateTime?: DateTime | null) {
   return dateTime?.toFormat(LUXON_DATETIME_FORMAT_DATE) ?? "";
 }
 
+export function dateTimeFormatTime(dateTime?: DateTime | null) {
+  return dateTime?.toFormat(LUXON_TIME_FORMAT_AM_PM) ?? "";
+}
+
 export function dateTimeWithinRange(
   dateTime: DateTime,
   dateRange: LuxonDateRange
@@ -268,6 +276,16 @@ export function utcOffsetMinutesToTimezone(utcOffsetMinutes: number) {
   return offsetString;
 }
 
+export function getLocalTimezone() {
+  const localDateTime = DateTime.local();
+  return utcOffsetMinutesToTimezone(localDateTime.offset);
+}
+
+export function getLocalTimezoneName() {
+  const localDateTime = DateTime.local();
+  return localDateTime.zoneName;
+}
+
 export function dateTimeFormatDateRange(
   startDateTimeArg: DateTime | null,
   endDateTimeArg: DateTime | null
@@ -903,10 +921,10 @@ export function dateTimeRangeCrossesMidnight(range: LuxonDateRange) {
 }
 
 /**
- * Given an overall range, split it into segments that use the input’s
- * start time as the daily “start” and the input’s end time as the daily “end.”
+ * Given an overall range, split it into segments that use the input's
+ * start time as the daily "start" and the input's end time as the daily "end."
  *
- * Each segment will run from a day’s daily start to the next day’s daily end.
+ * Each segment will run from a day's daily start to the next day's daily end.
  *
  * For example, if the overall range is:
  *    start: March 5, 2025 11:00 am
@@ -918,7 +936,7 @@ export function dateTimeRangeCrossesMidnight(range: LuxonDateRange) {
  *    March 7, 11:00 am – March 8, 9:00 pm
  *    March 8, 11:00 am – March 9, 9:00 pm
  *
- * (You can then filter out partial segments if you want only full “days”.)
+ * (You can then filter out partial segments if you want only full "days.")
  */
 export function splitRangeByInputTimes(
   range: LuxonDateRange
@@ -931,7 +949,7 @@ export function splitRangeByInputTimes(
   // Determine if the range crosses midnight.
   const crossesMidnight = dateTimeRangeCrossesMidnight(range);
 
-  // Set the first segment’s start.
+  // Set the first segment's start.
   let currentStart = range.start.set(startTime);
   if (currentStart < range.start) {
     currentStart = currentStart.plus({ days: 1 });
@@ -949,7 +967,7 @@ export function splitRangeByInputTimes(
     }
     segments.push({ start: currentStart, end: currentEnd });
 
-    // Move to the next segment’s start:
+    // Move to the next segment's start:
     // (Always add one day and then snap to the start time.)
     currentStart = currentStart.plus({ days: 1 }).set(startTime);
   }