[FIX]: Merge Errors

frontend/src/components/Board/Card/CardItem/CardItem.tsx

@@ -121,6 +121,7 @@ const CardItem: React.FC<CardItemProps> = React.memo(
 				)}
 				{deleting && (
 					<DeleteCard
+						cardTitle={item.text}
 						boardId={boardId}
 						cardId={cardGroupId}
 						socketId={socketId}

frontend/src/components/Board/Card/DeleteCard.tsx

@@ -39,6 +39,7 @@ const DeleteCard = ({
 			title="Delete card"
 			defaultOpen
 			variant="danger"
+			addEllipsis={cardTitle.length > 100}
 			text={
 				<>
 					Do you really want to delete <span>{cardTitle}</span> card?

frontend/src/components/CardBoard/CardBody/CardTitle/partials/Title/styles.tsx

@@ -1,5 +1,6 @@
-import { styled } from '../../../../../../stitches.config';
-import Text from '../../../../../Primitives/Text';
+import { styled } from '@stitches/react';
+
+import Text from 'components/Primitives/Text';
 
 const StyledBoardTitle = styled(Text, {
 	fontWeight: '$bold',

frontend/src/components/Primitives/AlertCustomDialog/index.tsx

@@ -1,6 +1,5 @@
 import { ReactNode } from 'react';
-
-import { CSSProps } from 'styles/stitches/stitches.config';
+import { CSS } from '@stitches/react/types/css-util';
 
 import Icon from 'components/icons/Icon';
 import {
@@ -28,8 +27,9 @@ interface BoardAlertDialog {
 	title: ReactNode;
 	handleClose?: () => void;
 	children?: ReactNode;
-	css?: CSSProps;
+	css?: CSS;
 	variant?: 'primary' | 'danger';
+	addEllipsis?: boolean;
 }
 
 const AlertCustomDialog = ({
@@ -42,6 +42,7 @@ const AlertCustomDialog = ({
 	confirmText,
 	children,
 	css,
+	addEllipsis,
 	variant = 'primary'
 }: BoardAlertDialog) => {
 	return (
@@ -62,7 +63,7 @@ const AlertCustomDialog = ({
 					</AlertDialogCancel>
 				</DialogTitleContainer>
 				<Separator css={{ backgroundColor: '$primary100' }} />
-				<DialogText direction="column">
+				<DialogText ellipsis={addEllipsis} direction="column">
 					<StyledAlertDialogDescription>{text}</StyledAlertDialogDescription>
 				</DialogText>
 				<DialogButtons justify="end" gap="24">
@@ -82,7 +83,8 @@ AlertCustomDialog.defaultProps = {
 	handleClose: undefined,
 	children: undefined,
 	css: undefined,
-	variant: 'primary'
+	variant: 'primary',
+	addEllipsis: false
 };
 
 export default AlertCustomDialog;

frontend/src/components/Primitives/AlertCustomDialog/styles.tsx

@@ -24,15 +24,26 @@ const DialogText = styled(Flex, {
 	px: '$32',
 	pt: '$24',
 
+	variants: {
+		ellipsis: {
+			true: {
+				'&>p': {
+					'&>span': {
+						display: '-webkit-box',
+						'-webkit-line-clamp': 3 /* number of lines to show */,
+						lineClamp: 3,
+						'-webkit-box-orient': 'vertical',
+						textOverflow: 'ellipsis'
+					}
+				}
+			}
+		}
+	},
+
 	'&>p': {
 		margin: 0,
 
 		'&>span': {
-			display: '-webkit-box',
-			'-webkit-line-clamp': 3 /* number of lines to show */,
-			lineClamp: 3,
-			'-webkit-box-orient': 'vertical',
-			textOverflow: 'ellipsis',
 			wordBreak: 'break-all',
 			overflow: 'hidden',
 

frontend/src/pages/_document.tsx

@@ -15,7 +15,7 @@ export default function Document() {
 				/>
 				<link
 					rel="shortcut icon"
-					href="/Users/danielsousa/Developer/open-source/divide-and-conquer/frontend/public/favicon.svg"
+					href="/favicon.svg"
 					type="image/svg+xml"
 				/>
 				<style id="stitches" dangerouslySetInnerHTML={{ __html: getCssText() }} />

frontend/src/pages/boards/[boardId].tsx

@@ -3,7 +3,7 @@ import { dehydrate, QueryClient, useQueryClient } from 'react-query';
 import { GetServerSideProps } from 'next';
 import Link from 'next/link';
 import { useSession } from 'next-auth/react';
-import { useSetRecoilState } from 'recoil';
+import { useRecoilState, useSetRecoilState } from 'recoil';
 import { DragDropContext, DropResult } from '@react-forked/dnd';
 import { io, Socket } from 'socket.io-client';
 
@@ -21,7 +21,7 @@ import Flex from 'components/Primitives/Flex';
 import { countBoardCards } from 'helper/board/countCards';
 import useBoard from 'hooks/useBoard';
 import useCards from 'hooks/useCards';
-import { boardInfoState } from 'store/board/atoms/board.atom';
+import { boardInfoState, newBoardState } from 'store/board/atoms/board.atom';
 import MergeCardsDto from 'types/board/mergeCard.dto';
 import UpdateCardPositionDto from 'types/card/updateCardPosition.dto';
 import { NEXT_PUBLIC_BACKEND_URL } from 'utils/constants';