Migrate NativeWind styling system and harden calendar sync

app.json

@@ -15,9 +15,7 @@
         "ExpoLocalization_supportsRTL": true,
         "CFBundleLocalizations": ["en", "he", "en", "he"],
         "NFCReaderUsageDescription": "NFC is used to read passport and identity document chips during verification.",
-        "com.apple.developer.nfc.readersession.iso7816.select-identifiers": [
-          "A0000002471001"
-        ]
+        "com.apple.developer.nfc.readersession.iso7816.select-identifiers": ["A0000002471001"]
       },
       "bundleIdentifier": "com.derpcat.queue",
       "privacyManifests": {

biome.json

@@ -63,5 +63,13 @@
     "formatter": {
       "trailingCommas": "none"
     }
+  },
+  "css": {
+    "parser": {
+      "tailwindDirectives": true
+    },
+    "formatter": {
+      "enabled": true
+    }
   }
 }

convex/calendarNode.ts

@@ -51,6 +51,9 @@ type GoogleIntegrationRecord = {
   agendaSyncToken?: string;
 };
 
+const GOOGLE_REFRESH_CREDENTIALS_MISSING_ERROR =
+  "Google Calendar integration is missing refresh credentials";
+
 type CalendarOwnerProfile = {
   role: CalendarOwnerRole;
   calendarProvider: "none" | "google" | "apple";
@@ -345,7 +348,7 @@ async function getGoogleAccessToken(ctx: any, integration: GoogleIntegrationReco
   if (!accessToken || accessTokenExpiresAt < now + 60_000) {
     const refreshToken = decryptCalendarToken(integration.refreshToken);
     if (!refreshToken || !integration.oauthClientId) {
-      throw new ConvexError("Google Calendar integration is missing refresh credentials");
+      throw new ConvexError(GOOGLE_REFRESH_CREDENTIALS_MISSING_ERROR);
     }
     const refreshed = await refreshGoogleAccessToken({
       refreshToken,
@@ -599,6 +602,15 @@ async function runGoogleCalendarSync(
       integrationId: integration._id,
       lastError: message,
     });
+    if (message === GOOGLE_REFRESH_CREDENTIALS_MISSING_ERROR) {
+      return {
+        ok: true,
+        syncedCount: 0,
+        removedCount: 0,
+        importedCount: 0,
+        importedRemovedCount: 0,
+      };
+    }
     throw error;
   }
 }

convex/jobs.ts

@@ -981,6 +981,7 @@ export const getMyApplications = query({
       applicationId: v.id("jobApplications"),
       jobId: v.id("jobs"),
       instructorId: v.id("instructorProfiles"),
+      studioId: v.id("studioProfiles"),
       status: v.union(
         v.literal("pending"),
         v.literal("accepted"),
@@ -990,6 +991,7 @@ export const getMyApplications = query({
       appliedAt: v.number(),
       message: v.optional(v.string()),
       studioName: v.string(),
+      studioImageUrl: v.optional(v.string()),
       sport: v.string(),
       zone: v.string(),
       startTime: v.number(),
@@ -1010,6 +1012,9 @@ export const getMyApplications = query({
         v.literal("cancelled"),
         v.literal("completed"),
       ),
+      closureReason: v.optional(
+        v.union(v.literal("expired"), v.literal("studio_cancelled"), v.literal("filled")),
+      ),
     }),
   ),
   handler: async (ctx, args) => {
@@ -1041,13 +1046,23 @@ export const getMyApplications = query({
     const studios = await Promise.all(
       studioIds.map((studioId) => ctx.db.get("studioProfiles", studioId)),
     );
+    const studioImageUrls = await Promise.all(
+      studios.map((studio) =>
+        studio?.logoStorageId ? ctx.storage.getUrl(studio.logoStorageId) : null,
+      ),
+    );
     const studioById = new Map<string, Doc<"studioProfiles">>();
+    const studioImageUrlById = new Map<string, string>();
     for (let i = 0; i < studioIds.length; i += 1) {
       const studioId = studioIds[i];
       const studio = studios[i];
       if (studio) {
         studioById.set(String(studioId), studio);
       }
+      const studioImageUrl = studioImageUrls[i];
+      if (studioImageUrl) {
+        studioImageUrlById.set(String(studioId), studioImageUrl);
+      }
     }
 
     const paymentDetailsByJobId = await loadLatestPaymentDetailsByJobId(ctx, {
@@ -1070,6 +1085,7 @@ export const getMyApplications = query({
         applicationId: application._id,
         jobId: application.jobId,
         instructorId: application.instructorId,
+        studioId: job.studioId,
         status: application.status,
         appliedAt: application.appliedAt,
         studioName: studio?.studioName ?? "Unknown studio",
@@ -1081,9 +1097,11 @@ export const getMyApplications = query({
         jobStatus: job.status,
         ...omitUndefined({
           message: application.message,
+          studioImageUrl: studioImageUrlById.get(String(job.studioId)),
           timeZone: job.timeZone,
           note: job.note,
           paymentDetails: paymentDetailsByJobId.get(String(job._id)),
+          closureReason: job.closureReason,
         }),
       });
     }

convex/schema.ts

@@ -99,6 +99,11 @@ export default defineSchema({
     bio: v.optional(v.string()),
     socialLinks: v.optional(socialLinksValidator),
     address: v.optional(v.string()),
+    addressCity: v.optional(v.string()),
+    addressStreet: v.optional(v.string()),
+    addressNumber: v.optional(v.string()),
+    addressFloor: v.optional(v.string()),
+    addressPostalCode: v.optional(v.string()),
     latitude: v.optional(v.number()),
     longitude: v.optional(v.number()),
     expoPushToken: v.optional(v.string()),
@@ -236,10 +241,16 @@ export default defineSchema({
     bio: v.optional(v.string()),
     socialLinks: v.optional(socialLinksValidator),
     address: v.string(),
+    addressCity: v.optional(v.string()),
+    addressStreet: v.optional(v.string()),
+    addressNumber: v.optional(v.string()),
+    addressFloor: v.optional(v.string()),
+    addressPostalCode: v.optional(v.string()),
     zone: v.string(),
     latitude: v.optional(v.number()),
     longitude: v.optional(v.number()),
     contactPhone: v.optional(v.string()),
+    mapMarkerColor: v.optional(v.string()),
     expoPushToken: v.optional(v.string()),
     notificationsEnabled: v.optional(v.boolean()),
     logoStorageId: v.optional(v.id("_storage")),