From cb94b7b3113f9f3a5b0394d8a307eb087cf5ed17 Mon Sep 17 00:00:00 2001
From: Ruben Bimberg <ruben.bimberg@mni.thm.de>
Date: Mon, 11 Oct 2021 15:22:42 +0200
Subject: [PATCH] Add new colors to comment
---
.../shared/comment-list/comment-list.component.html | 2 ++
src/app/components/shared/comment/comment.component.html | 4 +++-
src/app/components/shared/comment/comment.component.scss | 8 ++++++++
src/app/components/shared/comment/comment.component.ts | 2 ++
4 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/src/app/components/shared/comment-list/comment-list.component.html b/src/app/components/shared/comment-list/comment-list.component.html
index 28de46839..b54fd25f3 100644
--- a/src/app/components/shared/comment-list/comment-list.component.html
+++ b/src/app/components/shared/comment-list/comment-list.component.html
@@ -272,6 +272,8 @@
[parseVote]="getVote(current)"
[userRole]="userRole"
[moderator]="false"
+ [isFromModerator]="moderatorIds.includes(current.creatorId)"
+ [isFromOwner]="room.ownerId === current.creatorId"
[user]="user"
[disabled]="!commentsEnabled"
[commentsWrittenByUser]="commentsWrittenByUsers.get(current.creatorId).size"
diff --git a/src/app/components/shared/comment/comment.component.html b/src/app/components/shared/comment/comment.component.html
index b2ed57a85..dbb3d0ca8 100644
--- a/src/app/components/shared/comment/comment.component.html
+++ b/src/app/components/shared/comment/comment.component.html
@@ -8,7 +8,9 @@
'border-wrong': comment.correct === 2,
'border-answer': comment.answer && comment.bookmark === false && comment.favorite === false,
'border-bookmark': comment.bookmark === true,
- 'border-favorite': comment.favorite === true
+ 'border-favorite': comment.favorite === true,
+ 'border-fromModerator': isFromModerator,
+ 'border-fromOwner': isFromOwner
}"
[@slide]="slideAnimationState"
(@slide.done)="changeSlideState()">
diff --git a/src/app/components/shared/comment/comment.component.scss b/src/app/components/shared/comment/comment.component.scss
index 461458aab..7af05a1c1 100644
--- a/src/app/components/shared/comment/comment.component.scss
+++ b/src/app/components/shared/comment/comment.component.scss
@@ -180,6 +180,14 @@ mat-card-content > :first-child {
&-mergeSelect {
@include card-box-shadow(var(--cyan));
}
+
+ &-fromModerator {
+ @include card-box-shadow(var(--red));
+ }
+
+ &-fromOwner {
+ @include card-box-shadow(var(--red));
+ }
}
.comment-tags {
diff --git a/src/app/components/shared/comment/comment.component.ts b/src/app/components/shared/comment/comment.component.ts
index a06e38bb9..59cde5fef 100644
--- a/src/app/components/shared/comment/comment.component.ts
+++ b/src/app/components/shared/comment/comment.component.ts
@@ -45,6 +45,8 @@ export class CommentComponent implements OnInit, AfterViewInit {
@Input() disabled = false;
@Input() usesJoyride = false;
@Input() commentsWrittenByUser = 1;
+ @Input() isFromModerator = false;
+ @Input() isFromOwner = false;
@Output() clickedOnTag = new EventEmitter<string>();
@Output() clickedOnKeyword = new EventEmitter<string>();
@Output() clickedUserNumber = new EventEmitter<number>();
--
GitLab