@churchapps/apphelper 0.3.11 → 0.3.13
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/notes/AddNote.d.ts.map +1 -1
- package/dist/components/notes/AddNote.js +4 -0
- package/dist/components/notes/AddNote.js.map +1 -1
- package/dist/components/notes/Conversation.js +1 -1
- package/dist/components/notes/Conversation.js.map +1 -1
- package/dist/components/notes/Note.d.ts +2 -1
- package/dist/components/notes/Note.d.ts.map +1 -1
- package/dist/components/notes/Note.js +2 -2
- package/dist/components/notes/Note.js.map +1 -1
- package/dist/components/notes/Notes.js +1 -1
- package/dist/components/notes/Notes.js.map +1 -1
- package/dist/components/wrapper/UserMenu.d.ts.map +1 -1
- package/dist/components/wrapper/UserMenu.js +1 -4
- package/dist/components/wrapper/UserMenu.js.map +1 -1
- package/dist/pageComponents/components/LoginSetPassword.d.ts.map +1 -1
- package/dist/pageComponents/components/LoginSetPassword.js +29 -7
- package/dist/pageComponents/components/LoginSetPassword.js.map +1 -1
- package/dist/public/locales/en.json +2 -0
- package/package.json +1 -1
- package/public/locales/en.json +2 -0
- package/src/components/notes/AddNote.tsx +3 -0
- package/src/components/notes/Conversation.tsx +1 -1
- package/src/components/notes/Note.tsx +8 -5
- package/src/components/notes/Notes.tsx +1 -1
- package/src/components/wrapper/UserMenu.tsx +0 -4
- package/src/pageComponents/components/LoginSetPassword.tsx +39 -11
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AddNote.d.ts","sourceRoot":"","sources":["../../../src/components/notes/AddNote.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAoB,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAK5E,KAAK,KAAK,GAAG;IACX,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,kBAAkB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,oBAAoB,CAAA;CAC9B,CAAC;AAEF,wBAAgB,OAAO,CAAC,EAAE,OAAO,EAAE,GAAG,KAAK,EAAE,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"AddNote.d.ts","sourceRoot":"","sources":["../../../src/components/notes/AddNote.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAoB,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAK5E,KAAK,KAAK,GAAG;IACX,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,kBAAkB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,oBAAoB,CAAA;CAC9B,CAAC;AAEF,wBAAgB,OAAO,CAAC,EAAE,OAAO,EAAE,GAAG,KAAK,EAAE,EAAE,KAAK,2CA6EnD"}
|
|
@@ -95,6 +95,10 @@ function AddNote(_a) {
|
|
|
95
95
|
const m = Object.assign({}, message);
|
|
96
96
|
m.content = "";
|
|
97
97
|
setMessage(m);
|
|
98
|
+
})
|
|
99
|
+
.catch((error) => {
|
|
100
|
+
if ((error === null || error === void 0 ? void 0 : error.message) === "Forbidden")
|
|
101
|
+
setErrors(["You can't edit the message sent by others."]);
|
|
98
102
|
})
|
|
99
103
|
.finally(() => { setIsSubmitting(false); });
|
|
100
104
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AddNote.js","sourceRoot":"","sources":["../../../src/components/notes/AddNote.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"AddNote.js","sourceRoot":"","sources":["../../../src/components/notes/AddNote.tsx"],"names":[],"mappings":"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"}
|
|
@@ -51,7 +51,7 @@ function Conversation(props) {
|
|
|
51
51
|
const getNotes = () => {
|
|
52
52
|
let noteArray = [];
|
|
53
53
|
for (let i = 1; i < conversation.messages.length; i++)
|
|
54
|
-
noteArray.push((0, jsx_runtime_1.jsx)(Note_1.Note, { message: conversation.messages[i], showEditNote: setEditMessageId }, conversation.messages[i].id));
|
|
54
|
+
noteArray.push((0, jsx_runtime_1.jsx)(Note_1.Note, { context: props.context, message: conversation.messages[i], showEditNote: setEditMessageId }, conversation.messages[i].id));
|
|
55
55
|
return noteArray;
|
|
56
56
|
};
|
|
57
57
|
let result = ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsxs)("div", { className: "conversation", children: [(0, jsx_runtime_1.jsx)("div", { className: "postedBy", children: (0, jsx_runtime_1.jsx)("img", { src: photoUrl, alt: "avatar" }) }), (0, jsx_runtime_1.jsx)(material_1.Box, { sx: { width: "100%" }, className: "conversationContents", children: (0, jsx_runtime_1.jsx)(material_1.Stack, { direction: "row", justifyContent: "space-between", children: (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)("b", { children: (_c = (_b = message.person) === null || _b === void 0 ? void 0 : _b.name) === null || _c === void 0 ? void 0 : _c.display }), " \u00B7 ", (0, jsx_runtime_1.jsxs)("span", { className: "text-grey", children: [displayDuration, isEdited] }), contents.map((c, i) => c ? (0, jsx_runtime_1.jsx)("p", { children: c }, i) : (0, jsx_runtime_1.jsx)("br", {}))] }) }) })] }), props.showCommentCount && ((0, jsx_runtime_1.jsxs)("div", { className: "commentCount", children: [(0, jsx_runtime_1.jsx)("div", { children: (conversation.postCount === 1) ? "1 " + helpers_1.Locale.label("notes.comment") : conversation.postCount + " " + helpers_1.Locale.label("notes.comments") }), (conversation.postCount > conversation.messages.length) ? (0, jsx_runtime_1.jsxs)("a", { href: "about:blank", onClick: (e) => { e.preventDefault(); loadNotes(); }, children: [helpers_1.Locale.label("notes.viewAll"), " ", conversation.postCount, " ", helpers_1.Locale.label("notes.comments")] }) : (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: "\u00A0" })] })), (0, jsx_runtime_1.jsxs)("div", { className: "messages", children: [getNotes(), (0, jsx_runtime_1.jsx)(AddNote_1.AddNote, { context: props.context, conversationId: props.conversation.id, onUpdate: loadNotes, createConversation: () => __awaiter(this, void 0, void 0, function* () { return (props.conversation.id); }), messageId: editMessageId })] })] }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Conversation.js","sourceRoot":"","sources":["../../../src/components/notes/Conversation.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;;;;;;AAEb,4CAAkD;AAClD,kDAA0B;AAC1B,2CAAyF;AAEzF,uCAAoC;AACpC,iCAA8B;AAS9B,SAAgB,YAAY,CAAC,KAAY;;IACvC,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAwB,IAAI,CAAC,CAAA;IACnF,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;IAE9D,MAAM,SAAS,GAAG,GAAS,EAAE;QAC3B,MAAM,QAAQ,GAAuB,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,mBAAS,CAAC,GAAG,CAAC,yBAAyB,GAAG,YAAY,CAAC,EAAE,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/I,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,MAAM,SAAS,GAAG,qBAAW,CAAC,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;YAC3D,MAAM,MAAM,GAAG,MAAM,mBAAS,CAAC,GAAG,CAAC,kBAAkB,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,eAAe,CAAC,CAAC;YAC9F,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBACnB,CAAC,CAAC,MAAM,GAAG,qBAAW,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC;YAC1D,CAAC,CAAC,CAAA;SACH;QACD,MAAM,CAAC,qBAAQ,YAAY,CAAE,CAAA;QAC7B,CAAC,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACtB,eAAe,CAAC,CAAC,CAAC,CAAC;QACnB,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC,CAAA,CAAC;IAEF,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,eAAe,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,qBAAqB;IAE3G,IAAI,YAAY,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;SAClC;QACH,MAAM,OAAO,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACzC,MAAM,QAAQ,GAAG,sBAAY,CAAC,WAAW,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,CAAC,CAAC;QAC3D,IAAI,UAAU,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;QACnE,MAAM,eAAe,GAAG,oBAAU,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;QAElE,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,WAAW,KAAK,OAAO,CAAC,QAAQ,IAAI,wEAAa,CAAC;QAClG,MAAM,QAAQ,GAAG,MAAA,OAAO,CAAC,OAAO,0CAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QAE9C,MAAM,QAAQ,GAAG,GAAG,EAAE;YACpB,IAAI,SAAS,GAAsB,EAAE,CAAC;YACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE;gBAAE,SAAS,CAAC,IAAI,CAAC,uBAAC,WAAI,IAAC,OAAO,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAoC,YAAY,EAAE,gBAAgB,IAA3D,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAoC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"Conversation.js","sourceRoot":"","sources":["../../../src/components/notes/Conversation.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import React from "react";
|
|
2
|
-
import { MessageInterface } from "@churchapps/helpers";
|
|
2
|
+
import { MessageInterface, UserContextInterface } from "@churchapps/helpers";
|
|
3
3
|
interface Props {
|
|
4
4
|
message: MessageInterface;
|
|
5
5
|
showEditNote: (noteId?: string) => void;
|
|
6
|
+
context: UserContextInterface;
|
|
6
7
|
}
|
|
7
8
|
export declare const Note: React.FC<Props>;
|
|
8
9
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Note.d.ts","sourceRoot":"","sources":["../../../src/components/notes/Note.tsx"],"names":[],"mappings":"AACA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAEnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"Note.d.ts","sourceRoot":"","sources":["../../../src/components/notes/Note.tsx"],"names":[],"mappings":"AACA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAEnD,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAE5E,UAAU,KAAK;IACb,OAAO,EAAE,gBAAgB,CAAC;IAC1B,YAAY,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,OAAO,EAAE,oBAAoB,CAAC;CAC/B;AAED,eAAO,MAAM,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAmChC,CAAC"}
|
|
@@ -6,7 +6,7 @@ const material_1 = require("@mui/material");
|
|
|
6
6
|
const react_1 = require("react");
|
|
7
7
|
const helpers_1 = require("../../helpers");
|
|
8
8
|
const Note = (props) => {
|
|
9
|
-
var _a, _b, _c;
|
|
9
|
+
var _a, _b, _c, _d;
|
|
10
10
|
const [message, setMessage] = (0, react_1.useState)(null);
|
|
11
11
|
(0, react_1.useEffect)(() => setMessage(props.message), [props.message]);
|
|
12
12
|
if (message === null)
|
|
@@ -16,7 +16,7 @@ const Note = (props) => {
|
|
|
16
16
|
const displayDuration = helpers_1.DateHelper.getDisplayDuration(datePosted);
|
|
17
17
|
const isEdited = message.timeUpdated && message.timeUpdated !== message.timeSent && (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: "(edited)" });
|
|
18
18
|
const contents = (_a = message.content) === null || _a === void 0 ? void 0 : _a.split("\n");
|
|
19
|
-
return ((0, jsx_runtime_1.jsxs)("div", { className: "note", children: [(0, jsx_runtime_1.jsx)("div", { className: "postedBy", children: (0, jsx_runtime_1.jsx)("img", { src: photoUrl, alt: "avatar" }) }), (0, jsx_runtime_1.jsx)(material_1.Box, { sx: { width: "100%" }, className: "note-contents", children: (0, jsx_runtime_1.jsxs)(material_1.Stack, { direction: "row", justifyContent: "space-between", children: [(0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)("b", { children: (_c = (_b = message.person) === null || _b === void 0 ? void 0 : _b.name) === null || _c === void 0 ? void 0 : _c.display }), " \u00B7 ", (0, jsx_runtime_1.jsxs)("span", { className: "text-grey", children: [displayDuration, isEdited] }), contents.map((c, i) => c ? (0, jsx_runtime_1.jsx)("p", { children: c }, i) : (0, jsx_runtime_1.jsx)("br", {}))] }), (0, jsx_runtime_1.jsx)("div", { children: (0, jsx_runtime_1.jsx)(material_1.IconButton, { "aria-label": "editNote", onClick: () => props.showEditNote(message.id), children: (0, jsx_runtime_1.jsx)(material_1.Icon, { style: { color: "#03a9f4" }, children: "edit" }) }) })] }) })] }));
|
|
19
|
+
return ((0, jsx_runtime_1.jsxs)("div", { className: "note", children: [(0, jsx_runtime_1.jsx)("div", { className: "postedBy", children: (0, jsx_runtime_1.jsx)("img", { src: photoUrl, alt: "avatar" }) }), (0, jsx_runtime_1.jsx)(material_1.Box, { sx: { width: "100%" }, className: "note-contents", children: (0, jsx_runtime_1.jsxs)(material_1.Stack, { direction: "row", justifyContent: "space-between", children: [(0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)("b", { children: (_c = (_b = message.person) === null || _b === void 0 ? void 0 : _b.name) === null || _c === void 0 ? void 0 : _c.display }), " \u00B7 ", (0, jsx_runtime_1.jsxs)("span", { className: "text-grey", children: [displayDuration, isEdited] }), contents.map((c, i) => c ? (0, jsx_runtime_1.jsx)("p", { children: c }, i) : (0, jsx_runtime_1.jsx)("br", {}))] }), (0, jsx_runtime_1.jsx)("div", { children: ((message === null || message === void 0 ? void 0 : message.id) && message.personId === ((_d = props.context) === null || _d === void 0 ? void 0 : _d.person.id)) && ((0, jsx_runtime_1.jsx)(material_1.IconButton, { "aria-label": "editNote", onClick: () => props.showEditNote(message.id), children: (0, jsx_runtime_1.jsx)(material_1.Icon, { style: { color: "#03a9f4" }, children: "edit" }) })) })] }) })] }));
|
|
20
20
|
};
|
|
21
21
|
exports.Note = Note;
|
|
22
22
|
//# sourceMappingURL=Note.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Note.js","sourceRoot":"","sources":["../../../src/components/notes/Note.tsx"],"names":[],"mappings":";;;;AAAA,4CAA6D;AAC7D,iCAAmD;AACnD,2CAAwD;
|
|
1
|
+
{"version":3,"file":"Note.js","sourceRoot":"","sources":["../../../src/components/notes/Note.tsx"],"names":[],"mappings":";;;;AAAA,4CAA6D;AAC7D,iCAAmD;AACnD,2CAAwD;AASjD,MAAM,IAAI,GAAoB,CAAC,KAAK,EAAE,EAAE;;IAC7C,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,IAAA,gBAAQ,EAAmB,IAAI,CAAC,CAAC;IAE/D,IAAA,iBAAS,EAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IAE5D,IAAI,OAAO,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IAClC,MAAM,QAAQ,GAAG,sBAAY,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1D,IAAI,UAAU,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;IACnE,MAAM,eAAe,GAAG,oBAAU,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;IAElE,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,WAAW,KAAK,OAAO,CAAC,QAAQ,IAAI,wEAAa,CAAC;IAClG,MAAM,QAAQ,GAAG,MAAA,OAAO,CAAC,OAAO,0CAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAC9C,OAAO,CACL,iCAAK,SAAS,EAAC,MAAM,aACnB,gCAAK,SAAS,EAAC,UAAU,YACvB,gCAAK,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAC,QAAQ,GAAG,GAC/B,EACN,uBAAC,cAAG,IAAC,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,SAAS,EAAC,eAAe,YACnD,wBAAC,gBAAK,IAAC,SAAS,EAAC,KAAK,EAAC,cAAc,EAAC,eAAe,aACnD,4CACE,wCAAI,MAAA,MAAA,OAAO,CAAC,MAAM,0CAAE,IAAI,0CAAE,OAAO,GAAK,cAAG,kCAAM,SAAS,EAAC,WAAW,aAAE,eAAe,EAAE,QAAQ,IAAQ,EACtG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,wCAAY,CAAC,IAAL,CAAC,CAAS,CAAC,CAAC,CAAC,gCAAM,CAAC,IACpD,EACN,0CACG,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,EAAE,KAAI,OAAO,CAAC,QAAQ,MAAK,MAAA,KAAK,CAAC,OAAO,0CAAE,MAAM,CAAC,EAAE,CAAA,CAAC,IAAI,CACjE,uBAAC,qBAAU,kBAAY,UAAU,EAAC,OAAO,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC,YAC7E,uBAAC,eAAI,IAAC,KAAK,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,qBAAa,GACnC,CACd,GACG,IACA,GAEJ,IACF,CACP,CAAC;AACJ,CAAC,CAAC;AAnCW,QAAA,IAAI,QAmCf"}
|
|
@@ -42,7 +42,7 @@ function Notes(props) {
|
|
|
42
42
|
else {
|
|
43
43
|
let noteArray = [];
|
|
44
44
|
for (let i = 0; i < messages.length; i++)
|
|
45
|
-
noteArray.push((0, jsx_runtime_1.jsx)(Note_1.Note, { message: messages[i], showEditNote: setEditMessageId }, messages[i].id));
|
|
45
|
+
noteArray.push((0, jsx_runtime_1.jsx)(Note_1.Note, { message: messages[i], showEditNote: setEditMessageId, context: props.context }, messages[i].id));
|
|
46
46
|
return noteArray;
|
|
47
47
|
}
|
|
48
48
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Notes.js","sourceRoot":"","sources":["../../../src/components/notes/Notes.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,kDAA0B;AAC1B,iCAA8B;AAC9B,uCAAoC;AACpC,2BAA0C;AAC1C,2CAA+D;AAa/D,SAAgB,KAAK,CAAC,KAAY;IAEhC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAqB,IAAI,CAAC,CAAA;IACxE,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;IAE9D,MAAM,SAAS,GAAG,GAAS,EAAE;QAC3B,MAAM,QAAQ,GAAuB,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,MAAM,mBAAS,CAAC,GAAG,CAAC,yBAAyB,GAAG,KAAK,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACzJ,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,MAAM,SAAS,GAAG,qBAAW,CAAC,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;YAC3D,MAAM,MAAM,GAAG,MAAM,mBAAS,CAAC,GAAG,CAAC,oBAAoB,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,eAAe,CAAC,CAAC;YAChG,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBACnB,CAAC,CAAC,MAAM,GAAG,qBAAW,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC;YAC1D,CAAC,CAAC,CAAA;SACH;QACD,WAAW,CAAC,QAAQ,CAAC,CAAC;QACtB,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC,CAAA,CAAC;IAEF,MAAM,QAAQ,GAAG,GAAG,EAAE;QACpB,IAAI,CAAC,QAAQ;YAAE,OAAO,uBAAC,WAAO,KAAG,CAAA;QACjC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,kDAAK,CAAA;aAClC;YACH,IAAI,SAAS,GAAsB,EAAE,CAAC;YACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE;gBAAE,SAAS,CAAC,IAAI,CAAC,uBAAC,WAAI,IAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAuB,YAAY,EAAE,gBAAgB,
|
|
1
|
+
{"version":3,"file":"Notes.js","sourceRoot":"","sources":["../../../src/components/notes/Notes.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserMenu.d.ts","sourceRoot":"","sources":["../../../src/components/wrapper/UserMenu.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAC;AAK1B,OAAO,EAAE,wBAAwB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"UserMenu.d.ts","sourceRoot":"","sources":["../../../src/components/wrapper/UserMenu.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAC;AAK1B,OAAO,EAAE,wBAAwB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AASrF,UAAU,KAAK;IACd,kBAAkB,EAAE;QAAE,iBAAiB,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IACnE,UAAU,EAAE,MAAM,IAAI,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,wBAAwB,EAAE,CAAC;IACzC,iBAAiB,EAAE,wBAAwB,CAAC;IAC5C,OAAO,EAAE,oBAAoB,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CACnC;AAED,eAAO,MAAM,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAqHpC,CAAC"}
|
|
@@ -12,7 +12,6 @@ const UserHelper_1 = require("../../helpers/UserHelper");
|
|
|
12
12
|
const material_1 = require("@mui/material");
|
|
13
13
|
const _1 = require(".");
|
|
14
14
|
const ChurchList_1 = require("./ChurchList");
|
|
15
|
-
const SupportModal_1 = require("../SupportModal");
|
|
16
15
|
const CommonEnvironmentHelper_1 = require("../../helpers/CommonEnvironmentHelper");
|
|
17
16
|
const TabPanel_1 = require("../TabPanel");
|
|
18
17
|
const helpers_1 = require("../../helpers");
|
|
@@ -21,7 +20,6 @@ const Notifications_1 = require("./Notifications");
|
|
|
21
20
|
const UserMenu = (props) => {
|
|
22
21
|
const userName = props.userName;
|
|
23
22
|
const [anchorEl, setAnchorEl] = react_1.default.useState(null);
|
|
24
|
-
const [showSupport, setShowSupport] = react_1.default.useState(false);
|
|
25
23
|
const [showPM, setShowPM] = react_1.default.useState(false);
|
|
26
24
|
const [showNotifications, setShowNotifications] = react_1.default.useState(false);
|
|
27
25
|
const [refreshKey, setRefreshKey] = react_1.default.useState(0);
|
|
@@ -45,7 +43,6 @@ const UserMenu = (props) => {
|
|
|
45
43
|
else
|
|
46
44
|
result.push((0, jsx_runtime_1.jsx)(_1.NavItem, { url: `${CommonEnvironmentHelper_1.CommonEnvironmentHelper.ChumsRoot}/login?jwt=${jwt}&churchId=${churchId}&returnUrl=/profile`, label: helpers_1.Locale.label("wrapper.profile"), icon: "person", external: true, onNavigate: props.onNavigate }, "/profile"));
|
|
47
45
|
result.push((0, jsx_runtime_1.jsx)(_1.NavItem, { url: "/logout", label: helpers_1.Locale.label("wrapper.logout"), icon: "logout", onNavigate: props.onNavigate }, "/logout"));
|
|
48
|
-
result.push((0, jsx_runtime_1.jsx)(_1.NavItem, { label: "Support", icon: "help", onClick: () => { setShowSupport(true); } }, helpers_1.Locale.label("wrapper.support")));
|
|
49
46
|
result.push((0, jsx_runtime_1.jsx)("div", { style: { borderTop: "1px solid #CCC", paddingTop: 2, paddingBottom: 2 } }));
|
|
50
47
|
result.push((0, jsx_runtime_1.jsx)(_1.NavItem, { label: "Switch App", icon: "apps", onClick: () => { setTabIndex(1); } }, helpers_1.Locale.label("wrapper.switchApp")));
|
|
51
48
|
if (props.userChurches.length > 1)
|
|
@@ -86,7 +83,7 @@ const UserMenu = (props) => {
|
|
|
86
83
|
console.log("THE COUNTS CHANGED");
|
|
87
84
|
setRefreshKey(Math.random());
|
|
88
85
|
}, [props.notificationCounts]);
|
|
89
|
-
return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [
|
|
86
|
+
return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.Button, { onClick: handleClick, color: "inherit", "aria-controls": open ? "account-menu" : undefined, "aria-haspopup": "true", "aria-expanded": open ? "true" : undefined, style: { textTransform: "none" }, endIcon: (0, jsx_runtime_1.jsx)(material_1.Icon, { children: "expand_more" }), children: (0, jsx_runtime_1.jsx)(material_1.Badge, { badgeContent: totalNotifcations, color: "error", invisible: totalNotifcations === 0, children: (0, jsx_runtime_1.jsx)(material_1.Avatar, { src: getProfilePic(), sx: { width: 32, height: 32, marginRight: 1 } }) }) }), (0, jsx_runtime_1.jsx)(material_1.Menu, { anchorEl: anchorEl, id: "account-menu", open: open, onClose: handleClose, onClick: (e) => { handleItemClick(e); }, slotProps: { paper: paperProps }, transformOrigin: { horizontal: "right", vertical: "top" }, anchorOrigin: { horizontal: "right", vertical: "bottom" }, sx: { "& .MuiBox-root": { borderBottom: 0 } }, children: getTabs() }), getModals()] }));
|
|
90
87
|
};
|
|
91
88
|
exports.UserMenu = UserMenu;
|
|
92
89
|
//# sourceMappingURL=UserMenu.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserMenu.js","sourceRoot":"","sources":["../../../src/components/wrapper/UserMenu.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;AAEb,kDAA0B;AAC1B,uDAAoD;AACpD,yDAAsD;AACtD,4CAA8H;AAC9H,wBAAqC;AAErC,6CAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"UserMenu.js","sourceRoot":"","sources":["../../../src/components/wrapper/UserMenu.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoginSetPassword.d.ts","sourceRoot":"","sources":["../../../src/pageComponents/components/LoginSetPassword.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAMxC,UAAU,KAAK;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IACtC,aAAa,EAAE,CAAC,UAAU,EAAE,OAAO,KAAK,IAAI,CAAC;IAC7C,YAAY,EAAE,OAAO,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC;CAC5B;AAED,eAAO,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"LoginSetPassword.d.ts","sourceRoot":"","sources":["../../../src/pageComponents/components/LoginSetPassword.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAMxC,UAAU,KAAK;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IACtC,aAAa,EAAE,CAAC,UAAU,EAAE,OAAO,KAAK,IAAI,CAAC;IAC7C,YAAY,EAAE,OAAO,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC;CAC5B;AAED,eAAO,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CA+E5C,CAAA"}
|
|
@@ -44,6 +44,7 @@ const LoginSetPassword = props => {
|
|
|
44
44
|
const [verifyPassword, setVerifyPassword] = react_1.default.useState("");
|
|
45
45
|
const [user, setUser] = react_1.default.useState(null);
|
|
46
46
|
const [showPassword, setShowPassword] = (0, react_1.useState)(false);
|
|
47
|
+
const [linkExpired, setLinkExpired] = react_1.default.useState(false);
|
|
47
48
|
const validate = () => {
|
|
48
49
|
const result = [];
|
|
49
50
|
if (!password)
|
|
@@ -56,7 +57,10 @@ const LoginSetPassword = props => {
|
|
|
56
57
|
return result.length === 0;
|
|
57
58
|
};
|
|
58
59
|
const submitChangePassword = () => {
|
|
59
|
-
if (
|
|
60
|
+
if (linkExpired) {
|
|
61
|
+
window.open("/login", "_blank");
|
|
62
|
+
}
|
|
63
|
+
else if (validate()) {
|
|
60
64
|
submit();
|
|
61
65
|
}
|
|
62
66
|
};
|
|
@@ -78,12 +82,30 @@ const LoginSetPassword = props => {
|
|
|
78
82
|
else
|
|
79
83
|
props.setShowForgot(true);
|
|
80
84
|
});
|
|
81
|
-
react_1.default.useEffect(
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
85
|
+
react_1.default.useEffect(() => {
|
|
86
|
+
//Get the timestamp from the URL
|
|
87
|
+
const urlParams = new URLSearchParams(window.location.search);
|
|
88
|
+
const timestampParam = urlParams.get("timestamp");
|
|
89
|
+
if (timestampParam) {
|
|
90
|
+
const linkTimestamp = parseInt(timestampParam, 10);
|
|
91
|
+
const currentTime = Date.now();
|
|
92
|
+
//Check if the link is expired (2 min)
|
|
93
|
+
if (currentTime - linkTimestamp > 120000) {
|
|
94
|
+
setLinkExpired(true);
|
|
95
|
+
}
|
|
96
|
+
else {
|
|
97
|
+
loadUser();
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
else {
|
|
101
|
+
setLinkExpired(true); //No timestamp means link is invalid
|
|
102
|
+
}
|
|
103
|
+
}, []);
|
|
104
|
+
return ((0, jsx_runtime_1.jsx)(components_1.InputBox, { headerText: helpers_1.Locale.label("login.setPassword"), saveFunction: submitChangePassword, saveButtonType: "submit", saveText: !linkExpired ? (props.isSubmitting || !user) ? helpers_1.Locale.label("common.pleaseWait") : helpers_1.Locale.label("login.signIn") : helpers_1.Locale.label("login.requestLink"), isSubmitting: props.isSubmitting, children: linkExpired ? ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: (0, jsx_runtime_1.jsx)(material_1.Typography, { sx: { color: "#c62828 !important", paddingBottom: 3 }, children: helpers_1.Locale.label("login.expiredLink") }) })) : ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [user && (0, jsx_runtime_1.jsxs)("p", { style: { marginTop: 0, marginBottom: 0 }, children: [helpers_1.Locale.label("login.welcomeBack"), " ", user.firstName, "."] }), (0, jsx_runtime_1.jsx)(material_1.TextField, { fullWidth: true, name: "password", type: showPassword ? "text" : "password", label: helpers_1.Locale.label("login.setPassword"), value: password, onChange: (e) => { e.preventDefault(); setPassword(e.target.value); }, InputProps: {
|
|
105
|
+
endAdornment: ((0, jsx_runtime_1.jsx)(material_1.InputAdornment, { position: "end", children: (0, jsx_runtime_1.jsx)(material_1.IconButton, { "aria-label": "toggle password visibility", onClick: () => { setShowPassword(!showPassword); }, children: showPassword ? (0, jsx_runtime_1.jsx)(material_1.Icon, { children: "visibility" }) : (0, jsx_runtime_1.jsx)(material_1.Icon, { children: "visibility_off" }) }) }))
|
|
106
|
+
} }), (0, jsx_runtime_1.jsx)(material_1.TextField, { fullWidth: true, name: "verifyPassword", type: showPassword ? "text" : "password", label: helpers_1.Locale.label("login.verifyPassword"), value: verifyPassword, onChange: (e) => { e.preventDefault(); setVerifyPassword(e.target.value); }, InputProps: {
|
|
107
|
+
endAdornment: ((0, jsx_runtime_1.jsx)(material_1.InputAdornment, { position: "end", children: (0, jsx_runtime_1.jsx)(material_1.IconButton, { "aria-label": "toggle password visibility", onClick: () => { setShowPassword(!showPassword); }, children: showPassword ? (0, jsx_runtime_1.jsx)(material_1.Icon, { children: "visibility" }) : (0, jsx_runtime_1.jsx)(material_1.Icon, { children: "visibility_off" }) }) }))
|
|
108
|
+
} })] })) }));
|
|
87
109
|
};
|
|
88
110
|
exports.LoginSetPassword = LoginSetPassword;
|
|
89
111
|
//# sourceMappingURL=LoginSetPassword.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoginSetPassword.js","sourceRoot":"","sources":["../../../src/pageComponents/components/LoginSetPassword.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEb,+CAAwC;AACxC,iDAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"LoginSetPassword.js","sourceRoot":"","sources":["../../../src/pageComponents/components/LoginSetPassword.tsx"],"names":[],"mappings":"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"}
|
|
@@ -153,12 +153,14 @@
|
|
|
153
153
|
"login": {
|
|
154
154
|
"createAccount": "Create an Account",
|
|
155
155
|
"email": "Email",
|
|
156
|
+
"expiredLink": "The current link is expired.",
|
|
156
157
|
"forgot": "Forgot Password",
|
|
157
158
|
"goLogin": "Go to Login",
|
|
158
159
|
"login": "Login",
|
|
159
160
|
"password": "Password",
|
|
160
161
|
"register": "Register",
|
|
161
162
|
"registerThankYou": "Thank you for registering! Please check your email to verify your account.",
|
|
163
|
+
"requestLink": "Request a new reset link",
|
|
162
164
|
"reset": "Reset",
|
|
163
165
|
"resetInstructions": "Enter your email address to request a password reset.",
|
|
164
166
|
"resetPassword": "Reset Password",
|
package/package.json
CHANGED
package/public/locales/en.json
CHANGED
|
@@ -153,12 +153,14 @@
|
|
|
153
153
|
"login": {
|
|
154
154
|
"createAccount": "Create an Account",
|
|
155
155
|
"email": "Email",
|
|
156
|
+
"expiredLink": "The current link is expired.",
|
|
156
157
|
"forgot": "Forgot Password",
|
|
157
158
|
"goLogin": "Go to Login",
|
|
158
159
|
"login": "Login",
|
|
159
160
|
"password": "Password",
|
|
160
161
|
"register": "Register",
|
|
161
162
|
"registerThankYou": "Thank you for registering! Please check your email to verify your account.",
|
|
163
|
+
"requestLink": "Request a new reset link",
|
|
162
164
|
"reset": "Reset",
|
|
163
165
|
"resetInstructions": "Enter your email address to request a password reset.",
|
|
164
166
|
"resetPassword": "Reset Password",
|
|
@@ -58,6 +58,9 @@ export function AddNote({ context, ...props }: Props) {
|
|
|
58
58
|
m.content = "";
|
|
59
59
|
setMessage(m);
|
|
60
60
|
})
|
|
61
|
+
.catch((error) => {
|
|
62
|
+
if (error?.message === "Forbidden") setErrors(["You can't edit the message sent by others."])
|
|
63
|
+
})
|
|
61
64
|
.finally(() => { setIsSubmitting(false); });
|
|
62
65
|
}
|
|
63
66
|
};
|
|
@@ -47,7 +47,7 @@ export function Conversation(props: Props) {
|
|
|
47
47
|
|
|
48
48
|
const getNotes = () => {
|
|
49
49
|
let noteArray: React.ReactNode[] = [];
|
|
50
|
-
for (let i = 1; i < conversation.messages.length; i++) noteArray.push(<Note message={conversation.messages[i]} key={conversation.messages[i].id} showEditNote={setEditMessageId} />);
|
|
50
|
+
for (let i = 1; i < conversation.messages.length; i++) noteArray.push(<Note context={props.context} message={conversation.messages[i]} key={conversation.messages[i].id} showEditNote={setEditMessageId} />);
|
|
51
51
|
return noteArray;
|
|
52
52
|
}
|
|
53
53
|
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { Icon, IconButton, Stack, Box } from "@mui/material";
|
|
2
2
|
import React, { useState, useEffect } from "react";
|
|
3
3
|
import { DateHelper, PersonHelper } from "../../helpers"
|
|
4
|
-
import { MessageInterface } from "@churchapps/helpers"
|
|
4
|
+
import { MessageInterface, UserContextInterface } from "@churchapps/helpers"
|
|
5
5
|
|
|
6
6
|
interface Props {
|
|
7
7
|
message: MessageInterface;
|
|
8
|
-
showEditNote: (noteId?: string) => void
|
|
8
|
+
showEditNote: (noteId?: string) => void;
|
|
9
|
+
context: UserContextInterface;
|
|
9
10
|
}
|
|
10
11
|
|
|
11
12
|
export const Note: React.FC<Props> = (props) => {
|
|
@@ -32,9 +33,11 @@ export const Note: React.FC<Props> = (props) => {
|
|
|
32
33
|
{contents.map((c, i) => c ? <p key={i}>{c}</p> : <br />)}
|
|
33
34
|
</div>
|
|
34
35
|
<div>
|
|
35
|
-
|
|
36
|
-
<
|
|
37
|
-
|
|
36
|
+
{(message?.id && message.personId === props.context?.person.id) && (
|
|
37
|
+
<IconButton aria-label="editNote" onClick={() => props.showEditNote(message.id)}>
|
|
38
|
+
<Icon style={{ color: "#03a9f4" }}>edit</Icon>
|
|
39
|
+
</IconButton>
|
|
40
|
+
)}
|
|
38
41
|
</div>
|
|
39
42
|
</Stack>
|
|
40
43
|
|
|
@@ -38,7 +38,7 @@ export function Notes(props: Props) {
|
|
|
38
38
|
if (messages.length === 0) return <></>
|
|
39
39
|
else {
|
|
40
40
|
let noteArray: React.ReactNode[] = [];
|
|
41
|
-
for (let i = 0; i < messages.length; i++) noteArray.push(<Note message={messages[i]} key={messages[i].id} showEditNote={setEditMessageId} />);
|
|
41
|
+
for (let i = 0; i < messages.length; i++) noteArray.push(<Note message={messages[i]} key={messages[i].id} showEditNote={setEditMessageId} context={props.context} />);
|
|
42
42
|
return noteArray;
|
|
43
43
|
}
|
|
44
44
|
}
|
|
@@ -7,7 +7,6 @@ import { Avatar, Menu, Typography, Icon, Button, Box, Badge, Modal, Dialog, Dial
|
|
|
7
7
|
import { NavItem, AppList } from ".";
|
|
8
8
|
import { LoginUserChurchInterface, UserContextInterface } from "@churchapps/helpers";
|
|
9
9
|
import { ChurchList } from "./ChurchList";
|
|
10
|
-
import { SupportModal } from "../SupportModal";
|
|
11
10
|
import { CommonEnvironmentHelper } from "../../helpers/CommonEnvironmentHelper";
|
|
12
11
|
import { TabPanel } from "../TabPanel";
|
|
13
12
|
import { Locale } from "../../helpers";
|
|
@@ -30,7 +29,6 @@ interface Props {
|
|
|
30
29
|
export const UserMenu: React.FC<Props> = (props) => {
|
|
31
30
|
const userName = props.userName;
|
|
32
31
|
const [anchorEl, setAnchorEl] = React.useState<null | HTMLElement>(null);
|
|
33
|
-
const [showSupport, setShowSupport] = React.useState(false);
|
|
34
32
|
const [showPM, setShowPM] = React.useState(false);
|
|
35
33
|
const [showNotifications, setShowNotifications] = React.useState(false);
|
|
36
34
|
const [refreshKey, setRefreshKey] = React.useState(0);
|
|
@@ -60,7 +58,6 @@ export const UserMenu: React.FC<Props> = (props) => {
|
|
|
60
58
|
if (props.appName === "CHUMS") result.push(<NavItem url={"/profile"} key="/profile" label={Locale.label("wrapper.profile")} icon="person" onNavigate={props.onNavigate} />);
|
|
61
59
|
else result.push(<NavItem url={`${CommonEnvironmentHelper.ChumsRoot}/login?jwt=${jwt}&churchId=${churchId}&returnUrl=/profile`} key="/profile" label={Locale.label("wrapper.profile")} icon="person" external={true} onNavigate={props.onNavigate} />);
|
|
62
60
|
result.push(<NavItem url="/logout" label={Locale.label("wrapper.logout")} icon="logout" key="/logout" onNavigate={props.onNavigate} />);
|
|
63
|
-
result.push(<NavItem label="Support" key={Locale.label("wrapper.support")} icon="help" onClick={() => { setShowSupport(true) }} />);
|
|
64
61
|
result.push(<div style={{borderTop:"1px solid #CCC", paddingTop:2, paddingBottom:2}}></div>)
|
|
65
62
|
result.push(<NavItem label="Switch App" key={Locale.label("wrapper.switchApp")} icon="apps" onClick={() => { setTabIndex(1); }} />);
|
|
66
63
|
if (props.userChurches.length > 1) result.push(<NavItem label={Locale.label("wrapper.switchChurch")} key="Switch Church" icon="church" onClick={() => { setTabIndex(2); }} />);
|
|
@@ -134,7 +131,6 @@ export const UserMenu: React.FC<Props> = (props) => {
|
|
|
134
131
|
|
|
135
132
|
return (
|
|
136
133
|
<>
|
|
137
|
-
{showSupport && <SupportModal onClose={() => setShowSupport(false)} appName={props.appName} />}
|
|
138
134
|
<Button onClick={handleClick} color="inherit" aria-controls={open ? "account-menu" : undefined} aria-haspopup="true" aria-expanded={open ? "true" : undefined} style={{ textTransform: "none" }} endIcon={<Icon>expand_more</Icon>}>
|
|
139
135
|
<Badge badgeContent={totalNotifcations} color="error" invisible={totalNotifcations===0}>
|
|
140
136
|
<Avatar src={getProfilePic()} sx={{ width: 32, height: 32, marginRight: 1 }}></Avatar>
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
import React, { useState } from "react";
|
|
4
4
|
import { InputBox } from "../../components";
|
|
5
|
-
import { Icon, IconButton, InputAdornment, TextField } from "@mui/material";
|
|
5
|
+
import { Icon, IconButton, InputAdornment, TextField, Typography } from "@mui/material";
|
|
6
6
|
import { LoginResponseInterface, UserInterface } from "@churchapps/helpers";
|
|
7
7
|
import { ApiHelper, Locale } from "../../helpers";
|
|
8
8
|
|
|
@@ -21,6 +21,7 @@ export const LoginSetPassword: React.FC<Props> = props => {
|
|
|
21
21
|
const [verifyPassword, setVerifyPassword] = React.useState("");
|
|
22
22
|
const [user, setUser] = React.useState<UserInterface>(null);
|
|
23
23
|
const [showPassword, setShowPassword] = useState(false);
|
|
24
|
+
const [linkExpired, setLinkExpired] = React.useState(false);
|
|
24
25
|
|
|
25
26
|
const validate = () => {
|
|
26
27
|
const result = [];
|
|
@@ -32,7 +33,9 @@ export const LoginSetPassword: React.FC<Props> = props => {
|
|
|
32
33
|
}
|
|
33
34
|
|
|
34
35
|
const submitChangePassword = () => {
|
|
35
|
-
if (
|
|
36
|
+
if (linkExpired) {
|
|
37
|
+
window.open("/login", "_blank");
|
|
38
|
+
} else if (validate()) {
|
|
36
39
|
submit();
|
|
37
40
|
}
|
|
38
41
|
}
|
|
@@ -54,17 +57,42 @@ export const LoginSetPassword: React.FC<Props> = props => {
|
|
|
54
57
|
else props.setShowForgot(true);
|
|
55
58
|
}
|
|
56
59
|
|
|
57
|
-
React.useEffect(
|
|
60
|
+
React.useEffect(() => {
|
|
61
|
+
//Get the timestamp from the URL
|
|
62
|
+
const urlParams = new URLSearchParams(window.location.search);
|
|
63
|
+
const timestampParam = urlParams.get("timestamp");
|
|
64
|
+
if (timestampParam) {
|
|
65
|
+
const linkTimestamp = parseInt(timestampParam, 10);
|
|
66
|
+
const currentTime = Date.now();
|
|
67
|
+
|
|
68
|
+
//Check if the link is expired (2 min)
|
|
69
|
+
if (currentTime - linkTimestamp > 120000) {
|
|
70
|
+
setLinkExpired(true);
|
|
71
|
+
} else {
|
|
72
|
+
loadUser();
|
|
73
|
+
}
|
|
74
|
+
} else {
|
|
75
|
+
setLinkExpired(true); //No timestamp means link is invalid
|
|
76
|
+
}
|
|
77
|
+
}, []);
|
|
58
78
|
|
|
59
79
|
return (
|
|
60
|
-
<InputBox headerText={Locale.label("login.setPassword")} saveFunction={submitChangePassword} saveButtonType="submit" saveText={(props.isSubmitting || !user) ? Locale.label("common.pleaseWait") : Locale.label("login.signIn")} isSubmitting={props.isSubmitting}>
|
|
61
|
-
{
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
80
|
+
<InputBox headerText={Locale.label("login.setPassword")} saveFunction={submitChangePassword} saveButtonType="submit" saveText={!linkExpired ? (props.isSubmitting || !user) ? Locale.label("common.pleaseWait") : Locale.label("login.signIn") : Locale.label("login.requestLink")} isSubmitting={props.isSubmitting}>
|
|
81
|
+
{linkExpired ? (
|
|
82
|
+
<>
|
|
83
|
+
<Typography sx={{ color: "#c62828 !important", paddingBottom: 3 }}>{Locale.label("login.expiredLink")}</Typography>
|
|
84
|
+
</>
|
|
85
|
+
) : (
|
|
86
|
+
<>
|
|
87
|
+
{user && <p style={{ marginTop: 0, marginBottom: 0 }}>{Locale.label("login.welcomeBack")} {user.firstName}.</p>}
|
|
88
|
+
<TextField fullWidth name="password" type={showPassword ? "text" : "password"} label={Locale.label("login.setPassword")} value={password} onChange={(e) => { e.preventDefault(); setPassword(e.target.value) }} InputProps={{
|
|
89
|
+
endAdornment: (<InputAdornment position="end"><IconButton aria-label="toggle password visibility" onClick={() => { setShowPassword(!showPassword) }}>{showPassword ? <Icon>visibility</Icon> : <Icon>visibility_off</Icon>}</IconButton></InputAdornment>)
|
|
90
|
+
}} />
|
|
91
|
+
<TextField fullWidth name="verifyPassword" type={showPassword ? "text" : "password"} label={Locale.label("login.verifyPassword")} value={verifyPassword} onChange={(e) => { e.preventDefault(); setVerifyPassword(e.target.value) }} InputProps={{
|
|
92
|
+
endAdornment: (<InputAdornment position="end"><IconButton aria-label="toggle password visibility" onClick={() => { setShowPassword(!showPassword) }}>{showPassword ? <Icon>visibility</Icon> : <Icon>visibility_off</Icon>}</IconButton></InputAdornment>)
|
|
93
|
+
}} />
|
|
94
|
+
</>
|
|
95
|
+
)}
|
|
68
96
|
</InputBox>
|
|
69
97
|
);
|
|
70
98
|
}
|