Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix lint
Signed-off-by: John Molakvoæ (skjnldsv) <[email protected]>
Signed-off-by: Richard Steinmetz <[email protected]>
  • Loading branch information
skjnldsv authored and st3iny committed Jun 25, 2021
commit 3c98f7a802c28008351eada8cde2bb51d7e0c28f
1 change: 1 addition & 0 deletions .stylelintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
src/fonts
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export default {
filters: {
formatDateRage,
},
data: function() {
data() {
return {
isDatepickerOpen: false,
}
Expand Down
6 changes: 3 additions & 3 deletions src/components/AppNavigation/CalendarList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
:calendar="calendar" />
</template>
<!-- The header slot must be placed here, otherwise vuedraggable adds undefined as item to the array -->
<CalendarListItemLoadingPlaceholder
v-if="loadingCalendars"
#footer />
<template #footer>
<CalendarListItemLoadingPlaceholder v-if="loadingCalendars" />
</template>
</draggable>
</template>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ export default {
required: true,
},
},
data: function() {
data() {
return {
// Rename action
showRenameLabel: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export default {
ActionText,
AppNavigationItem,
},
data: function() {
data() {
return {
// Open state
isOpen: false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ export default {
required: true,
},
},
data: function() {
data() {
return {
// copy subscription link:
showCopySubscriptionLinkLabel: true,
Expand Down
8 changes: 8 additions & 0 deletions src/components/AppNavigation/CalendarList/Trashbin.vue
Original file line number Diff line number Diff line change
Expand Up @@ -236,35 +236,43 @@ export default {
max-width: 40vw;
margin: 2vw;
}

table {
width: 100%;
}

th, td {
padding: 4px;
}

th {
color: var(--color-text-maxcontrast)
}

.name {
// Take remaining width to prevent whitespace on the right side
width: 100vw;
}

.item {
display: flex;

.item-subline {
color: var(--color-text-maxcontrast)
}
}

.deletedAt {
text-align: right;
}

.footer {
color: var(--color-text-lighter);
text-align: center;
font-size: small;
margin-top: 16px;
}

.color-dot {
display: inline-block;
vertical-align: middle;
Expand Down
2 changes: 1 addition & 1 deletion src/components/AppNavigation/Settings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ export default {
default: false,
},
},
data: function() {
data() {
return {
savingBirthdayCalendar: false,
savingEventLimit: false,
Expand Down
2 changes: 2 additions & 0 deletions src/components/AppNavigation/Settings/ImportScreenRow.vue
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ export default {
return this.$store.getters.getCalendarById(calendarId)
},
calendars() {
// TODO: remove once the false positive is fixed upstream
// eslint-disable-next-line vue/no-side-effects-in-computed-properties
const calendars = this.$store.getters.sortedCalendarFilteredByComponents(
this.file.parser.containsVEvents(),
this.file.parser.containsVJournals(),
Expand Down
20 changes: 10 additions & 10 deletions src/components/Editor/Alarm/AlarmTimeUnitSelect.vue
Original file line number Diff line number Diff line change
Expand Up @@ -71,29 +71,29 @@ export default {

if (this.unit === 'seconds') {
options.push({
'label': this.$n('calendar', 'second', 'seconds', this.count),
'unit': 'seconds',
label: this.$n('calendar', 'second', 'seconds', this.count),
unit: 'seconds',
})
}

if (!this.isAllDay || ['minutes', 'hours'].indexOf(this.unit) !== -1) {
options.push({
'label': this.$n('calendar', 'minute', 'minutes', this.count),
'unit': 'minutes',
label: this.$n('calendar', 'minute', 'minutes', this.count),
unit: 'minutes',
})
options.push({
'label': this.$n('calendar', 'hour', 'hours', this.count),
'unit': 'hours',
label: this.$n('calendar', 'hour', 'hours', this.count),
unit: 'hours',
})
}

options.push({
'label': this.$n('calendar', 'day', 'days', this.count),
'unit': 'days',
label: this.$n('calendar', 'day', 'days', this.count),
unit: 'days',
})
options.push({
'label': this.$n('calendar', 'week', 'weeks', this.count),
'unit': 'weeks',
label: this.$n('calendar', 'week', 'weeks', this.count),
unit: 'weeks',
})

return options
Expand Down
2 changes: 1 addition & 1 deletion src/components/Editor/FreeBusy/FreeBusy.vue
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ export default {
let title = attendee.commonName || attendee.uri.substr(7)
if (attendee === this.organizer) {
title = this.$t('calendar', '{organizer} (organizer)', {
organizer: title
organizer: title,
})
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ export default {
opacity: .45;
position: relative;
}

.avatar-participation-status__text {
opacity: .45;
left: 69px;
Expand Down
1 change: 1 addition & 0 deletions src/components/Editor/Invitees/InviteesListItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ export default {
.invitees-list-item__displayname {
margin-bottom: 17px;
}

.avatar-participation-status {
margin-top: 5px;
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/Editor/Invitees/InviteesListSearch.vue
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ export default {
arr.push({
calendarUserType: 'INDIVIDUAL',
commonName: result.name,
email: email,
email,
isUser: false,
avatar: result.photo,
language: result.lang,
Expand Down Expand Up @@ -221,7 +221,7 @@ export default {
}

if (this.alreadyInvitedEmails.includes(principal.email)) {
return
return false
}

// We do not support GROUPS for now
Expand Down
1 change: 1 addition & 0 deletions src/components/Editor/Invitees/OrganizerListItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ export default {
.invitees-list-item__displayname {
margin-bottom: 13px;
}

.invitees-list-item__organizer-hint {
margin-bottom: 14px;
}
Expand Down
20 changes: 10 additions & 10 deletions src/components/Editor/Repeat/RepeatFreqSelect.vue
Original file line number Diff line number Diff line change
Expand Up @@ -51,20 +51,20 @@ export default {
computed: {
options() {
return [{
'label': this.$t('calendar', 'never'),
'freq': 'NONE',
label: this.$t('calendar', 'never'),
freq: 'NONE',
}, {
'label': this.$n('calendar', 'day', 'days', this.count),
'freq': 'DAILY',
label: this.$n('calendar', 'day', 'days', this.count),
freq: 'DAILY',
}, {
'label': this.$n('calendar', 'week', 'weeks', this.count),
'freq': 'WEEKLY',
label: this.$n('calendar', 'week', 'weeks', this.count),
freq: 'WEEKLY',
}, {
'label': this.$n('calendar', 'month', 'months', this.count),
'freq': 'MONTHLY',
label: this.$n('calendar', 'month', 'months', this.count),
freq: 'MONTHLY',
}, {
'label': this.$n('calendar', 'year', 'years', this.count),
'freq': 'YEARLY',
label: this.$n('calendar', 'year', 'years', this.count),
freq: 'YEARLY',
}]
},
selected() {
Expand Down
4 changes: 2 additions & 2 deletions src/components/Shared/CalendarPicker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
:options="calendars"
:value="calendar"
@select="change">
<template v-slot:singleLabel="scope">
<template #singleLabel="scope">
<CalendarPickerOption v-bind="scope.option" />
</template>
<template v-slot:option="scope">
<template #option="scope">
<CalendarPickerOption v-bind="scope.option" />
</template>
</Multiselect>
Expand Down
4 changes: 2 additions & 2 deletions src/components/Shared/DatePicker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
@close="close"
@change="change"
@pick="pickDate">
<template v-slot:icon-calendar>
<template #icon-calendar>
<button
class="datetime-picker-inline-icon icon"
:class="{'icon-timezone': !isAllDay, 'icon-new-calendar': isAllDay, 'datetime-picker-inline-icon--highlighted': highlightTimezone}"
Expand All @@ -62,7 +62,7 @@
</template>
<template
v-if="!isAllDay"
v-slot:footer>
#footer>
<button
v-if="!showTimePanel"
class="mx-btn mx-btn-text"
Expand Down
2 changes: 1 addition & 1 deletion src/fullcalendar/eventSources/eventSource.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export default function(store) {
let timeRangeId
try {
timeRangeId = await store.dispatch('getEventsFromCalendarInTimeRange', {
calendar: calendar,
calendar,
from: start,
to: end,
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ export default function(organizer, attendees, resources) {
groupId: 'free-busy-blocked-for-all',
start: slot.start.toISOString(),
end: slot.end.toISOString(),
resourceIds: resourceIds,
resourceIds,
display: 'background',
allDay: false,
backgroundColor: 'var(--color-text-maxcontrast)',
Expand Down
2 changes: 1 addition & 1 deletion src/services/caldavService.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const getClient = () => {
}, () => {
const headers = {
'X-Requested-With': 'XMLHttpRequest',
'requesttoken': getRequestToken(),
requesttoken: getRequestToken(),
'X-NC-CalDAV-Webcal-Caching': 'On',
}
const xhr = new XMLHttpRequest()
Expand Down
2 changes: 1 addition & 1 deletion src/services/talkService.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import { generateUrl, generateOcsUrl } from '@nextcloud/router'
export async function createTalkRoom(eventTitle = null) {
let response
try {
response = await HTTPClient.post(generateOcsUrl('apps/spreed/api/v1', 2) + `room`, {
response = await HTTPClient.post(generateOcsUrl('apps/spreed/api/v1', 2) + 'room', {
roomType: 3,
roomName: eventTitle || t('calendar', 'Chat room for event'),
})
Expand Down
4 changes: 2 additions & 2 deletions src/store/calendarObjectInstance.js
Original file line number Diff line number Diff line change
Expand Up @@ -1437,7 +1437,7 @@ const actions = {
const defaultReminder = parseInt(settings.state.defaultReminder)
if (!isNaN(defaultReminder)) {
commit('addAlarmToCalendarObjectInstance', {
calendarObjectInstance: calendarObjectInstance,
calendarObjectInstance,
type: 'DISPLAY',
totalSeconds: defaultReminder,
})
Expand Down Expand Up @@ -1521,7 +1521,7 @@ const actions = {
if (original !== null && fork !== null && original.root !== fork.root) {
await dispatch('createCalendarObjectFromFork', {
eventComponent: fork,
calendarId: calendarId,
calendarId,
})
}
}
Expand Down
18 changes: 7 additions & 11 deletions src/store/calendars.js
Original file line number Diff line number Diff line change
Expand Up @@ -984,17 +984,13 @@ const actions = {
components.push('VTODO')
}

try {
const response = await createCalendar(displayName, color, components, 0)
const calendar = mapDavCollectionToCalendar(response, context.getters.getCurrentUserPrincipal)
context.commit('addCalendar', { calendar })
context.commit('setCalendarForFileId', {
fileId: file.id,
calendarId: calendar.id,
})
} catch (error) {
throw error
}
const response = await createCalendar(displayName, color, components, 0)
const calendar = mapDavCollectionToCalendar(response, context.getters.getCurrentUserPrincipal)
context.commit('addCalendar', { calendar })
context.commit('setCalendarForFileId', {
fileId: file.id,
calendarId: calendar.id,
})
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/utils/timezone.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export function getSortedTimezoneList(timezoneList = [], additionalTimezones = [
}

sortedByContinent[continent].regions.push({
label: label,
label,
cities: [],
timezoneId,
})
Expand Down
2 changes: 1 addition & 1 deletion src/views/Calendar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ export default {
computed: {
...mapGetters({
timezoneId: 'getResolvedTimezone',
'hasTrashBin': 'hasTrashBin',
hasTrashBin: 'hasTrashBin',
},
),
...mapState({
Expand Down
6 changes: 3 additions & 3 deletions src/views/EditSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@
</EmptyContent>
</template>

<template v-slot:header>
<template #header>
<IllustrationHeader :color="illustrationColor" :illustration-url="backgroundImage" />
</template>

<template
v-if="!isLoading && !isError"
v-slot:secondary-actions>
#secondary-actions>
<ActionLink v-if="hasDownloadURL"
icon="icon-download"
:href="downloadURL">
Expand All @@ -71,7 +71,7 @@

<template
v-if="!isLoading && !isError"
v-slot:description>
#description>
<PropertyCalendarPicker
v-if="showCalendarPicker"
:calendars="calendars"
Expand Down
Loading