{trans.common.CHILD_ISSUES}
-
diff --git a/apps/web/components/pages/task/IssueCard.tsx b/apps/web/components/pages/task/IssueCard.tsx
index 45860df41..e279be65e 100644
--- a/apps/web/components/pages/task/IssueCard.tsx
+++ b/apps/web/components/pages/task/IssueCard.tsx
@@ -5,11 +5,12 @@ import { createTaskLinkedIsssueAPI } from '@app/services/client/api';
import { detailedTaskState } from '@app/stores';
import { clsxm } from '@app/utils';
import { Card, Modal, SpinnerLoader, Text } from 'lib/components';
-import { ChevronDownIcon, ChevronUpIcon, PlusIcon } from 'lib/components/svgs';
+import { ChevronDownIcon, ChevronUpIcon } from 'assets/svg';
import { TaskInput, TaskLinkedIssue } from 'lib/features';
import { useCallback, useMemo, useState } from 'react';
import { useRecoilValue } from 'recoil';
import { useTranslations } from 'next-intl';
+import { AddIcon } from 'assets/svg';
export const RelatedIssueCard = () => {
const t = useTranslations();
@@ -54,7 +55,7 @@ export const RelatedIssueCard = () => {
@@ -71,9 +72,9 @@ export const RelatedIssueCard = () => {
diff --git a/apps/web/components/pages/task/description-block/editor-components/BlockButton.tsx b/apps/web/components/pages/task/description-block/editor-components/BlockButton.tsx
index a8e942bd7..ee64faceb 100644
--- a/apps/web/components/pages/task/description-block/editor-components/BlockButton.tsx
+++ b/apps/web/components/pages/task/description-block/editor-components/BlockButton.tsx
@@ -5,7 +5,7 @@ import { useSlate } from 'slate-react';
interface IMarkButtonProps {
format: string;
- icon: React.ComponentType;
+ icon: any;
isBlockActive: (editor: any, format: any, blockType?: string) => boolean;
className?: string;
}
@@ -37,7 +37,7 @@ const BlockButton = ({ format, icon: Icon, isBlockActive, className }: IMarkButt
TextEditorService.toggleBlock(editor, format, isBlockActive, LIST_TYPES, TEXT_ALIGN_TYPES);
}}
>
-
+
);
};
diff --git a/apps/web/components/pages/task/description-block/editor-components/CheckListElement.tsx b/apps/web/components/pages/task/description-block/editor-components/CheckListElement.tsx
index 8f45d5804..8795cd856 100644
--- a/apps/web/components/pages/task/description-block/editor-components/CheckListElement.tsx
+++ b/apps/web/components/pages/task/description-block/editor-components/CheckListElement.tsx
@@ -1,8 +1,7 @@
import { Transforms, Element as SlateElement } from 'slate';
import { ReactEditor, useReadOnly, useSlateStatic } from 'slate-react';
-import { CheckBoxIcon, UncheckedBoxIcon } from 'lib/components/svgs';
import { useRef } from 'react';
-
+import { SquareBoxIcon as UncheckedBoxIcon, CheckSquareRoundIcon as CheckBoxIcon } from 'assets/svg';
const CheckListElement = ({ attributes, children, element }: any) => {
const editor = useSlateStatic();
const readOnly = useReadOnly();
@@ -50,11 +49,11 @@ const CheckListElement = ({ attributes, children, element }: any) => {
/>
{checked ? (
) : (
)}
diff --git a/apps/web/components/pages/task/description-block/editor-components/LinkElement.tsx b/apps/web/components/pages/task/description-block/editor-components/LinkElement.tsx
index 0e5b0e581..3bc09d970 100644
--- a/apps/web/components/pages/task/description-block/editor-components/LinkElement.tsx
+++ b/apps/web/components/pages/task/description-block/editor-components/LinkElement.tsx
@@ -1,8 +1,8 @@
import { useSelected, useFocused, useSlateStatic } from 'slate-react';
-import { ExternalLinkIcon, UnlinkIcon } from 'lib/components/svgs';
import { removeLink } from '../editor-components/TextEditorService';
import { useEffect, useRef, useState } from 'react';
+import { ExternalLinkIcon, UnlinkRoundIcon } from 'assets/svg';
const LinkElement = ({ attributes, element, children }: any) => {
const editor = useSlateStatic();
@@ -48,7 +48,7 @@ const LinkElement = ({ attributes, element, children }: any) => {
contentEditable="false"
>
)}
diff --git a/apps/web/components/pages/task/description-block/editor-components/MarkButton.tsx b/apps/web/components/pages/task/description-block/editor-components/MarkButton.tsx
index fd5710c21..10fdf8f47 100644
--- a/apps/web/components/pages/task/description-block/editor-components/MarkButton.tsx
+++ b/apps/web/components/pages/task/description-block/editor-components/MarkButton.tsx
@@ -5,7 +5,7 @@ import { useSlate } from 'slate-react';
interface IMarkButtonProps {
format: string;
- icon: React.ComponentType;
+ icon: any;
isMarkActive: (editor: any, format: string) => boolean;
}
@@ -23,7 +23,7 @@ const MarkButton = ({ format, icon: Icon, isMarkActive }: IMarkButtonProps) => {
TextEditorService.toggleMark(editor, format, isMarkActive);
}}
>
-
+
);
};
diff --git a/apps/web/components/pages/task/description-block/editor-toolbar.tsx b/apps/web/components/pages/task/description-block/editor-toolbar.tsx
index 0c608817c..b21aa931a 100644
--- a/apps/web/components/pages/task/description-block/editor-toolbar.tsx
+++ b/apps/web/components/pages/task/description-block/editor-toolbar.tsx
@@ -2,33 +2,31 @@ import React, { useCallback, useEffect, useRef, useState } from 'react';
import BlockButton from './editor-components/BlockButton';
import MarkButton from './editor-components/MarkButton';
import { insertLink } from './editor-components/TextEditorService';
-
import { Popover, PopoverContent, PopoverTrigger } from '@components/ui/popover';
import { Button, InputField } from 'lib/components';
+import { Element, Node } from 'slate';
+import { useSlateStatic } from 'slate-react';
+import { useTranslations } from 'next-intl';
import {
+ AlignQuoteIcon,
+ CodeIcon as CodeBlockIcon,
+ ExternalLinkIcon,
+ LinkRoundIcon,
AlignCenterIcon,
- AlignJustifyIcon,
AlignLeftIcon,
AlignRightIcon,
- ArrowDown,
- BoldIcon,
- CheckBoxIcon,
- CodeBlockIcon,
- CopyIconRounded,
- ExternalLinkIcon,
- HeaderOneIcon,
- HeaderTwoIcon,
- ItalicIcon,
- LinkIcon,
- OrderedListIcon,
- QuoteBlockIcon,
- UnderlineIcon,
- UnorderedListIcon
-} from 'lib/components/svgs';
-import { Element, Node } from 'slate';
-import { useSlateStatic } from 'slate-react';
-import { useTranslations } from 'next-intl';
-
+ H1TextIcon as HeaderOneIcon,
+ H2TextIcon as HeaderTwoIcon,
+ ThreeNumberLineIcon as OrderedListIcon,
+ ThreeDotLineIcon as UnorderedListIcon,
+ UnderlineTextIcon as UnderlineIcon,
+ ItalicTextIcon as ItalicIcon,
+ BTextIcon as BoldIcon,
+ CheckSquareRoundIcon as CheckBoxIcon,
+ CopyRoundIcon as CopyIconRounded,
+ AlignFullIcon,
+ ChevronDownIcon
+} from 'assets/svg';
interface IToolbarProps {
isMarkActive?: (editor: any, format: string) => boolean;
isBlockActive?: (editor: any, format: any, blockType?: string) => boolean;
@@ -167,7 +165,6 @@ const Toolbar = ({ isMarkActive, isBlockActive }: IToolbarProps) => {
{t('pages.taskDetails.DESCRIPTION')}
-
{
icon={UnderlineIcon}
isMarkActive={isMarkActive as (editor: any, format: string) => boolean}
/>
-
boolean}
/>
-
{
/>
boolean}
/>
{
icon={UnorderedListIcon}
isBlockActive={isBlockActive as (editor: any, format: any, blockType?: string | undefined) => boolean}
/>
-
{
boolean}
/>
@@ -251,7 +245,7 @@ const Toolbar = ({ isMarkActive, isBlockActive }: IToolbarProps) => {
>
More
-
+
{/* {showDropdown && (
@@ -298,10 +292,9 @@ const Toolbar = ({ isMarkActive, isBlockActive }: IToolbarProps) => {
{/*
*/}
-
-
+
{
ref={inputRef}
/>
-
- {showLinkPopup && (
+ {showLinkPopup && ( // this block of code is not working because onclick function is commented out
{
top: linkPopupPosition.top + 3
}}
>
-
+
setLink(e.target.value)}
- value={link}
+ value={'new'}
ref={inputRef}
/>
)}
@@ -355,7 +347,7 @@ const Toolbar = ({ isMarkActive, isBlockActive }: IToolbarProps) => {
);
};
diff --git a/apps/web/components/pages/task/details-section/blocks/task-estimations-info.tsx b/apps/web/components/pages/task/details-section/blocks/task-estimations-info.tsx
index 60a17cec9..9d9e2c580 100644
--- a/apps/web/components/pages/task/details-section/blocks/task-estimations-info.tsx
+++ b/apps/web/components/pages/task/details-section/blocks/task-estimations-info.tsx
@@ -1,6 +1,6 @@
import { detailedTaskState } from '@app/stores';
import { Disclosure } from '@headlessui/react';
-import { ChevronDownIcon, ChevronUpIcon } from 'lib/components/svgs';
+import { ChevronDownIcon, ChevronUpIcon } from 'assets/svg';
import { TaskEstimate } from 'lib/features';
import { useRecoilState } from 'recoil';
import ProfileInfoWithTime from '../components/profile-info-with-time';
@@ -33,9 +33,9 @@ const TaskEstimationsInfo = () => {
/>
{!open ? (
-