@churchapps/apphelper 0.0.12 → 0.0.14

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.
@@ -1 +1 @@
1
- {"version":3,"file":"SiteWrapper.d.ts","sourceRoot":"","sources":["../../../src/components/material/SiteWrapper.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAA8C,mBAAmB,EAAa,MAAM,eAAe,CAAC;AAE3G,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAKxD,UAAU,KAAK;IACb,UAAU,EAAE,GAAG,CAAC,OAAO,CAAC;IACxB,OAAO,EAAE,oBAAoB,CAAC;IAC9B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,UAAU,CAAC,EAAE,mBAAmB,CAAA;CACjC;AA4DD,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAkEvC,CAAC"}
1
+ {"version":3,"file":"SiteWrapper.d.ts","sourceRoot":"","sources":["../../../src/components/material/SiteWrapper.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAA8C,mBAAmB,EAAa,MAAM,eAAe,CAAC;AAE3G,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAKxD,UAAU,KAAK;IACb,UAAU,EAAE,GAAG,CAAC,OAAO,CAAC;IACxB,OAAO,EAAE,oBAAoB,CAAC;IAC9B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,UAAU,CAAC,EAAE,mBAAmB,CAAA;CACjC;AA4DD,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAoEvC,CAAC"}
@@ -1,4 +1,13 @@
1
1
  "use strict";
2
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
+ return new (P || (P = Promise))(function (resolve, reject) {
5
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
9
+ });
10
+ };
2
11
  var __importDefault = (this && this.__importDefault) || function (mod) {
3
12
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
13
  };
@@ -7,7 +16,9 @@ exports.SiteWrapper = void 0;
7
16
  const react_1 = __importDefault(require("react"));
8
17
  const material_1 = require("@mui/material");
9
18
  const helpers_1 = require("../../helpers");
19
+ const UserMenu_1 = require("./UserMenu");
10
20
  const useMountedState_1 = require("../../hooks/useMountedState");
21
+ const SocketHelper_1 = require("../../helpers/SocketHelper");
11
22
  const OpenDrawer = (0, material_1.styled)(material_1.Drawer)(({ theme }) => ({
12
23
  "& .MuiDrawer-paper": {
13
24
  position: "relative",
@@ -55,7 +66,7 @@ const OpenDrawerAppBar = (0, material_1.styled)(ClosedDrawerAppBar)(({ theme })
55
66
  })
56
67
  }));
57
68
  const SiteWrapper = props => {
58
- var _a, _b;
69
+ var _a, _b, _c, _d, _e;
59
70
  const [churchLogo, setChurchLogo] = react_1.default.useState();
60
71
  const [open, setOpen] = react_1.default.useState(false);
61
72
  const toggleDrawer = () => { setOpen(!open); };
@@ -65,31 +76,27 @@ const SiteWrapper = props => {
65
76
  const handleNotification = () => {
66
77
  alert("Notification received. Make GET to fetch bell count and toast message.");
67
78
  };
68
- /*
69
-
70
- React.useEffect(() => {
71
- const getChurchLogo = async () => {
72
- if (UserHelper.currentUserChurch) {
73
- setChurchLogo(AppearanceHelper.getLogoDark(props.appearance, "/images/logo-wrapper.png"));
79
+ react_1.default.useEffect(() => {
80
+ const getChurchLogo = () => __awaiter(void 0, void 0, void 0, function* () {
81
+ if (helpers_1.UserHelper.currentUserChurch) {
82
+ setChurchLogo(helpers_1.AppearanceHelper.getLogoDark(props.appearance, "/images/logo-wrapper.png"));
83
+ }
84
+ });
85
+ if (!isMounted()) {
86
+ getChurchLogo();
74
87
  }
75
- }
76
-
77
- if (!isMounted()) {
78
- getChurchLogo();
79
- }
80
88
  }, [isMounted, props.appearance]);
81
-
82
- React.useEffect(() => {
83
- if (!props.context.userChurch) SocketHelper.setPersonChurch({personId:null, churchId:null});
84
- else SocketHelper.setPersonChurch({personId:props.context.userChurch?.person?.id, churchId:props.context.userChurch?.church.id});
89
+ react_1.default.useEffect(() => {
90
+ var _a, _b, _c, _d;
91
+ if (!props.context.userChurch)
92
+ SocketHelper_1.SocketHelper.setPersonChurch({ personId: null, churchId: null });
93
+ else
94
+ SocketHelper_1.SocketHelper.setPersonChurch({ personId: (_b = (_a = props.context.userChurch) === null || _a === void 0 ? void 0 : _a.person) === null || _b === void 0 ? void 0 : _b.id, churchId: (_d = (_c = props.context.userChurch) === null || _c === void 0 ? void 0 : _c.church) === null || _d === void 0 ? void 0 : _d.id });
85
95
  }, [props.context.userChurch]);
86
-
87
- React.useEffect(() => {
88
- SocketHelper.addHandler("notification", "notificationBell", handleNotification);
89
- SocketHelper.init();
96
+ react_1.default.useEffect(() => {
97
+ SocketHelper_1.SocketHelper.addHandler("notification", "notificationBell", handleNotification);
98
+ SocketHelper_1.SocketHelper.init();
90
99
  }, []);
91
-
92
- */
93
100
  return react_1.default.createElement(react_1.default.Fragment, null,
94
101
  react_1.default.createElement(CustomAppBar, { position: "absolute" },
95
102
  react_1.default.createElement(material_1.Toolbar, { sx: { pr: "24px" } },
@@ -97,6 +104,7 @@ const SiteWrapper = props => {
97
104
  react_1.default.createElement(material_1.Icon, null, "menu")),
98
105
  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) || ""),
99
106
  react_1.default.createElement("div", { style: { flex: 1 } }),
107
+ 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 }),
100
108
  !helpers_1.UserHelper.user && react_1.default.createElement(material_1.Link, { href: "/login", color: "inherit", style: { textDecoration: "none" } }, "Login"))),
