@devvistatech/devvista-kit 0.0.12 → 0.0.13

package/app/schedule/page.tsx

@@ -5,11 +5,11 @@ import { Card } from "@/components/other/card";
 import Spinner from "@/components/addOns/non-functional/spinner";
 import { motion } from "framer-motion";
 import Schedule from "@/components/addOns/functional/schedules/SchedulerForm";
-import ScheduleGrid from "@/components/addOns/functional/schedules/ScheduleGridTwoBasic";
-import { ScheduleClass, WeeklySchedule } from "@/components/types";
+import ScheduleGrid from "@/components/addOns/functional/schedules/ScheduleGridTwo";
+import { ScheduleClass, WeeklySchedule } from "@/lib/types";
 import { useAuth, useUser } from "@clerk/nextjs";
-import { useStrapiAuth } from "@/lib/auth-context";
-import { SCHEDULE_PAGE } from "../../lib/constants/schedule"; 
+import { useStrapiAuth } from "@/lib/auth/auth-context";
+import { SCHEDULE_PAGE } from "../../lib/constants/schedule";
 
 export default function SchedulePage() {
   const [schedule, setSchedule] = useState<WeeklySchedule>({
@@ -44,9 +44,9 @@ export default function SchedulePage() {
   const { getToken } = useAuth();
   const { isSignedIn } = useUser();
 
-  const isAdmin = isSignedIn && !!user?.businessAdminId || false;
+  const isAdmin = (isSignedIn && !!user?.businessAdminId) || false;
 
-  const numberToDayKey: { [key: number]: string } = {
+  const numberToDayKey: { [key: number]: keyof WeeklySchedule } = {
     1: "Monday",
     2: "Tuesday",
     3: "Wednesday",
@@ -107,7 +107,13 @@ export default function SchedulePage() {
       });
       if (!response.ok) {
         const errorData = await response.json();
-        throw new Error(errorData.error || SCHEDULE_PAGE.ERRORS.FETCH_EVENTS_FAILED.replace("${response.status}", response.status.toString()));
+        throw new Error(
+          errorData.error ||
+            SCHEDULE_PAGE.ERRORS.FETCH_EVENTS_FAILED.replace(
+              "${response.status}",
+              response.status.toString()
+            )
+        );
       }
 
       const result = await response.json();
@@ -117,7 +123,7 @@ export default function SchedulePage() {
         name: event.title || "Untitled",
         startTime: roundToNearestFiveMinutes(event.startTime || "00:00"),
         endTime: roundToNearestFiveMinutes(event.endTime || "00:00"),
-        daysOfWeek: event.daysOfWeek || [],
+        daysOfWeek: event.daysOfWeek ?? [],
         classDescription: event.classDescription || "",
       }));
 
@@ -131,25 +137,29 @@ export default function SchedulePage() {
         Sunday: [],
       };
       fetchedClasses.forEach((cls: ScheduleClass) => {
-        cls.daysOfWeek.forEach((dayNum: number) => {
-          const dayKey = numberToDayKey[dayNum];
-          if (dayKey && updatedSchedule[dayKey]) {
-            updatedSchedule[dayKey].push({
-              name: cls.name,
-              startTime: cls.startTime,
-              endTime: cls.endTime,
-              id: cls.id,
-              documentId: cls.documentId,
-              daysOfWeek: cls.daysOfWeek,
-              classDescription: cls.classDescription,
-            });
-          }
-        });
+        if (cls.daysOfWeek) {
+          cls.daysOfWeek.forEach((dayNum: number) => {
+            const dayKey = numberToDayKey[dayNum] as keyof WeeklySchedule;
+            if (dayKey && updatedSchedule[dayKey]) {
+              updatedSchedule[dayKey].push({
+                name: cls.name,
+                startTime: cls.startTime,
+                endTime: cls.endTime,
+                id: cls.id,
+                documentId: cls.documentId,
+                daysOfWeek: cls.daysOfWeek,
+                classDescription: cls.classDescription,
+              });
+            }
+          });
+        }
       });
 
       setSchedule(updatedSchedule);
     } catch (err) {
-      setError(err instanceof Error ? err.message : SCHEDULE_PAGE.ERRORS.UNKNOWN_ERROR);
+      setError(
+        err instanceof Error ? err.message : SCHEDULE_PAGE.ERRORS.UNKNOWN_ERROR
+      );
     } finally {
       setIsLoading(false);
     }
@@ -165,7 +175,7 @@ export default function SchedulePage() {
       name: cls?.name || "",
       startTime: cls?.startTime || "",
       endTime: cls?.endTime || "",
-      daysOfWeek: cls ? cls.daysOfWeek : [],
+      daysOfWeek: cls?.daysOfWeek ?? [],
       classDescription: cls?.classDescription || "",
       id: cls?.id || null,
       documentId: cls?.documentId || null,
@@ -208,14 +218,30 @@ export default function SchedulePage() {
 
       if (!response.ok) {
         const errorData = await response.json();
-        throw new Error(errorData.error || SCHEDULE_PAGE.ERRORS.SUBMIT_CLASS_FAILED.replace("${formData.documentId ? 'update' : 'create'}", formData.documentId ? "update" : "create"));
+        throw new Error(
+          errorData.error ||
+            SCHEDULE_PAGE.ERRORS.SUBMIT_CLASS_FAILED.replace(
+              "${formData.documentId ? 'update' : 'create'}",
+              formData.documentId ? "update" : "create"
+            )
+        );
       }
 
       await fetchEvents();
       setIsModalOpen(false);
-      setFormData({ name: "", startTime: "", endTime: "", daysOfWeek: [], classDescription: "", id: null, documentId: null });
+      setFormData({
+        name: "",
+        startTime: "",
+        endTime: "",
+        daysOfWeek: [],
+        classDescription: "",
+        id: null,
+        documentId: null,
+      });
     } catch (err) {
-      setError(err instanceof Error ? err.message : SCHEDULE_PAGE.ERRORS.UNKNOWN_ERROR);
+      setError(
+        err instanceof Error ? err.message : SCHEDULE_PAGE.ERRORS.UNKNOWN_ERROR
+      );
     } finally {
       setIsLoading(false);
     }
@@ -246,12 +272,20 @@ export default function SchedulePage() {
 
       if (!response.ok) {
         const errorData = await response.json();
-        throw new Error(errorData.error || SCHEDULE_PAGE.ERRORS.DELETE_CLASS_FAILED.replace("${response.status}", response.status.toString()));
+        throw new Error(
+          errorData.error ||
+            SCHEDULE_PAGE.ERRORS.DELETE_CLASS_FAILED.replace(
+              "${response.status}",
+              response.status.toString()
+            )
+        );
       }
 
       await fetchEvents();
     } catch (err) {
-      setError(err instanceof Error ? err.message : SCHEDULE_PAGE.ERRORS.UNKNOWN_ERROR);
+      setError(
+        err instanceof Error ? err.message : SCHEDULE_PAGE.ERRORS.UNKNOWN_ERROR
+      );
     } finally {
       setIsLoading(false);
     }
@@ -278,7 +312,10 @@ export default function SchedulePage() {
 
   const formatTime = (time: string) => {
     if (!time) return "";
-    return new Date(`2023-01-01 ${time}`).toLocaleTimeString("en-US", { hour: "numeric", minute: "2-digit" });
+    return new Date(`2023-01-01 ${time}`).toLocaleTimeString("en-US", {
+      hour: "numeric",
+      minute: "2-digit",
+    });
   };
 
   const uniqueClassDescriptions = Array.from(
@@ -312,9 +349,7 @@ export default function SchedulePage() {
     {
       name: SCHEDULE_PAGE.UI.MEMBERSHIP_3_NAME,
       desc: SCHEDULE_PAGE.UI.MEMBERSHIP_3_DESC,
-      pricing: [
-        SCHEDULE_PAGE.UI.MEMBERSHIP_3_PRICING_1,
-      ],
+      pricing: [SCHEDULE_PAGE.UI.MEMBERSHIP_3_PRICING_1],
     },
     {
       name: SCHEDULE_PAGE.UI.MEMBERSHIP_4_NAME,
@@ -551,7 +586,8 @@ export default function SchedulePage() {
           {/* Footer Text */}
           <div className="mt-6 text-center">
             <p className="text-md">
-              <strong>{SCHEDULE_PAGE.UI.FAMILY_RATES_BOLD}</strong> {SCHEDULE_PAGE.UI.FAMILY_RATES_TEXT}
+              <strong>{SCHEDULE_PAGE.UI.FAMILY_RATES_BOLD}</strong>{" "}
+              {SCHEDULE_PAGE.UI.FAMILY_RATES_TEXT}
             </p>
             <p className="mt-2 text-md italic">
               <strong>{SCHEDULE_PAGE.UI.NOTE_BOLD}</strong> {SCHEDULE_PAGE.UI.NOTE_TEXT}
@@ -609,12 +645,16 @@ export default function SchedulePage() {
                     >
                       {cls.name}
                     </h3>
-                    <p className="text-white font-medium flex-1 overflow-hidden text-ellipsis content-text">{cls.desc}</p>
+                    <p className="text-white font-medium flex-1 overflow-hidden text-ellipsis content-text">
+                      {cls.desc}
+                    </p>
                   </Card>
                 </div>
               ))
             ) : (
-              <p className="text-center text-white text-lg content-text">{SCHEDULE_PAGE.UI.NO_CLASS_DESCRIPTIONS}</p>
+              <p className="text-center text-white text-lg content-text">
+                {SCHEDULE_PAGE.UI.NO_CLASS_DESCRIPTIONS}
+              </p>
             )}
           </div>
         </div>
@@ -628,11 +668,9 @@ export default function SchedulePage() {
               {SCHEDULE_PAGE.UI.ADMIN_LOGGED_IN_MESSAGE}
             </p>
           ) : user ? (
-            <p className="text-gray-400 text-sm font-medium">
-            </p>
+            <p className="text-gray-400 text-sm font-medium"></p>
           ) : (
-            <p className="text-gray-400 text-sm font-medium">
-            </p>
+            <p className="text-gray-400 text-sm font-medium"></p>
           )}
         </div>
 

package/bin/init.js

@@ -30,7 +30,6 @@ try {
         copyFiles(sourceItemPath, destItemPath);
       } else {
         fs.copyFileSync(sourceItemPath, destItemPath);
-        console.log(`Copied ${path.relative(projectDir, destItemPath)}`);
       }
     });
   };
@@ -42,7 +41,6 @@ try {
       const destPath = path.join(projectDir, file);
       if (!fs.existsSync(destPath)) {
         fs.cpSync(sourcePath, destPath, { recursive: true });
-        console.log(`Copied new directory ${file}`);
       } else {
         copyFiles(sourcePath, destPath);
       }
@@ -66,9 +64,7 @@ try {
       const destPath = path.join(projectDir, file);
       if (!fs.existsSync(destPath)) {
         fs.copyFileSync(sourcePath, destPath);
-        console.log(`Copied new file ${file}`);
       } else {
-        console.log(`Skipping ${file} (already exists)`);
       }
     }
   });
