@devvistatech/devvista-kit 0.0.12 → 0.0.13

package/app/api/gallery-data/route.ts

@@ -1,51 +1,9 @@
 import { NextRequest, NextResponse } from "next/server";
 import { getAuth } from "@clerk/nextjs/server";
+import { StrapiUser, UploadedImage } from "@/lib/types";
 
 export const revalidate = 0;
 
-interface StrapiUser {
-  id: number;
-  username: string;
-  email: string;
-  authId: string;
-  authProvider: string;
-  businessAdminId?: string;
-  userRole?: string;
-  firstName?: string;
-  lastName?: string;
-  businessId?: string[] | null;
-  dateJoined?: string;
-  businessOwner?: boolean;
-  userStatus?: string;
-  timezone?: string | null;
-  language?: string | null;
-  isVerified?: boolean;
-  businessTitle?: string | null;
-  userTitle?: string | null;
-  number?: string | null;
-  address?: {
-    zip: string;
-    city: string;
-    state: string;
-    street: string;
-    country: string;
-  } | null;
-  websiteUrl?: string | null;
-  primaryBusinessColor?: string | null;
-  secondaryBusinessColor?: string | null;
-  logoImage?: string | null;
-}
-
-interface UploadedImage {
-  id: number;
-  documentId: string;
-  title?: string;
-  description?: string;
-  url: string;
-  createdAt: string;
-  category?: "none" | "indoor" | "outdoor" | "commercial";
-}
-
 const CONTENT_API_URL = process.env.STRAPI_CONTENT_API_URL || "";
 const BASE_URL = process.env.STRAPI_API_URL || "";
 const UPLOAD_API_URL = `${BASE_URL}/api/upload`;
