@churchapps/apphelper 0.2.27 → 0.2.29

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.
@@ -0,0 +1 @@
1
+ github: [ChurchApps]
@@ -25,7 +25,7 @@ function Notes(props) {
25
25
  const messages = (props.conversationId) ? yield helpers_1.ApiHelper.get("/messages/conversation/" + props.conversationId, "MessagingApi") : [];
26
26
  if (messages.length > 0) {
27
27
  const peopleIds = helpers_1.ArrayHelper.getIds(messages, "personId");
28
- const people = yield helpers_1.ApiHelper.get("/people/ids?ids=" + peopleIds.join(","), "MembershipApi");
28
+ const people = yield helpers_1.ApiHelper.get("/people/basic?ids=" + peopleIds.join(","), "MembershipApi");
29
29
  messages.forEach(n => {
30
30
  n.person = helpers_1.ArrayHelper.getOne(people, "id", n.personId);
31
31
  });
@@ -1 +1 @@
1
- {"version":3,"file":"Notes.js","sourceRoot":"","sources":["../../../src/components/notes/Notes.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Notes.js","sourceRoot":"","sources":["../../../src/components/notes/Notes.tsx"],"names":[],"mappings":"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"}
@@ -54,7 +54,7 @@ const PrivateMessages = (props) => {
54
54
  peopleIds.push(personId);
55
55
  });
56
56
  if (peopleIds.length > 0) {
57
- const people = yield ApiHelper_1.ApiHelper.get("/people/ids?ids=" + peopleIds.join(","), "MembershipApi");
57
+ const people = yield ApiHelper_1.ApiHelper.get("/people/basic?ids=" + peopleIds.join(","), "MembershipApi");
58
58
  pms.forEach(pm => {
59
59
  const personId = (pm.fromPersonId === props.context.person.id) ? pm.toPersonId : pm.fromPersonId;
60
60
  pm.person = helpers_1.ArrayHelper.getOne(people, "id", personId);
@@ -1 +1 @@
1
- {"version":3,"file":"PrivateMessages.js","sourceRoot":"","sources":["../../../src/components/wrapper/PrivateMessages.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"PrivateMessages.js","sourceRoot":"","sources":["../../../src/components/wrapper/PrivateMessages.tsx"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"SelectChurchModal.d.ts","sourceRoot":"","sources":["../../../src/pageComponents/components/SelectChurchModal.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAMhF,UAAU,KAAK;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,OAAO,CAAC;IACd,YAAY,CAAC,EAAE,wBAAwB,EAAE,CAAC;IAC1C,YAAY,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,wBAAwB,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,KAAK,IAAI,CAAC;IAC7D,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;CAClB;AAED,eAAO,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAwB7C,CAAC"}
1
+ {"version":3,"file":"SelectChurchModal.d.ts","sourceRoot":"","sources":["../../../src/pageComponents/components/SelectChurchModal.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAMhF,UAAU,KAAK;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,OAAO,CAAC;IACd,YAAY,CAAC,EAAE,wBAAwB,EAAE,CAAC;IAC1C,YAAY,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,wBAAwB,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,KAAK,IAAI,CAAC;IAC7D,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;CAClB;AAED,eAAO,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CA6B7C,CAAC"}
@@ -25,6 +25,9 @@ const SelectChurchModal = (props) => {
25
25
  };
26
26
  return (react_1.default.createElement(material_1.Dialog, { open: props.show, onClose: handleClose },
27
27
  react_1.default.createElement(material_1.DialogTitle, null, "Select Church"),
28
+ react_1.default.createElement(material_1.Tooltip, { title: "Logout", arrow: true },
29
+ react_1.default.createElement(material_1.IconButton, { sx: { position: "absolute", right: 8, top: 8 }, color: "error", onClick: () => { window.location.href = "/logout"; } },
30
+ react_1.default.createElement(material_1.Icon, null, "logout"))),
28
31
  react_1.default.createElement(material_1.DialogContent, { sx: { width: 500, maxWidth: "100%" } },
29
32
  react_1.default.createElement(components_1.ErrorMessages, { errors: props.errors }),
30
33
  getContents())));
@@ -1 +1 @@
1
- {"version":3,"file":"SelectChurchModal.js","sourceRoot":"","sources":["../../../src/pageComponents/components/SelectChurchModal.tsx"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAE1B,6DAA0D;AAC1D,yDAAsD;AACtD,iDAAgD;AAChD,4CAAmE;AAW5D,MAAM,iBAAiB,GAAoB,CAAC,KAAK,EAAE,EAAE;IAC1D,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAE1D,MAAM,WAAW,GAAG,GAAG,EAAE;QACvB,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;IAC3B,CAAC,CAAA;IAED,MAAM,WAAW,GAAG,GAAG,EAAE;;QACvB,IAAI,UAAU,IAAI,CAAA,MAAA,KAAK,CAAC,YAAY,0CAAE,MAAM,MAAK,CAAC;YAAE,OAAO,8BAAC,uCAAkB,IAAC,YAAY,EAAE,KAAK,CAAC,YAAY,EAAE,wBAAwB,EAAE,KAAK,CAAC,wBAAwB,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,GAAI,CAAA;;YAChM,OAAO,CAAC,8DACV,MAAA,KAAK,CAAC,YAAY;mBAAE,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,8BAAC,mCAAgB,IAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,CAAC,YAAY,EAAE,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,GAAI,CAAC,CAAC;gBAC9H,qCAAG,IAAI,EAAC,aAAa,EAAC,KAAK,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,cAAc,EAAE,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,4BAA2B,CAC9J,CAAC,CAAC;IACP,CAAC,CAAA;IAED,OAAO,CACL,8BAAC,iBAAM,IAAC,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,WAAW;QAC5C,8BAAC,sBAAW,wBAA4B;QACxC,8BAAC,wBAAa,IAAC,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE;YACjD,8BAAC,0BAAa,IAAC,MAAM,EAAE,KAAK,CAAC,MAAM,GAAI;YACtC,WAAW,EAAE,CACA,CACT,CACV,CAAC;AACJ,CAAC,CAAC;AAxBW,QAAA,iBAAiB,qBAwB5B"}
1
+ {"version":3,"file":"SelectChurchModal.js","sourceRoot":"","sources":["../../../src/pageComponents/components/SelectChurchModal.tsx"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAE1B,6DAA0D;AAC1D,yDAAsD;AACtD,iDAAgD;AAChD,4CAA8F;AAWvF,MAAM,iBAAiB,GAAoB,CAAC,KAAK,EAAE,EAAE;IAC1D,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAE1D,MAAM,WAAW,GAAG,GAAG,EAAE;QACvB,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;IAC3B,CAAC,CAAA;IAED,MAAM,WAAW,GAAG,GAAG,EAAE;;QACvB,IAAI,UAAU,IAAI,CAAA,MAAA,KAAK,CAAC,YAAY,0CAAE,MAAM,MAAK,CAAC;YAAE,OAAO,8BAAC,uCAAkB,IAAC,YAAY,EAAE,KAAK,CAAC,YAAY,EAAE,wBAAwB,EAAE,KAAK,CAAC,wBAAwB,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,GAAI,CAAA;;YAChM,OAAO,CAAC,8DACV,MAAA,KAAK,CAAC,YAAY;mBAAE,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,8BAAC,mCAAgB,IAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,CAAC,YAAY,EAAE,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,GAAI,CAAC,CAAC;gBAC9H,qCAAG,IAAI,EAAC,aAAa,EAAC,KAAK,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,cAAc,EAAE,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,4BAA2B,CAC9J,CAAC,CAAC;IACP,CAAC,CAAA;IAED,OAAO,CACL,8BAAC,iBAAM,IAAC,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,WAAW;QAC5C,8BAAC,sBAAW,wBAA4B;QACxC,8BAAC,kBAAO,IAAC,KAAK,EAAC,QAAQ,EAAC,KAAK;YAC3B,8BAAC,qBAAU,IAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,KAAK,EAAC,OAAO,EAAC,OAAO,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,SAAS,CAAA,CAAC,CAAC;gBAC3H,8BAAC,eAAI,iBAAc,CACR,CACL;QACV,8BAAC,wBAAa,IAAC,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE;YACjD,8BAAC,0BAAa,IAAC,MAAM,EAAE,KAAK,CAAC,MAAM,GAAI;YACtC,WAAW,EAAE,CACA,CACT,CACV,CAAC;AACJ,CAAC,CAAC;AA7BW,QAAA,iBAAiB,qBA6B5B"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@churchapps/apphelper",
3
- "version": "0.2.27",
3
+ "version": "0.2.29",
4
4
  "description": "Library of helper functions for React and NextJS ChurchApps",
5
5
  "main": "dist/index.js",
6
6
  "scripts": {
@@ -24,7 +24,7 @@ export function Notes(props: Props) {
24
24
  const messages: MessageInterface[] = (props.conversationId) ? await ApiHelper.get("/messages/conversation/" + props.conversationId, "MessagingApi") : [];
25
25
  if (messages.length > 0) {
26
26
  const peopleIds = ArrayHelper.getIds(messages, "personId");
27
- const people = await ApiHelper.get("/people/ids?ids=" + peopleIds.join(","), "MembershipApi");
27
+ const people = await ApiHelper.get("/people/basic?ids=" + peopleIds.join(","), "MembershipApi");
28
28
  messages.forEach(n => {
29
29
  n.person = ArrayHelper.getOne(people, "id", n.personId);
30
30
  })
@@ -28,7 +28,7 @@ export const PrivateMessages: React.FC<Props> = (props) => {
28
28
  if (peopleIds.indexOf(personId) === -1) peopleIds.push(personId);
29
29
  });
30
30
  if (peopleIds.length > 0) {
31
- const people = await ApiHelper.get("/people/ids?ids=" + peopleIds.join(","), "MembershipApi");
31
+ const people = await ApiHelper.get("/people/basic?ids=" + peopleIds.join(","), "MembershipApi");
32
32
  pms.forEach(pm => {
33
33
  const personId = (pm.fromPersonId === props.context.person.id) ? pm.toPersonId : pm.fromPersonId;
34
34
  pm.person = ArrayHelper.getOne(people, "id", personId);
@@ -3,7 +3,7 @@ import { ChurchInterface, LoginUserChurchInterface } from "@churchapps/helpers";
3
3
  import { SelectChurchSearch } from "./SelectChurchSearch";
4
4
  import { SelectableChurch } from "./SelectableChurch";
5
5
  import { ErrorMessages } from "../../components"
6
- import { Dialog, DialogContent, DialogTitle } from "@mui/material";
6
+ import { Dialog, DialogContent, DialogTitle, Icon, IconButton, Tooltip } from "@mui/material";
7
7
 
8
8
  interface Props {
9
9
  appName: string,
@@ -32,6 +32,11 @@ export const SelectChurchModal: React.FC<Props> = (props) => {
32
32
  return (
33
33
  <Dialog open={props.show} onClose={handleClose}>
34
34
  <DialogTitle>Select Church</DialogTitle>
35
+ <Tooltip title="Logout" arrow>
36
+ <IconButton sx={{ position: "absolute", right: 8, top: 8 }} color="error" onClick={() => { window.location.href = "/logout" }}>
37
+ <Icon>logout</Icon>
38
+ </IconButton>
39
+ </Tooltip>
35
40
  <DialogContent sx={{ width: 500, maxWidth: "100%" }}>
36
41
  <ErrorMessages errors={props.errors} />
37
42
  {getContents()}