potsda.mn/mobilizon
10
4
Fork 1
Code Issues 22 Pull requests 1 Projects Releases Wiki Activity

Merge pull request 'remove fullcalendar/icalendar component as we fetch events from the GraphQl API' (#56) from remove-icalendar into main

Browse source 
Reviewed-on: #56
This commit is contained in:
778a69cd 2024-02-26 11:47:49 +01:00
parent 9672131ad0 24f534fc57
commit cb64baa0a4
4 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
package-lock.json generated
View file

@ -1,12 +1,12 @@
{ {
"name": "mobilizon", "name": "mobilizon",
"version": "4.0.2", "version": "4.1.0-alpha.1",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "mobilizon", "name": "mobilizon",
"version": "4.0.2", "version": "4.1.0-alpha.1",
"hasInstallScript": true, "hasInstallScript": true,
"dependencies": { "dependencies": {
"@apollo/client": "^3.3.16", "@apollo/client": "^3.3.16",
@ -14,7 +14,6 @@
"@framasoft/socket-apollo-link": "^1.0.0", "@framasoft/socket-apollo-link": "^1.0.0",
"@fullcalendar/core": "^6.1.10", "@fullcalendar/core": "^6.1.10",
"@fullcalendar/daygrid": "^6.1.10", "@fullcalendar/daygrid": "^6.1.10",
"@fullcalendar/icalendar": "^6.1.10",
"@fullcalendar/interaction": "^6.1.10", "@fullcalendar/interaction": "^6.1.10",
"@fullcalendar/vue3": "^6.1.10", "@fullcalendar/vue3": "^6.1.10",
"@oruga-ui/oruga-next": "^0.8.2", "@oruga-ui/oruga-next": "^0.8.2",
@ -2690,15 +2689,6 @@
"@fullcalendar/core": "~6.1.10" "@fullcalendar/core": "~6.1.10"
} }
}, },
"node_modules/@fullcalendar/icalendar": {
"version": "6.1.10",
"resolved": "https://registry.npmjs.org/@fullcalendar/icalendar/-/icalendar-6.1.10.tgz",
"integrity": "sha512-TXjtZhjYIQZjeqULRjwDd2VWlymdhJmltaN26YS0dcGuCrQhJJ3x/sODVbVaW1mvbMjnjXYUE8AhdpxvhYGIJg==",
"peerDependencies": {
"@fullcalendar/core": "~6.1.10",
"ical.js": "^1.4.0"
}
},
"node_modules/@fullcalendar/interaction": { "node_modules/@fullcalendar/interaction": {
"version": "6.1.10", "version": "6.1.10",
"resolved": "https://registry.npmjs.org/@fullcalendar/interaction/-/interaction-6.1.10.tgz", "resolved": "https://registry.npmjs.org/@fullcalendar/interaction/-/interaction-6.1.10.tgz",

1
package.json
View file

@ -34,7 +34,6 @@
"@framasoft/socket-apollo-link": "^1.0.0", "@framasoft/socket-apollo-link": "^1.0.0",
"@fullcalendar/core": "^6.1.10", "@fullcalendar/core": "^6.1.10",
"@fullcalendar/daygrid": "^6.1.10", "@fullcalendar/daygrid": "^6.1.10",
"@fullcalendar/icalendar": "^6.1.10",
"@fullcalendar/interaction": "^6.1.10", "@fullcalendar/interaction": "^6.1.10",
"@fullcalendar/vue3": "^6.1.10", "@fullcalendar/vue3": "^6.1.10",
"@oruga-ui/oruga-next": "^0.8.2", "@oruga-ui/oruga-next": "^0.8.2",

3
src/components/FullCalendar/EventsAgenda.vue
View file

@ -38,7 +38,6 @@ import { SEARCH_CALENDAR_EVENTS } from "@/graphql/search";
import FullCalendar from "@fullcalendar/vue3"; import FullCalendar from "@fullcalendar/vue3";
import { EventSegment } from "@fullcalendar/core"; import { EventSegment } from "@fullcalendar/core";
import dayGridPlugin from "@fullcalendar/daygrid"; import dayGridPlugin from "@fullcalendar/daygrid";
import iCalendarPlugin from "@fullcalendar/icalendar";
import interactionPlugin from "@fullcalendar/interaction"; import interactionPlugin from "@fullcalendar/interaction";
import { import {
formatDateISOStringWithoutTime, formatDateISOStringWithoutTime,
@ -92,7 +91,7 @@ const { load: searchEventsLoad, refetch: searchEventsRefetch } = useLazyQuery<{
const calendarOptions = computed((): object => { const calendarOptions = computed((): object => {
return { return {
plugins: [dayGridPlugin, iCalendarPlugin, interactionPlugin], plugins: [dayGridPlugin, interactionPlugin],
initialView: "dayGridMonth", initialView: "dayGridMonth",
initialDate: lastSelectedDate.value, initialDate: lastSelectedDate.value,
events: async ( events: async (

3
src/components/FullCalendar/EventsCalendar.vue
View file

@ -21,7 +21,6 @@ import { Paginate } from "@/types/paginate";
import { SEARCH_CALENDAR_EVENTS } from "@/graphql/search"; import { SEARCH_CALENDAR_EVENTS } from "@/graphql/search";
import FullCalendar from "@fullcalendar/vue3"; import FullCalendar from "@fullcalendar/vue3";
import dayGridPlugin from "@fullcalendar/daygrid"; import dayGridPlugin from "@fullcalendar/daygrid";
import iCalendarPlugin from "@fullcalendar/icalendar";
import interactionPlugin from "@fullcalendar/interaction"; import interactionPlugin from "@fullcalendar/interaction";
const calendarRef = ref(); const calendarRef = ref();
@ -34,7 +33,7 @@ const { load: searchEventsLoad, refetch: searchEventsRefetch } = useLazyQuery<{
const calendarOptions = computed((): object => { const calendarOptions = computed((): object => {
return { return {
plugins: [dayGridPlugin, iCalendarPlugin, interactionPlugin], plugins: [dayGridPlugin, interactionPlugin],
initialView: "dayGridMonth", initialView: "dayGridMonth",
events: async ( events: async (
info: { start: Date; end: Date; startStr: string; endStr: string }, info: { start: Date; end: Date; startStr: string; endStr: string },