@@ -151,7 +109,7 @@ export async function GET(request: NextRequest) {
     }
 
     const response = await fetch(
-      `${CONTENT_API_URL}?publicationState=live&populate=image&fields[0]=title&fields[1]=description&fields[2]=createdAt&fields[3]=category&pagination[pageSize]=100&t=${Date.now()}`,
+      `${CONTENT_API_URL}?publicationState=live&populate=image&fields[0]=title&fields[1]=description&fields[2]=createdAt&fields[3]=category&fields[4]=subCategory&fields[5]=banner&fields[6]=favorite&fields[7]=startDate&fields[8]=endDate&pagination[pageSize]=100&t=${Date.now()}`,
       {
         headers: {
           "Content-Type": "application/json",
@@ -177,7 +135,7 @@ export async function GET(request: NextRequest) {
       const totalPages = result.meta.pagination.pageCount;
       for (let page = 2; page <= totalPages; page++) {
         const nextPageResponse = await fetch(
-          `${CONTENT_API_URL}?publicationState=live&populate=image&fields[0]=title&fields[1]=description&fields[2]=createdAt&fields[3]=category&pagination[page]=${page}&pagination[pageSize]=100&t=${Date.now()}`,
+          `${CONTENT_API_URL}?publicationState=live&populate=image&fields[0]=title&fields[1]=description&fields[2]=createdAt&fields[3]=category&fields[4]=subCategory&fields[5]=banner&fields[6]=favorite&fields[7]=startDate&fields[8]=endDate&pagination[page]=${page}&pagination[pageSize]=100&t=${Date.now()}`,
           {
             headers: {
               "Content-Type": "application/json",
@@ -193,23 +151,24 @@ export async function GET(request: NextRequest) {
     const images: UploadedImage[] = allImages
       .map((item: any) => {
         const image = item.image;
-        if (!image || !image.url) {
-          console.warn(`Image missing for item ${item.id}:`, JSON.stringify(item, null, 2));
-          return null;
-        }
-        const rawUrl = image.url || "";
+        const rawUrl = image?.url || "";
         const imageUrl = rawUrl.startsWith("http") ? rawUrl : `${BASE_URL}${rawUrl}`;
         return {
           id: item.id,
-          documentId: item.documentId,
+          documentId: item.documentId || "",
           title: item.title || "",
           description: item.description || "",
-          url: imageUrl,
-          createdAt: item.createdAt,
+          url: image ? imageUrl : "",
+          createdAt: item.createdAt || new Date().toISOString(),
           category: item.category || "none",
+          subCategory: item.subCategory || "",
+          banner: item.banner || false,
+          favorite: item.favorite ?? false,
+          startDate: item.startDate || undefined,
+          endDate: item.endDate || undefined,
         };
       })
-      .filter((image: UploadedImage | null): image is UploadedImage => image !== null)
+      .filter((image: UploadedImage): image is UploadedImage => image !== null)
       .sort((a: UploadedImage, b: UploadedImage) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime());
 
     return NextResponse.json({
@@ -262,7 +221,12 @@ export async function POST(request: NextRequest) {
     const file = formData.get("file") as File | null;
     const title = formData.get("title") as string | null;
     const description = formData.get("description") as string | null;
-    const category = formData.get("category") as UploadedImage["category"] | null;
+    const category = formData.get("category") as string | null;
+    const subCategory = formData.get("subCategory") as string | null;
+    const banner = formData.get("banner") === "true";
+    const favorite = formData.get("favorite") === "true";
+    const startDate = formData.get("startDate") as string | null;
+    const endDate = formData.get("endDate") as string | null;
 
     if (!file) {
       console.error("POST /api/gallery-data: No file provided");
@@ -310,6 +274,11 @@ export async function POST(request: NextRequest) {
         title: title || `Image ${new Date().toISOString()}`,
         description: description || "",
         category: validCategory,
+        subCategory: subCategory || "",
+        banner: banner,
+        favorite: favorite ?? false,
+        startDate: startDate || null,
+        endDate: endDate || null,
         publishedAt: new Date().toISOString(),
       },
     };
@@ -334,7 +303,7 @@ export async function POST(request: NextRequest) {
     }
 
     const filesResponse = await fetch(
-      `${CONTENT_API_URL}?publicationState=live&populate=image&fields[0]=title&fields[1]=description&fields[2]=createdAt&fields[3]=category&pagination[pageSize]=100&t=${Date.now()}`,
+      `${CONTENT_API_URL}?publicationState=live&populate=image&fields[0]=title&fields[1]=description&fields[2]=createdAt&fields[3]=category&fields[4]=subCategory&fields[5]=banner&fields[6]=favorite&fields[7]=startDate&fields[8]=endDate&pagination[pageSize]=100&t=${Date.now()}`,
       {
         headers: {
           "Content-Type": "application/json",
@@ -371,6 +340,11 @@ export async function POST(request: NextRequest) {
           url: imageUrl,
           createdAt: item.createdAt,
           category: item.category || "none",
+          subCategory: item.subCategory || "",
+          banner: item.banner || false,
+          favorite: item.favorite ?? false,
+          startDate: item.startDate || undefined,
+          endDate: item.endDate || undefined,
         };
       })
       .filter((image: UploadedImage | null): image is UploadedImage => image !== null)
@@ -428,6 +402,11 @@ export async function PUT(request: NextRequest) {
     const title = formData.get("title") as string | null;
     const description = formData.get("description") as string | null;
     const category = formData.get("category") as string | null;
+    const subCategory = formData.get("subCategory") as string | null;
+    const banner = formData.get("banner") === "true";
+    const favorite = formData.get("favorite") === "true";
+    const startDate = formData.get("startDate") as string | null;
+    const endDate = formData.get("endDate") as string | null;
     const file = formData.get("file") as File | null;
 
     if (!documentId) {
@@ -498,6 +477,11 @@ export async function PUT(request: NextRequest) {
         title: title || `Image ${new Date().toISOString()}`,
         description: description || "",
         category: validCategory,
+        subCategory: subCategory || "",
+        banner: banner,
+        favorite: favorite ?? false,
+        startDate: startDate || null,
+        endDate: endDate || null,
         ...(imageId && { image: imageId }),
       },
     };
@@ -535,7 +519,7 @@ export async function PUT(request: NextRequest) {
     }
 
     const filesResponse = await fetch(
-      `${CONTENT_API_URL}?publicationState=live&populate=image&fields[0]=title&fields[1]=description&fields[2]=createdAt&fields[3]=category&pagination[pageSize]=100&t=${Date.now()}`,
+      `${CONTENT_API_URL}?publicationState=live&populate=image&fields[0]=title&fields[1]=description&fields[2]=createdAt&fields[3]=category&fields[4]=subCategory&fields[5]=banner&fields[6]=favorite&fields[7]=startDate&fields[8]=endDate&pagination[pageSize]=100&t=${Date.now()}`,
       {
         headers: {
           "Content-Type": "application/json",
@@ -572,6 +556,11 @@ export async function PUT(request: NextRequest) {
           url: imageUrl,
           createdAt: item.createdAt,
           category: item.category || "none",
+          subCategory: item.subCategory || "",
+          banner: item.banner || false,
+          favorite: item.favorite ?? false,
+          startDate: item.startDate || undefined,
+          endDate: item.endDate || undefined,
         };
       })
       .filter((image: UploadedImage | null): image is UploadedImage => image !== null)
@@ -668,19 +657,17 @@ export async function DELETE(request: NextRequest) {
       const deleteFileResponse = await fetch(`${UPLOAD_API_URL}/files/${uploadFileId}`, {
         method: "DELETE",
         headers: {
-          "Content-Type": "application/json",
           Authorization: `Bearer ${STRAPI_API_TOKEN}`,
         },
       });
 
       if (!deleteFileResponse.ok) {
-        const errorText = await deleteFileResponse.text();
-        console.warn(`DELETE /api/gallery-data: Failed to delete associated file: ${deleteFileResponse.status} - ${errorText}`);
+        console.warn(`DELETE /api/gallery-data: Failed to delete associated file: ${deleteFileResponse.status}`);
       }
     }
 
     const filesResponse = await fetch(
-      `${CONTENT_API_URL}?publicationState=live&populate=image&fields[0]=title&fields[1]=description&fields[2]=createdAt&fields[3]=category&pagination[pageSize]=100&t=${Date.now()}`,
+      `${CONTENT_API_URL}?publicationState=live&populate=image&fields[0]=title&fields[1]=description&fields[2]=createdAt&fields[3]=category&fields[4]=subCategory&fields[5]=banner&fields[6]=favorite&fields[7]=startDate&fields[8]=endDate&pagination[pageSize]=100&t=${Date.now()}`,
       {
         headers: {
           "Content-Type": "application/json",
@@ -717,6 +704,11 @@ export async function DELETE(request: NextRequest) {
           url: imageUrl,
           createdAt: item.createdAt,
           category: item.category || "none",
+          subCategory: item.subCategory || "",
+          banner: item.banner || false,
+          favorite: item.favorite ?? false,
+          startDate: item.startDate || undefined,
+          endDate: item.endDate || undefined,
         };
       })
       .filter((image: UploadedImage | null): image is UploadedImage => image !== null)

package/app/api/schedule/route.ts

@@ -1,22 +1,6 @@
 import { NextRequest, NextResponse } from "next/server";
 import { getAuth } from "@clerk/nextjs/server";
-
-interface StrapiUser {
-  id: number;
-  username: string;
-  email: string;
-  businessAdminId?: string;
-}
-
-interface ScheduleClass {
-  id: number;
-  documentId: string;
-  title: string;
-  startTime: string;
-  endTime: string;
-  daysOfWeek: number[];
-  classDescription?: string;
-}
+import { StrapiUser, ScheduleClass } from "@/lib/types";
 
 const CALENDAR_API_URL = process.env.STRAPI_CALENDAR_API_URL || "";
 const BASE_URL = process.env.STRAPI_API_URL || "";
@@ -94,7 +78,7 @@ export async function GET() {
 
     const result = await response.json();
 
-    const events = (result.data || []).map((event: any) => {
+    const events: ScheduleClass[] = (result.data || []).map((event: any) => {
       const daysOfWeekRaw = event.attributes?.daysOfWeek || event.daysOfWeek || [];
       const daysOfWeekNumbers = Array.isArray(daysOfWeekRaw)
         ? daysOfWeekRaw
@@ -231,7 +215,7 @@ export async function POST(request: NextRequest) {
     }
 
     const result = await eventsResponse.json();
-    const events = (result.data || []).map((event: any) => ({
+    const events: ScheduleClass[] = (result.data || []).map((event: any) => ({
       id: event.id || 0,
       documentId: event.documentId || "",
       title: event.attributes?.title || event.title || "Untitled",
@@ -335,7 +319,7 @@ export async function PUT(request: NextRequest) {
     }
 
     const result = await eventsResponse.json();
-    const events = (result.data || []).map((event: any) => ({
+    const events: ScheduleClass[] = (result.data || []).map((event: any) => ({
       id: event.id || 0,
       documentId: event.documentId || "",
       title: event.attributes?.title || event.title || "Untitled",
@@ -433,7 +417,7 @@ export async function DELETE(request: NextRequest) {
     }
 
     const result = await eventsResponse.json();
-    const events = (result.data || []).map((event: any) => ({
+    const events: ScheduleClass[] = (result.data || []).map((event: any) => ({
       id: event.id || 0,
       documentId: event.documentId || "",
       title: event.attributes?.title || event.title || "Untitled",

package/app/api/signup/route.ts

@@ -0,0 +1,129 @@
+import { NextRequest, NextResponse } from "next/server";
+import crypto from "crypto";
+
+export async function POST(req: NextRequest) {
+  const STRAPI_USER_LIST_API_URL = process.env.STRAPI_USER_LIST_API_URL;
+  const STRAPI_API_TOKEN = process.env.STRAPI_API_TOKEN;
+  const allowedOrigin = process.env.NEXT_PUBLIC_BASE_URL;
+
+  if (!STRAPI_USER_LIST_API_URL || !STRAPI_API_TOKEN || !allowedOrigin) {
+    console.error("POST /api/signup: Missing environment variables", {
+      hasStrapiUrl: !!STRAPI_USER_LIST_API_URL,
+      hasStrapiToken: !!STRAPI_API_TOKEN,
+      hasBaseUrl: !!allowedOrigin,
+      timestamp: new Date().toISOString(),
+    });
+    return NextResponse.json({ error: "Server configuration error" }, { status: 500 });
+  }
+
+  const headers = new Headers({
+    "Access-Control-Allow-Origin": allowedOrigin,
+    "Access-Control-Allow-Methods": "POST",
+    "Access-Control-Allow-Headers": "Content-Type, Authorization",
+  });
+
+  if (req.method === "OPTIONS") {
+    return new NextResponse(null, { status: 204, headers });
+  }
+
+  const requestId = crypto.randomUUID();
+  let body;
+  try {
+    body = await req.json();
+  } catch (error) {
+    console.error("POST /api/signup: Failed to parse request body", { requestId, error, timestamp: new Date().toISOString() });
+    return NextResponse.json({ error: "Invalid request body" }, { status: 400, headers });
+  }
+
+  const { authId, email, username } = body;
+
+  if (!authId || !email || !username) {
+    console.error("POST /api/signup: Missing required fields", { requestId, body, timestamp: new Date().toISOString() });
+    return NextResponse.json({ error: "Missing required fields: authId, email, or username" }, { status: 400, headers });
+  }
+
+  const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+  if (!emailRegex.test(email)) {
+    console.error("POST /api/signup: Invalid email format", { requestId, email, timestamp: new Date().toISOString() });
+    return NextResponse.json({ error: "Invalid email format" }, { status: 400, headers });
+  }
+
+  try {
+    // Check if user exists by authId or email
+    const checkResponse = await fetch(
+      `${STRAPI_USER_LIST_API_URL}?filters[$or][0][authId][$eq]=${encodeURIComponent(authId)}&filters[$or][1][email][$eq]=${encodeURIComponent(email)}`,
+      {
+        headers: {
+          Authorization: `Bearer ${STRAPI_API_TOKEN}`,
+          "Content-Type": "application/json",
+        },
+      }
+    );
+
+    if (!checkResponse.ok) {
+      console.error("POST /api/signup: Failed to check existing user:", {
+        requestId,
+        status: checkResponse.status,
+        timestamp: new Date().toISOString(),
+      });
+      return NextResponse.json({ error: "Failed to check existing user" }, { status: checkResponse.status, headers });
+    }
+
+    const checkResult = await checkResponse.json();
+    if (checkResult.data && checkResult.data.length > 0) {
+      return NextResponse.json(checkResult.data[0], { status: 200, headers });
+    }
+
+    // Create new Strapi user
+    const strapiUserData = {
+      data: {
+        authId,
+        email,
+        username,
+        userRole: "user",
+        businessAdminId: null,
+        publishedAt: new Date().toISOString(),
+      },
+    };
+
+    const createResponse = await fetch(STRAPI_USER_LIST_API_URL, {
+      method: "POST",
+      headers: {
+        Authorization: `Bearer ${STRAPI_API_TOKEN}`,
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify(strapiUserData),
+    });
+
+    if (!createResponse.ok) {
+      const errorData = await createResponse.json();
+      console.error("POST /api/signup: Failed to create Strapi user:", {
+        requestId,
+        status: createResponse.status,
+        errorData,
+        timestamp: new Date().toISOString(),
+      });
+      return NextResponse.json({ error: errorData.error?.message || "Failed to create user" }, { status: createResponse.status, headers });
+    }
+
+    const newStrapiUser = await createResponse.json();
+
+    return NextResponse.json(newStrapiUser.data, { status: 201, headers });
+  } catch (error) {
+    console.error("POST /api/signup: Error:", {
+      requestId,
+      error: error instanceof Error ? error.message : "Unknown error",
+      timestamp: new Date().toISOString(),
+    });
+    return NextResponse.json(
+      { error: "Internal server error", details: error instanceof Error ? error.message : "Unknown error" },
+      { status: 500, headers }
+    );
+  }
+}
+
+export const config = {
+  api: {
+    bodyParser: true,
+  },
+};