@bash-app/bash-common 30.90.0 → 30.92.0
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.
|
@@ -29,8 +29,8 @@ export function normalizeDates(dates) {
|
|
|
29
29
|
.filter((date) => !!date); // Filter out invalid dates
|
|
30
30
|
}
|
|
31
31
|
export function dateWithinDateRange(date, dateRange) {
|
|
32
|
-
const startDate = DateTime.fromJSDate(dateRange?.startDate
|
|
33
|
-
const endDate = DateTime.fromJSDate(dateRange?.endDate
|
|
32
|
+
const startDate = DateTime.fromJSDate(dateRange?.startDate ? new Date(dateRange.startDate) : new Date()).startOf("day");
|
|
33
|
+
const endDate = DateTime.fromJSDate(dateRange?.endDate ? new Date(dateRange.endDate) : new Date()).endOf("day");
|
|
34
34
|
const checkDate = DateTime.fromJSDate(new Date(date || ""));
|
|
35
35
|
return checkDate >= startDate && checkDate < endDate;
|
|
36
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dateTimeUtils.js","sourceRoot":"","sources":["../../src/utils/dateTimeUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAIjC,MAAM,cAAc,GAAG,oCAAoC,CAAC;AAQ5D,MAAM,UAAU,oBAAoB;IAClC,OAAO,QAAQ,CAAC,KAAK,EAAE,CAAC,QAAQ,CAAC;AACnC,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,aAA8B;IAE9B,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO,OAAO,aAAa,KAAK,QAAQ;QACtC,CAAC,CAAC,IAAI,IAAI,CAAC,aAAa,CAAC;QACzB,CAAC,CAAC,aAAa,CAAC;AACpB,CAAC;AAED,kCAAkC;AAClC,MAAM,UAAU,aAAa,CAC3B,SAA2C;IAE3C,IAAI,CAAC,SAAS;QAAE,OAAO,SAAS,CAAC;IAEjC,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC;IAEjC,IAAI,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;QAC1B,OAAO,CAAC,KAAK,CAAC,wBAAwB,EAAE,SAAS,CAAC,CAAC;QACnD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,uCAAuC;IACvC,OAAO,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;AACxE,CAAC;AAED,MAAM,UAAU,cAAc,CAC5B,KAA2C;IAE3C,OAAO,KAAK;SACT,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,sBAAsB;SACzD,MAAM,CAAC,CAAC,IAAI,EAAgB,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,2BAA2B;AACxE,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,IAAqB,EACrB,SAAoC;IAEpC,MAAM,SAAS,GAAG,QAAQ,CAAC,UAAU,CACnC,SAAS,EAAE,SAAS,IAAI,IAAI,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"dateTimeUtils.js","sourceRoot":"","sources":["../../src/utils/dateTimeUtils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@bash-app/bash-common",
|
|
3
|
-
"version": "30.
|
|
3
|
+
"version": "30.92.0",
|
|
4
4
|
"description": "Common data and scripts to use on the frontend and backend",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -34,7 +34,7 @@
|
|
|
34
34
|
"@prisma/client": "^6.1.0",
|
|
35
35
|
"luxon": "^3.5.0",
|
|
36
36
|
"prisma": "^6.1.0",
|
|
37
|
-
"react-tailwindcss-datepicker": "^
|
|
37
|
+
"react-tailwindcss-datepicker": "^1.6.6",
|
|
38
38
|
"tsx": "^4.10.3"
|
|
39
39
|
},
|
|
40
40
|
"devDependencies": {
|
package/prisma/schema.prisma
CHANGED
|
@@ -284,6 +284,7 @@ model BashEvent {
|
|
|
284
284
|
absorbDonationFees Boolean @default(false)
|
|
285
285
|
absorbTicketFees Boolean @default(false)
|
|
286
286
|
showAttendees Boolean @default(true)
|
|
287
|
+
serviceVisibility Json?
|
|
287
288
|
originalCreatorId String?
|
|
288
289
|
transferredAt DateTime?
|
|
289
290
|
transferredFromId String?
|
|
@@ -55,11 +55,11 @@ export function dateWithinDateRange(
|
|
|
55
55
|
dateRange: DateValueType | undefined
|
|
56
56
|
): boolean {
|
|
57
57
|
const startDate = DateTime.fromJSDate(
|
|
58
|
-
dateRange?.startDate
|
|
58
|
+
dateRange?.startDate ? new Date(dateRange.startDate) : new Date()
|
|
59
59
|
).startOf("day");
|
|
60
|
-
const endDate = DateTime.fromJSDate(
|
|
61
|
-
|
|
62
|
-
);
|
|
60
|
+
const endDate = DateTime.fromJSDate(
|
|
61
|
+
dateRange?.endDate ? new Date(dateRange.endDate) : new Date()
|
|
62
|
+
).endOf("day");
|
|
63
63
|
const checkDate = DateTime.fromJSDate(new Date(date || ""));
|
|
64
64
|
|
|
65
65
|
return checkDate >= startDate && checkDate < endDate;
|