gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-20 07:08:55 +02:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

feat(calendar): set up time grid

Browse Source
This commit is contained in:
Elian Doran 2025-03-16 19:46:39 +02:00
parent 4e7572cf04
commit 7570205059
No known key found for this signature in database
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "trilium", "name": "trilium",
"version": "0.92.3-beta", "version": "0.92.4",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "trilium", "name": "trilium",
"version": "0.92.3-beta", "version": "0.92.4",
"license": "AGPL-3.0-only", "license": "AGPL-3.0-only",
"dependencies": { "dependencies": {
"@braintree/sanitize-url": "7.1.1", "@braintree/sanitize-url": "7.1.1",
@ -116,6 +116,7 @@
"@electron-forge/plugin-auto-unpack-natives": "7.7.0", "@electron-forge/plugin-auto-unpack-natives": "7.7.0",
"@electron/rebuild": "3.7.1", "@electron/rebuild": "3.7.1",
"@eslint/js": "9.22.0", "@eslint/js": "9.22.0",
"@fullcalendar/timegrid": "6.1.15",
"@playwright/test": "1.51.0", "@playwright/test": "1.51.0",
"@popperjs/core": "2.11.8", "@popperjs/core": "2.11.8",
"@types/archiver": "6.0.3", "@types/archiver": "6.0.3",
@ -2902,6 +2903,19 @@
"@fullcalendar/core": "~6.1.15" "@fullcalendar/core": "~6.1.15"
} }
}, },
"node_modules/@fullcalendar/timegrid": {
"version": "6.1.15",
"resolved": "https://registry.npmjs.org/@fullcalendar/timegrid/-/timegrid-6.1.15.tgz",
"integrity": "sha512-61ORr3A148RtxQ2FNG7JKvacyA/TEVZ7z6I+3E9Oeu3dqTf6M928bFcpehRTIK6zIA6Yifs7BeWHgOE9dFnpbw==",
"dev": true,
"license": "MIT",
"dependencies": {
"@fullcalendar/daygrid": "~6.1.15"
},
"peerDependencies": {
"@fullcalendar/core": "~6.1.15"
}
},
"node_modules/@gar/promisify": { "node_modules/@gar/promisify": {
"version": "1.1.3", "version": "1.1.3",
"resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz",

1
package.json
View File

@ -173,6 +173,7 @@
"@electron-forge/plugin-auto-unpack-natives": "7.7.0", "@electron-forge/plugin-auto-unpack-natives": "7.7.0",
"@electron/rebuild": "3.7.1", "@electron/rebuild": "3.7.1",
"@eslint/js": "9.22.0", "@eslint/js": "9.22.0",
"@fullcalendar/timegrid": "6.1.15",
"@playwright/test": "1.51.0", "@playwright/test": "1.51.0",
"@popperjs/core": "2.11.8", "@popperjs/core": "2.11.8",
"@types/archiver": "6.0.3", "@types/archiver": "6.0.3",

4
src/public/app/widgets/view_widgets/calendar_view.ts
View File

@ -3,7 +3,6 @@ import froca from "../../services/froca.js";
import ViewMode, { type ViewModeArgs } from "./view_mode.js"; import ViewMode, { type ViewModeArgs } from "./view_mode.js";
import type FNote from "../../entities/fnote.js"; import type FNote from "../../entities/fnote.js";
import server from "../../services/server.js"; import server from "../../services/server.js";
import ws from "../../services/ws.js";
import { t } from "../../services/i18n.js"; import { t } from "../../services/i18n.js";
import options from "../../services/options.js"; import options from "../../services/options.js";
import dialogService from "../../services/dialog.js"; import dialogService from "../../services/dialog.js";
@ -102,6 +101,7 @@ export default class CalendarView extends ViewMode {
const { Calendar } = await import("@fullcalendar/core"); const { Calendar } = await import("@fullcalendar/core");
const plugins: PluginDef[] = []; const plugins: PluginDef[] = [];
plugins.push((await import("@fullcalendar/daygrid")).default); plugins.push((await import("@fullcalendar/daygrid")).default);
plugins.push((await import("@fullcalendar/timegrid")).default);
if (isEditable || this.isCalendarRoot) { if (isEditable || this.isCalendarRoot) {
plugins.push((await import("@fullcalendar/interaction")).default); plugins.push((await import("@fullcalendar/interaction")).default);
} }
@ -115,7 +115,7 @@ export default class CalendarView extends ViewMode {
const calendar = new Calendar(this.$calendarContainer[0], { const calendar = new Calendar(this.$calendarContainer[0], {
plugins, plugins,
initialView: "dayGridMonth", initialView: "timeGridWeek",
events: eventBuilder, events: eventBuilder,
editable: isEditable, editable: isEditable,
selectable: isEditable, selectable: isEditable,