Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use nextcloud/vue@6 #2127

Merged
merged 3 commits into from
Oct 13, 2022
Merged

Use nextcloud/vue@6 #2127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0ba414
Bump nextcloud/vue to 6.0.0
raimund-schluessler Oct 13, 2022
5666eb6
Adjust to changed behaviour of NcEmptyContent
raimund-schluessler Oct 13, 2022
1449a36
Fix TaskCreateDialog and Multiselect appearance
raimund-schluessler Oct 13, 2022
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
14 changes: 7 additions & 7 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"@nextcloud/logger": "^2.3.0",
"@nextcloud/moment": "^1.2.1",
"@nextcloud/router": "^2.0.0",
"@nextcloud/vue": "^6.0.0-beta.8",
"@nextcloud/vue": "^6.0.0",
"color-convert": "^2.0.1",
"debounce": "^1.2.1",
"ical.js": "^1.5.0",
Expand Down
11 changes: 7 additions & 4 deletions src/components/AppNavigation/Trashbin.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,15 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
size="large"
@close="showModal = false">
<div class="modal__content">
<NcEmptyContent v-if="loading" icon="icon-loading">
{{ t('tasks', 'Loading deleted calendars, tasks and events.') }}
<NcEmptyContent v-if="loading" :description="t('tasks', 'Loading deleted calendars, tasks and events.')">
<template #icon>
<NcLoadingIcon :size="64" />
</template>
</NcEmptyContent>
<NcEmptyContent v-else-if="!items.length">
<NcEmptyContent v-else-if="!items.length" :description="t('tasks', 'You do not have any deleted calendars, tasks or events.')">
<template #icon>
<Delete :size="64" />
</template>
{{ t('tasks', 'You do not have any deleted calendars, tasks or events.') }}
</NcEmptyContent>
<template v-else>
<h2>{{ t('tasks', 'Trash bin') }}</h2>
Expand Down Expand Up @@ -118,6 +119,7 @@ import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
import NcLoadingIcon from '@nextcloud/vue/dist/Components/NcLoadingIcon.js'
import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'

