upgrade to 4.52 (349298c3) · Commits · e / infra / ecloud / nextcloud-apps / calendar

src/components/AppNavigation/AppNavigationHeader/AppNavigationHeaderDatePicker.vue

+0 −8

Original line number	Diff line number	Diff line
		@@ -36,11 +36,7 @@
		@click.stop.prevent="toggleDatepicker"
		@mousedown.stop.prevent="doNothing"
		@mouseup.stop.prevent="doNothing">
		<<<<<<< HEAD
		{{ selectedDate \| formatDateRage(view, locale) }}
		=======
		{{ selectedDate \| formatDateRange(view, locale) }}
		>>>>>>> 956826ca66b66de76eb7561ddf0ad088428115c4
		</NcButton>
		<DatePicker ref="datepicker"
		class="datepicker-button-section__datepicker"
		@@ -73,11 +69,7 @@ import formatDateRange from '../../../filters/dateRangeFormat.js'
		import DatePicker from '../../Shared/DatePicker.vue'
		import ChevronLeftIcon from 'vue-material-design-icons/ChevronLeft.vue'
		import ChevronRightIcon from 'vue-material-design-icons/ChevronRight.vue'
		<<<<<<< HEAD
		import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
		=======
		import { NcButton } from '@nextcloud/vue'
		>>>>>>> 956826ca66b66de76eb7561ddf0ad088428115c4

		export default {
		name: 'AppNavigationHeaderDatePicker',

+0 −14

Original line number	Diff line number	Diff line
		@@ -22,10 +22,7 @@

		<template>
		<NcButton v-shortkey="['c']"
		<<<<<<< HEAD
		=======
		:aria-label="newEventButtonAriaLabel"
		>>>>>>> 956826ca66b66de76eb7561ddf0ad088428115c4
		class="button new-event"
		type="primary"
		@click="newEvent"
		@@ -33,35 +30,24 @@
		<template #icon>
		<Plus :size="20" />
		</template>
		<<<<<<< HEAD
		{{ $t('calendar', 'New event') }}
		=======
		{{ $t('calendar', 'Event') }}
		>>>>>>> 956826ca66b66de76eb7561ddf0ad088428115c4
		</NcButton>
		</template>

		<script>
		import Plus from 'vue-material-design-icons/Plus.vue'
		<<<<<<< HEAD
		import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
		=======
		import { NcButton } from '@nextcloud/vue'
		>>>>>>> 956826ca66b66de76eb7561ddf0ad088428115c4

		export default {
		name: 'AppNavigationHeaderNewEvent',
		components: {
		Plus,
		NcButton,
		<<<<<<< HEAD
		=======
		},
		computed: {
		newEventButtonAriaLabel() {
		return this.$t('calendar', 'Create new event')
		},
		>>>>>>> 956826ca66b66de76eb7561ddf0ad088428115c4
		},
		methods: {
		/**

+0 −4

Original line number	Diff line number	Diff line
		@@ -30,11 +30,7 @@
		</template>

		<script>
		<<<<<<< HEAD
		import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
		=======
		import { NcButton } from '@nextcloud/vue'
		>>>>>>> 956826ca66b66de76eb7561ddf0ad088428115c4

		export default {
		name: 'AppNavigationHeaderTodayButton',

+0 −5

Original line number	Diff line number	Diff line
		@@ -39,15 +39,10 @@
		</template>

		<script>
		<<<<<<< HEAD
		import Actions from '@nextcloud/vue/dist/Components/NcActions.js'
		import ActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
		=======
		import {
		NcActions as Actions,
		NcActionButton as ActionButton,
		} from '@nextcloud/vue'
		>>>>>>> 956826ca66b66de76eb7561ddf0ad088428115c4

		import ViewDay from 'vue-material-design-icons/ViewDay.vue'
		import ViewGrid from 'vue-material-design-icons/ViewGrid.vue'

+0 −6

Original line number	Diff line number	Diff line
		@@ -59,17 +59,11 @@
		</template>

		<script>
		<<<<<<< HEAD
		import AppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
		import ActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
		import ActionLink from '@nextcloud/vue/dist/Components/NcActionLink.js'
		=======
		import {
		NcAppNavigationItem as AppNavigationItem,
		NcActionButton as ActionButton,
		NcActionLink as ActionLink,
		} from '@nextcloud/vue'
		>>>>>>> 956826ca66b66de76eb7561ddf0ad088428115c4
		import CalendarCheckIcon from 'vue-material-design-icons/CalendarCheck.vue'
		import DeleteIcon from 'vue-material-design-icons/Delete.vue'
		import OpenInNewIcon from 'vue-material-design-icons/OpenInNew.vue'