@churchapps/apphelper 0.3.35 → 0.3.36

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- {"version":3,"file":"PersonHelper.d.ts","sourceRoot":"","sources":["../../src/helpers/PersonHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAI5E,qBAAa,YAAY;IAEvB,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,eAAe;IAK1C,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,GAAG,MAAM;IAUtC,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;WAKtE,cAAc,CAAC,QAAQ,EAAE,oBAAoB,EAAE,QAAQ,EAAE,oBAAoB,GAAG,OAAO;WAUvF,eAAe,CAAC,OAAO,EAAE,oBAAoB,GAAG,MAAM;WAItD,iBAAiB,CAAC,YAAY,EAAE,oBAAoB,EAAE,YAAY,EAAE,oBAAoB,GAAG,oBAAoB;WAa/G,uBAAuB,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO;CAOxE"}
1
+ {"version":3,"file":"PersonHelper.d.ts","sourceRoot":"","sources":["../../src/helpers/PersonHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAI5E,qBAAa,YAAY;IAExB,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,eAAe;IAO1C,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,GAAG,MAAM;IAUtC,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;WAKtE,cAAc,CAAC,QAAQ,EAAE,oBAAoB,EAAE,QAAQ,EAAE,oBAAoB,GAAG,OAAO;WAUvF,eAAe,CAAC,OAAO,EAAE,oBAAoB,GAAG,MAAM;WAItD,iBAAiB,CAAC,YAAY,EAAE,oBAAoB,EAAE,YAAY,EAAE,oBAAoB,GAAG,oBAAoB;WAa/G,uBAAuB,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO;CAOvE"}
@@ -5,11 +5,13 @@ const CommonEnvironmentHelper_1 = require("./CommonEnvironmentHelper");
5
5
  const Locale_1 = require("./Locale");
6
6
  class PersonHelper {
7
7
  static getPhotoUrl(person) {
8
- var _a;
8
+ var _a, _b;
9
9
  if (!(person === null || person === void 0 ? void 0 : person.photo))
10
10
  return "/images/sample-profile.png";
11
11
  else
12
- return ((_a = person === null || person === void 0 ? void 0 : person.photo) === null || _a === void 0 ? void 0 : _a.startsWith("data:image/png;base64,")) ? person.photo : CommonEnvironmentHelper_1.CommonEnvironmentHelper.ContentRoot + person.photo;
12
+ return (((_a = person === null || person === void 0 ? void 0 : person.photo) === null || _a === void 0 ? void 0 : _a.startsWith("data:image/png;base64,")) || ((_b = person.photo) === null || _b === void 0 ? void 0 : _b.indexOf("://")) > -1)
13
+ ? person.photo
14
+ : CommonEnvironmentHelper_1.CommonEnvironmentHelper.ContentRoot + person.photo;
13
15
  }
14
16
  static getAge(birthdate) {
15
17
  if (birthdate !== undefined && birthdate !== null) {
@@ -1 +1 @@
1
- {"version":3,"file":"PersonHelper.js","sourceRoot":"","sources":["../../src/helpers/PersonHelper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"PersonHelper.js","sourceRoot":"","sources":["../../src/helpers/PersonHelper.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@churchapps/apphelper",
3
- "version": "0.3.35",
3
+ "version": "0.3.36",
4
4
  "description": "Library of helper functions for React and NextJS ChurchApps",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -4,58 +4,60 @@ import { Locale } from "./Locale";
4
4
 
5
5
  export class PersonHelper {
6
6
 
7
- static getPhotoUrl(person: PersonInterface) {
8
- if (!person?.photo) return "/images/sample-profile.png"
9
- else return person?.photo?.startsWith("data:image/png;base64,") ? person.photo : CommonEnvironmentHelper.ContentRoot + person.photo;
10
- }
11
-
12
- static getAge(birthdate: Date): string {
13
- if (birthdate !== undefined && birthdate !== null) {
14
- let ageDifMs = Date.now() - new Date(birthdate).getTime();
15
- let ageDate = new Date(ageDifMs);
16
- let years = Math.abs(ageDate.getUTCFullYear() - 1970);
17
- return years + " " + Locale.label("person.years");
18
- }
19
- else return "";
20
- }
21
-
22
- static getDisplayName(firstName: string, lastName: string, nickName: string): string {
23
- if (nickName !== undefined && nickName !== null && nickName.length > 0) return firstName + ' "' + nickName + '" ' + lastName;
24
- else return firstName + " " + lastName;
25
- }
26
-
27
- public static compareAddress(address1: ContactInfoInterface, address2: ContactInfoInterface): boolean {
28
- const displayAddress1: string = this.addressToString(address1).trim();
29
- const displayAddress2: string = this.addressToString(address2).trim();
30
-
31
- if (displayAddress1 !== displayAddress2) {
32
- return true
33
- }
34
- return false
35
- }
36
-
37
- public static addressToString(address: ContactInfoInterface): string {
38
- return `${address.address1 || ""} ${address.address2 || ""} ${address.city || ""}${(address.city && address.state) ? "," : ""} ${address.state || ""} ${address.zip || ""}`
39
- }
40
-
41
- public static changeOnlyAddress(contactInfo1: ContactInfoInterface, contactInfo2: ContactInfoInterface): ContactInfoInterface {
42
- const updatedAddress: ContactInfoInterface = {
43
- ...contactInfo1,
44
- address1: contactInfo2.address1,
45
- address2: contactInfo2.address2,
46
- city: contactInfo2.city,
47
- state: contactInfo2.state,
48
- zip: contactInfo2.zip
49
- }
50
-
51
- return updatedAddress
52
- }
53
-
54
- public static checkAddressAvailabilty(person: PersonInterface): boolean {
55
- const addressString: string = this.addressToString(person.contactInfo).trim();
56
- if (addressString !== "") {
57
- return true;
58
- }
59
- return false;
60
- }
7
+ static getPhotoUrl(person: PersonInterface) {
8
+ if (!person?.photo) return "/images/sample-profile.png"
9
+ else return (person?.photo?.startsWith("data:image/png;base64,") || person.photo?.indexOf("://") > -1)
10
+ ? person.photo
11
+ : CommonEnvironmentHelper.ContentRoot + person.photo;
12
+ }
13
+
14
+ static getAge(birthdate: Date): string {
15
+ if (birthdate !== undefined && birthdate !== null) {
16
+ let ageDifMs = Date.now() - new Date(birthdate).getTime();
17
+ let ageDate = new Date(ageDifMs);
18
+ let years = Math.abs(ageDate.getUTCFullYear() - 1970);
19
+ return years + " " + Locale.label("person.years");
20
+ }
21
+ else return "";
22
+ }
23
+
24
+ static getDisplayName(firstName: string, lastName: string, nickName: string): string {
25
+ if (nickName !== undefined && nickName !== null && nickName.length > 0) return firstName + ' "' + nickName + '" ' + lastName;
26
+ else return firstName + " " + lastName;
27
+ }
28
+
29
+ public static compareAddress(address1: ContactInfoInterface, address2: ContactInfoInterface): boolean {
30
+ const displayAddress1: string = this.addressToString(address1).trim();
31
+ const displayAddress2: string = this.addressToString(address2).trim();
32
+
33
+ if (displayAddress1 !== displayAddress2) {
34
+ return true
35
+ }
36
+ return false
37
+ }
38
+
39
+ public static addressToString(address: ContactInfoInterface): string {
40
+ return `${address.address1 || ""} ${address.address2 || ""} ${address.city || ""}${(address.city && address.state) ? "," : ""} ${address.state || ""} ${address.zip || ""}`
41
+ }
42
+
43
+ public static changeOnlyAddress(contactInfo1: ContactInfoInterface, contactInfo2: ContactInfoInterface): ContactInfoInterface {
44
+ const updatedAddress: ContactInfoInterface = {
45
+ ...contactInfo1,
46
+ address1: contactInfo2.address1,
47
+ address2: contactInfo2.address2,
48
+ city: contactInfo2.city,
49
+ state: contactInfo2.state,
50
+ zip: contactInfo2.zip
51
+ }
52
+
53
+ return updatedAddress
54
+ }
55
+
56
+ public static checkAddressAvailabilty(person: PersonInterface): boolean {
57
+ const addressString: string = this.addressToString(person.contactInfo).trim();
58
+ if (addressString !== "") {
59
+ return true;
60
+ }
61
+ return false;
62
+ }
61
63
  }