@churchapps/apphelper 0.5.1 → 0.5.3

package/src/helpers/PersonHelper.ts

@@ -1,62 +1,62 @@
-import { PersonInterface, ContactInfoInterface, CommonEnvironmentHelper } from "@churchapps/helpers";
-import { Locale } from "./Locale";
-
-export class PersonHelper {
-
-	static getPhotoUrl(person: PersonInterface) {
-		if (!person?.photo) return "/images/sample-profile.png"
-		else return (person?.photo?.startsWith("data:image/png;base64,") || person.photo?.indexOf("://") > -1)
-			? person.photo
-			: CommonEnvironmentHelper.ContentRoot + person.photo;
-	}
-
-	static getAge(birthdate: Date): string {
-		if (birthdate !== undefined && birthdate !== null) {
-			let ageDifMs = Date.now() - new Date(birthdate).getTime();
-			let ageDate = new Date(ageDifMs);
-			let years = Math.abs(ageDate.getUTCFullYear() - 1970);
-			return years + " " + Locale.label("person.years");
-		}
-		else return "";
-	}
-
-	static getDisplayName(firstName: string, lastName: string, nickName: string): string {
-		if (nickName !== undefined && nickName !== null && nickName.length > 0) return firstName + ' "' + nickName + '" ' + lastName;
-		else return firstName + " " + lastName;
-	}
-
-	public static compareAddress(address1: ContactInfoInterface, address2: ContactInfoInterface): boolean {
-		const displayAddress1: string = this.addressToString(address1).trim();
-		const displayAddress2: string = this.addressToString(address2).trim();
-
-		if (displayAddress1 !== displayAddress2) {
-			return true
-		}
-		return false
-	}
-
-	public static addressToString(address: ContactInfoInterface): string {
-		return `${address.address1 || ""} ${address.address2 || ""} ${address.city || ""}${(address.city && address.state) ? "," : ""} ${address.state || ""} ${address.zip || ""}`
-	}
-
-	public static changeOnlyAddress(contactInfo1: ContactInfoInterface, contactInfo2: ContactInfoInterface): ContactInfoInterface {
-		const updatedAddress: ContactInfoInterface = {
-			...contactInfo1,
-			address1: contactInfo2.address1,
-			address2: contactInfo2.address2,
-			city: contactInfo2.city,
-			state: contactInfo2.state,
-			zip: contactInfo2.zip
-		}
-
-		return updatedAddress
-	}
-
-	public static checkAddressAvailabilty(person: PersonInterface): boolean {
-		const addressString: string = this.addressToString(person.contactInfo).trim();
-		if (addressString !== "") {
-			return true;
-		}
-		return false;
-	}
-}
+import { PersonInterface, ContactInfoInterface, CommonEnvironmentHelper } from "@churchapps/helpers";
+import { Locale } from "./Locale";
+
+export class PersonHelper {
+
+	static getPhotoUrl(person: PersonInterface) {
+		if (!person?.photo) return "/images/sample-profile.png"
+		else return (person?.photo?.startsWith("data:image/png;base64,") || person.photo?.indexOf("://") > -1)
+			? person.photo
+			: CommonEnvironmentHelper.ContentRoot + person.photo;
+	}
+
+	static getAge(birthdate: Date): string {
+		if (birthdate !== undefined && birthdate !== null) {
+			let ageDifMs = Date.now() - new Date(birthdate).getTime();
+			let ageDate = new Date(ageDifMs);
+			let years = Math.abs(ageDate.getUTCFullYear() - 1970);
+			return years + " " + Locale.label("person.years");
+		}
+		else return "";
+	}
+
+	static getDisplayName(firstName: string, lastName: string, nickName: string): string {
+		if (nickName !== undefined && nickName !== null && nickName.length > 0) return firstName + ' "' + nickName + '" ' + lastName;
+		else return firstName + " " + lastName;
+	}
+
+	public static compareAddress(address1: ContactInfoInterface, address2: ContactInfoInterface): boolean {
+		const displayAddress1: string = this.addressToString(address1).trim();
+		const displayAddress2: string = this.addressToString(address2).trim();
+
+		if (displayAddress1 !== displayAddress2) {
+			return true
+		}
+		return false
+	}
+
+	public static addressToString(address: ContactInfoInterface): string {
+		return `${address.address1 || ""} ${address.address2 || ""} ${address.city || ""}${(address.city && address.state) ? "," : ""} ${address.state || ""} ${address.zip || ""}`
+	}
+
+	public static changeOnlyAddress(contactInfo1: ContactInfoInterface, contactInfo2: ContactInfoInterface): ContactInfoInterface {
+		const updatedAddress: ContactInfoInterface = {
+			...contactInfo1,
+			address1: contactInfo2.address1,
+			address2: contactInfo2.address2,
+			city: contactInfo2.city,
+			state: contactInfo2.state,
+			zip: contactInfo2.zip
+		}
+
+		return updatedAddress
+	}
+
+	public static checkAddressAvailabilty(person: PersonInterface): boolean {
+		const addressString: string = this.addressToString(person.contactInfo).trim();
+		if (addressString !== "") {
+			return true;
+		}
+		return false;
+	}
+}

