abmp-npm 10.0.64 → 10.0.66

package/backend/index.js

@@ -16,4 +16,5 @@ module.exports = {
   ...require('./dev-only-methods'),
   ...require('./tasks/migration-methods'),
   ...require('./tasks/url-migration-methods'),
+  ...require('./public-profile-methods'),
 };

package/backend/jobs.js

@@ -2,7 +2,6 @@ const { taskManager } = require('psdev-task-manager');
 
 const { MEMBER_ACTIONS } = require('./daily-pull/consts');
 const { TASKS_NAMES } = require('./tasks/consts');
-const { dailyPullExecutionCheck } = require('./tasks/daily-pull-check-methods');
 const { TASKS } = require('./tasks/tasks-configs');
 
 async function runScheduledTasks() {
@@ -97,16 +96,6 @@ async function scheduleFixUrlsWithSpacesTask() {
   }
 }
 
-async function runDailyPullExecutionCheck() {
-  try {
-    console.log('runDailyPullExecutionCheck started!');
-    return await dailyPullExecutionCheck({});
-  } catch (error) {
-    console.error(`Failed to runDailyPullExecutionCheck: ${error.message}`);
-    throw new Error(`Failed to runDailyPullExecutionCheck: ${error.message}`);
-  }
-}
-
 async function updateSiteMapS3() {
   try {
     return await taskManager().schedule({
@@ -126,5 +115,4 @@ module.exports = {
   scheduleCreateContactsFromMembersTask,
   scheduleFixPrimaryAddressForMembersTask,
   scheduleFixUrlsWithSpacesTask,
-  runDailyPullExecutionCheck,
 };

package/backend/public-profile-methods.js

@@ -0,0 +1,45 @@
+const { COLLECTIONS } = require('../public/consts');
+
+const { CONFIG_KEYS } = require('./consts');
+const { MEMBER_ACTIONS } = require('./daily-pull/consts');
+const { wixData } = require('./elevated-modules');
+const { findMemberByWixDataId } = require('./members-data-methods');
+const { transformMemberToProfileData } = require('./routers/utils');
+const { getSiteConfigs } = require('./utils');
+
+const getPublicMemberRecord = memberDataId =>
+  wixData
+    .query(COLLECTIONS.MEMBERS_DATA_PUBLIC)
+    .eq('memberData', memberDataId)
+    .limit(1)
+    .find()
+    .then(res => res.items?.[0] || null);
+
+async function getPublicMemberProfileData({ memberDataId }) {
+  if (!memberDataId) {
+    return null;
+  }
+
+  const publicMember = await getPublicMemberRecord(memberDataId);
+  if (!publicMember || publicMember.showWixUrl !== true) {
+    return null;
+  }
+
+  const member = await findMemberByWixDataId(memberDataId);
+  if (!member || member.action === MEMBER_ACTIONS.DROP || member.showWixUrl !== true) {
+    return null;
+  }
+
+  const siteConfigs = await getSiteConfigs();
+  const siteAssociation = siteConfigs[CONFIG_KEYS.SITE_ASSOCIATION];
+  const defaultProfileImage = siteConfigs[CONFIG_KEYS.DEFAULT_PROFILE_IMAGE];
+
+  const profileData = transformMemberToProfileData(member, siteAssociation);
+  return {
+    profileData: { ...profileData, defaultProfileImage },
+  };
+}
+
+module.exports = {
+  getPublicMemberProfileData,
+};

package/backend/routers/utils.js

@@ -125,4 +125,5 @@ module.exports = {
   generateSEOTitle,
   stripHtmlTags,
   getMemberProfileData,
+  transformMemberToProfileData,
 };

package/backend/tasks/consts.js

@@ -22,7 +22,6 @@ const TASKS_NAMES = {
   fixPrimaryAddressChunk: 'fixPrimaryAddressChunk',
   scheduleFixUrlsWithSpaces: 'scheduleFixUrlsWithSpaces',
   fixUrlsWithSpacesChunk: 'fixUrlsWithSpacesChunk',
-  dailyPullExecutionCheck: 'dailyPullExecutionCheck',
 };
 
 module.exports = {

package/backend/tasks/index.js

@@ -6,5 +6,4 @@ module.exports = {
   ...require('./url-migration-methods'),
   ...require('./address-primary-methods'),
   ...require('./url-space-fix-methods'),
-  ...require('./daily-pull-check-methods'),
 };

package/backend/tasks/tasks-configs.js

@@ -9,7 +9,6 @@ const {
   fixPrimaryAddressChunk,
 } = require('./address-primary-methods');
 const { TASKS_NAMES } = require('./consts');
-const { dailyPullExecutionCheck } = require('./daily-pull-check-methods');
 const {
   scheduleTaskForEmptyAboutYouMembers,
   convertAboutYouHtmlToRichContent,
@@ -203,13 +202,6 @@ const TASKS = {
     shouldSkipCheck: () => false,
     estimatedDurationSec: 80,
   },
-  [TASKS_NAMES.dailyPullExecutionCheck]: {
-    name: TASKS_NAMES.dailyPullExecutionCheck,
-    getIdentifier: task => task.data,
-    process: dailyPullExecutionCheck,
-    shouldSkipCheck: () => false,
-    estimatedDurationSec: 30,
-  },
 };
 
 module.exports = { TASKS };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abmp-npm",
-  "version": "10.0.64",
+  "version": "10.0.66",
   "main": "index.js",
   "scripts": {
     "check-cycles": "madge --circular .",

package/pages/index.js

@@ -1,6 +1,7 @@
 module.exports = {
   ...require('./ContactUs.js'),
   ...require('./Profile.js'),
+  ...require('./publicProfile.js'),
   ...require('./Home.js'),
   ...require('./personalDetails.js'),
   ...require('./QAPage.js'),

package/pages/publicProfile.js

@@ -0,0 +1,386 @@
+const { location: wixLocation } = require('@wix/site-location');
+const { window: wixWindow } = require('@wix/site-window');
+
+const { LIGHTBOX_NAMES } = require('../public/consts');
+const {
+  generateId,
+  formatPracticeAreasForDisplay,
+  isWixHostedImage,
+} = require('../public/Utils/sharedUtils');
+
+const TESTIMONIALS_PER_PAGE_CONFIG = {
+  DESKTOP: 4,
+  TABLET: 2,
+  MOBILE: 1,
+};
+
+const BREAKPOINTS = {
+  DESKTOP: 1301,
+  TABLET: 750,
+};
+
+const resolveMemberDataId = memberData => {
+  if (!memberData) {
+    return null;
+  }
+  if (typeof memberData === 'string') {
+    return memberData;
+  }
+  return memberData?._id || memberData?._ref || null;
+};
+
+async function publicProfileOnReady({ $w: _$w, getPublicMemberProfileData }) {
+  const dataset = _$w('#dynamicDataset');
+  let profileData = null;
+
+  let testimonialsPerPage = TESTIMONIALS_PER_PAGE_CONFIG.TABLET;
+  let currentTestimonialPage = 0;
+
+  if (typeof getPublicMemberProfileData !== 'function') {
+    console.error('[publicProfileOnReady] getPublicMemberProfileData is required');
+    wixLocation.to(`${wixLocation.baseUrl}/404`);
+    return;
+  }
+
+  await dataset.onReadyAsync();
+  const item = dataset.getCurrentItem();
+  if (!item || item.showWixUrl !== true) {
+    wixLocation.to(`${wixLocation.baseUrl}/404`);
+    return;
+  }
+
+  const memberDataId = resolveMemberDataId(item.memberData);
+  if (!memberDataId) {
+    wixLocation.to(`${wixLocation.baseUrl}/404`);
+    return;
+  }
+
+  const result = await getPublicMemberProfileData({ memberDataId });
+  profileData = result?.profileData || null;
+
+  if (!profileData) {
+    wixLocation.to(`${wixLocation.baseUrl}/404`);
+    return;
+  }
+
+  initializePage();
+
+  function initializePage() {
+    bindProfileData();
+    setupAddressToggle();
+    setupResponsiveTestimonials();
+  }
+
+  // Profile data binding
+  function bindProfileData() {
+    bindAddressData();
+    bindMemberInfo();
+    bindContactInfo();
+    bindBusinessInfo();
+    bindGalleryData();
+    bindTestimonialsData();
+  }
+
+  function bindAddressData() {
+    if (profileData.mainAddress) {
+      setTextForElements(
+        ['#LocationText', '#LocationText2', '#LocationText3'],
+        profileData.mainAddress
+      );
+    } else {
+      deleteElements(['#locationContainer', '#location1Container', '#locationContainer2']);
+    }
+
+    setupAdditionalAddresses();
+  }
+
+  function setupAdditionalAddresses() {
+    _$w('#moreAdressesRepeater').data = profileData.moreAddressesToDisplay;
+
+    if (profileData.moreAddressesToDisplay.length > 0) {
+      _$w('#moreLocationButton').expand();
+      _$w('#addressTitle').collapse();
+    }
+
+    _$w('#moreAdressesRepeater').onItemReady(($item, itemData) => {
+      console.log('Item Data:', itemData);
+      $item('#adressText').text = itemData.address || '';
+    });
+  }
+
+  function setupAddressToggle() {
+    toggleContainer('#moreLocationButton', '#addressContainer');
+  }
+
+  function toggleContainer(buttonId, containerId) {
+    const $button = _$w(buttonId);
+    const $container = _$w(containerId);
+
+    $button.onClick(() => {
+      const isCollapsed = $container.collapsed;
+      $container[isCollapsed ? 'expand' : 'collapse']();
+      $button.label = isCollapsed ? 'Less Locations  -' : 'More Locations  +';
+    });
+  }
+
+  function bindMemberInfo() {
+    bindMemberSince();
+    bindStudentBadge();
+    bindProfileImages();
+    bindFullName();
+  }
+
+  function bindMemberSince() {
+    if (profileData.memberSince) {
+      _$w('#sinceYearText').text = profileData.memberSince;
+    } else {
+      _$w('#memberSinceBox').delete();
+    }
+  }
+
+  function bindStudentBadge() {
+    if (profileData.shouldHaveStudentBadge) {
+      _$w('#studentContainer, #studentContainerMobile').expand();
+    } else {
+      _$w('#studentContainer, #studentContainerMobile').delete();
+    }
+  }
+
+  function bindProfileImages() {
+    if (profileData.logoImage) {
+      _$w('#logoImage').src = profileData.logoImage;
+    } else {
+      _$w('#logoImage').delete();
+    }
+
+    if (profileData.profileImage && isWixHostedImage(profileData.profileImage)) {
+      _$w('#profileImage').src = profileData.profileImage;
+    } else {
+      _$w('#profileImage').src = profileData.defaultProfileImage;
+    }
+  }
+
+  function bindFullName() {
+    if (profileData.fullName) {
+      setTextForElements(
+        ['#fullNameText', '#fullNameText2', '#fullNameTextFoter'],
+        profileData.fullName
+      );
+    } else {
+      deleteElements(['#fullNameText', '#fullNameText2', '#fullNameTextFoter']);
+    }
+  }
+
+  // Contact information binding
+  function bindContactInfo() {
+    bindContactForm();
+    bindBookingUrl();
+    bindPhoneNumber();
+    bindLicenseNumber();
+  }
+
+  function bindContactForm() {
+    if (profileData.showContactForm) {
+      _$w('#contactButton').onClick(() =>
+        wixWindow.openLightbox(LIGHTBOX_NAMES.CONTACT_US, profileData)
+      );
+    } else {
+      _$w('#contactButton').delete();
+    }
+  }
+
+  function bindBookingUrl() {
+    if (profileData.bookingUrl) {
+      _$w('#bookNowButton').link = profileData.bookingUrl;
+    } else {
+      _$w('#bookNowButton').delete();
+    }
+  }
+
+  function bindPhoneNumber() {
+    if (profileData.phone) {
+      const formattedPhoneNumber = profileData.phone.replace(/[^\d+]/g, '');
+      const getPhoneHTML = $phoneSelector =>
+        $phoneSelector.html.replace(
+          $phoneSelector.text,
+          `<a href="${`tel:${formattedPhoneNumber}`}">${profileData.phone}</a>`
+        );
+      _$w('#phoneText').html = getPhoneHTML(_$w('#phoneText'));
+      _$w('#phoneText2').html = getPhoneHTML(_$w('#phoneText2'));
+    } else {
+      deleteElements(['#phoneContainer', '#phoneContainer2']);
+    }
+  }
+
+  function bindLicenseNumber() {
+    if (profileData.licenceNo) {
+      _$w('#licenceNoText').text = profileData.licenceNo;
+    } else {
+      _$w('#licensesContainer').delete();
+    }
+  }
+
+  function bindBusinessInfo() {
+    bindAboutService();
+    bindBusinessName();
+    bindAreasOfPractice();
+  }
+
+  function bindAboutService() {
+    if (profileData.aboutService) {
+      _$w('#aboutYouText').html = profileData.aboutService;
+    } else {
+      _$w('#aboutSection').delete();
+    }
+  }
+
+  function bindBusinessName() {
+    if (profileData.businessName) {
+      _$w('#businessName').text = profileData.businessName;
+      _$w('#businessName').expand();
+    } else {
+      _$w('#businessName').delete();
+    }
+  }
+
+  function bindAreasOfPractice() {
+    const areasText = formatPracticeAreasForDisplay(profileData.areasOfPractices);
+
+    if (areasText) {
+      _$w('#areaOfPracticesText').text = areasText;
+    } else {
+      _$w('#areaOfPracticesText').delete();
+    }
+
+    if (Array.isArray(profileData.areasOfPractices) && profileData.areasOfPractices.length > 0) {
+      populateRepeater(profileData.areasOfPractices, '#areaOfPracticesRepeater', '#practiceText');
+    } else {
+      _$w('#servicesSection').delete();
+    }
+  }
+
+  function bindGalleryData() {
+    if (profileData.bannerImages && profileData.bannerImages.length > 0) {
+      _$w('#bannerImage').src = profileData.bannerImages[0];
+    }
+
+    if (!profileData.gallery?.length) {
+      _$w('#gallerySection').delete();
+    } else {
+      _$w('#gallery').items = profileData.gallery;
+      _$w('#gallerySection').restore();
+    }
+  }
+
+  function bindTestimonialsData() {
+    if (!profileData.testimonials?.length) {
+      _$w('#testimonialsSection').delete();
+    }
+  }
+
+  // Responsive testimonials setup
+  async function setupResponsiveTestimonials() {
+    const { window } = await wixWindow.getBoundingRect();
+    testimonialsPerPage = getTestimonialsPerPage(window.width);
+
+    // Monitor window resize
+    setInterval(async () => {
+      const { window: win } = await wixWindow.getBoundingRect();
+      const newTestimonialsPerPage = getTestimonialsPerPage(win.width);
+
+      if (newTestimonialsPerPage !== testimonialsPerPage) {
+        testimonialsPerPage = newTestimonialsPerPage;
+        currentTestimonialPage = 0;
+        displayTestimonialsPage(profileData.testimonials);
+      }
+    }, 500);
+
+    setupTestimonialsIfAvailable();
+  }
+
+  function setupTestimonialsIfAvailable() {
+    if (profileData.testimonials.length > 0) {
+      setupTestimonialsPagination(profileData.testimonials);
+      _$w('#testimonialsSection').expand();
+    } else {
+      _$w('#testimonialsSection').delete();
+    }
+  }
+
+  function getTestimonialsPerPage(width) {
+    if (width >= BREAKPOINTS.DESKTOP) return TESTIMONIALS_PER_PAGE_CONFIG.DESKTOP;
+    if (width >= BREAKPOINTS.TABLET) return TESTIMONIALS_PER_PAGE_CONFIG.TABLET;
+    return TESTIMONIALS_PER_PAGE_CONFIG.MOBILE;
+  }
+
+  function setTextForElements(elementIds, text) {
+    elementIds.forEach(id => {
+      _$w(id).text = text;
+    });
+  }
+
+  function deleteElements(elementIds) {
+    elementIds.forEach(id => {
+      _$w(id).delete();
+    });
+  }
+
+  function populateRepeater(data, repeaterId, textElementId) {
+    const repeaterData = data.map(item => ({
+      _id: generateId(),
+      text: item.trim(),
+    }));
+    _$w(repeaterId).data = repeaterData;
+    _$w(repeaterId).onItemReady(($item, itemData) => {
+      $item(textElementId).text = itemData.text;
+    });
+  }
+
+  // Testimonials pagination
+  function setupTestimonialsPagination(allTestimonials) {
+    currentTestimonialPage = 0;
+
+    _$w('#prevTestimonialBtn').onClick(() => {
+      if (currentTestimonialPage > 0) {
+        currentTestimonialPage--;
+        displayTestimonialsPage(allTestimonials);
+      }
+    });
+
+    _$w('#nextTestimonialBtn').onClick(() => {
+      const maxPage = Math.floor((allTestimonials.length - 1) / testimonialsPerPage);
+      if (currentTestimonialPage < maxPage) {
+        currentTestimonialPage++;
+        displayTestimonialsPage(allTestimonials);
+      }
+    });
+
+    displayTestimonialsPage(allTestimonials);
+  }
+
+  function displayTestimonialsPage(allTestimonials) {
+    const start = currentTestimonialPage * testimonialsPerPage;
+    const end = start + testimonialsPerPage;
+    const currentBatch = allTestimonials.slice(start, end);
+
+    populateRepeater(currentBatch, '#testimonialsrepeater', '#testimonialText');
+    updateTestimonialNavigation(end, allTestimonials.length);
+  }
+
+  function updateTestimonialNavigation(end, totalLength) {
+    _$w('#prevTestimonialBtn').hide();
+    _$w('#nextTestimonialBtn').hide();
+
+    if (currentTestimonialPage > 0) {
+      _$w('#prevTestimonialBtn').show();
+    }
+
+    if (end < totalLength) {
+      _$w('#nextTestimonialBtn').show();
+    }
+  }
+}
+
+module.exports = {
+  publicProfileOnReady,
+};

package/public/consts.js

@@ -5,6 +5,7 @@ const REGEX = {
 
 const COLLECTIONS = {
   MEMBERS_DATA: 'MembersDataLatest',
+  MEMBERS_DATA_PUBLIC: 'MembersDataPublic',
   CONTACT_US_SUBMISSIONS: 'contactUsSubmissions',
   SITE_CONFIGS: 'SiteConfigs',
   COMPILED_STATE_CITY_MAP: 'CompiledStateCityMap',

package/backend/tasks/daily-pull-check-methods.js

@@ -1,88 +0,0 @@
-const { taskManager } = require('psdev-task-manager');
-const { COLLECTIONS } = require('psdev-task-manager/public/consts');
-
-const { MEMBER_ACTIONS } = require('../daily-pull/consts');
-const { wixData } = require('../elevated-modules');
-const { queryAllItems } = require('../utils');
-
-const { TASKS_NAMES } = require('./consts');
-
-const DEFAULT_HOURS_BACK = 4;
-
-const getActionsToCheck = includeNone =>
-  includeNone
-    ? Object.values(MEMBER_ACTIONS)
-    : Object.values(MEMBER_ACTIONS).filter(action => action !== MEMBER_ACTIONS.NONE);
-
-/**
- * Verifies ScheduleMembersDataPerAction tasks exist and succeeded per action.
- */
-async function dailyPullExecutionCheck(taskData) {
-  const hoursBack =
-    taskData?.hoursBack && Number.isFinite(taskData.hoursBack)
-      ? taskData.hoursBack
-      : DEFAULT_HOURS_BACK;
-  const includeNone = Boolean(taskData?.includeNone);
-  const sinceDate = new Date(Date.now() - hoursBack * 60 * 60 * 1000);
-
-  console.log('dailyPullExecutionCheck started', { hoursBack, sinceDate });
-
-  const tasksQuery = wixData
-    .query(COLLECTIONS.TASKS)
-    .eq('name', TASKS_NAMES.ScheduleMembersDataPerAction)
-    .ge('_createdDate', sinceDate)
-    .limit(1000);
-
-  const tasks = await queryAllItems(tasksQuery);
-  const actionsToCheck = getActionsToCheck(includeNone);
-
-  const statusByAction = actionsToCheck.reduce((acc, action) => {
-    acc[action] = { success: 0, failed: 0, pending: 0, in_progress: 0, skipped: 0 };
-    return acc;
-  }, {});
-
-  tasks.forEach(task => {
-    const action = task?.data?.action;
-    if (!action || !(action in statusByAction)) {
-      return;
-    }
-    const status = task?.status || 'unknown';
-    if (!statusByAction[action][status]) {
-      statusByAction[action][status] = 0;
-    }
-    statusByAction[action][status] += 1;
-  });
-
-  const missingActions = actionsToCheck.filter(
-    action => (statusByAction[action]?.success || 0) === 0
-  );
-
-  const result = {
-    success: missingActions.length === 0,
-    sinceDate: sinceDate.toISOString(),
-    actionsChecked: actionsToCheck,
-    missingActions,
-    statusByAction,
-    totalTasksFound: tasks.length,
-  };
-
-  if (missingActions.length > 0) {
-    console.log('Missing daily pull actions detected, scheduling fallback daily pull run', {
-      missingActions,
-    });
-    await taskManager().schedule({
-      name: TASKS_NAMES.ScheduleDailyMembersDataSync,
-      data: {},
-      type: 'scheduled',
-    });
-    result.fallbackScheduled = true;
-  }
-
-  console.log('dailyPullExecutionCheck result', JSON.stringify(result, null, 2));
-
-  return result;
-}
-
-module.exports = {
-  dailyPullExecutionCheck,
-};