@churchapps/apphelper 0.4.5 → 0.4.6
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.
- package/dist/donationComponents/DonationPage.js +3 -3
- package/dist/donationComponents/DonationPage.js.map +1 -1
- package/dist/helpers/FileHelper.d.ts +1 -1
- package/dist/helpers/FileHelper.d.ts.map +1 -1
- package/dist/helpers/FileHelper.js +6 -2
- package/dist/helpers/FileHelper.js.map +1 -1
- package/package.json +1 -1
- package/src/donationComponents/DonationPage.tsx +5 -5
- package/src/helpers/FileHelper.ts +6 -3
|
@@ -12,7 +12,7 @@ const components_1 = require("./components");
|
|
|
12
12
|
const components_2 = require("../components");
|
|
13
13
|
const helpers_1 = require("../helpers");
|
|
14
14
|
const helpers_2 = require("@churchapps/helpers");
|
|
15
|
-
|
|
15
|
+
// import { Link } from "react-router-dom"
|
|
16
16
|
const material_1 = require("@mui/material");
|
|
17
17
|
const useMountedState_1 = require("../hooks/useMountedState");
|
|
18
18
|
const DonationPage = (props) => {
|
|
@@ -106,7 +106,7 @@ const DonationPage = (props) => {
|
|
|
106
106
|
];
|
|
107
107
|
result.push((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.Button, { id: "download-button", "aria-controls": open ? "download-menu" : undefined, "aria-haspopup": "true", "aria-expanded": open ? "true" : undefined, onClick: (e) => {
|
|
108
108
|
setAnchorEl(e.currentTarget);
|
|
109
|
-
}, children: (0, jsx_runtime_1.jsx)(material_1.Icon, { children: "download" }) }), (0, jsx_runtime_1.jsxs)(material_1.Menu, { id: "download-menu", anchorEl: anchorEl, open: open, onClose: handleClose, MenuListProps: { 'aria-labelledby': "download-button" }, children: [(0, jsx_runtime_1.jsx)(material_1.MenuItem, { onClick: handleClose, dense: true, children: (0, jsx_runtime_1.jsx)(components_2.ExportLink, { data: current_year, filename: "current_year_donations", customHeaders: customHeaders, text: "Current Year (CSV)", icon: "table_chart" }) }), (0, jsx_runtime_1.jsx)(material_1.MenuItem, { onClick: handleClose, dense: true, children: (0, jsx_runtime_1.jsx)(
|
|
109
|
+
}, children: (0, jsx_runtime_1.jsx)(material_1.Icon, { children: "download" }) }), (0, jsx_runtime_1.jsxs)(material_1.Menu, { id: "download-menu", anchorEl: anchorEl, open: open, onClose: handleClose, MenuListProps: { 'aria-labelledby': "download-button" }, children: [(0, jsx_runtime_1.jsx)(material_1.MenuItem, { onClick: handleClose, dense: true, children: (0, jsx_runtime_1.jsx)(components_2.ExportLink, { data: current_year, filename: "current_year_donations", customHeaders: customHeaders, text: "Current Year (CSV)", icon: "table_chart" }) }), (0, jsx_runtime_1.jsx)(material_1.MenuItem, { onClick: handleClose, dense: true, children: (0, jsx_runtime_1.jsx)(material_1.Link, { href: "/donations/print/" + person?.id, children: (0, jsx_runtime_1.jsxs)(material_1.Button, { children: [(0, jsx_runtime_1.jsx)(material_1.Icon, { children: "print" }), " \u00A0 Current Year (PRINT)"] }) }) }), (0, jsx_runtime_1.jsx)(material_1.MenuItem, { onClick: handleClose, dense: true, children: (0, jsx_runtime_1.jsx)(components_2.ExportLink, { data: last_year, filename: "last_year_donations", customHeaders: customHeaders, text: "Last Year (CSV)", icon: "table_chart" }) }), (0, jsx_runtime_1.jsx)(material_1.MenuItem, { onClick: handleClose, dense: true, children: (0, jsx_runtime_1.jsx)(material_1.Link, { href: "/donations/print/" + person?.id + "?prev=1", children: (0, jsx_runtime_1.jsxs)(material_1.Button, { children: [(0, jsx_runtime_1.jsx)(material_1.Icon, { children: "print" }), " \u00A0 Last Year (PRINT)"] }) }) })] })] }));
|
|
110
110
|
return result;
|
|
111
111
|
};
|
|
112
112
|
const getRows = () => {
|
|
@@ -117,7 +117,7 @@ const DonationPage = (props) => {
|
|
|
117
117
|
}
|
|
118
118
|
for (let i = 0; i < donations.length; i++) {
|
|
119
119
|
let d = donations[i];
|
|
120
|
-
rows.push((0, jsx_runtime_1.jsxs)(material_1.TableRow, { children: [appName !== "B1App" && (0, jsx_runtime_1.jsx)(material_1.TableCell, { children: (0, jsx_runtime_1.jsx)(
|
|
120
|
+
rows.push((0, jsx_runtime_1.jsxs)(material_1.TableRow, { children: [appName !== "B1App" && (0, jsx_runtime_1.jsx)(material_1.TableCell, { children: (0, jsx_runtime_1.jsx)(material_1.Link, { href: "/donations/" + d.batchId, children: d.batchId }) }), (0, jsx_runtime_1.jsx)(material_1.TableCell, { children: helpers_1.DateHelper.prettyDate(new Date(d.donationDate)) }), (0, jsx_runtime_1.jsxs)(material_1.TableCell, { children: [d.method, " - ", d.methodDetails] }), (0, jsx_runtime_1.jsx)(material_1.TableCell, { children: d.fund.name }), (0, jsx_runtime_1.jsx)(material_1.TableCell, { children: helpers_1.CurrencyHelper.formatCurrency(d.fund.amount) })] }, i));
|
|
121
121
|
}
|
|
122
122
|
return rows;
|
|
123
123
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DonationPage.js","sourceRoot":"","sources":["../../src/donationComponents/DonationPage.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;AAEb,kDAA0B;AAC1B,iDAAuD;AACvD,6CAAgF;AAChF,8CAAgE;AAChE,wCAA2F;AAC3F,iDAA+G;AAC/G,
|
|
1
|
+
{"version":3,"file":"DonationPage.js","sourceRoot":"","sources":["../../src/donationComponents/DonationPage.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export declare class FileHelper {
|
|
2
|
-
static postPresignedFile: (presigned: any, uploadedFile: File, progressCallback: (percent: number) => void) =>
|
|
2
|
+
static postPresignedFile: (presigned: any, uploadedFile: File, progressCallback: (percent: number) => void, axiosInstance?: any) => any;
|
|
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/helpers/FileHelper.ts"],"names":[],"mappings":"AAEA,qBAAa,UAAU;
|
|
1
|
+
{"version":3,"file":"FileHelper.d.ts","sourceRoot":"","sources":["../../src/helpers/FileHelper.ts"],"names":[],"mappings":"AAEA,qBAAa,UAAU;IACrB,MAAM,CAAC,iBAAiB,GAAI,WAAW,GAAG,EAAE,cAAc,IAAI,EAAE,kBAAkB,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,EAAE,gBAAgB,GAAG,SAoB9H;IAEF,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM;CAQrC"}
|
|
@@ -15,7 +15,8 @@ class FileHelper {
|
|
|
15
15
|
}
|
|
16
16
|
}
|
|
17
17
|
exports.FileHelper = FileHelper;
|
|
18
|
-
FileHelper.postPresignedFile = (presigned, uploadedFile, progressCallback) => {
|
|
18
|
+
FileHelper.postPresignedFile = (presigned, uploadedFile, progressCallback, axiosInstance) => {
|
|
19
|
+
const axiosToUse = axiosInstance || axios_1.default;
|
|
19
20
|
const formData = new FormData();
|
|
20
21
|
//formData.append("key", presigned.key); //no longer needed with new aws sdk
|
|
21
22
|
formData.append("acl", "public-read");
|
|
@@ -29,6 +30,9 @@ FileHelper.postPresignedFile = (presigned, uploadedFile, progressCallback) => {
|
|
|
29
30
|
progressCallback(Math.round((100 * data.loaded) / data.total));
|
|
30
31
|
}
|
|
31
32
|
};
|
|
32
|
-
|
|
33
|
+
console.log("#10");
|
|
34
|
+
console.log("axios: ", axiosToUse);
|
|
35
|
+
console.log("axios tyeof: ", typeof axiosToUse.post);
|
|
36
|
+
return axiosToUse.post(presigned.url, formData, axiosConfig);
|
|
33
37
|
};
|
|
34
38
|
//# sourceMappingURL=FileHelper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileHelper.js","sourceRoot":"","sources":["../../src/helpers/FileHelper.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAE1B,MAAa,UAAU;
|
|
1
|
+
{"version":3,"file":"FileHelper.js","sourceRoot":"","sources":["../../src/helpers/FileHelper.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAE1B,MAAa,UAAU;IAuBrB,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;;AA9BH,gCA+BC;AA9BQ,4BAAiB,GAAG,CAAC,SAAc,EAAE,YAAkB,EAAE,gBAA2C,EAAE,aAAmB,EAAE,EAAE;IAClI,MAAM,UAAU,GAAG,aAAa,IAAI,eAAK,CAAC;IAC1C,MAAM,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;IAChC,4EAA4E;IAC5E,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,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACnB,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IACnC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;IACrD,OAAO,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;AAC/D,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -6,8 +6,8 @@ import { DonationForm, RecurringDonations, PaymentMethods } from "./components";
|
|
|
6
6
|
import { DisplayBox, ExportLink, Loading } from "../components";
|
|
7
7
|
import { ApiHelper, DateHelper, UniqueIdHelper, CurrencyHelper, Locale } from "../helpers";
|
|
8
8
|
import { DonationInterface, PersonInterface, StripePaymentMethod, ChurchInterface } from "@churchapps/helpers";
|
|
9
|
-
import { Link } from "react-router-dom"
|
|
10
|
-
import { Table, TableBody, TableRow, TableCell, TableHead, Alert, Button, Icon, Menu, MenuItem } from "@mui/material"
|
|
9
|
+
// import { Link } from "react-router-dom"
|
|
10
|
+
import { Table, TableBody, TableRow, TableCell, TableHead, Alert, Button, Icon, Link, Menu, MenuItem } from "@mui/material"
|
|
11
11
|
import { useMountedState } from "../hooks/useMountedState";
|
|
12
12
|
|
|
13
13
|
interface Props { personId: string, appName?: string, church?: ChurchInterface, churchLogo?: string }
|
|
@@ -129,9 +129,9 @@ export const DonationPage: React.FC<Props> = (props) => {
|
|
|
129
129
|
MenuListProps={{ 'aria-labelledby': "download-button" }}
|
|
130
130
|
>
|
|
131
131
|
<MenuItem onClick={handleClose} dense><ExportLink data={current_year} filename="current_year_donations" customHeaders={customHeaders} text="Current Year (CSV)" icon="table_chart" /></MenuItem>
|
|
132
|
-
<MenuItem onClick={handleClose} dense><Link
|
|
132
|
+
<MenuItem onClick={handleClose} dense><Link href={"/donations/print/" + person?.id}><Button><Icon>print</Icon> Current Year (PRINT)</Button></Link></MenuItem>
|
|
133
133
|
<MenuItem onClick={handleClose} dense><ExportLink data={last_year} filename="last_year_donations" customHeaders={customHeaders} text="Last Year (CSV)" icon="table_chart" /></MenuItem>
|
|
134
|
-
<MenuItem onClick={handleClose} dense><Link
|
|
134
|
+
<MenuItem onClick={handleClose} dense><Link href={"/donations/print/" + person?.id + "?prev=1"}><Button><Icon>print</Icon> Last Year (PRINT)</Button></Link></MenuItem>
|
|
135
135
|
</Menu>
|
|
136
136
|
</>);
|
|
137
137
|
|
|
@@ -150,7 +150,7 @@ export const DonationPage: React.FC<Props> = (props) => {
|
|
|
150
150
|
let d = donations[i];
|
|
151
151
|
rows.push(
|
|
152
152
|
<TableRow key={i}>
|
|
153
|
-
{appName !== "B1App" && <TableCell><Link
|
|
153
|
+
{appName !== "B1App" && <TableCell><Link href={"/donations/" + d.batchId}>{d.batchId}</Link></TableCell>}
|
|
154
154
|
<TableCell>{DateHelper.prettyDate(new Date(d.donationDate))}</TableCell>
|
|
155
155
|
<TableCell>{d.method} - {d.methodDetails}</TableCell>
|
|
156
156
|
<TableCell>{d.fund.name}</TableCell>
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import axios from "axios";
|
|
2
2
|
|
|
3
3
|
export class FileHelper {
|
|
4
|
-
|
|
5
|
-
|
|
4
|
+
static postPresignedFile = (presigned: any, uploadedFile: File, progressCallback: (percent: number) => void, axiosInstance?: any) => {
|
|
5
|
+
const axiosToUse = axiosInstance || axios;
|
|
6
6
|
const formData = new FormData();
|
|
7
7
|
//formData.append("key", presigned.key); //no longer needed with new aws sdk
|
|
8
8
|
formData.append("acl", "public-read");
|
|
@@ -17,7 +17,10 @@ export class FileHelper {
|
|
|
17
17
|
}
|
|
18
18
|
};
|
|
19
19
|
|
|
20
|
-
|
|
20
|
+
console.log("#10");
|
|
21
|
+
console.log("axios: ", axiosToUse);
|
|
22
|
+
console.log("axios tyeof: ", typeof axiosToUse.post);
|
|
23
|
+
return axiosToUse.post(presigned.url, formData, axiosConfig);
|
|
21
24
|
};
|
|
22
25
|
|
|
23
26
|
static dataURLtoBlob(dataurl: string) {
|