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

use deck icon for boards, MDI-card for cards and MDI-comment for comments

Browse Source 
Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
This commit is contained in:
Julien Veyssier
2023-02-01 15:15:34 +01:00
parent b4d477dc05
commit bbd6f0c26c
6 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
img/card.svg
View File

@@ -1,3 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" style="height: 240px; width: 240px;" viewBox="0 0 24 24">
<path d="M8 3H16C18.76 3 21 5.24 21 8V16C21 18.76 18.76 21 16 21H8C5.24 21 3 18.76 3 16V8C3 5.24 5.24 3 8 3M8 5C6.34 5 5 6.34 5 8V16C5 17.66 6.34 19 8 19H16C17.66 19 19 17.66 19 16V8C19 6.34 17.66 5 16 5H8Z" />
<path fill="currentColor" d="M12,15H10V13H12V15M18,15H14V13H18V15M8,11H6V9H8V11M18,11H10V9H18V11M20,20H4A2,2 0 0,1 2,18V6A2,2 0 0,1 4,4H20A2,2 0 0,1 22,6V18A2,2 0 0,1 20,20M4,6V18H20V6H4Z" />
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 317 B

After

Width:  |  Height:  |  Size: 298 B

4
lib/Reference/CommentReferenceProvider.php
View File

@@ -23,21 +23,17 @@
namespace OCA\Deck\Reference;
use OCA\Deck\AppInfo\Application;
use OCA\Deck\Db\Acl;
use OCA\Deck\Db\Assignment;
use OCA\Deck\Db\Attachment;
use OCA\Deck\Db\Label;
use OCA\Deck\Model\CardDetails;
use OCA\Deck\NotFoundException;
use OCA\Deck\Service\BoardService;
use OCA\Deck\Service\CardService;
use OCA\Deck\Service\CommentService;
use OCA\Deck\Service\PermissionService;
use OCA\Deck\Service\StackService;
use OCP\Collaboration\Reference\IReference;
use OCP\Collaboration\Reference\IReferenceProvider;
use OCP\Collaboration\Reference\Reference;
use OCP\Comments\ICommentsManager;
use OCP\IL10N;
use OCP\IURLGenerator;

1
lib/Search/CommentSearchResultEntry.php
View File

@@ -26,7 +26,6 @@ declare(strict_types=1);
namespace OCA\Deck\Search;
use OCA\Deck\AppInfo\Application;
use OCA\Deck\Db\Card;
use OCP\IL10N;
use OCP\IURLGenerator;

2
lib/Service/CommentService.php
View File

@@ -86,7 +86,7 @@ class CommentService {
private function get(int $cardId, int $commentId): IComment {
$this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_READ);
try {
$comment = $this->commentsManager->get($commentId);
$comment = $this->commentsManager->get((string) $commentId);
if ($comment->getObjectType() !== Application::COMMENT_ENTITY_TYPE || (int) $comment->getObjectId() !== $cardId) {
throw new CommentNotFoundException();
}

5
src/views/CardReferenceWidget.vue
View File

@@ -22,7 +22,7 @@
<template>
<div class="deck-card-reference">
<div class="line">
<DeckIcon :size="20" class="title-icon" />
<CardBulletedOutlineIcon :size="20" class="title-icon" />
<strong>
<a :href="cardLink"
:title="cardTooltip"
@@ -41,6 +41,7 @@
</span>
</div>
<div class="line">
<DeckIcon :size="20" class="title-icon" />
<a v-tooltip.top="{ content: stackTooltip }"
:href="boardLink"
target="_blank"
@@ -83,6 +84,7 @@
<script>
import CalendarBlankIcon from 'vue-material-design-icons/CalendarBlank.vue'
import TextIcon from 'vue-material-design-icons/Text.vue'
import CardBulletedOutlineIcon from 'vue-material-design-icons/CardBulletedOutline.vue'
import DeckIcon from '../components/icons/DeckIcon.vue'
import AvatarList from '../components/cards/AvatarList.vue'
@@ -99,6 +101,7 @@ export default {
AvatarList,
DeckIcon,
CalendarBlankIcon,
CardBulletedOutlineIcon,
TextIcon,
RichText,
},

5
src/views/CommentReferenceWidget.vue
View File

@@ -22,7 +22,7 @@
<template>
<div class="deck-comment-reference">
<div class="line">
<DeckIcon :size="20" class="title-icon" />
<CardBulletedOutlineIcon :size="20" class="title-icon" />
<strong>
<a :href="cardLink"
:title="cardTooltip"
@@ -41,6 +41,7 @@
</span>
</div>
<div class="line">
<DeckIcon :size="20" class="title-icon" />
<a v-tooltip.top="{ content: stackTooltip }"
:href="boardLink"
target="_blank"
@@ -95,6 +96,7 @@
<script>
import CalendarBlankIcon from 'vue-material-design-icons/CalendarBlank.vue'
import TextIcon from 'vue-material-design-icons/Text.vue'
import CardBulletedOutlineIcon from 'vue-material-design-icons/CardBulletedOutline.vue'
import CommentProcessingOutlineIcon from 'vue-material-design-icons/CommentProcessingOutline.vue'
import DeckIcon from '../components/icons/DeckIcon.vue'
@@ -113,6 +115,7 @@ export default {
DeckIcon,
CalendarBlankIcon,
TextIcon,
CardBulletedOutlineIcon,
RichText,
CommentProcessingOutlineIcon,
},