@churchapps/apphelper 0.1.25 → 0.1.26
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/SiteWrapper.d.ts +1 -0
- package/dist/components/wrapper/SiteWrapper.d.ts.map +1 -1
- package/dist/components/wrapper/SiteWrapper.js +4 -1
- package/dist/components/wrapper/SiteWrapper.js.map +1 -1
- package/package.json +1 -1
- package/src/components/wrapper/SiteWrapper.tsx +6 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SiteWrapper.d.ts","sourceRoot":"","sources":["../../../src/components/wrapper/SiteWrapper.tsx"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"SiteWrapper.d.ts","sourceRoot":"","sources":["../../../src/components/wrapper/SiteWrapper.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAE7C,OAAO,EAA8C,mBAAmB,EAAa,MAAM,eAAe,CAAC;AAE3G,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAMxD,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,CAAC;IACjC,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB;AAED,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAiFvC,CAAC"}
|
|
@@ -64,6 +64,9 @@ const SiteWrapper = props => {
|
|
|
64
64
|
loadCounts();
|
|
65
65
|
console.log("RELOADED SiteWrapper2");
|
|
66
66
|
}, []);
|
|
67
|
+
const boxStyle = { flexGrow: 1, marginTop: 8, minHeight: "90vh" };
|
|
68
|
+
if (!props.omitOverflow)
|
|
69
|
+
boxStyle.overflow = "auto";
|
|
67
70
|
return react_1.default.createElement(react_1.default.Fragment, null,
|
|
68
71
|
react_1.default.createElement(CustomAppBar, { position: "absolute" },
|
|
69
72
|
react_1.default.createElement(material_1.Toolbar, { sx: { pr: "24px" } },
|
|
@@ -81,7 +84,7 @@ const SiteWrapper = props => {
|
|
|
81
84
|
react_1.default.createElement(material_1.IconButton, { onClick: toggleDrawer },
|
|
82
85
|
react_1.default.createElement(material_1.Icon, { style: { color: "#FFFFFF" } }, "chevron_left")))),
|
|
83
86
|
props.navContent),
|
|
84
|
-
react_1.default.createElement(material_1.Box, { component: "main", sx:
|
|
87
|
+
react_1.default.createElement(material_1.Box, { component: "main", sx: boxStyle },
|
|
85
88
|
react_1.default.createElement(material_1.Container, { maxWidth: false, sx: { mt: 4, mb: 4 } }, props.children)));
|
|
86
89
|
};
|
|
87
90
|
exports.SiteWrapper = SiteWrapper;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SiteWrapper.js","sourceRoot":"","sources":["../../../src/components/wrapper/SiteWrapper.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"SiteWrapper.js","sourceRoot":"","sources":["../../../src/components/wrapper/SiteWrapper.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAA6C;AAC7C,4CAA4F;AAC5F,2CAA2G;AAC3G,yCAAsC;AAEtC,iEAA8D;AAC9D,6DAA0D;AAC1D,yDAAsD;AACtD,uCAA2F;AAYpF,MAAM,WAAW,GAAoB,KAAK,CAAC,EAAE;;IAClD,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,eAAK,CAAC,QAAQ,EAAU,CAAC;IAC7D,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC9C,MAAM,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,EAAC,iBAAiB,EAAC,CAAC,EAAE,OAAO,EAAC,CAAC,EAAC,CAAC,CAAC;IACrG,MAAM,YAAY,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/C,MAAM,SAAS,GAAG,IAAA,iCAAe,GAAE,CAAC;IAEpC,MAAM,YAAY,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,oBAAU,CAAC,CAAC,CAAC,sBAAY,CAAC;IACxD,MAAM,YAAY,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,0BAAgB,CAAC,CAAC,CAAC,4BAAkB,CAAC;IAEpE,MAAM,UAAU,GAAG,GAAG,EAAE;QACtB,mBAAS,CAAC,GAAG,CAAC,4BAA4B,EAAE,cAAc,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACtE,IAAI,CAAC,kBAAkB,IAAI,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;gBAAE,qBAAqB,CAAC,IAAI,CAAC,CAAC;QACtH,CAAC,CAAC,CAAC;IACL,CAAC,CAAA;IAED,MAAM,kBAAkB,GAAG,GAAG,EAAE;QAC9B,kFAAkF;QAClF,OAAO,CAAC,GAAG,CAAC,yEAAyE,CAAC,CAAC;QACvF,UAAU,EAAE,CAAC;IACf,CAAC,CAAA;IAID,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,MAAM,aAAa,GAAG,GAAS,EAAE;YAC/B,IAAI,oBAAU,CAAC,iBAAiB,EAAE;gBAChC,aAAa,CAAC,0BAAgB,CAAC,WAAW,CAAC,KAAK,CAAC,UAAU,EAAE,0BAA0B,CAAC,CAAC,CAAC;aAC3F;QACH,CAAC,CAAA,CAAA;QAED,IAAI,CAAC,SAAS,EAAE,EAAE;YAChB,aAAa,EAAE,CAAC;SACjB;IACH,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;IAGlC,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;;QACnB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU;YAAE,2BAAY,CAAC,eAAe,CAAC,EAAC,QAAQ,EAAC,IAAI,EAAE,QAAQ,EAAC,IAAI,EAAC,CAAC,CAAC;;YACvF,2BAAY,CAAC,eAAe,CAAC,EAAC,QAAQ,EAAC,MAAA,MAAA,KAAK,CAAC,OAAO,CAAC,UAAU,0CAAE,MAAM,0CAAE,EAAE,EAAE,QAAQ,EAAC,MAAA,MAAA,KAAK,CAAC,OAAO,CAAC,UAAU,0CAAE,MAAM,0CAAE,EAAE,EAAC,CAAC,CAAC;IACpI,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;IAE/B,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,2BAAY,CAAC,UAAU,CAAC,cAAc,EAAE,kBAAkB,EAAE,kBAAkB,CAAC,CAAC;QAChF,2BAAY,CAAC,IAAI,EAAE,CAAC;QACpB,UAAU,EAAE,CAAC;QACb,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;IACvC,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,QAAQ,GAAkB,EAAE,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,CAAA;IAChF,IAAI,CAAC,KAAK,CAAC,YAAY;QAAE,QAAQ,CAAC,QAAQ,GAAG,MAAM,CAAC;IAEpD,OAAO;QACL,8BAAC,YAAY,IAAC,QAAQ,EAAC,UAAU;YAC/B,8BAAC,kBAAO,IAAC,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE;gBACzB,8BAAC,qBAAU,IAAC,IAAI,EAAC,OAAO,EAAC,KAAK,EAAC,SAAS,gBAAY,aAAa,EAAC,OAAO,EAAE,YAAY,EAAE,EAAE,kBAAI,WAAW,EAAE,MAAM,IAAK,CAAC,IAAI,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;oBAClJ,8BAAC,eAAI,eAAY,CACN;gBACb,8BAAC,qBAAU,IAAC,OAAO,EAAC,IAAI,EAAC,MAAM,UAAE,CAAA,MAAA,MAAA,oBAAU,CAAC,iBAAiB,0CAAE,MAAM,0CAAE,IAAI,KAAI,EAAE,CAAc;gBAC/F,uCAAK,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,GAAQ;gBAC9B,oBAAU,CAAC,IAAI,IAAI,8BAAC,mCAAgB,IAAC,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,kBAAkB,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,GAAI;gBACvI,oBAAU,CAAC,IAAI,IAAI,8BAAC,mBAAQ,IAAC,cAAc,EAAE,sBAAY,CAAC,WAAW,CAAC,MAAA,KAAK,CAAC,OAAO,0CAAE,MAAM,CAAC,EAAE,QAAQ,EAAE,GAAG,MAAA,oBAAU,CAAC,IAAI,0CAAE,SAAS,IAAI,MAAA,oBAAU,CAAC,IAAI,0CAAE,QAAQ,EAAE,EAAE,YAAY,EAAE,oBAAU,CAAC,YAAY,EAAE,iBAAiB,EAAE,oBAAU,CAAC,iBAAiB,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,GAAI;gBACtU,CAAC,oBAAU,CAAC,IAAI,IAAI,8BAAC,eAAI,IAAC,IAAI,EAAC,QAAQ,EAAC,KAAK,EAAC,SAAS,EAAC,KAAK,EAAE,EAAE,cAAc,EAAE,MAAM,EAAE,YAAc,CAChG,CACG;QAEf,8BAAC,YAAY,IAAC,OAAO,EAAC,WAAW,EAAC,IAAI,EAAE,IAAI;YAC1C,8BAAC,kBAAO,IAAC,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE;gBAC5E,uCAAK,GAAG,EAAE,UAAU,IAAI,0BAA0B,EAAE,GAAG,EAAC,MAAM,EAAC,KAAK,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAI;gBAC3F,uCAAK,KAAK,EAAE,EAAE,cAAc,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE;oBAClE,8BAAC,qBAAU,IAAC,OAAO,EAAE,YAAY;wBAAE,8BAAC,eAAI,IAAC,KAAK,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,mBAAqB,CAAa,CAClG,CACE;YACT,KAAK,CAAC,UAAU,CACJ;QACf,8BAAC,cAAG,IAAC,SAAS,EAAC,MAAM,EAAC,EAAE,EAAE,QAAQ;YAChC,8BAAC,oBAAS,IAAC,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,IAC7C,KAAK,CAAC,QAAQ,CACL,CACR,CACL,CAAA;AACL,CAAC,CAAC;AAjFW,QAAA,WAAW,eAiFtB"}
|
package/package.json
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React from "react";
|
|
1
|
+
import React, { CSSProperties } from "react";
|
|
2
2
|
import { IconButton, Toolbar, Icon, Typography, Box, Container, Link } from "@mui/material";
|
|
3
3
|
import { UserHelper, AppearanceHelper, PersonHelper, AppearanceInterface, ApiHelper } from "../../helpers";
|
|
4
4
|
import { UserMenu } from "./UserMenu";
|
|
@@ -14,7 +14,8 @@ interface Props {
|
|
|
14
14
|
children: React.ReactNode,
|
|
15
15
|
appName: string,
|
|
16
16
|
router?: any,
|
|
17
|
-
appearance?: AppearanceInterface
|
|
17
|
+
appearance?: AppearanceInterface,
|
|
18
|
+
omitOverflow?: boolean
|
|
18
19
|
}
|
|
19
20
|
|
|
20
21
|
export const SiteWrapper: React.FC<Props> = props => {
|
|
@@ -66,6 +67,8 @@ export const SiteWrapper: React.FC<Props> = props => {
|
|
|
66
67
|
console.log("RELOADED SiteWrapper2");
|
|
67
68
|
}, []);
|
|
68
69
|
|
|
70
|
+
const boxStyle: CSSProperties = { flexGrow: 1, marginTop: 8, minHeight: "90vh" }
|
|
71
|
+
if (!props.omitOverflow) boxStyle.overflow = "auto";
|
|
69
72
|
|
|
70
73
|
return <>
|
|
71
74
|
<CustomAppBar position="absolute">
|
|
@@ -90,7 +93,7 @@ export const SiteWrapper: React.FC<Props> = props => {
|
|
|
90
93
|
</Toolbar>
|
|
91
94
|
{props.navContent}
|
|
92
95
|
</CustomDrawer>
|
|
93
|
-
<Box component="main" sx={
|
|
96
|
+
<Box component="main" sx={boxStyle}>
|
|
94
97
|
<Container maxWidth={false} sx={{ mt: 4, mb: 4 }}>
|
|
95
98
|
{props.children}
|
|
96
99
|
</Container>
|