@@ -141,7 +137,6 @@ readline.question('Proceed with update? (y/n): ', answer => {
           copyFiles(sourceItemPath, destItemPath);
         } else {
           fs.copyFileSync(sourceItemPath, destItemPath);
-          console.log(\`Updated \${path.relative(projectDir, destItemPath)}\`);
         }
       });
     };
@@ -153,7 +148,6 @@ readline.question('Proceed with update? (y/n): ', answer => {
         const destPath = path.join(projectDir, file);
         if (!fs.existsSync(destPath)) {
           fs.cpSync(sourcePath, destPath, { recursive: true });
-          console.log(\`Copied new directory \${file}\`);
         } else {
           copyFiles(sourcePath, destPath);
         }
@@ -170,14 +164,11 @@ readline.question('Proceed with update? (y/n): ', answer => {
           const sourceContent = fs.readFileSync(sourcePath, 'utf8');
           const destContent = fs.readFileSync(destPath, 'utf8');
           if (sourceContent !== destContent) {
-            console.log(\`Skipping \${file} (modified locally)\`);
           } else {
             fs.copyFileSync(sourcePath, destPath);
-            console.log(\`Updated \${file}\`);
           }
         } else {
           fs.copyFileSync(sourcePath, destPath);
-          console.log(\`Copied new file \${file}\`);
         }
       }
     });
@@ -199,8 +190,6 @@ readline.question('Proceed with update? (y/n): ', answer => {
       autoprefixer: libPkg.dependencies.autoprefixer
     });
     fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2));
-
-    console.log('Project updated successfully.');
   } catch (error) {
     console.error('Error updating project:', error.message);
     process.exit(1);
@@ -213,7 +202,6 @@ readline.question('Proceed with update? (y/n): ', answer => {
   // Run npm install to ensure dependencies are installed
   execSync('npm install', { stdio: 'inherit', cwd: projectDir });
 
-  console.log('Project initialized successfully.');
 } catch (error) {
   console.error('Error initializing project:', error.message);
   process.exit(1);

package/components/addOns/functional/ClassList.tsx

@@ -3,7 +3,7 @@
 import React, { useState, useEffect } from "react";
 import { useRouter } from "next/navigation";
 import { Card, CardHeader, CardTitle, CardContent } from "@/components/other/card";
-import { ScheduleClass, WeeklySchedule } from "@/components/types";
+import { ScheduleClass, WeeklySchedule } from "@/lib/types";
 
 interface ClassDescription {
   name: string;
@@ -16,7 +16,9 @@ export default function ClassList() {
   const [error, setError] = useState<string | null>(null);
   const router = useRouter();
 
-  const numberToDayKey: { [key: number]: string } = {
+  type DayKey = keyof WeeklySchedule;
+
+  const numberToDayKey: { [key: number]: DayKey } = {
     1: "Monday",
     2: "Tuesday",
     3: "Wednesday",
@@ -54,7 +56,7 @@ export default function ClassList() {
         name: event.title || "Untitled",
         startTime: roundToNearestFiveMinutes(event.startTime || "00:00"),
         endTime: roundToNearestFiveMinutes(event.endTime || "00:00"),
-        daysOfWeek: event.daysOfWeek || [],
+        daysOfWeek: event.daysOfWeek ?? [],
         classDescription: event.classDescription || "",
       }));
 
@@ -68,20 +70,22 @@ export default function ClassList() {
         Sunday: [],
       };
       fetchedClasses.forEach((cls: ScheduleClass) => {
-        cls.daysOfWeek.forEach((dayNum: number) => {
-          const dayKey = numberToDayKey[dayNum];
-          if (dayKey && updatedSchedule[dayKey]) {
-            updatedSchedule[dayKey].push({
-              name: cls.name,
-              startTime: cls.startTime,
-              endTime: cls.endTime,
-              id: cls.id,
-              documentId: cls.documentId,
-              daysOfWeek: cls.daysOfWeek,
-              classDescription: cls.classDescription,
-            });
-          }
-        });
+        if (cls.daysOfWeek) {
+          cls.daysOfWeek.forEach((dayNum: number) => {
+            const dayKey = numberToDayKey[dayNum];
+            if (dayKey && updatedSchedule[dayKey]) {
+              updatedSchedule[dayKey].push({
+                name: cls.name,
+                startTime: cls.startTime,
+                endTime: cls.endTime,
+                id: cls.id,
+                documentId: cls.documentId,
+                daysOfWeek: cls.daysOfWeek,
+                classDescription: cls.classDescription,
+              });
+            }
+          });
+        }
       });
 
       const uniqueClassDescriptions: ClassDescription[] = Array.from(