@churchapps/apphelper 1.8.9 → 1.8.11
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/forms/components/FormSubmissionEdit.js +1 -1
- package/dist/forms/components/FormSubmissionEdit.js.map +1 -1
- package/dist/website/components/admin/calendar/CuratedCalendar.d.ts +3 -1
- package/dist/website/components/admin/calendar/CuratedCalendar.d.ts.map +1 -1
- package/dist/website/components/admin/calendar/CuratedCalendar.js +5 -3
- package/dist/website/components/admin/calendar/CuratedCalendar.js.map +1 -1
- package/dist/website/components/elementTypes/CalendarElement.d.ts.map +1 -1
- package/dist/website/components/elementTypes/CalendarElement.js +3 -2
- package/dist/website/components/elementTypes/CalendarElement.js.map +1 -1
- package/dist/website/components/eventCalendar/GroupCalendar.d.ts +3 -1
- package/dist/website/components/eventCalendar/GroupCalendar.d.ts.map +1 -1
- package/dist/website/components/eventCalendar/GroupCalendar.js +5 -3
- package/dist/website/components/eventCalendar/GroupCalendar.js.map +1 -1
- package/package.json +2 -2
|
@@ -122,7 +122,7 @@ export const FormSubmissionEdit = ({ showHeader = true, noBackground = false, ..
|
|
|
122
122
|
};
|
|
123
123
|
const loadData = () => {
|
|
124
124
|
if (!UniqueIdHelper.isMissing(props.formSubmissionId)) {
|
|
125
|
-
ApiHelper.get("/formsubmissions/" + props.formSubmissionId, "MembershipApi").then((data) => {
|
|
125
|
+
ApiHelper.get("/formsubmissions/" + props.formSubmissionId + "/?include=questions,answers", "MembershipApi").then((data) => {
|
|
126
126
|
setFormSubmission(data);
|
|
127
127
|
});
|
|
128
128
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FormSubmissionEdit.js","sourceRoot":"","sources":["../../../src/forms/components/FormSubmissionEdit.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"FormSubmissionEdit.js","sourceRoot":"","sources":["../../../src/forms/components/FormSubmissionEdit.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type EventInterface } from "@churchapps/helpers";
|
|
2
2
|
interface Props {
|
|
3
3
|
curatedCalendarId: string;
|
|
4
4
|
churchId: string;
|
|
@@ -7,6 +7,8 @@ interface Props {
|
|
|
7
7
|
updatedCallback?: () => void;
|
|
8
8
|
refresh?: any;
|
|
9
9
|
eventUrl?: (event: EventInterface) => string;
|
|
10
|
+
/** Only show events carrying this tag; empty shows all. */
|
|
11
|
+
tag?: string;
|
|
10
12
|
}
|
|
11
13
|
export declare function CuratedCalendar(props: Props): import("react").JSX.Element;
|
|
12
14
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CuratedCalendar.d.ts","sourceRoot":"","sources":["../../../../../src/website/components/admin/calendar/CuratedCalendar.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"CuratedCalendar.d.ts","sourceRoot":"","sources":["../../../../../src/website/components/admin/calendar/CuratedCalendar.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAoD,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAG5G,UAAU,KAAK;IACb,iBAAiB,EAAE,MAAM,CAAC;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,IAAI,CAAC;IAC7B,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,MAAM,CAAC;IAC7C,2DAA2D;IAC3D,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,KAAK,+BAoB3C"}
|
|
@@ -2,21 +2,23 @@
|
|
|
2
2
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
3
3
|
import { useState, useEffect } from "react";
|
|
4
4
|
import { ApiHelper } from "../../../..";
|
|
5
|
+
import { EventHelper } from "@churchapps/helpers";
|
|
5
6
|
import { CuratedEventCalendar } from "./CuratedEventCalendar";
|
|
6
7
|
export function CuratedCalendar(props) {
|
|
7
8
|
const [events, setEvents] = useState([]);
|
|
9
|
+
const filterTag = (data) => (data || []).filter((e) => EventHelper.hasTag(e, props.tag));
|
|
8
10
|
const loadData = () => {
|
|
9
11
|
// Curated calendars can be public or require editing permissions
|
|
10
12
|
// Use mode prop to determine which endpoint to use
|
|
11
13
|
if (props.mode === "edit") {
|
|
12
|
-
ApiHelper.get("/curatedEvents/calendar/" + props.curatedCalendarId, "ContentApi").then((data) => { setEvents(data); if (props.updatedCallback)
|
|
14
|
+
ApiHelper.get("/curatedEvents/calendar/" + props.curatedCalendarId, "ContentApi").then((data) => { setEvents(filterTag(data)); if (props.updatedCallback)
|
|
13
15
|
props.updatedCallback(); });
|
|
14
16
|
}
|
|
15
17
|
else {
|
|
16
|
-
ApiHelper.getAnonymous("/curatedEvents/public/calendar/" + props.churchId + "/" + props.curatedCalendarId, "ContentApi").then((data) => { setEvents(data); });
|
|
18
|
+
ApiHelper.getAnonymous("/curatedEvents/public/calendar/" + props.churchId + "/" + props.curatedCalendarId, "ContentApi").then((data) => { setEvents(filterTag(data)); });
|
|
17
19
|
}
|
|
18
20
|
};
|
|
19
|
-
useEffect(loadData, [props.curatedCalendarId, props?.refresh]);
|
|
21
|
+
useEffect(loadData, [props.curatedCalendarId, props?.refresh, props.tag]);
|
|
20
22
|
return (_jsx(CuratedEventCalendar, { events: events, curatedCalendarId: props.curatedCalendarId, churchId: props.churchId, firstDayOfWeek: props.firstDayOfWeek, onRequestRefresh: loadData, mode: props.mode, eventUrl: props.eventUrl }));
|
|
21
23
|
}
|
|
22
24
|
//# sourceMappingURL=CuratedCalendar.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CuratedCalendar.js","sourceRoot":"","sources":["../../../../../src/website/components/admin/calendar/CuratedCalendar.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AAEb,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"CuratedCalendar.js","sourceRoot":"","sources":["../../../../../src/website/components/admin/calendar/CuratedCalendar.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AAEb,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,WAAW,EAA4D,MAAM,qBAAqB,CAAC;AAC5G,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAc9D,MAAM,UAAU,eAAe,CAAC,KAAY;IAC1C,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAmC,EAAE,CAAC,CAAC;IAE3E,MAAM,SAAS,GAAG,CAAC,IAAsC,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IAE3H,MAAM,QAAQ,GAAG,GAAG,EAAE;QACpB,iEAAiE;QACjE,mDAAmD;QACnD,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YAC1B,SAAS,CAAC,GAAG,CAAC,0BAA0B,GAAG,KAAK,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,IAAS,EAAE,EAAE,GAAG,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,eAAe;gBAAE,KAAK,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7L,CAAC;aAAM,CAAC;YACN,SAAS,CAAC,YAAY,CAAC,iCAAiC,GAAG,KAAK,CAAC,QAAQ,GAAG,GAAG,GAAG,KAAK,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,IAAS,EAAE,EAAE,GAAG,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAChL,CAAC;IACH,CAAC,CAAC;IAEF,SAAS,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,iBAAiB,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IAE1E,OAAO,CACL,KAAC,oBAAoB,IAAC,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,KAAK,CAAC,iBAAiB,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,cAAc,EAAE,KAAK,CAAC,cAAc,EAAE,gBAAgB,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,GAAI,CAC7N,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CalendarElement.d.ts","sourceRoot":"","sources":["../../../../src/website/components/elementTypes/CalendarElement.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAIjD,UAAU,KAAK;IACb,OAAO,EAAE,gBAAgB,CAAC;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,iDAAiD;IACjD,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,4DAA4D;IAC5D,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,uFAAuF;IACvF,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,MAAM,CAAC;CAC9C;AAED,eAAO,MAAM,eAAe,GAAI,0DAAsE,KAAK,
|
|
1
|
+
{"version":3,"file":"CalendarElement.d.ts","sourceRoot":"","sources":["../../../../src/website/components/elementTypes/CalendarElement.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAIjD,UAAU,KAAK;IACb,OAAO,EAAE,gBAAgB,CAAC;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,iDAAiD;IACjD,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,4DAA4D;IAC5D,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,uFAAuF;IACvF,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,MAAM,CAAC;CAC9C;AAED,eAAO,MAAM,eAAe,GAAI,0DAAsE,KAAK,gCAgC1G,CAAC"}
|
|
@@ -4,15 +4,16 @@ import { CuratedCalendar } from "../admin/calendar/CuratedCalendar";
|
|
|
4
4
|
export const CalendarElement = ({ element, churchId, canEdit = false, firstDayOfWeek = 0, eventUrl }) => {
|
|
5
5
|
const calendarType = element.answers?.calendarType;
|
|
6
6
|
const calendarId = element.answers?.calendarId;
|
|
7
|
+
const tag = element.answers?.tag;
|
|
7
8
|
const renderCalendar = () => {
|
|
8
9
|
if (!calendarId) {
|
|
9
10
|
return (_jsx("div", { style: { textAlign: "center", padding: "20px" }, children: _jsx("p", { children: "No calendar selected. Please configure this element." }) }));
|
|
10
11
|
}
|
|
11
12
|
if (calendarType === "group") {
|
|
12
|
-
return _jsx(GroupCalendar, { churchId: churchId, groupId: calendarId, canEdit: canEdit, firstDayOfWeek: firstDayOfWeek, eventUrl: eventUrl });
|
|
13
|
+
return _jsx(GroupCalendar, { churchId: churchId, groupId: calendarId, canEdit: canEdit, firstDayOfWeek: firstDayOfWeek, eventUrl: eventUrl, tag: tag });
|
|
13
14
|
}
|
|
14
15
|
else if (calendarType === "curated") {
|
|
15
|
-
return _jsx(CuratedCalendar, { churchId: churchId, curatedCalendarId: calendarId, mode: canEdit ? "edit" : "view", firstDayOfWeek: firstDayOfWeek, eventUrl: eventUrl });
|
|
16
|
+
return _jsx(CuratedCalendar, { churchId: churchId, curatedCalendarId: calendarId, mode: canEdit ? "edit" : "view", firstDayOfWeek: firstDayOfWeek, eventUrl: eventUrl, tag: tag });
|
|
16
17
|
}
|
|
17
18
|
return (_jsx("div", { style: { textAlign: "center", padding: "20px" }, children: _jsxs("p", { children: ["Unknown calendar type: ", calendarType] }) }));
|
|
18
19
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CalendarElement.js","sourceRoot":"","sources":["../../../../src/website/components/elementTypes/CalendarElement.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAapE,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,GAAG,KAAK,EAAE,cAAc,GAAG,CAAC,EAAE,QAAQ,EAAS,EAAE,EAAE;IAC7G,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,EAAE,YAAY,CAAC;IACnD,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,EAAE,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"CalendarElement.js","sourceRoot":"","sources":["../../../../src/website/components/elementTypes/CalendarElement.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAapE,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,GAAG,KAAK,EAAE,cAAc,GAAG,CAAC,EAAE,QAAQ,EAAS,EAAE,EAAE;IAC7G,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,EAAE,YAAY,CAAC;IACnD,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,EAAE,UAAU,CAAC;IAC/C,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC;IAEjC,MAAM,cAAc,GAAG,GAAG,EAAE;QAC1B,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,CACL,cAAK,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,YAClD,+EAA2D,GACvD,CACP,CAAC;QACJ,CAAC;QAED,IAAI,YAAY,KAAK,OAAO,EAAE,CAAC;YAC7B,OAAO,KAAC,aAAa,IAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,GAAI,CAAC;QACpJ,CAAC;aAAM,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;YACtC,OAAO,KAAC,eAAe,IAAC,QAAQ,EAAE,QAAQ,EAAE,iBAAiB,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,cAAc,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,GAAI,CAAC;QAC/K,CAAC;QAED,OAAO,CACL,cAAK,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,YAClD,mDAA2B,YAAY,IAAK,GACxC,CACP,CAAC;IACJ,CAAC,CAAC;IAEF,OAAO,CACL,cAAK,EAAE,EAAE,KAAK,GAAG,OAAO,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,eAAe,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,YAC5F,cAAc,EAAE,GACb,CACP,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import "react-big-calendar/lib/css/react-big-calendar.css";
|
|
2
|
-
import type
|
|
2
|
+
import { type EventInterface } from "@churchapps/helpers";
|
|
3
3
|
interface Props {
|
|
4
4
|
churchId: string;
|
|
5
5
|
groupId: string;
|
|
6
6
|
canEdit: boolean;
|
|
7
7
|
firstDayOfWeek?: number;
|
|
8
8
|
eventUrl?: (event: EventInterface) => string;
|
|
9
|
+
/** Only show events carrying this tag; empty shows all. */
|
|
10
|
+
tag?: string;
|
|
9
11
|
}
|
|
10
12
|
export declare function GroupCalendar(props: Props): import("react").JSX.Element;
|
|
11
13
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GroupCalendar.d.ts","sourceRoot":"","sources":["../../../../src/website/components/eventCalendar/GroupCalendar.tsx"],"names":[],"mappings":"AAEA,OAAO,mDAAmD,CAAC;AAE3D,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"GroupCalendar.d.ts","sourceRoot":"","sources":["../../../../src/website/components/eventCalendar/GroupCalendar.tsx"],"names":[],"mappings":"AAEA,OAAO,mDAAmD,CAAC;AAE3D,OAAO,EAAe,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAIvE,UAAU,KAAK;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,MAAM,CAAC;IAC7C,2DAA2D;IAC3D,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,KAAK,+BAoBzC"}
|
|
@@ -2,21 +2,23 @@
|
|
|
2
2
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
3
3
|
import "react-big-calendar/lib/css/react-big-calendar.css";
|
|
4
4
|
import { ApiHelper } from "../../..";
|
|
5
|
+
import { EventHelper } from "@churchapps/helpers";
|
|
5
6
|
import { EventCalendar } from "./EventCalendar";
|
|
6
7
|
import { useEffect, useState } from "react";
|
|
7
8
|
export function GroupCalendar(props) {
|
|
8
9
|
const [events, setEvents] = useState([]);
|
|
10
|
+
const filterTag = (data) => setEvents((data || []).filter((e) => EventHelper.hasTag(e, props.tag)));
|
|
9
11
|
const loadData = () => {
|
|
10
12
|
// Groups are private by default, so always use authenticated endpoint when canEdit is true
|
|
11
13
|
// For public viewing (canEdit=false), use the anonymous public endpoint
|
|
12
14
|
if (props.canEdit) {
|
|
13
|
-
ApiHelper.get("/events/group/" + props.groupId, "ContentApi").then(
|
|
15
|
+
ApiHelper.get("/events/group/" + props.groupId, "ContentApi").then(filterTag);
|
|
14
16
|
}
|
|
15
17
|
else {
|
|
16
|
-
ApiHelper.getAnonymous("/events/public/group/" + props.churchId + "/" + props.groupId, "ContentApi").then(
|
|
18
|
+
ApiHelper.getAnonymous("/events/public/group/" + props.churchId + "/" + props.groupId, "ContentApi").then(filterTag);
|
|
17
19
|
}
|
|
18
20
|
};
|
|
19
|
-
useEffect(loadData, [props.groupId]);
|
|
21
|
+
useEffect(loadData, [props.groupId, props.tag]);
|
|
20
22
|
return (_jsx(EventCalendar, { events: events, editGroupId: props.canEdit ? props.groupId : "", churchId: props.churchId, firstDayOfWeek: props.firstDayOfWeek, onRequestRefresh: loadData, eventUrl: props.eventUrl }));
|
|
21
23
|
}
|
|
22
24
|
//# sourceMappingURL=GroupCalendar.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GroupCalendar.js","sourceRoot":"","sources":["../../../../src/website/components/eventCalendar/GroupCalendar.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AAEb,OAAO,mDAAmD,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"GroupCalendar.js","sourceRoot":"","sources":["../../../../src/website/components/eventCalendar/GroupCalendar.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AAEb,OAAO,mDAAmD,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,WAAW,EAAuB,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAY5C,MAAM,UAAU,aAAa,CAAC,KAAY;IACxC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAmB,EAAE,CAAC,CAAC;IAE3D,MAAM,SAAS,GAAG,CAAC,IAAsB,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAEtH,MAAM,QAAQ,GAAG,GAAG,EAAE;QACpB,2FAA2F;QAC3F,wEAAwE;QACxE,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;YAClB,SAAS,CAAC,GAAG,CAAC,gBAAgB,GAAG,KAAK,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAChF,CAAC;aAAM,CAAC;YACN,SAAS,CAAC,YAAY,CAAC,uBAAuB,GAAG,KAAK,CAAC,QAAQ,GAAG,GAAG,GAAG,KAAK,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACvH,CAAC;IACH,CAAC,CAAC;IAEF,SAAS,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IAEhD,OAAO,CACL,KAAC,aAAa,IAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,cAAc,EAAE,KAAK,CAAC,cAAc,EAAE,gBAAgB,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,GAAI,CACzM,CAAC;AACJ,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@churchapps/apphelper",
|
|
3
|
-
"version": "1.8.
|
|
3
|
+
"version": "1.8.11",
|
|
4
4
|
"description": "Library of helper functions, components, and feature modules (donations/forms/login/markdown/website) for React and NextJS ChurchApps",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -139,7 +139,7 @@
|
|
|
139
139
|
"slug": "^11.0.0"
|
|
140
140
|
},
|
|
141
141
|
"devDependencies": {
|
|
142
|
-
"@churchapps/helpers": "^2.
|
|
142
|
+
"@churchapps/helpers": "^2.8.0",
|
|
143
143
|
"@eslint/js": "^10.0.1",
|
|
144
144
|
"@stripe/react-stripe-js": "^3.10.0",
|
|
145
145
|
"@stripe/stripe-js": "^7.9.0",
|