@churchapps/helpers 1.0.34 → 1.0.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,5 +1,5 @@
1
1
  export declare class FileHelper {
2
- static postPresignedFile: (presigned: any, uploadedFile: File, progressCallback: (percent: number) => void) => Promise<import("axios").AxiosResponse<any, any>>;
2
+ static postPresignedFile: (presigned: any, uploadedFile: File, progressCallback: (percent: number) => void) => Promise<unknown>;
3
3
  static dataURLtoBlob(dataurl: string): Blob;
4
4
  }
5
5
  //# sourceMappingURL=FileHelper.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"FileHelper.d.ts","sourceRoot":"","sources":["../src/FileHelper.ts"],"names":[],"mappings":"AAEA,qBAAa,UAAU;IAErB,MAAM,CAAC,iBAAiB,GAAI,WAAW,GAAG,EAAE,cAAc,IAAI,EAAE,kBAAkB,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,sDAgBzG;IAEF,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM;CAQrC"}
1
+ {"version":3,"file":"FileHelper.d.ts","sourceRoot":"","sources":["../src/FileHelper.ts"],"names":[],"mappings":"AAAA,qBAAa,UAAU;IAErB,MAAM,CAAC,iBAAiB,GAAI,WAAW,GAAG,EAAE,cAAc,IAAI,EAAE,kBAAkB,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,sBAsCzG;IAEF,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM;CAQrC"}
@@ -1,10 +1,6 @@
1
1
  "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
4
- };
5
2
  Object.defineProperty(exports, "__esModule", { value: true });
6
3
  exports.FileHelper = void 0;
