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

merge-upstream-5.0.1 #66

Merged
778a69cd merged 80 commits from merge-upstream-5.0.1 into main 2024-12-26 12:55:41 +01:00
Conversation 0 Commits 80 Files changed 68 +6 -12
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 27da46829d - Show all commits

18
src/views/Event/MyEventsView.vue
View file

@ -33,11 +33,11 @@
" "
labelFor="events-start-datepicker" labelFor="events-start-datepicker"
> >
<o-datepicker <event-date-picker
v-model="datePick"
:first-day-of-week="firstDayOfWeek"
id="events-start-datepicker" id="events-start-datepicker"
/> :time="false"
v-model="datePick"
></event-date-picker>
<o-button <o-button
@click="datePick = new Date()" @click="datePick = new Date()"
class="reset-area !h-auto" class="reset-area !h-auto"
@ -221,17 +221,17 @@ import {
LOGGED_USER_UPCOMING_EVENTS, LOGGED_USER_UPCOMING_EVENTS,
} from "@/graphql/participant"; } from "@/graphql/participant";
import { useApolloClient, useQuery } from "@vue/apollo-composable"; import { useApolloClient, useQuery } from "@vue/apollo-composable";
import { computed, inject, ref, defineAsyncComponent } from "vue"; import { computed, ref, defineAsyncComponent } from "vue";
import { IUser } from "@/types/current-user.model"; import { IUser } from "@/types/current-user.model";
import { import {
booleanTransformer, booleanTransformer,
integerTransformer, integerTransformer,
useRouteQuery, useRouteQuery,
} from "vue-use-route-query"; } from "vue-use-route-query";
import { Locale } from "date-fns";
import { useI18n } from "vue-i18n"; import { useI18n } from "vue-i18n";
import { useRestrictions } from "@/composition/apollo/config"; import { useRestrictions } from "@/composition/apollo/config";
import { useHead } from "@/utils/head"; import { useHead } from "@/utils/head";
import EventDatePicker from "@/components/Event/EventDatePicker.vue";
const EventParticipationCard = defineAsyncComponent( const EventParticipationCard = defineAsyncComponent(
() => import("@/components/Event/EventParticipationCard.vue") () => import("@/components/Event/EventParticipationCard.vue")
@ -490,12 +490,6 @@ const hideCreateEventButton = computed((): boolean => {
return restrictions.value?.onlyGroupsCanCreateEvents === true; return restrictions.value?.onlyGroupsCanCreateEvents === true;
}); });
const dateFnsLocale = inject<Locale>("dateFnsLocale");
const firstDayOfWeek = computed((): number => {
return dateFnsLocale?.options?.weekStartsOn ?? 0;
});
useHead({ useHead({
title: computed(() => t("My events")), title: computed(() => t("My events")),
}); });