package/src/helpers/SlugHelper.ts

@@ -1,38 +1,38 @@
-import slug from "slug";
-
-export class SlugHelper {
-
-  static slugifyString(string: string, type: "urlPath" | "urlSlug", removeCharacters?: string[]) {
-    const charactersToRemove = removeCharacters ? removeCharacters : ["for", "and", "nor", "but", "or", "yet", "so", "the", "a", "an"];
-    const characStr = charactersToRemove.join("|");
-    if (type === "urlPath") {
-      slug.extend({'/': '/'}); //To keep '/' in the url since it's a special character.
-    }
-    const initialSlug = slug(string, { remove: new RegExp('\\b(' + characStr + ')\\b', 'gi') });
-    const verfiedSlug = this.numerifySlug(initialSlug);
-    return verfiedSlug;
-  }
-
-  //remove multiple numbers in sequence
-  static numerifySlug(slug: string) {
-    let initialString = slug;
-    const regex = /\d+(?:-\d+)+|\d+/g;
-    const matchedArray = initialString.match(regex);
-
-    if (matchedArray) {
-      matchedArray.forEach((data) => {
-        const length = data.length;
-        let splitResult = data;
-        if (length > 1) {
-          const array = data.split("");
-          splitResult = array[0];
-        }
-        const replacedString = initialString.replace(data, splitResult);
-        initialString = replacedString;
-      });
-    }
-    
-    return initialString;
-  }
-
+import slug from "slug";
+
+export class SlugHelper {
+
+  static slugifyString(string: string, type: "urlPath" | "urlSlug", removeCharacters?: string[]) {
+    const charactersToRemove = removeCharacters ? removeCharacters : ["for", "and", "nor", "but", "or", "yet", "so", "the", "a", "an"];
+    const characStr = charactersToRemove.join("|");
+    if (type === "urlPath") {
+      slug.extend({'/': '/'}); //To keep '/' in the url since it's a special character.
+    }
+    const initialSlug = slug(string, { remove: new RegExp('\\b(' + characStr + ')\\b', 'gi') });
+    const verfiedSlug = this.numerifySlug(initialSlug);
+    return verfiedSlug;
+  }
+
+  //remove multiple numbers in sequence
+  static numerifySlug(slug: string) {
+    let initialString = slug;
+    const regex = /\d+(?:-\d+)+|\d+/g;
+    const matchedArray = initialString.match(regex);
+
+    if (matchedArray) {
+      matchedArray.forEach((data) => {
+        const length = data.length;
+        let splitResult = data;
+        if (length > 1) {
+          const array = data.split("");
+          splitResult = array[0];
+        }
+        const replacedString = initialString.replace(data, splitResult);
+        initialString = replacedString;
+      });
+    }
+    
+    return initialString;
+  }
+
 }