101
109
  react_1.default.createElement(CustomDrawer, { variant: "permanent", open: open },
102
110
  react_1.default.createElement(material_1.Toolbar, { sx: { display: "flex", alignItems: "center", width: "100%", px: [1] } },
@@ -1 +1 @@
1
- {"version":3,"file":"SiteWrapper.js","sourceRoot":"","sources":["../../../src/components/material/SiteWrapper.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SiteWrapper.js","sourceRoot":"","sources":["../../../src/components/material/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.0.12",
3
+ "version": "0.0.14",
4
4
  "description": "Library of helper functions for React and NextJS ChurchApps",
5
5
  "main": "dist/index.js",
6
6
  "scripts": {
@@ -87,7 +87,7 @@ export const SiteWrapper: React.FC<Props> = props => {
87
87
  alert("Notification received. Make GET to fetch bell count and toast message.")
88
88
  }
89
89
 
90
- /*
90
+
91
91
 
92
92
  React.useEffect(() => {
93
93
  const getChurchLogo = async () => {
@@ -101,9 +101,10 @@ export const SiteWrapper: React.FC<Props> = props => {
101
101
  }
102
102
  }, [isMounted, props.appearance]);
103
103
 
104
+
104
105
  React.useEffect(() => {
105
106
  if (!props.context.userChurch) SocketHelper.setPersonChurch({personId:null, churchId:null});
106
- else SocketHelper.setPersonChurch({personId:props.context.userChurch?.person?.id, churchId:props.context.userChurch?.church.id});
107
+ else SocketHelper.setPersonChurch({personId:props.context.userChurch?.person?.id, churchId:props.context.userChurch?.church?.id});
107
108
  }, [props.context.userChurch]);
108
109
 
109
110
  React.useEffect(() => {
@@ -111,7 +112,7 @@ export const SiteWrapper: React.FC<Props> = props => {
111
112
  SocketHelper.init();
112
113
  }, []);
113
114
 
114
- */
115
+
115
116
 
116
117
  return <>
117
118
  <CustomAppBar position="absolute">
@@ -121,6 +122,7 @@ export const SiteWrapper: React.FC<Props> = props => {
121
122
  </IconButton>
122
123
  <Typography variant="h6" noWrap>{UserHelper.currentUserChurch?.church?.name || ""}</Typography>
123
124
  <div style={{ flex: 1 }}></div>
125
+ {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} />}
124
126
  {!UserHelper.user && <Link href="/login" color="inherit" style={{ textDecoration: "none" }}>Login</Link>}
125
127
  </Toolbar>
126
128
  </CustomAppBar>