@churchapps/apphelper 0.5.0 → 0.5.2

package/src/components/wrapper/index.tsx

@@ -1,8 +1,8 @@
-export { NavItem } from "./NavItem";
-export { AppList } from "./AppList";
-export { ChurchList } from "./ChurchList";
-export { UserMenu } from "./UserMenu";
-export { NewPrivateMessage } from "./NewPrivateMessage";
-export { PrivateMessages } from "./PrivateMessages";
-export { PrivateMessageDetails } from "./PrivateMessageDetails";
-export { Notifications } from "./Notifications";
+export { NavItem } from "./NavItem";
+export { AppList } from "./AppList";
+export { ChurchList } from "./ChurchList";
+export { UserMenu } from "./UserMenu";
+export { NewPrivateMessage } from "./NewPrivateMessage";
+export { PrivateMessages } from "./PrivateMessages";
+export { PrivateMessageDetails } from "./PrivateMessageDetails";
+export { Notifications } from "./Notifications";

package/src/helpers/AnalyticsHelper.ts

@@ -1,32 +1,44 @@
-import ReactGA from "react-ga4";
-import { CommonEnvironmentHelper, UserHelper } from "@churchapps/helpers";
-
-export class AnalyticsHelper {
-
-  static init = () => {
-    if (CommonEnvironmentHelper.GoogleAnalyticsTag !== "" && typeof(window)!=="undefined") {
-      ReactGA.initialize([{trackingId: CommonEnvironmentHelper.GoogleAnalyticsTag}]);
-      AnalyticsHelper.logPageView();
-    }
-  }
-
-  static logPageView = () => {
-    if (CommonEnvironmentHelper.GoogleAnalyticsTag !== "" && typeof(window)!=="undefined") {
-      this.setChurchKey();
-      ReactGA.send({ hitType: "pageview", page: window.location.pathname + window.location.search });
-    }
-  }
-
-  static logEvent = (category: string, action: string, label?:string) => {
-    if (CommonEnvironmentHelper.GoogleAnalyticsTag !== "" && typeof(window)!=="undefined") {
-      this.setChurchKey();
-      ReactGA.event({ category, action, label });
-    }
-  }
-
-  private static setChurchKey = () => {
-    const churchKey = UserHelper?.currentUserChurch?.church?.subDomain;
-    if (churchKey) ReactGA.set({church_key: churchKey });
-  }
-
-}
+import ReactGA from "react-ga4";
+import { CommonEnvironmentHelper, UserHelper } from "@churchapps/helpers";
+
+export class AnalyticsHelper {
+
+  static init = () => {
+    if (CommonEnvironmentHelper.GoogleAnalyticsTag !== "" && typeof(window)!=="undefined") {
+      try {
+        ReactGA.initialize([{trackingId: CommonEnvironmentHelper.GoogleAnalyticsTag}]);
+        AnalyticsHelper.logPageView();
+      } catch (error) {
+        console.warn('Analytics initialization failed:', error);
+      }
+    }
+  }
+
+  static logPageView = () => {
+    if (CommonEnvironmentHelper.GoogleAnalyticsTag !== "" && typeof(window)!=="undefined") {
+      try {
+        this.setChurchKey();
+        ReactGA.send({ hitType: "pageview", page: window.location.pathname + window.location.search });
+      } catch (error) {
+        console.warn('Analytics page view logging failed:', error);
+      }
+    }
+  }
+
+  static logEvent = (category: string, action: string, label?:string) => {
+    if (CommonEnvironmentHelper.GoogleAnalyticsTag !== "" && typeof(window)!=="undefined") {
+      try {
+        this.setChurchKey();
+        ReactGA.event({ category, action, label });
+      } catch (error) {
+        console.warn('Analytics event logging failed:', error);
+      }
+    }
+  }
+
+  private static setChurchKey = () => {
+    const churchKey = UserHelper?.currentUserChurch?.church?.subDomain;
+    if (churchKey) ReactGA.set({church_key: churchKey });
+  }
+
+}

