@churchapps/apphelper 0.2.20 → 0.2.22
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/NotificationMenu.d.ts +1 -0
- package/dist/components/wrapper/NotificationMenu.d.ts.map +1 -1
- package/dist/components/wrapper/NotificationMenu.js +1 -1
- package/dist/components/wrapper/NotificationMenu.js.map +1 -1
- package/dist/components/wrapper/Notifications.d.ts +2 -0
- package/dist/components/wrapper/Notifications.d.ts.map +1 -1
- package/dist/components/wrapper/Notifications.js +40 -2
- package/dist/components/wrapper/Notifications.js.map +1 -1
- package/dist/components/wrapper/SiteWrapper.js +1 -1
- package/dist/components/wrapper/SiteWrapper.js.map +1 -1
- package/package.json +2 -2
- package/src/components/wrapper/NotificationMenu.tsx +3 -2
- package/src/components/wrapper/Notifications.tsx +36 -4
- package/src/components/wrapper/SiteWrapper.tsx +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NotificationMenu.d.ts","sourceRoot":"","sources":["../../../src/components/wrapper/NotificationMenu.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAM3D,UAAU,KAAK;IACb,MAAM,EAAE;QAAE,iBAAiB,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IACvD,OAAO,EAAE,oBAAoB,CAAC;IAC9B,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,QAAQ,EAAE,MAAM,IAAI,CAAC;CACtB;AAED,eAAO,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CA6E5C,CAAC"}
|
|
1
|
+
{"version":3,"file":"NotificationMenu.d.ts","sourceRoot":"","sources":["../../../src/components/wrapper/NotificationMenu.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAM3D,UAAU,KAAK;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE;QAAE,iBAAiB,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IACvD,OAAO,EAAE,oBAAoB,CAAC;IAC9B,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,QAAQ,EAAE,MAAM,IAAI,CAAC;CACtB;AAED,eAAO,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CA6E5C,CAAC"}
|
|
@@ -68,7 +68,7 @@ const NotificationMenu = (props) => {
|
|
|
68
68
|
react_1.default.createElement(material_1.Tab, { label: "Messages", icon: (props.counts.pmCount > 0) ? react_1.default.createElement(material_1.Icon, { style: { color: "#FF0000" } }, "notifications") : react_1.default.createElement(react_1.default.Fragment, null), iconPosition: "end" }),
|
|
69
69
|
react_1.default.createElement(material_1.Tab, { label: "Notifications", icon: (props.counts.notificationCount > 0) ? react_1.default.createElement(material_1.Icon, { style: { color: "#FF0000" } }, "notifications") : react_1.default.createElement(react_1.default.Fragment, null), iconPosition: "end" })),
|
|
70
70
|
tabIndex === 0 && react_1.default.createElement(PrivateMessages_1.PrivateMessages, { context: props.context, refreshKey: refreshKey, onUpdate: props.onUpdate }),
|
|
71
|
-
tabIndex === 1 && react_1.default.createElement(Notifications_1.Notifications, { context: props.context, onUpdate: props.onUpdate })))));
|
|
71
|
+
tabIndex === 1 && react_1.default.createElement(Notifications_1.Notifications, { context: props.context, appName: props.appName, onUpdate: props.onUpdate, router: props.router })))));
|
|
72
72
|
};
|
|
73
73
|
exports.NotificationMenu = NotificationMenu;
|
|
74
74
|
//# sourceMappingURL=NotificationMenu.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NotificationMenu.js","sourceRoot":"","sources":["../../../src/components/wrapper/NotificationMenu.tsx"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,4CAAmE;AAEnE,uDAAoD;AAEpD,mDAAgD;AAChD,oCAAkC;
|
|
1
|
+
{"version":3,"file":"NotificationMenu.js","sourceRoot":"","sources":["../../../src/components/wrapper/NotificationMenu.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Notifications.d.ts","sourceRoot":"","sources":["../../../src/components/wrapper/Notifications.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAGxC,OAAO,EAAyB,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"Notifications.d.ts","sourceRoot":"","sources":["../../../src/components/wrapper/Notifications.tsx"],"names":[],"mappings":"AAAA,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,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,QAAQ,EAAE,MAAM,IAAI,CAAC;CACtB;AAED,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAsEzC,CAAC"}
|
|
@@ -37,7 +37,9 @@ const react_1 = __importStar(require("react"));
|
|
|
37
37
|
const ApiHelper_1 = require("../../helpers/ApiHelper");
|
|
38
38
|
const material_1 = require("@mui/material");
|
|
39
39
|
const helpers_1 = require("../../helpers");
|
|
40
|
+
const react_router_dom_1 = require("react-router-dom");
|
|
40
41
|
const Notifications = (props) => {
|
|
42
|
+
const [redirectUrl, setRedirectUrl] = react_1.default.useState("");
|
|
41
43
|
const [notifications, setNotifications] = (0, react_1.useState)([]);
|
|
42
44
|
const loadData = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
43
45
|
const n = yield ApiHelper_1.ApiHelper.get("/notifications/my", "MessagingApi");
|
|
@@ -45,6 +47,39 @@ const Notifications = (props) => {
|
|
|
45
47
|
props.onUpdate();
|
|
46
48
|
});
|
|
47
49
|
react_1.default.useEffect(() => { loadData(); }, []); //eslint-disable-line
|
|
50
|
+
const getAppUrl = (appName) => {
|
|
51
|
+
switch (appName) {
|
|
52
|
+
case props.appName.toLowerCase(): return "";
|
|
53
|
+
case "chums": return "https://app.chums.org";
|
|
54
|
+
case "b1": return "https://" + props.context.userChurch.church.subDomain + ".b1.church";
|
|
55
|
+
default: return "";
|
|
56
|
+
}
|
|
57
|
+
};
|
|
58
|
+
const handleClick = (notification) => {
|
|
59
|
+
let app = "";
|
|
60
|
+
let path = "";
|
|
61
|
+
switch (notification.contentType) {
|
|
62
|
+
case "task":
|
|
63
|
+
app = "chums";
|
|
64
|
+
path = "/tasks/" + notification.contentId;
|
|
65
|
+
break;
|
|
66
|
+
case "assignment":
|
|
67
|
+
app = "b1";
|
|
68
|
+
path = "/member/plans/" + notification.contentId;
|
|
69
|
+
break;
|
|
70
|
+
}
|
|
71
|
+
const appUrl = getAppUrl(app);
|
|
72
|
+
if (appUrl === "") {
|
|
73
|
+
if (props.router)
|
|
74
|
+
props.router.push(path);
|
|
75
|
+
else
|
|
76
|
+
setRedirectUrl(path);
|
|
77
|
+
}
|
|
78
|
+
else {
|
|
79
|
+
console.log("REDIRECTING TO", appUrl + path);
|
|
80
|
+
window.location.assign(appUrl + path);
|
|
81
|
+
}
|
|
82
|
+
};
|
|
48
83
|
const getMainLinks = () => {
|
|
49
84
|
let result = [];
|
|
50
85
|
notifications.forEach(notification => {
|
|
@@ -53,7 +88,7 @@ const Notifications = (props) => {
|
|
|
53
88
|
result.push(react_1.default.createElement("div", { className: "note", style: { cursor: "pointer" }, onClick: (e) => { e.preventDefault(); } },
|
|
54
89
|
react_1.default.createElement(material_1.Box, { sx: { width: "100%" }, className: "note-contents" },
|
|
55
90
|
react_1.default.createElement(material_1.Stack, { direction: "row", justifyContent: "space-between" },
|
|
56
|
-
react_1.default.createElement("div", { style: { width: "100%" } },
|
|
91
|
+
react_1.default.createElement("div", { style: { width: "100%" }, onClick: (e) => { e.preventDefault(); handleClick(notification); } },
|
|
57
92
|
react_1.default.createElement("span", { className: "text-grey", style: { float: "right" } }, displayDuration),
|
|
58
93
|
react_1.default.createElement("p", null,
|
|
59
94
|
react_1.default.createElement(material_1.Icon, null, "notifications"),
|
|
@@ -63,7 +98,10 @@ const Notifications = (props) => {
|
|
|
63
98
|
return result;
|
|
64
99
|
};
|
|
65
100
|
react_1.default.useEffect(() => { console.log("RELOADED NOTIFICATIONS"); }, []);
|
|
66
|
-
|
|
101
|
+
if (redirectUrl)
|
|
102
|
+
return react_1.default.createElement(react_router_dom_1.Navigate, { to: redirectUrl });
|
|
103
|
+
else
|
|
104
|
+
return (react_1.default.createElement(react_1.default.Fragment, null, getMainLinks()));
|
|
67
105
|
};
|
|
68
106
|
exports.Notifications = Notifications;
|
|
69
107
|
//# sourceMappingURL=Notifications.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Notifications.js","sourceRoot":"","sources":["../../../src/components/wrapper/Notifications.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAwC;AACxC,uDAAoD;AACpD,4CAAiD;AAEjD,
|
|
1
|
+
{"version":3,"file":"Notifications.js","sourceRoot":"","sources":["../../../src/components/wrapper/Notifications.tsx"],"names":[],"mappings":"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"}
|
|
@@ -74,7 +74,7 @@ const SiteWrapper = props => {
|
|
|
74
74
|
react_1.default.createElement(material_1.Icon, null, "menu")),
|
|
75
75
|
react_1.default.createElement(material_1.Typography, { variant: "h6", noWrap: true }, ((_b = (_a = helpers_1.UserHelper.currentUserChurch) === null || _a === void 0 ? void 0 : _a.church) === null || _b === void 0 ? void 0 : _b.name) || ""),
|
|
76
76
|
react_1.default.createElement("div", { style: { flex: 1 } }),
|
|
77
|
-
helpers_1.UserHelper.user && react_1.default.createElement(NotificationMenu_1.NotificationMenu, { onUpdate: loadCounts, counts: notificationCounts, context: props.context, router: props.router }),
|
|
77
|
+
helpers_1.UserHelper.user && react_1.default.createElement(NotificationMenu_1.NotificationMenu, { appName: props.appName, onUpdate: loadCounts, counts: notificationCounts, context: props.context, router: props.router }),
|
|
78
78
|
helpers_1.UserHelper.user && react_1.default.createElement(UserMenu_1.UserMenu, { profilePicture: helpers_1.PersonHelper.getPhotoUrl((_c = props.context) === null || _c === void 0 ? void 0 : _c.person), userName: `${(_d = helpers_1.UserHelper.user) === null || _d === void 0 ? void 0 : _d.firstName} ${(_e = helpers_1.UserHelper.user) === null || _e === void 0 ? void 0 : _e.lastName}`, userChurches: helpers_1.UserHelper.userChurches, currentUserChurch: helpers_1.UserHelper.currentUserChurch, context: props.context, appName: props.appName, router: props.router }),
|
|
79
79
|
!helpers_1.UserHelper.user && react_1.default.createElement(material_1.Link, { href: "/login", color: "inherit", style: { textDecoration: "none" } }, "Login"))),
|
|
80
80
|
react_1.default.createElement(CustomDrawer, { variant: "permanent", open: open },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SiteWrapper.js","sourceRoot":"","sources":["../../../src/components/wrapper/SiteWrapper.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"SiteWrapper.js","sourceRoot":"","sources":["../../../src/components/wrapper/SiteWrapper.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@churchapps/apphelper",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.22",
|
|
4
4
|
"description": "Library of helper functions for React and NextJS ChurchApps",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -34,7 +34,7 @@
|
|
|
34
34
|
"react-router-dom": "^6.15.0"
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
|
-
"@churchapps/helpers": "^1.0.
|
|
37
|
+
"@churchapps/helpers": "^1.0.19",
|
|
38
38
|
"@emotion/cache": "^11.11.0",
|
|
39
39
|
"@emotion/react": "^11.11.1",
|
|
40
40
|
"@emotion/styled": "^11.11.0",
|
|
@@ -7,6 +7,7 @@ import { Notifications } from "./Notifications";
|
|
|
7
7
|
import { Badge } from "@mui/base";
|
|
8
8
|
|
|
9
9
|
interface Props {
|
|
10
|
+
appName: string;
|
|
10
11
|
counts: { notificationCount: number, pmCount: number };
|
|
11
12
|
context: UserContextInterface;
|
|
12
13
|
router?: any;
|
|
@@ -82,10 +83,10 @@ export const NotificationMenu: React.FC<Props> = (props) => {
|
|
|
82
83
|
<Box sx={{ borderBottom: 1, borderColor: "divider" }}>
|
|
83
84
|
<Tabs variant="fullWidth" value={tabIndex} onChange={handleChange}>
|
|
84
85
|
<Tab label="Messages" icon={(props.counts.pmCount>0) ? <Icon style={{color:"#FF0000"}}>notifications</Icon> : <></>} iconPosition="end" />
|
|
85
|
-
<Tab label="Notifications" icon={(props.counts.notificationCount>0) ? <Icon style={{color:"#FF0000"}}>notifications</Icon> : <></>} iconPosition="end"
|
|
86
|
+
<Tab label="Notifications" icon={(props.counts.notificationCount>0) ? <Icon style={{color:"#FF0000"}}>notifications</Icon> : <></>} iconPosition="end" />
|
|
86
87
|
</Tabs>
|
|
87
88
|
{tabIndex === 0 && <PrivateMessages context={props.context} refreshKey={refreshKey} onUpdate={props.onUpdate} />}
|
|
88
|
-
{tabIndex === 1 && <Notifications context={props.context} onUpdate={props.onUpdate} />}
|
|
89
|
+
{tabIndex === 1 && <Notifications context={props.context} appName={props.appName} onUpdate={props.onUpdate} router={props.router} />}
|
|
89
90
|
</Box>
|
|
90
91
|
</Menu>
|
|
91
92
|
</>
|
|
@@ -2,15 +2,18 @@ import React, { useState } from "react";
|
|
|
2
2
|
import { ApiHelper } from "../../helpers/ApiHelper";
|
|
3
3
|
import { Box, Icon, Stack } from "@mui/material";
|
|
4
4
|
import { NotificationInterface, UserContextInterface } from "@churchapps/helpers";
|
|
5
|
-
import {
|
|
5
|
+
import { DateHelper } from "../../helpers";
|
|
6
|
+
import { Navigate } from "react-router-dom";
|
|
6
7
|
|
|
7
8
|
interface Props {
|
|
9
|
+
appName: string;
|
|
8
10
|
context: UserContextInterface;
|
|
11
|
+
router?: any;
|
|
9
12
|
onUpdate: () => void;
|
|
10
13
|
}
|
|
11
14
|
|
|
12
15
|
export const Notifications: React.FC<Props> = (props) => {
|
|
13
|
-
|
|
16
|
+
const [redirectUrl, setRedirectUrl] = React.useState("");
|
|
14
17
|
const [notifications, setNotifications] = useState<NotificationInterface[]>([]);
|
|
15
18
|
|
|
16
19
|
const loadData = async () => {
|
|
@@ -21,6 +24,34 @@ export const Notifications: React.FC<Props> = (props) => {
|
|
|
21
24
|
|
|
22
25
|
React.useEffect(() => { loadData(); }, []); //eslint-disable-line
|
|
23
26
|
|
|
27
|
+
const getAppUrl = (appName:string) => {
|
|
28
|
+
switch (appName) {
|
|
29
|
+
case props.appName.toLowerCase(): return "";
|
|
30
|
+
case "chums": return "https://app.chums.org";
|
|
31
|
+
case "b1": return "https://" + props.context.userChurch.church.subDomain + ".b1.church";
|
|
32
|
+
default: return "";
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
const handleClick = (notification:NotificationInterface) => {
|
|
37
|
+
let app = "";
|
|
38
|
+
let path = "";
|
|
39
|
+
switch (notification.contentType) {
|
|
40
|
+
case "task": app = "chums"; path = "/tasks/" + notification.contentId; break;
|
|
41
|
+
case "assignment": app = "b1"; path = "/member/plans/" + notification.contentId; break;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
const appUrl = getAppUrl(app);
|
|
45
|
+
if (appUrl === "") {
|
|
46
|
+
if (props.router) props.router.push(path);
|
|
47
|
+
else setRedirectUrl(path);
|
|
48
|
+
}
|
|
49
|
+
else {
|
|
50
|
+
console.log("REDIRECTING TO", appUrl + path)
|
|
51
|
+
window.location.assign(appUrl + path);
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
|
|
24
55
|
const getMainLinks = () => {
|
|
25
56
|
let result: JSX.Element[] = [];
|
|
26
57
|
notifications.forEach(notification => {
|
|
@@ -31,7 +62,7 @@ export const Notifications: React.FC<Props> = (props) => {
|
|
|
31
62
|
<div className="note" style={{ cursor: "pointer" }} onClick={(e) => { e.preventDefault(); }}>
|
|
32
63
|
<Box sx={{ width: "100%" }} className="note-contents">
|
|
33
64
|
<Stack direction="row" justifyContent="space-between">
|
|
34
|
-
<div style={{width:"100%"}}>
|
|
65
|
+
<div style={{width:"100%"}} onClick={(e) => { e.preventDefault(); handleClick(notification); }}>
|
|
35
66
|
<span className="text-grey" style={{float:"right"}}>{displayDuration}</span>
|
|
36
67
|
<p><Icon>notifications</Icon> {notification.message}</p>
|
|
37
68
|
</div>
|
|
@@ -45,7 +76,8 @@ export const Notifications: React.FC<Props> = (props) => {
|
|
|
45
76
|
|
|
46
77
|
React.useEffect(() => { console.log("RELOADED NOTIFICATIONS") }, []);
|
|
47
78
|
|
|
48
|
-
return
|
|
79
|
+
if (redirectUrl) return <Navigate to={redirectUrl} />
|
|
80
|
+
else return (
|
|
49
81
|
<>
|
|
50
82
|
{getMainLinks()}
|
|
51
83
|
</>
|
|
@@ -78,7 +78,7 @@ export const SiteWrapper: React.FC<Props> = props => {
|
|
|
78
78
|
</IconButton>
|
|
79
79
|
<Typography variant="h6" noWrap>{UserHelper.currentUserChurch?.church?.name || ""}</Typography>
|
|
80
80
|
<div style={{ flex: 1 }}></div>
|
|
81
|
-
{UserHelper.user && <NotificationMenu onUpdate={loadCounts} counts={notificationCounts} context={props.context} router={props.router} />}
|
|
81
|
+
{UserHelper.user && <NotificationMenu appName={props.appName} onUpdate={loadCounts} counts={notificationCounts} context={props.context} router={props.router} />}
|
|
82
82
|
{UserHelper.user && <UserMenu profilePicture={PersonHelper.getPhotoUrl(props.context?.person)} userName={`${UserHelper.user?.firstName} ${UserHelper.user?.lastName}`} userChurches={UserHelper.userChurches} currentUserChurch={UserHelper.currentUserChurch} context={props.context} appName={props.appName} router={props.router} />}
|
|
83
83
|
{!UserHelper.user && <Link href="/login" color="inherit" style={{ textDecoration: "none" }}>Login</Link>}
|
|
84
84
|
</Toolbar>
|