@becollective/utils 1.10.2 → 2.0.0

package/src/constants.ts

@@ -0,0 +1,40 @@
+import allowedHtmlTags from './constants/allowedHtmlTags';
+import avatarColours from './constants/avatarColours';
+import countries from './constants/countries';
+import customFields from './constants/customFields';
+import languages from './constants/languages';
+import currencies from './constants/currencies';
+import distanceUnits from './constants/distancesUnits';
+import groups from './constants/groups';
+import insuranceStatuses from './constants/insuranceStatuses';
+import insuranceTypes from './constants/insuranceTypes';
+import locales from './constants/locales';
+import notifications from './constants/notifications';
+import opportunities from './constants/opportunities';
+import rules from './constants/rules';
+import subscriptions from './constants/subscriptions';
+import surveys from './constants/surveys';
+
+import qualificationTypes, { licencesAndCertifications, educationalQualifications } from './constants/qualificationTypes';
+
+module.exports = {
+  allowedHtmlTags,
+  avatarColours,
+  currencies,
+  customFields,
+  countries,
+  languages,
+  distanceUnits,
+  groups,
+  insuranceStatuses,
+  insuranceTypes,
+  locales,
+  notifications,
+  opportunities,
+  qualificationTypes,
+  licencesAndCertifications,
+  educationalQualifications,
+  surveys,
+  subscriptions,
+  rules,
+};

package/src/{date-time.js → date-time.ts}

@@ -1,4 +1,4 @@
-const moment = require('moment-timezone');
+import { DateTime } from 'luxon';
 
 /**
  * Get current age based on the given birth date
@@ -9,11 +9,18 @@ const moment = require('moment-timezone');
  * @returns {number} age
  */
 export const getAge = (dateOfBirth, unit = 'years') => {
-  const age = moment().diff(dateOfBirth, unit);
-  if (isNaN(age)) {
+  if (!dateOfBirth) {
     throw new Error('Invalid date');
   }
-  return age;
+
+  const dob = DateTime.fromJSDate(new Date(dateOfBirth));
+  if (!dob.isValid) {
+    throw new Error('Invalid date');
+  }
+  const age = dob.diffNow(unit);
+  const ageUnit = -age.as(unit);
+  // Note: luxon returns scientific notation, ie 6.976154236428209e-9
+  return Number(ageUnit.toString().split('.').shift());
 };
 /**
  * Check if a user requires parent(guardian) consent
@@ -31,15 +38,15 @@ export const getAge = (dateOfBirth, unit = 'years') => {
  * Then we should throw error if birthdate is not valid
  */
 export const isUnderSixteen = (dateOfBirth) => {
-  if (!dateOfBirth || !moment(dateOfBirth).isValid()) {
+  if (!dateOfBirth || !DateTime.fromJSDate(new Date(dateOfBirth)).isValid) {
     return false;
   }
   const age = getAge(dateOfBirth);
   return isNaN(age) ? false : age < 16;
 };
 
-export const isUnderAge = (dateOfBirth, limit, maxAcknowledgedAge) => {
-  if ((!dateOfBirth || !moment(dateOfBirth).isValid()) && !maxAcknowledgedAge) {
+export const isUnderAge = (dateOfBirth, limit, maxAcknowledgedAge: number | null = null) => {
+  if ((!dateOfBirth || !DateTime.fromJSDate(new Date(dateOfBirth)).isValid) && !maxAcknowledgedAge) {
     return false;
   }
 
@@ -52,15 +59,15 @@ export const isUnderAge = (dateOfBirth, limit, maxAcknowledgedAge) => {
 
 export const datesByThemselves = (a, b) => {
   if (!a.from) return 1;
-  return moment(a.from) - moment(b.from);
+  return new Date(a.from).getTime() - new Date(b.from).getTime();
 };
 
 export const getShiftText = (from, to, timezone) => {
   try {
     if (!from || !to || !timezone) return '';
-    const startToTimezone = moment(from).tz(timezone);
-    const endToTimezone = moment(to).tz(timezone);
-    return `${moment(startToTimezone).format('dddd, DD MMMM YYYY, h:mma')}-${moment(endToTimezone).format('h:mma')}`;
+    const startToTimezone = DateTime.fromJSDate(from).setZone(timezone);
+    const endToTimezone = DateTime.fromJSDate(to).setZone(timezone);
+    return `${startToTimezone.toFormat('cccc, DD, h:mma')}-${endToTimezone.toFormat('h:mma')}`;
   }
   catch (e) {
     return '';