package/src/helpers/AppearanceHelper.ts

@@ -1,73 +1,73 @@
-
-export type AppearanceInterface = { wrapperBackground?: string, logoLight?: string, logoDark?: string, favicon_400x400?: string, favicon_16x16?: string, ogImage?: string }
-
-export class AppearanceHelper {
-
-  public static getLogoDark(appearanceSettings: AppearanceInterface, defaultLogo: string) {
-    return (appearanceSettings?.logoDark) ? appearanceSettings.logoDark : defaultLogo;
-  }
-
-  public static getLogoLight(appearanceSettings: AppearanceInterface, defaultLogo: string) {
-    return (appearanceSettings?.logoLight) ? appearanceSettings.logoLight : defaultLogo;
-  }
-
-  public static getFavicon(appearanceSettings: AppearanceInterface, size: "400" | "16") {
-    if (size === "400") {
-      return appearanceSettings?.favicon_400x400;
-    }
-
-    if (size === "16") {
-      return appearanceSettings?.favicon_16x16;
-    }
-
-    return;
-  }
-
-  public static getLogo(appearanceSettings: AppearanceInterface, defaultLogoLight: string, defaultLogoDark: string, backgroundColor: string) {
-    const isDark = (appearanceSettings.logoDark) ? this.isDark(backgroundColor) : false;
-    if (isDark) return this.getLogoDark(appearanceSettings, defaultLogoDark);
-    else return this.getLogoLight(appearanceSettings, defaultLogoLight);
-  }
-
-  public static getLogoByTextColor(logoLight: string, logoDark: string, textColor: string) {
-    return (this.isDark(textColor)) ? logoLight : logoDark;
-  }
-
-  private static isDark(backgroundColor: string) {
-    let valid = false;
-    let r = 0;
-    let g = 0;
-    let b = 0;
-
-    if (backgroundColor.match(/#[0-9a-fA-F{6}]/)) {
-      r = this.getHexValue(backgroundColor.substring(1, 2));
-      g = this.getHexValue(backgroundColor.substring(3, 4));
-      b = this.getHexValue(backgroundColor.substring(5, 6));
-      valid = true;
-    } else if (backgroundColor.match(/#[0-9a-fA-F{3}]/)) {
-      r = this.getHexValue(backgroundColor.substring(1, 1));
-      g = this.getHexValue(backgroundColor.substring(2, 2));
-      b = this.getHexValue(backgroundColor.substring(3, 3));
-      valid = true;
-    }
-
-    if (!valid) return false;
-    else {
-      //HSP brightness formula.  Some colors have a bigger impact on our perceived brightness than others.
-      const rWeight = .299 * Math.pow(r, 2);
-      const gWeight = .587 * Math.pow(g, 2);
-      const bWeight = .114 * Math.pow(b, 2);
-      const brightness = Math.sqrt(rWeight + gWeight + bWeight);
-      //return brightness < 128;  //
-      return brightness < 156;
-    }
-
-  }
-
-  private static getHexValue(hex: string) {
-    let result = parseInt(hex, 16);
-    if (hex.length === 1) result = result * 16;
-    return result;
-  }
-
-}
+
+export type AppearanceInterface = { wrapperBackground?: string, logoLight?: string, logoDark?: string, favicon_400x400?: string, favicon_16x16?: string, ogImage?: string }
+
+export class AppearanceHelper {
+
+  public static getLogoDark(appearanceSettings: AppearanceInterface, defaultLogo: string) {
+    return (appearanceSettings?.logoDark) ? appearanceSettings.logoDark : defaultLogo;
+  }
+
+  public static getLogoLight(appearanceSettings: AppearanceInterface, defaultLogo: string) {
+    return (appearanceSettings?.logoLight) ? appearanceSettings.logoLight : defaultLogo;
+  }
+
+  public static getFavicon(appearanceSettings: AppearanceInterface, size: "400" | "16") {
+    if (size === "400") {
+      return appearanceSettings?.favicon_400x400;
+    }
+
+    if (size === "16") {
+      return appearanceSettings?.favicon_16x16;
+    }
+
+    return;
+  }
+
+  public static getLogo(appearanceSettings: AppearanceInterface, defaultLogoLight: string, defaultLogoDark: string, backgroundColor: string) {
+    const isDark = (appearanceSettings.logoDark) ? this.isDark(backgroundColor) : false;
+    if (isDark) return this.getLogoDark(appearanceSettings, defaultLogoDark);
+    else return this.getLogoLight(appearanceSettings, defaultLogoLight);
+  }
+
+  public static getLogoByTextColor(logoLight: string, logoDark: string, textColor: string) {
+    return (this.isDark(textColor)) ? logoLight : logoDark;
+  }
+
+  private static isDark(backgroundColor: string) {
+    let valid = false;
+    let r = 0;
+    let g = 0;
+    let b = 0;
+
+    if (backgroundColor.match(/#[0-9a-fA-F{6}]/)) {
+      r = this.getHexValue(backgroundColor.substring(1, 2));
+      g = this.getHexValue(backgroundColor.substring(3, 4));
+      b = this.getHexValue(backgroundColor.substring(5, 6));
+      valid = true;
+    } else if (backgroundColor.match(/#[0-9a-fA-F{3}]/)) {
+      r = this.getHexValue(backgroundColor.substring(1, 1));
+      g = this.getHexValue(backgroundColor.substring(2, 2));
+      b = this.getHexValue(backgroundColor.substring(3, 3));
+      valid = true;
+    }
+
+    if (!valid) return false;
+    else {
+      //HSP brightness formula.  Some colors have a bigger impact on our perceived brightness than others.
+      const rWeight = .299 * Math.pow(r, 2);
+      const gWeight = .587 * Math.pow(g, 2);
+      const bWeight = .114 * Math.pow(b, 2);
+      const brightness = Math.sqrt(rWeight + gWeight + bWeight);
+      //return brightness < 128;  //
+      return brightness < 156;
+    }
+
+  }
+
+  private static getHexValue(hex: string) {
+    let result = parseInt(hex, 16);
+    if (hex.length === 1) result = result * 16;
+    return result;
+  }
+
+}

package/src/helpers/ArrayHelper.ts

@@ -1,87 +1,87 @@
-import { UniqueIdHelper } from "./UniqueIdHelper";
-
-export class ArrayHelper {
-	
-  static getIds(array: any[], propertyName: string) {
-    const result: string[] = [];
-    for (const item of array) {
-      const id = item[propertyName]?.toString();
-      if (!UniqueIdHelper.isMissing(id) && result.indexOf(id) === -1) result.push(id);
-    }
-    return result;
-  }
-
-  static sortBy(array: any[], propertyName: string, descending: boolean = false) {
-    array.sort((a, b) => {
-      const valA = a[propertyName];
-      const valB = b[propertyName];
-      if (valA < valB) return descending ? 1 : -1;
-      else return descending ? -1 : 1;
-    });
-  }
-
-  static getIndex(array: any[], propertyName: string, value: any) {
-    for (let i = 0; i < array.length; i++) {
-      const item = array[i];
-      if (ArrayHelper.compare(item, propertyName, value)) return i;
-    }
-    return -1;
-  }
-
-  static getOne(array: any[], propertyName: string, value: any) {
-    for (const item of array || []) if (ArrayHelper.compare(item, propertyName, value)) return item;
-    return null
-  }
-
-  static getAll(array: any[], propertyName: string, value: any) {
-    const result: any[] = []
-    for (const item of array || []) {
-      if (ArrayHelper.compare(item, propertyName, value)) result.push(item);
-    }
-    return result;
-  }
-
-  static getAllArray(array: any[], propertyName: string, values: any[]) {
-    const result: any[] = []
-    for (const item of array || []) if (values.indexOf(item[propertyName]) > -1) result.push(item);
-    return result;
-  }
-
-	static getAllContaining(array: any[], propertyName: string, value: any) {
-    const result: any[] = []
-    for (const item of array) if (item[propertyName].toString().toLowerCase().indexOf(value.toLowerCase()) > -1) result.push(item);
-    return result;
-  }
-
-  private static compare(item: any, propertyName: string, value: any) {
-    const propChain = propertyName.split(".");
-    if (propChain.length === 1) return item[propertyName] === value;
-    else {
-      let obj = item;
-      for (let i = 0; i < propChain.length - 1; i++) {
-        if (obj) obj = obj[propChain[i]];
-      }
-      return obj[propChain[propChain.length - 1]] === value;
-    }
-  }
-
-  static getUniqueValues(array: any[], propertyName: string) {
-    const result: any[] = [];
-
-    for (const item of array) {
-      const val = (propertyName.indexOf(".") === -1) ? item[propertyName] : this.getDeepValue(item, propertyName)
-      if (result.indexOf(val) === -1) result.push(val);
-    }
-    return result;
-  }
-
-  static getDeepValue(item: any, propertyName: string) {
-    const propertyNames = propertyName.split(".");
-    let result: any = item;
-    propertyNames.forEach(name => {
-      result = result[name];
-    });
-    return result;
-  }
-
-}
+import { UniqueIdHelper } from "./UniqueIdHelper";
+
+export class ArrayHelper {
+	
+  static getIds(array: any[], propertyName: string) {
+    const result: string[] = [];
+    for (const item of array) {
+      const id = item[propertyName]?.toString();
+      if (!UniqueIdHelper.isMissing(id) && result.indexOf(id) === -1) result.push(id);
+    }
+    return result;
+  }
+
+  static sortBy(array: any[], propertyName: string, descending: boolean = false) {
+    array.sort((a, b) => {
+      const valA = a[propertyName];
+      const valB = b[propertyName];
+      if (valA < valB) return descending ? 1 : -1;
+      else return descending ? -1 : 1;
+    });
+  }
+
+  static getIndex(array: any[], propertyName: string, value: any) {
+    for (let i = 0; i < array.length; i++) {
+      const item = array[i];
+      if (ArrayHelper.compare(item, propertyName, value)) return i;
+    }
+    return -1;
+  }
+
+  static getOne(array: any[], propertyName: string, value: any) {
+    for (const item of array || []) if (ArrayHelper.compare(item, propertyName, value)) return item;
+    return null
+  }
+
+  static getAll(array: any[], propertyName: string, value: any) {
+    const result: any[] = []
+    for (const item of array || []) {
+      if (ArrayHelper.compare(item, propertyName, value)) result.push(item);
+    }
+    return result;
+  }
+
+  static getAllArray(array: any[], propertyName: string, values: any[]) {
+    const result: any[] = []
+    for (const item of array || []) if (values.indexOf(item[propertyName]) > -1) result.push(item);
+    return result;
+  }
+
+	static getAllContaining(array: any[], propertyName: string, value: any) {
+    const result: any[] = []
+    for (const item of array) if (item[propertyName].toString().toLowerCase().indexOf(value.toLowerCase()) > -1) result.push(item);
+    return result;
+  }
+
+  private static compare(item: any, propertyName: string, value: any) {
+    const propChain = propertyName.split(".");
+    if (propChain.length === 1) return item[propertyName] === value;
+    else {
+      let obj = item;
+      for (let i = 0; i < propChain.length - 1; i++) {
+        if (obj) obj = obj[propChain[i]];
+      }
+      return obj[propChain[propChain.length - 1]] === value;
+    }
+  }
+
+  static getUniqueValues(array: any[], propertyName: string) {
+    const result: any[] = [];
+
+    for (const item of array) {
+      const val = (propertyName.indexOf(".") === -1) ? item[propertyName] : this.getDeepValue(item, propertyName)
+      if (result.indexOf(val) === -1) result.push(val);
+    }
+    return result;
+  }
+
+  static getDeepValue(item: any, propertyName: string) {
+    const propertyNames = propertyName.split(".");
+    let result: any = item;
+    propertyNames.forEach(name => {
+      result = result[name];
+    });
+    return result;
+  }
+
+}

package/src/helpers/CurrencyHelper.ts

@@ -1,10 +1,10 @@
-export class CurrencyHelper {
-  static formatCurrency(amount: number) {
-    const formatter = new Intl.NumberFormat("en-US", {
-      style: "currency",
-      currency: "USD",
-      minimumFractionDigits: 2
-    });
-    return formatter.format(amount);
-  }
-}
+export class CurrencyHelper {
+  static formatCurrency(amount: number) {
+    const formatter = new Intl.NumberFormat("en-US", {
+      style: "currency",
+      currency: "USD",
+      minimumFractionDigits: 2
+    });
+    return formatter.format(amount);
+  }
+}

package/src/helpers/DateHelper.ts

@@ -1,104 +1,104 @@
-import { format as dateFormat } from "date-fns"
-
-export class DateHelper {
-
-  //Fixes timezone issues when you just need the date.
-  static toDate(input: any) {
-    return new Date(Date.parse(input.toString().replace("Z", "")));
-  }
-
-  static toDateTime(input: any) {
-    return new Date(Date.parse(input.toString()));
-  }
-
-  static addDays(date: Date, days: number) {
-    date.setDate(date.getDate() + days);
-    return date;
-  }
-
-  static prettyDate(date: Date) {
-    if (date === undefined || date === null) return "";
-    return this.formatDateTime(date, "MMM d, yyyy");
-  }
-
-  static prettyDateTime(date: Date) {
-    if (date === undefined || date === null) return "";
-    return this.formatDateTime(date, "MMM d, yyyy h:mm a");
-  }
-
-  static prettyTime(date: Date) {
-    if (date === undefined || date === null) return "";
-    return this.formatDateTime(date, "h:mm a");
-  }
-
-  static getLastSunday() {
-    let result = new Date();
-    while (result.getDay() !== 0) result.setDate(result.getDate() - 1);
-    return result;
-  }
-
-  static getWeekSunday(year: number, week: number) {
-    let result = new Date(year, 0, 1);
-    while (result.getDay() !== 0) result.setDate(result.getDate() + 1);
-    result.setDate(result.getDate() + ((week - 1) * 7));
-    return result;
-  }
-
-  static formatHtml5Date(date: Date): string {
-    let result = "";
-    if (date !== undefined && date !== null) {
-      try {
-        result = new Date(date).toISOString().split("T")[0];
-      } catch { }
-    }
-    return result;
-  }
-
-  static formatHtml5Time(time: Date): string {
-    let h = time.getHours();
-    let m = time.getMinutes();
-    let s = time.getSeconds();
-    return `${h < 10 ? ("0" + h) : h}:${m < 10 ? ("0" + m) : m}:${s < 10 ? ("0" + s) : s}`;
-  }
-
-  static formatHtml5DateTime(date: Date): string {
-    if (date === undefined || date === null) return "";
-    else {
-      return this.formatDateTime(date, "yyyy-MM-dd") + "T" + this.formatDateTime(date, "HH:mm");
-    }
-  }
-
-  static getDisplayDuration(d: Date): string {
-    let seconds = Math.round((new Date().getTime() - d.getTime()) / 1000);
-    if (seconds > 86400) {
-      let days = Math.floor(seconds / 86400);
-      return (days === 1) ? "1d" : days.toString() + "d";
-    }
-    else if (seconds > 3600) {
-      let hours = Math.floor(seconds / 3600);
-      return (hours === 1) ? "1h" : hours.toString() + "h";
-    }
-    else if (seconds > 60) {
-      let minutes = Math.floor(seconds / 60);
-      return (minutes === 1) ? "1m" : minutes.toString() + "m";
-    }
-    else if (seconds < 1) return "now";
-    else return (seconds === 1) ? "1s" : Math.floor(seconds).toString() + "s";
-  }
-
-  static getShortDate(d: Date): string {
-    return (d.getMonth() + 1).toString() + "/" + (d.getDate()).toString() + "/" + d.getFullYear().toString();
-  }
-
-  static convertDatePickerFormat(d: Date): Date {
-    const date = this.formatHtml5Date(d).split("-");
-    if (date.length === 3) return new Date(`${date[1]}-${date[2]}-${date[0]}`);
-    return new Date();
-  }
-
-  private static formatDateTime(date: Date, format: string) {
-    try {
-      return dateFormat(date, format);
-    } catch { return ""; }
-  }
-}
+import { format as dateFormat } from "date-fns"
+
+export class DateHelper {
+
+  //Fixes timezone issues when you just need the date.
+  static toDate(input: any) {
+    return new Date(Date.parse(input.toString().replace("Z", "")));
+  }
+
+  static toDateTime(input: any) {
+    return new Date(Date.parse(input.toString()));
+  }
+
+  static addDays(date: Date, days: number) {
+    date.setDate(date.getDate() + days);
+    return date;
+  }
+
+  static prettyDate(date: Date) {
+    if (date === undefined || date === null) return "";
+    return this.formatDateTime(date, "MMM d, yyyy");
+  }
+
+  static prettyDateTime(date: Date) {
+    if (date === undefined || date === null) return "";
+    return this.formatDateTime(date, "MMM d, yyyy h:mm a");
+  }
+
+  static prettyTime(date: Date) {
+    if (date === undefined || date === null) return "";
+    return this.formatDateTime(date, "h:mm a");
+  }
+
+  static getLastSunday() {
+    let result = new Date();
+    while (result.getDay() !== 0) result.setDate(result.getDate() - 1);
+    return result;
+  }
+
+  static getWeekSunday(year: number, week: number) {
+    let result = new Date(year, 0, 1);
+    while (result.getDay() !== 0) result.setDate(result.getDate() + 1);
+    result.setDate(result.getDate() + ((week - 1) * 7));
+    return result;
+  }
+
+  static formatHtml5Date(date: Date): string {
+    let result = "";
+    if (date !== undefined && date !== null) {
+      try {
+        result = new Date(date).toISOString().split("T")[0];
+      } catch { }
+    }
+    return result;
+  }
+
+  static formatHtml5Time(time: Date): string {
+    let h = time.getHours();
+    let m = time.getMinutes();
+    let s = time.getSeconds();
+    return `${h < 10 ? ("0" + h) : h}:${m < 10 ? ("0" + m) : m}:${s < 10 ? ("0" + s) : s}`;
+  }
+
+  static formatHtml5DateTime(date: Date): string {
+    if (date === undefined || date === null) return "";
+    else {
+      return this.formatDateTime(date, "yyyy-MM-dd") + "T" + this.formatDateTime(date, "HH:mm");
+    }
+  }
+
+  static getDisplayDuration(d: Date): string {
+    let seconds = Math.round((new Date().getTime() - d.getTime()) / 1000);
+    if (seconds > 86400) {
+      let days = Math.floor(seconds / 86400);
+      return (days === 1) ? "1d" : days.toString() + "d";
+    }
+    else if (seconds > 3600) {
+      let hours = Math.floor(seconds / 3600);
+      return (hours === 1) ? "1h" : hours.toString() + "h";
+    }
+    else if (seconds > 60) {
+      let minutes = Math.floor(seconds / 60);
+      return (minutes === 1) ? "1m" : minutes.toString() + "m";
+    }
+    else if (seconds < 1) return "now";
+    else return (seconds === 1) ? "1s" : Math.floor(seconds).toString() + "s";
+  }
+
+  static getShortDate(d: Date): string {
+    return (d.getMonth() + 1).toString() + "/" + (d.getDate()).toString() + "/" + d.getFullYear().toString();
+  }
+
+  static convertDatePickerFormat(d: Date): Date {
+    const date = this.formatHtml5Date(d).split("-");
+    if (date.length === 3) return new Date(`${date[1]}-${date[2]}-${date[0]}`);
+    return new Date();
+  }
+
+  private static formatDateTime(date: Date, format: string) {
+    try {
+      return dateFormat(date, format);
+    } catch { return ""; }
+  }
+}