diff --git a/client/src/components/cards/Card/InlineContent.jsx b/client/src/components/cards/Card/InlineContent.jsx index 341b25f3..7fdea984 100644 --- a/client/src/components/cards/Card/InlineContent.jsx +++ b/client/src/components/cards/Card/InlineContent.jsx @@ -11,7 +11,7 @@ import { Icon } from 'semantic-ui-react'; import selectors from '../../../selectors'; import markdownToText from '../../../utils/markdown-to-text'; -import { BoardViews } from '../../../constants/Enums'; +import { BoardViews, ListTypes } from '../../../constants/Enums'; import UserAvatar from '../../users/UserAvatar'; import LabelChip from '../../labels/LabelChip'; @@ -28,6 +28,7 @@ const InlineContent = React.memo(({ cardId }) => { ); const card = useSelector((state) => selectCardById(state, cardId)); + const list = useSelector((state) => selectListById(state, card.listId)); const labelIds = useSelector((state) => selectLabelIdsByCardId(state, cardId)); const notificationsTotal = useSelector((state) => @@ -35,8 +36,6 @@ const InlineContent = React.memo(({ cardId }) => { ); const listName = useSelector((state) => { - const list = selectListById(state, card.listId); - if (!list.name) { return null; } @@ -55,6 +54,8 @@ const InlineContent = React.memo(({ cardId }) => { [card.description], ); + const isInClosedList = list.type === ListTypes.CLOSED; + return (
@@ -88,7 +89,9 @@ const InlineContent = React.memo(({ cardId }) => { ))} )} - +
{card.name}
{descriptionText && ( diff --git a/client/src/components/cards/Card/InlineContent.module.scss b/client/src/components/cards/Card/InlineContent.module.scss index a1eff782..c19bffd7 100644 --- a/client/src/components/cards/Card/InlineContent.module.scss +++ b/client/src/components/cards/Card/InlineContent.module.scss @@ -50,6 +50,10 @@ max-width: 30%; } + .nameClosed { + text-decoration: line-through; + } + .notification { background: #eb5a46; color: #fff; diff --git a/client/src/components/cards/Card/ProjectContent.jsx b/client/src/components/cards/Card/ProjectContent.jsx index 3582b73a..8074d923 100644 --- a/client/src/components/cards/Card/ProjectContent.jsx +++ b/client/src/components/cards/Card/ProjectContent.jsx @@ -110,6 +110,8 @@ const ProjectContent = React.memo(({ cardId }) => { [cardId, card.stopwatch, dispatch], ); + const isInClosedList = list.type === ListTypes.CLOSED; + const hasInformation = card.description || card.dueDate || @@ -145,7 +147,9 @@ const ProjectContent = React.memo(({ cardId }) => { return (
-
{card.name}
+
+ {card.name} +
{coverUrl && (
@@ -190,7 +194,7 @@ const ProjectContent = React.memo(({ cardId }) => { )} diff --git a/client/src/components/cards/Card/ProjectContent.module.scss b/client/src/components/cards/Card/ProjectContent.module.scss index 72503ee2..57ff384c 100644 --- a/client/src/components/cards/Card/ProjectContent.module.scss +++ b/client/src/components/cards/Card/ProjectContent.module.scss @@ -84,6 +84,10 @@ word-wrap: break-word; } + .nameClosed { + text-decoration: line-through; + } + .notification { background: #eb5a46; color: #fff; diff --git a/client/src/components/cards/Card/StoryContent.jsx b/client/src/components/cards/Card/StoryContent.jsx index 42db3628..2911b2b2 100644 --- a/client/src/components/cards/Card/StoryContent.jsx +++ b/client/src/components/cards/Card/StoryContent.jsx @@ -11,7 +11,7 @@ import { Icon } from 'semantic-ui-react'; import selectors from '../../../selectors'; import markdownToText from '../../../utils/markdown-to-text'; -import { BoardViews } from '../../../constants/Enums'; +import { BoardViews, ListTypes } from '../../../constants/Enums'; import LabelChip from '../../labels/LabelChip'; import CustomFieldValueChip from '../../custom-field-values/CustomFieldValueChip'; @@ -40,6 +40,7 @@ const StoryContent = React.memo(({ cardId }) => { const selectAttachmentById = useMemo(() => selectors.makeSelectAttachmentById(), []); const card = useSelector((state) => selectCardById(state, cardId)); + const list = useSelector((state) => selectListById(state, card.listId)); const labelIds = useSelector((state) => selectLabelIdsByCardId(state, cardId)); const attachmentsTotal = useSelector((state) => selectAttachmentsTotalByCardId(state, cardId)); @@ -52,8 +53,6 @@ const StoryContent = React.memo(({ cardId }) => { ); const listName = useSelector((state) => { - const list = selectListById(state, card.listId); - if (!list.name) { return null; } @@ -77,6 +76,8 @@ const StoryContent = React.memo(({ cardId }) => { [card.description], ); + const isInClosedList = list.type === ListTypes.CLOSED; + return ( <> {coverUrl && ( @@ -106,7 +107,9 @@ const StoryContent = React.memo(({ cardId }) => { ))} )} -
{card.name}
+
+ {card.name} +
{card.description &&
{descriptionText}
} {(attachmentsTotal > 0 || notificationsTotal > 0 || listName) && ( diff --git a/client/src/components/cards/Card/StoryContent.module.scss b/client/src/components/cards/Card/StoryContent.module.scss index 57282192..a735b210 100644 --- a/client/src/components/cards/Card/StoryContent.module.scss +++ b/client/src/components/cards/Card/StoryContent.module.scss @@ -74,6 +74,10 @@ word-wrap: break-word; } + .nameClosed { + text-decoration: line-through; + } + .notification { background: #eb5a46; color: #fff;