@timardex/cluemart-shared 1.1.65 → 1.1.67

package/dist/hooks/index.cjs

@@ -350,7 +350,7 @@ var locationSchema = yup.object().shape({
   region: yup.string().label("Region").required("Region is required"),
   type: yup.string().oneOf(["Point"], "Type must be 'Point'").default("Point").required("Type is required")
 });
-var emailSchema = yup.string().email("Invalid email address").required("Email is required").label("Email").transform(
+var emailRequiredSchema = yup.string().email("Invalid email address").required("Email is required").label("Email").transform(
   (value) => typeof value === "string" ? value.toLowerCase() : value
 );
 var passwordSchema = yup.string().trim().label("Password").min(8, "Password must be at least 8 characters long").required("Password is required");
@@ -394,7 +394,14 @@ var categorySchema = yup.array().of(
 );
 var mobileRegex = /^02\d{7,9}$/;
 var landlineRegex = /^(0(3|4|6|7|9)[0-9]{7})$/;
-var phoneSchema = yup.object({
+var contactDetailsSchema = yup.object({
+  email: yup.string().nullable().notRequired().transform(
+    (value) => typeof value === "string" ? value.trim().toLowerCase() : value
+  ).test(
+    "is-valid-email",
+    "Invalid email address",
+    (value) => !value || yup.string().email().isValidSync(value)
+  ).label("Email"),
   mobilePhone: yup.string().nullable().notRequired().test(
     "mobile-phone",
     "Mobile must start with 02 and be 9\u201311 digits",
@@ -407,7 +414,7 @@ var phoneSchema = yup.object({
     (value) => !value || landlineRegex.test(value)
     // skip empty values
   )
-});
+}).nullable().optional().label("Contact Details");
 
 // src/yupSchema/market.ts
 var yup2 = __toESM(require("yup"));
@@ -457,14 +464,13 @@ var paymentInfoSchema = yup2.object({
   })
 });
 var marketInfoSchema = yup2.object().shape({
+  contactDetails: contactDetailsSchema,
   applicationDeadlineHours: yup2.number().nullable().transform((value, originalValue) => originalValue === "" ? null : value).typeError("Application deadline hours must be a number").min(1, "Application deadline hours must be at least 1").required("Application deadline hours is required").test("no-leading-zeros", "", noLeadingZeros("Application deadline hours")),
   dateTime: yup2.array().of(dateTimeWithPriceSchema).required("DateTime is required"),
-  email: emailSchema,
   marketId: yup2.string().trim().required("Market ID is required"),
   packInTime: yup2.number().typeError("Pack in time must be a number").min(1, "Pack in time must be at least 1").required("Pack in time is required").test("no-leading-zeros", "", noLeadingZeros("Pack in time")),
   paymentDueHours: yup2.number().typeError("Payment due hours must be a number").min(1, "Payment due hours must be at least 1").required("Payment due hours is required").test("no-leading-zeros", "", noLeadingZeros("Payment due hours")),
-  paymentInfo: yup2.array().of(paymentInfoSchema).min(1, "At least one payment info is required").required("Payment info is required"),
-  phoneNumber: phoneSchema.nullable().optional().label("Phone Number")
+  paymentInfo: yup2.array().of(paymentInfoSchema).min(1, "At least one payment info is required").required("Payment info is required")
 });
 
 // src/yupSchema/stallholder.ts
@@ -475,13 +481,13 @@ var stallHolderSchema = globalResourceSchema.shape({
   products: yup3.array().of(yup3.string().defined()).min(1, "Product list must contain at least one item").required("Products are required")
 });
 var stallholderInfoSchema = yup3.object().shape({
+  contactDetails: contactDetailsSchema,
   electricity: yup3.object().shape({
     details: yup3.string().trim().test("details-required", "Please add details", function(value) {
       return !this.parent?.isRequired || (value?.trim().length ?? 0) > 0;
     }).nullable(),
     isRequired: yup3.boolean().required("Electricity requirement is required")
   }),
-  email: emailSchema,
   foodSafetyGradeFiles: yup3.array().of(yup3.string().defined()).nullable(),
   foodSafetyGradeFilesUpload: yup3.array().of(yup3.string().defined()).nullable(),
   gazebo: yup3.object().shape({
@@ -491,7 +497,6 @@ var stallholderInfoSchema = yup3.object().shape({
     isRequired: yup3.boolean().required("Gazebo requirement is required")
   }),
   packaging: yup3.array().of(yup3.string().defined()).min(1, "Packaging list must contain at least one item").required("Packaging is required"),
-  phoneNumber: phoneSchema.nullable().optional().label("Phone Number"),
   priceRange: yup3.object().shape({
     max: yup3.number().min(1).required("Max price is required").test(
       "is-greater",
@@ -521,7 +526,7 @@ var stallholderInfoSchema = yup3.object().shape({
 var yup4 = __toESM(require("yup"));
 var userSchema = yup4.object().shape({
   active: yup4.boolean().required("Active is required"),
-  email: emailSchema,
+  email: emailRequiredSchema,
   firstName: yup4.string().required("First name is required"),
   lastName: yup4.string().required("Last name is required"),
   password: passwordSchema,
@@ -534,27 +539,27 @@ var userSchema = yup4.object().shape({
 // src/yupSchema/auth.ts
 var yup5 = __toESM(require("yup"));
 var loginSchema = yup5.object().shape({
-  email: emailSchema,
+  email: emailRequiredSchema,
   password: passwordSchema
 });
 var registerSchema = yup5.object().shape({
-  email: emailSchema,
+  email: emailRequiredSchema,
   firstName: yup5.string().label("First Name").required("First Name is required"),
   lastName: yup5.string().label("Last Name").required("Last Name is required"),
   password: passwordSchema,
   preferredRegion: yup5.string().label("Preferred Region").required("Preferred Region is required")
 });
 var requestPasswordResetSchema = yup5.object().shape({
-  email: emailSchema
+  email: emailRequiredSchema
 });
 var resetPasswordSchema = yup5.object().shape({
-  email: emailSchema,
+  email: emailRequiredSchema,
   password: passwordSchema,
   // eslint-disable-next-line sort-keys
   confirmPassword: yup5.string().oneOf([yup5.ref("password")], "Passwords must match").required("Confirm Password is required")
 });
 var validateVerificationTokenSchema = yup5.object().shape({
-  email: emailSchema,
+  email: emailRequiredSchema,
   verificationToken: yup5.string().required("Verification code is required").matches(/^\d{6}$/, "Verification code must be exactly 6 digits")
 });
 
@@ -567,7 +572,7 @@ var testersSchema = yup6.object().shape({
     otherwise: () => yup6.array().nullable().notRequired()
   }),
   companyName: yup6.string().required("Company name is required"),
-  email: emailSchema,
+  email: emailRequiredSchema,
   firstName: yup6.string().required("First name is required"),
   lastName: yup6.string().required("Last name is required"),
   osType: yup6.mixed().oneOf(Object.values(EnumOSPlatform), "Please select Android or iOS device").required("OS Type is required"),
@@ -679,16 +684,10 @@ var defaultMarketFormValues = {
   ...globalDefaultValues,
   dateTime: [
     {
-      endDate: "04-09-2025",
-      endTime: "15:00",
-      startDate: "04-09-2025",
-      startTime: "09:00"
-    },
-    {
-      endDate: "05-09-2025",
-      endTime: "15:00",
-      startDate: "05-09-2025",
-      startTime: "09:00"
+      endDate: "",
+      endTime: "",
+      startDate: "",
+      startTime: ""
     }
   ],
   location: {
@@ -709,6 +708,11 @@ var defaultMarketFormValues = {
 };
 var defaultMarketInfoFormValues = {
   applicationDeadlineHours: 48,
+  contactDetails: {
+    email: null,
+    landlinePhone: null,
+    mobilePhone: null
+  },
   dateTime: [
     {
       endDate: "",
@@ -718,16 +722,11 @@ var defaultMarketInfoFormValues = {
       startTime: ""
     }
   ],
-  email: "",
   marketId: "",
   packInTime: 2,
   // e.g., 2 hours before market opens
   paymentDueHours: 24,
   paymentInfo: [],
-  phoneNumber: {
-    landlinePhone: null,
-    mobilePhone: null
-  },
   requirements: []
 };
 var defaultStallholderFormValues = {
@@ -739,16 +738,16 @@ var defaultStallholderFormValues = {
   specialities: null
 };
 var defaultStallholderInfoFormValues = {
+  contactDetails: {
+    email: null,
+    landlinePhone: null,
+    mobilePhone: null
+  },
   electricity: { details: null, isRequired: false },
-  email: "",
   foodSafetyGradeFiles: null,
   foodSafetyGradeFilesUpload: null,
   gazebo: { details: null, isRequired: false },
   packaging: [],
-  phoneNumber: {
-    landlinePhone: null,
-    mobilePhone: null
-  },
   priceRange: { max: 0, min: 0 },
   producedIn: [],
   stallholderId: "",
@@ -872,13 +871,12 @@ function useStallholderInfoForm(data) {
     if (data) {
       reset({
         _id: data._id,
+        contactDetails: data.contactDetails,
         electricity: data.electricity,
-        email: data.email,
         foodSafetyGradeFiles: data.foodSafetyGradeFiles,
         foodSafetyGradeFilesUpload: data.foodSafetyGradeFilesUpload,
         gazebo: data.gazebo,
         packaging: data.packaging,
-        phoneNumber: data.phoneNumber,
         priceRange: data.priceRange,
         producedIn: data.producedIn,
         stallholderId: data.stallholderId,
@@ -891,13 +889,12 @@ function useStallholderInfoForm(data) {
   }, [data]);
   const {
     _id,
+    contactDetails,
     electricity,
-    email,
     foodSafetyGradeFiles,
     foodSafetyGradeFilesUpload,
     gazebo,
     packaging,
-    phoneNumber,
     priceRange,
     producedIn,
     stallholderId,
@@ -908,13 +905,12 @@ function useStallholderInfoForm(data) {
     control,
     fields: {
       _id,
+      contactDetails,
       electricity,
-      email,
       foodSafetyGradeFiles,
       foodSafetyGradeFilesUpload,
       gazebo,
       packaging,
-      phoneNumber,
       priceRange,
       producedIn,
       stallholderId,
@@ -1032,13 +1028,12 @@ function useMarketInfoForm(data) {
       reset({
         _id: data._id,
         applicationDeadlineHours: data.applicationDeadlineHours,
+        contactDetails: data.contactDetails,
         dateTime: data.dateTime,
-        email: data.email,
         marketId: data.marketId,
         packInTime: data.packInTime,
         paymentDueHours: data.paymentDueHours,
         paymentInfo: data.paymentInfo,
-        phoneNumber: data.phoneNumber,
         requirements: data.requirements
       });
     } else {
@@ -1048,13 +1043,12 @@ function useMarketInfoForm(data) {
   const {
     _id,
     applicationDeadlineHours,
+    contactDetails,
     dateTime,
-    email,
     marketId,
     packInTime,
     paymentDueHours,
     paymentInfo,
-    phoneNumber,
     requirements
   } = getValues();
   return {
@@ -1062,13 +1056,12 @@ function useMarketInfoForm(data) {
     fields: {
       _id,
       applicationDeadlineHours,
+      contactDetails,
       dateTime,
-      email,
       marketId,
       packInTime,
       paymentDueHours,
       paymentInfo,
-      phoneNumber,
       requirements
     },
     formState: { errors },
@@ -1421,7 +1414,7 @@ var import_react_hook_form12 = require("react-hook-form");
 // src/yupSchema/contactUs.ts
 var yup8 = __toESM(require("yup"));
 var contactUsSchema = yup8.object().shape({
-  email: emailSchema,
+  email: emailRequiredSchema,
   firstName: yup8.string().required("First name is required"),
   lastName: yup8.string().required("Last name is required"),
   message: yup8.string().required("Message is required")