import Delete from 'vue-material-design-icons/Delete.vue'
Expand All @@ -132,6 +134,7 @@ export default {
NcAppNavigationItem,
Delete,
NcEmptyContent,
NcLoadingIcon,
NcModal,
Moment,
NcActions,
Expand Down
2 changes: 2 additions & 0 deletions src/components/AppSidebar/CalendarPickerItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ export default {
.multiselect__tags {
border: 1px solid transparent;
height: 44px;
padding: 0 !important;

.multiselect__single {
padding: 0;
Expand All @@ -133,6 +134,7 @@ export default {
position: absolute !important;
font-weight: bold;
font-size: var(--default-font-size);
line-height: 44px;
}
}

Expand Down
1 change: 1 addition & 0 deletions src/components/AppSidebar/MultiselectItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ export default {
.multiselect__tags {
border: 1px solid transparent;
height: 44px;
padding: 0 !important;

.multiselect__single {
padding: 0;
Expand Down
2 changes: 2 additions & 0 deletions src/components/AppSidebar/TagsItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ export default {
.multiselect__tags {
border: 1px solid transparent;
height: 44px;
padding: 0 !important;
flex-grow: 1;

.multiselect__single {
Expand All @@ -166,6 +167,7 @@ export default {
position: absolute !important;
font-weight: bold;
font-size: var(--default-font-size);
line-height: 44px;
}

.multiselect__tags-wrap {
Expand Down
35 changes: 16 additions & 19 deletions src/components/TaskCreateDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,19 +63,16 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
</div>
</div>
<div v-else id="modal-inner">
<NcEmptyContent v-if="creating" key="creating">
{{ t('tasks', 'Creating the new task…') }}
<NcEmptyContent v-if="creating" key="creating" :description="t('tasks', 'Creating the new task…')">
<template #icon>
<NcLoadingIcon />
</template>
</NcEmptyContent>
<NcEmptyContent v-else-if="created" key="created">
{{ t('tasks', '"{task}" was added to "{calendar}"', { task: pendingTitle, calendar: pendingCalendar.displayName }, undefined, { sanitize: false, escape: false }) }}
<NcEmptyContent v-else-if="created" key="created" :description="createdMessage">
<template #icon>
<Check />
</template>
<template #desc>
&nbsp;
<template #action>
<NcButton @click="close">
{{ t('tasks', 'Close') }}
</NcButton>
Expand Down Expand Up @@ -146,6 +143,9 @@ export default {
writableCalendars: 'getSortedWritableCalendars',
defaultCalendar: 'getDefaultCalendar',
}),
createdMessage() {
return t('tasks', '"{task}" was added to "{calendar}"', { task: this.pendingTitle, calendar: this.pendingCalendar.displayName }, undefined, { sanitize: false, escape: false })
},
},

beforeMount() {
Expand Down Expand Up @@ -219,9 +219,8 @@ export default {
.empty-content {
margin: 10vh 0;

::v-deep p {
:deep(.empty-content__action) {
display: flex;
justify-content: flex-end;
}
}
}
Expand All @@ -230,9 +229,8 @@ export default {
border-bottom: none;
margin-bottom: 3px;

:deep(.multiselect) {
border: 1px solid var(--color-border-dark);
border-radius: var(--border-radius);
:deep(.multiselect .multiselect__tags) {
border: 2px solid var(--color-border-dark);
}
}

Expand All @@ -241,15 +239,14 @@ export default {

.material-design-icon {
position: absolute;
top: 12px;
left: 12px;
top: 14px;
left: 14px;
}

input,
textarea {
width: 100%;
font-size: var(--default-font-size);
padding-left: 44px;
padding-left: 44px !important;
}

input {
Expand All @@ -264,10 +261,10 @@ export default {
}
}

.modal-buttons {
display: flex;
justify-content: flex-end;
}
.modal-buttons {
display: flex;
justify-content: flex-end;
}

:deep(.calendar-picker-option__label),
:deep(.property__item .multiselect__tags) input.multiselect__input {
Expand Down
15 changes: 9 additions & 6 deletions src/views/AppSidebar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,11 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
@set-tags="updateTags" />
</div>
</NcAppSidebarTab>
<NcEmptyContent v-else
:icon="taskStatusIcon">
{{ taskStatusLabel }}
<NcEmptyContent v-else :description="taskStatusLabel">
<template #icon>
<NcLoadingIcon v-if="loading" />
<Magnify v-else />
</template>
</NcEmptyContent>
<NcAppSidebarTab v-if="task && (!readOnly || task.note)"
id="app-sidebar-tab-notes"
Expand Down Expand Up @@ -249,6 +251,7 @@ import NcActionLink from '@nextcloud/vue/dist/Components/NcActionLink.js'
import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
import NcAppSidebar from '@nextcloud/vue/dist/Components/NcAppSidebar.js'
import NcAppSidebarTab from '@nextcloud/vue/dist/Components/NcAppSidebarTab.js'
import NcLoadingIcon from '@nextcloud/vue/dist/Components/NcLoadingIcon.js'
import { generateUrl } from '@nextcloud/router'

import Calendar from 'vue-material-design-icons/Calendar.vue'
Expand All @@ -257,6 +260,7 @@ import CalendarStart from 'vue-material-design-icons/CalendarStart.vue'
import Delete from 'vue-material-design-icons/Delete.vue'
import Download from 'vue-material-design-icons/Download.vue'
import InformationOutline from 'vue-material-design-icons/InformationOutline.vue'
import Magnify from 'vue-material-design-icons/Magnify.vue'
import Pencil from 'vue-material-design-icons/Pencil.vue'
import Percent from 'vue-material-design-icons/Percent.vue'
import Pin from 'vue-material-design-icons/Pin.vue'
Expand All @@ -273,6 +277,7 @@ export default {
NcAppSidebarTab,
NcActionButton,
NcActionLink,
NcLoadingIcon,
CheckboxItem,
DatetimePickerItem,
Calendar,
Expand All @@ -281,6 +286,7 @@ export default {
Delete,
Download,
InformationOutline,
Magnify,
Pencil,
Percent,
Pin,
Expand Down Expand Up @@ -501,9 +507,6 @@ export default {
taskStatusLabel() {
return this.loading ? t('tasks', 'Loading task from server.') : t('tasks', 'Task not found!')
},
taskStatusIcon() {
return this.loading ? 'icon-loading' : 'icon-search'
},
/**
* Whether we treat the task as read-only.
* We also treat tasks in shared calendars with an access class other than 'PUBLIC'
Expand Down