@churchapps/apphelper 0.3.26 → 0.3.28
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/components/wrapper/Notifications.d.ts.map +1 -1
- package/dist/components/wrapper/Notifications.js +3 -3
- package/dist/components/wrapper/Notifications.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/dist/helpers/Locale.js +2 -2
- package/dist/helpers/Locale.js.map +1 -1
- package/package.json +2 -2
- package/src/components/wrapper/Notifications.tsx +7 -3
- package/src/helpers/FileHelper.ts +6 -3
- package/src/helpers/Locale.ts +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Notifications.d.ts","sourceRoot":"","sources":["../../../src/components/wrapper/Notifications.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAGxC,OAAO,EAAyB,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAIlF,UAAU,KAAK;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,oBAAoB,CAAC;IAC9B,UAAU,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,QAAQ,EAAE,MAAM,IAAI,CAAC;CACtB;AAED,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"Notifications.d.ts","sourceRoot":"","sources":["../../../src/components/wrapper/Notifications.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAGxC,OAAO,EAAyB,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAIlF,UAAU,KAAK;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,oBAAoB,CAAC;IAC9B,UAAU,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,QAAQ,EAAE,MAAM,IAAI,CAAC;CACtB;AAED,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAuEzC,CAAC"}
|
|
@@ -65,7 +65,7 @@ const Notifications = (props) => {
|
|
|
65
65
|
break;
|
|
66
66
|
case "assignment":
|
|
67
67
|
app = "b1";
|
|
68
|
-
path = "/
|
|
68
|
+
path = "/my/plans/" + notification.contentId;
|
|
69
69
|
break;
|
|
70
70
|
}
|
|
71
71
|
const appUrl = getAppUrl(app);
|
|
@@ -74,7 +74,7 @@ const Notifications = (props) => {
|
|
|
74
74
|
}
|
|
75
75
|
else {
|
|
76
76
|
console.log("REDIRECTING TO", appUrl + path);
|
|
77
|
-
window.
|
|
77
|
+
window.open(appUrl + path, "_blank");
|
|
78
78
|
}
|
|
79
79
|
};
|
|
80
80
|
const getMainLinks = () => {
|
|
@@ -82,7 +82,7 @@ const Notifications = (props) => {
|
|
|
82
82
|
notifications.forEach(notification => {
|
|
83
83
|
let datePosted = new Date(notification.timeSent);
|
|
84
84
|
const displayDuration = helpers_1.DateHelper.getDisplayDuration(datePosted);
|
|
85
|
-
result.push((0, jsx_runtime_1.jsx)("div", { className: "note", style: { cursor: "pointer" }, onClick: (e) => { e.preventDefault(); }, children: (0, jsx_runtime_1.jsx)(material_1.Box, { sx: { width: "100%" }, className: "note-contents", children: (0, jsx_runtime_1.jsx)(material_1.Stack, { direction: "row", justifyContent: "space-between", children: (0, jsx_runtime_1.jsxs)("div", { style: { width: "100%" }, onClick: (e) => { e.preventDefault(); handleClick(notification); }, children: [(0, jsx_runtime_1.jsx)("span", { className: "text-grey", style: { float: "right" }, children: displayDuration }), (0, jsx_runtime_1.jsxs)("p", { children: [(0, jsx_runtime_1.jsx)(material_1.Icon, { children: "notifications" }), " ", notification.
|
|
85
|
+
result.push((0, jsx_runtime_1.jsx)("div", { className: "note", style: { cursor: "pointer" }, onClick: (e) => { e.preventDefault(); }, children: (0, jsx_runtime_1.jsx)(material_1.Box, { sx: { width: "100%" }, className: "note-contents", children: (0, jsx_runtime_1.jsx)(material_1.Stack, { direction: "row", justifyContent: "space-between", children: (0, jsx_runtime_1.jsxs)("div", { style: { width: "100%" }, onClick: (e) => { e.preventDefault(); handleClick(notification); }, children: [(0, jsx_runtime_1.jsx)("span", { className: "text-grey", style: { float: "right" }, children: displayDuration }), (0, jsx_runtime_1.jsxs)("p", { children: [(0, jsx_runtime_1.jsx)(material_1.Icon, { children: "notifications" }), notification.message, (0, jsx_runtime_1.jsx)("span", { children: (notification === null || notification === void 0 ? void 0 : notification.link) ? (0, jsx_runtime_1.jsx)("a", { href: notification.link, onClick: (e) => { e.stopPropagation(); }, target: "_blank", children: "View Details" }) : null })] })] }) }) }) }));
|
|
86
86
|
});
|
|
87
87
|
return result;
|
|
88
88
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Notifications.js","sourceRoot":"","sources":["../../../src/components/wrapper/Notifications.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEb,+CAAwC;AACxC,uDAAoD;AACpD,4CAAiD;AAEjD,2CAA2C;AAUpC,MAAM,aAAa,GAAoB,CAAC,KAAK,EAAE,EAAE;IACtD,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,IAAA,gBAAQ,EAA0B,EAAE,CAAC,CAAC;IAEhF,MAAM,QAAQ,GAAG,GAAS,EAAE;QAC1B,MAAM,CAAC,GAA4B,MAAM,qBAAS,CAAC,GAAG,CAAC,mBAAmB,EAAE,cAAc,CAAC,CAAC;QAC5F,gBAAgB,CAAC,CAAC,CAAC,CAAC;QACpB,KAAK,CAAC,QAAQ,EAAE,CAAC;IACnB,CAAC,CAAA,CAAA;IAED,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,qBAAqB;IAEjE,MAAM,SAAS,GAAG,CAAC,OAAc,EAAE,EAAE;QACnC,QAAQ,OAAO,EAAE;YACf,KAAK,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;YAC5C,KAAK,OAAO,CAAC,CAAC,OAAO,uBAAuB,CAAC;YAC7C,KAAK,IAAI,CAAC,CAAC,OAAO,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,GAAG,YAAY,CAAC;YACxF,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC;SACpB;IACH,CAAC,CAAA;IAED,MAAM,WAAW,GAAG,CAAC,YAAkC,EAAE,EAAE;QACzD,IAAI,GAAG,GAAG,EAAE,CAAC;QACb,IAAI,IAAI,GAAG,EAAE,CAAC;QACd,QAAQ,YAAY,CAAC,WAAW,EAAE;YAChC,KAAK,MAAM;gBAAE,GAAG,GAAG,OAAO,CAAC;gBAAC,IAAI,GAAG,SAAS,GAAG,YAAY,CAAC,SAAS,CAAC;gBAAC,MAAM;YAC7E,KAAK,YAAY;gBAAE,GAAG,GAAG,IAAI,CAAC;gBAAC,IAAI,GAAG,
|
|
1
|
+
{"version":3,"file":"Notifications.js","sourceRoot":"","sources":["../../../src/components/wrapper/Notifications.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,cAAe,GAAG,gBAAgB,IAAI,8BAA8B,MAAM,KAAK,IAAI,kBAAkB,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;YACV,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;SAC/B;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/dist/helpers/Locale.js
CHANGED
|
@@ -15,7 +15,7 @@ var _a;
|
|
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
16
|
exports.Locale = void 0;
|
|
17
17
|
const i18next_1 = __importDefault(require("i18next"));
|
|
18
|
-
const
|
|
18
|
+
const initReactI18next_1 = require("react-i18next/initReactI18next");
|
|
19
19
|
const i18next_browser_languagedetector_1 = __importDefault(require("i18next-browser-languagedetector"));
|
|
20
20
|
const i18next_chained_backend_1 = __importDefault(require("i18next-chained-backend"));
|
|
21
21
|
class Locale {
|
|
@@ -82,7 +82,7 @@ Locale.init = (backends) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
82
82
|
yield i18next_1.default
|
|
83
83
|
.use(i18next_chained_backend_1.default)
|
|
84
84
|
.use(i18next_browser_languagedetector_1.default)
|
|
85
|
-
.use(
|
|
85
|
+
.use(initReactI18next_1.initReactI18next)
|
|
86
86
|
.init({
|
|
87
87
|
resources,
|
|
88
88
|
fallbackLng: "en",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Locale.js","sourceRoot":"","sources":["../../src/helpers/Locale.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,sDAA2B;AAC3B,
|
|
1
|
+
{"version":3,"file":"Locale.js","sourceRoot":"","sources":["../../src/helpers/Locale.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.
|
|
3
|
+
"version": "0.3.28",
|
|
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",
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
"react-router-dom": "^6.15.0"
|
|
38
38
|
},
|
|
39
39
|
"dependencies": {
|
|
40
|
-
"@churchapps/helpers": "^1.0.
|
|
40
|
+
"@churchapps/helpers": "^1.0.33",
|
|
41
41
|
"@emotion/cache": "^11.11.0",
|
|
42
42
|
"@emotion/react": "^11.11.1",
|
|
43
43
|
"@emotion/styled": "^11.11.0",
|
|
@@ -39,7 +39,7 @@ export const Notifications: React.FC<Props> = (props) => {
|
|
|
39
39
|
let path = "";
|
|
40
40
|
switch (notification.contentType) {
|
|
41
41
|
case "task": app = "chums"; path = "/tasks/" + notification.contentId; break;
|
|
42
|
-
case "assignment": app = "b1"; path = "/
|
|
42
|
+
case "assignment": app = "b1"; path = "/my/plans/" + notification.contentId; break;
|
|
43
43
|
}
|
|
44
44
|
|
|
45
45
|
const appUrl = getAppUrl(app);
|
|
@@ -48,7 +48,7 @@ export const Notifications: React.FC<Props> = (props) => {
|
|
|
48
48
|
}
|
|
49
49
|
else {
|
|
50
50
|
console.log("REDIRECTING TO", appUrl + path)
|
|
51
|
-
window.
|
|
51
|
+
window.open(appUrl + path, "_blank");
|
|
52
52
|
}
|
|
53
53
|
}
|
|
54
54
|
|
|
@@ -64,7 +64,11 @@ export const Notifications: React.FC<Props> = (props) => {
|
|
|
64
64
|
<Stack direction="row" justifyContent="space-between">
|
|
65
65
|
<div style={{width:"100%"}} onClick={(e) => { e.preventDefault(); handleClick(notification); }}>
|
|
66
66
|
<span className="text-grey" style={{float:"right"}}>{displayDuration}</span>
|
|
67
|
-
<p
|
|
67
|
+
<p>
|
|
68
|
+
<Icon>notifications</Icon>
|
|
69
|
+
{notification.message}
|
|
70
|
+
<span>{notification?.link ? <a href={notification.link} onClick={(e) => { e.stopPropagation() }} target="_blank">View Details</a> : null}</span>
|
|
71
|
+
</p>
|
|
68
72
|
</div>
|
|
69
73
|
</Stack>
|
|
70
74
|
</Box>
|
|
@@ -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) {
|
package/src/helpers/Locale.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import i18n from "i18next";
|
|
2
|
-
import { initReactI18next } from "react-i18next";
|
|
2
|
+
import { initReactI18next } from "react-i18next/initReactI18next";
|
|
3
3
|
import LanguageDetector from "i18next-browser-languagedetector";
|
|
4
4
|
import Backend from "i18next-chained-backend";
|
|
5
5
|
import HttpBackend from "i18next-http-backend";
|