ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #4623 from nextcloud/deps/update

Browse Source
This commit is contained in:
Julius Härtl
2023-04-27 15:46:58 +02:00
committed by GitHub
parent 42aff58c6e 2066080e56
commit 741e4be749
10 changed files with 131 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/components/card/CardSidebar.vue
View File

@@ -50,32 +50,38 @@
<NcAppSidebarTab id="details"
:order="0"
:name="t('deck', 'Details')"
icon="icon-home">
:name="t('deck', 'Details')">
<CardSidebarTabDetails :card="currentCard" />
<template #icon>
<HomeIcon :size="20" />
</template>
</NcAppSidebarTab>
<NcAppSidebarTab id="attachments"
:order="1"
:name="t('deck', 'Attachments')">
<template #icon>
<AttachmentIcon :size="20" decorative />
<AttachmentIcon :size="20" />
</template>
<CardSidebarTabAttachments :card="currentCard" />
</NcAppSidebarTab>
<NcAppSidebarTab id="comments"
:order="2"
:name="t('deck', 'Comments')"
icon="icon-comment">
:name="t('deck', 'Comments')">
<template #icon>
<CommentIcon :size="20" />
</template>
<CardSidebarTabComments :card="currentCard" :tab-query="tabQuery" />
</NcAppSidebarTab>
<NcAppSidebarTab v-if="hasActivity"
id="timeline"
:order="3"
:name="t('deck', 'Timeline')"
icon="icon-activity">
:name="t('deck', 'Timeline')">
<template #icon>
<ActivityIcon :size="20" />
</template>
<CardSidebarTabActivity :card="currentCard" />
</NcAppSidebarTab>
</NcAppSidebar>
@@ -92,6 +98,9 @@ import CardSidebarTabActivity from './CardSidebarTabActivity.vue'
import relativeDate from '../../mixins/relativeDate.js'
import moment from '@nextcloud/moment'
import AttachmentIcon from 'vue-material-design-icons/Paperclip.vue'
import HomeIcon from 'vue-material-design-icons/Home.vue'
import CommentIcon from 'vue-material-design-icons/Comment.vue'
import ActivityIcon from 'vue-material-design-icons/LightningBolt.vue'
import { showError } from '@nextcloud/dialogs'
import { getLocale } from '@nextcloud/l10n'
@@ -108,7 +117,10 @@ export default {
CardSidebarTabComments,
CardSidebarTabActivity,
CardSidebarTabDetails,
ActivityIcon,
AttachmentIcon,
CommentIcon,
HomeIcon,
},
mixins: [relativeDate],
props: {

9
src/components/card/CommentItem.vue
View File

@@ -12,7 +12,7 @@
</NcActionButton>
</NcActions>
</div>
<RichText class="comment--content"
<NcRichText class="comment--content"
:text="richText(comment)"
:arguments="richArgs(comment)"
:autolink="true" />
@@ -54,7 +54,7 @@
</div>
<CommentItem v-if="comment.replyTo" :reply="true" :comment="comment.replyTo" />
<div v-show="!edit" ref="richTextElement">
<RichText class="comment--content"
<NcRichText class="comment--content"
:text="richText(comment)"
:arguments="richArgs(comment)"
:autolink="true" />
@@ -64,8 +64,7 @@
</template>
<script>
import { NcAvatar, NcActions, NcActionButton, NcUserBubble } from '@nextcloud/vue'
import { RichText } from '@nextcloud/vue-richtext'
import { NcAvatar, NcActions, NcActionButton, NcRichText, NcUserBubble } from '@nextcloud/vue'
import CommentForm from './CommentForm.vue'
import { getCurrentUser } from '@nextcloud/auth'
import md5 from 'blueimp-md5'
@@ -93,7 +92,7 @@ export default {
NcActions,
NcActionButton,
CommentForm,
RichText,
NcRichText,
ReplyIcon,
},
mixins: [relativeDate],