7
- const axios_1 = __importDefault(require("axios"));
8
4
  class FileHelper {
9
5
  static dataURLtoBlob(dataurl) {
10
6
  let arr = dataurl.split(","), mime = arr[0].match(/:(.*?);/)[1], bstr = atob(arr[1]), n = bstr.length, u8arr = new Uint8Array(n);
@@ -23,12 +19,32 @@ FileHelper.postPresignedFile = (presigned, uploadedFile, progressCallback) => {
23
19
  for (const property in presigned.fields)
24
20
  formData.append(property, presigned.fields[property]);
25
21
  formData.append("file", uploadedFile);
26
- const axiosConfig = {
27
- headers: { "Content-Type": "multipart/form-data" },
28
- onUploadProgress: (data) => {
29
- progressCallback(Math.round((100 * data.loaded) / data.total));
30
- }
31
- };
32
- return axios_1.default.post(presigned.url, formData, axiosConfig);
22
+ // Use XMLHttpRequest for upload progress tracking since fetch doesn't support it natively
23
+ return new Promise((resolve, reject) => {
24
+ const xhr = new XMLHttpRequest();
25
+ xhr.upload.addEventListener('progress', (event) => {
26
+ if (event.lengthComputable) {
27
+ const percent = Math.round((event.loaded / event.total) * 100);
28
+ progressCallback(percent);
29
+ }
30
+ });
31
+ xhr.addEventListener('load', () => {
32
+ if (xhr.status >= 200 && xhr.status < 300) {
33
+ resolve({
34
+ status: xhr.status,
35
+ statusText: xhr.statusText,
36
+ data: xhr.responseText
37
+ });
38
+ }
39
+ else {
40
+ reject(new Error(`HTTP Error: ${xhr.status} ${xhr.statusText}`));
41
+ }
42
+ });
43
+ xhr.addEventListener('error', () => {
44
+ reject(new Error('Network error occurred'));
45
+ });
46
+ xhr.open('POST', presigned.url);
47
+ xhr.send(formData);
48
+ });
33
49
  };
34
50
  //# sourceMappingURL=FileHelper.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"FileHelper.js","sourceRoot":"","sources":["../src/FileHelper.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAE1B,MAAa,UAAU;IAoBrB,MAAM,CAAC,aAAa,CAAC,OAAe;QAClC,IAAI,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAC7D,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,KAAK,GAAG,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC;QAClE,OAAO,CAAC,EAAE,EAAE,CAAC;YACX,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAChC,CAAC;QACD,OAAO,IAAI,IAAI,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3C,CAAC;;AA3BH,gCA4BC;AA1BQ,4BAAiB,GAAG,CAAC,SAAc,EAAE,YAAkB,EAAE,gBAA2C,EAAE,EAAE;IAC7G,MAAM,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;IAChC,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC;IACtC,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;IACtC,QAAQ,CAAC,MAAM,CAAC,cAAc,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;IACnD,KAAK,MAAM,QAAQ,IAAI,SAAS,CAAC,MAAM;QAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC/F,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAEtC,MAAM,WAAW,GAAG;QAClB,OAAO,EAAE,EAAE,cAAc,EAAE,qBAAqB,EAAE;QAClD,gBAAgB,EAAE,CAAC,IAAS,EAAE,EAAE;YAC9B,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QACjE,CAAC;KACF,CAAC;IAEF,OAAO,eAAK,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;AAC1D,CAAC,CAAC"}
1
+ {"version":3,"file":"FileHelper.js","sourceRoot":"","sources":["../src/FileHelper.ts"],"names":[],"mappings":";;;AAAA,MAAa,UAAU;IA0CrB,MAAM,CAAC,aAAa,CAAC,OAAe;QAClC,IAAI,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAC7D,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,KAAK,GAAG,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC;QAClE,OAAO,CAAC,EAAE,EAAE,CAAC;YACX,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAChC,CAAC;QACD,OAAO,IAAI,IAAI,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3C,CAAC;;AAjDH,gCAkDC;AAhDQ,4BAAiB,GAAG,CAAC,SAAc,EAAE,YAAkB,EAAE,gBAA2C,EAAE,EAAE;IAC7G,MAAM,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;IAChC,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC;IACtC,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;IACtC,QAAQ,CAAC,MAAM,CAAC,cAAc,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;IACnD,KAAK,MAAM,QAAQ,IAAI,SAAS,CAAC,MAAM;QAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC/F,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAEtC,0FAA0F;IAC1F,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,GAAG,GAAG,IAAI,cAAc,EAAE,CAAC;QAEjC,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,EAAE;YAChD,IAAI,KAAK,CAAC,gBAAgB,EAAE,CAAC;gBAC3B,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC;gBAC/D,gBAAgB,CAAC,OAAO,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,gBAAgB,CAAC,MAAM,EAAE,GAAG,EAAE;YAChC,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;gBAC1C,OAAO,CAAC;oBACN,MAAM,EAAE,GAAG,CAAC,MAAM;oBAClB,UAAU,EAAE,GAAG,CAAC,UAAU;oBAC1B,IAAI,EAAE,GAAG,CAAC,YAAY;iBACvB,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,KAAK,CAAC,eAAe,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;YACnE,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE;YACjC,MAAM,CAAC,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC;QAChC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"PersonHelper.d.ts","sourceRoot":"","sources":["../src/PersonHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAGrE,qBAAa,YAAY;WAET,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG;IAKxD,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,eAAe;IAK1C,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,GAAG,MAAM;WAUxB,wBAAwB,CAAC,MAAM,EAAE,GAAG;IAKlD,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;WAKtE,aAAa,CAAC,SAAS,EAAE,IAAI,GAAG,MAAM;WAKtC,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/PersonHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAGrE,qBAAa,YAAY;WAET,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG;IAQxD,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,eAAe;IAK1C,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,GAAG,MAAM;WAUxB,wBAAwB,CAAC,MAAM,EAAE,GAAG;IAKlD,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;WAKtE,aAAa,CAAC,SAAS,EAAE,IAAI,GAAG,MAAM;WAKtC,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"}
@@ -4,8 +4,13 @@ exports.PersonHelper = void 0;
4
4
  const CommonEnvironmentHelper_1 = require("./CommonEnvironmentHelper");
5
5
  class PersonHelper {
6
6
  static getPhotoPath(churchId, person) {
7
- if (!person.photoUpdated)
8
- return "";
7
+ var _a;
8
+ if (!person.photoUpdated) {
9
+ if ((_a = person.id) === null || _a === void 0 ? void 0 : _a.startsWith("PER0000"))
10
+ return "https://app.staging.chums.org/images/demo/avatars/" + person.id + ".svg";
11
+ else
12
+ return "";
13
+ }
9
14
  else
10
15
  return "/" + churchId + "/membership/people/" + person.id + ".png?dt=" + person.photoUpdated.getTime().toString();
11
16
  }
@@ -1 +1 @@
1
- {"version":3,"file":"PersonHelper.js","sourceRoot":"","sources":["../src/PersonHelper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"PersonHelper.js","sourceRoot":"","sources":["../src/PersonHelper.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@churchapps/helpers",
3
- "version": "1.0.34",
3
+ "version": "1.0.36",
4
4
  "description": "Library of helper functions not specific to any one ChurchApps project or framework.",
5
5
  "main": "dist/index.js",
6
6
  "scripts": {
@@ -29,7 +29,6 @@
29
29
  "typescript": "^5.8.3"
30
30
  },
31
31
  "dependencies": {
32
- "axios": "^1.9.0",
33
32
  "date-fns": "^4.1.0",
34
33
  "dayjs": "^1.11.13",
35
34
  "react-ga4": "^2.1.0",
package/src/FileHelper.ts CHANGED
@@ -1,5 +1,3 @@
1
- import axios from "axios";
2
-
3
1
  export class FileHelper {
4
2
 
5
3
  static postPresignedFile = (presigned: any, uploadedFile: File, progressCallback: (percent: number) => void) => {
@@ -10,14 +8,36 @@ export class FileHelper {
10
8
  for (const property in presigned.fields) formData.append(property, presigned.fields[property]);
11
9
  formData.append("file", uploadedFile);
12
10
 
13
- const axiosConfig = {
14
- headers: { "Content-Type": "multipart/form-data" },
15
- onUploadProgress: (data: any) => {
16
- progressCallback(Math.round((100 * data.loaded) / data.total));
17
- }
18
- };
11
+ // Use XMLHttpRequest for upload progress tracking since fetch doesn't support it natively
12
+ return new Promise((resolve, reject) => {
13
+ const xhr = new XMLHttpRequest();
14
+
15
+ xhr.upload.addEventListener('progress', (event) => {
16
+ if (event.lengthComputable) {
17
+ const percent = Math.round((event.loaded / event.total) * 100);
18
+ progressCallback(percent);
19
+ }
20
+ });
21
+
22
+ xhr.addEventListener('load', () => {
23
+ if (xhr.status >= 200 && xhr.status < 300) {
24
+ resolve({
25
+ status: xhr.status,
26
+ statusText: xhr.statusText,
27
+ data: xhr.responseText
28
+ });
29
+ } else {
30
+ reject(new Error(`HTTP Error: ${xhr.status} ${xhr.statusText}`));
31
+ }
32
+ });
33
+
34
+ xhr.addEventListener('error', () => {
35
+ reject(new Error('Network error occurred'));
36
+ });
19
37
 
20
- return axios.post(presigned.url, formData, axiosConfig);
38
+ xhr.open('POST', presigned.url);
39
+ xhr.send(formData);
40
+ });
21
41
  };
22
42
 
23
43
  static dataURLtoBlob(dataurl: string) {
@@ -4,7 +4,10 @@ import { CommonEnvironmentHelper } from "./CommonEnvironmentHelper";
4
4
  export class PersonHelper {
5
5
 
6
6
  public static getPhotoPath(churchId: string, person: any) {
7
- if (!person.photoUpdated) return "";
7
+ if (!person.photoUpdated) {
8
+ if (person.id?.startsWith("PER0000")) return "https://app.staging.chums.org/images/demo/avatars/" + person.id + ".svg";
9
+ else return "";
10
+ }
8
11
  else return "/" + churchId + "/membership/people/" + person.id + ".png?dt=" + person.photoUpdated.getTime().toString();
9
12
  }
10
13