kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 03:39:55 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup calendar module (#3300)

Browse Source 
- Update default calendar config to use customEvents
- Update url that is displayed when old authentication is used
This commit is contained in:
Veeck 2023-12-22 19:34:06 +01:00 committed by GitHub
parent d397568062
commit 786ea86e0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -19,7 +19,7 @@ _This release is scheduled to be released on 2024-01-01._
### Removed ### Removed
- Removed Codecov workflow (not working anymore, other workflow required) (#3107) - Removed Codecov workflow (not working anymore, other workflow required) (#3107)
- Removed titleReplace from calendar, replaced + extended by customEvents (backward compatibility included) - Removed titleReplace from calendar, replaced + extended by customEvents (backward compatibility included) (#3249)
- Removed failing unit test (#3254) - Removed failing unit test (#3254)
### Updated ### Updated

14
modules/default/calendar/calendar.js
View File

@ -28,6 +28,7 @@ Module.register("calendar", {
fetchInterval: 60 * 60 * 1000, // Update every hour fetchInterval: 60 * 60 * 1000, // Update every hour
animationSpeed: 2000, animationSpeed: 2000,
fade: true, fade: true,
fadePoint: 0.25, // Start on 1/4th of the list.
urgency: 7, urgency: 7,
timeFormat: "relative", timeFormat: "relative",
dateFormat: "MMM Do", dateFormat: "MMM Do",
@ -35,14 +36,12 @@ Module.register("calendar", {
fullDayEventDateFormat: "MMM Do", fullDayEventDateFormat: "MMM Do",
showEnd: false, showEnd: false,
getRelative: 6, getRelative: 6,
fadePoint: 0.25, // Start on 1/4th of the list.
hidePrivate: false, hidePrivate: false,
hideOngoing: false, hideOngoing: false,
hideTime: false, hideTime: false,
hideDuplicates: true, hideDuplicates: true,
showTimeToday: false, showTimeToday: false,
colored: false, colored: false,
customEvents: [], // Array of {keyword: "", symbol: "", color: "", eventClass: ""} where Keyword is a regexp and symbol/color/eventClass are to be applied for matched
tableClass: "small", tableClass: "small",
calendars: [ calendars: [
{ {
@ -50,10 +49,11 @@ Module.register("calendar", {
url: "https://www.calendarlabs.com/templates/ical/US-Holidays.ics" url: "https://www.calendarlabs.com/templates/ical/US-Holidays.ics"
} }
], ],
titleReplace: { customEvents: [
"De verjaardag van ": "", // Array of {keyword: "", symbol: "", color: "", eventClass: ""} where Keyword is a regexp and symbol/color/eventClass are to be applied for matched
"'s birthday": "" { keyword: ".*", transform: { search: "De verjaardag van ", replace: "" } },
}, { keyword: ".*", transform: { search: "'s birthday", replace: "" } }
],
locationTitleReplace: { locationTitleReplace: {
"street ": "" "street ": ""
}, },
@ -145,7 +145,7 @@ Module.register("calendar", {
// we check user and password here for backwards compatibility with old configs // we check user and password here for backwards compatibility with old configs
if (calendar.user && calendar.pass) { if (calendar.user && calendar.pass) {
Log.warn("Deprecation warning: Please update your calendar authentication configuration."); Log.warn("Deprecation warning: Please update your calendar authentication configuration.");
Log.warn("https://github.com/MichMich/MagicMirror/tree/v2.1.2/modules/default/calendar#calendar-authentication-options"); Log.warn("https://docs.magicmirror.builders/modules/calendar.html#configuration-options");
calendar.auth = { calendar.auth = {
user: calendar.user, user: calendar.user,
pass: calendar.pass pass: calendar.pass