Application adding bugfix; consolidated Settings headers

src/pages/settings/components/Bookmarks/Bookmarks.tsx

@@ -1,40 +1,34 @@
 import { DragDropContext, Draggable, Droppable } from '@hello-pangea/dnd';
-import {
-	Box,
-	Button,
-	Card,
-	Divider,
-	Group,
-	Modal,
-	Stack,
-	Text,
-	TextInput,
-} from '@mantine/core';
+import { Box, Button, Card, Divider, Group, Stack, Text, TextInput } from '@mantine/core';
 import { useDebouncedValue, useDisclosure } from '@mantine/hooks';
 import { useCommonHooks, useMutationAPI, useQueryAPI } from 'hooks';
 import { useEffect, useState } from 'react';
-import { cardClasses, modalClasses, textInputClasses } from 'styles';
+import { textInputClasses } from 'styles';
 import type { Bookmark, BookmarkGroup } from 'types';
+import AddItemModal from '../Shared/AddItemModal';
 import SettingsHeader from '../Shared/SettingsHeader';
 import DebouncedGroupSettingsItem from './DebouncedGroupSettingsItem';
 const BookmarkSettings = () => {
-	const { data: linkData, isFetched: linksIsFetched } = useQueryAPI({
-		endpoint: 'api/links',
-	});
-	const [bookmarks, setBookmarks] = useState<Bookmark[]>([]);
-	const { data: groupData, isFetched: groupsIsFetched } = useQueryAPI({
-		endpoint: 'api/categories',
-	});
-	const [dragging, setDragging] = useState(false);
-	const [groups, setGroups] = useState<BookmarkGroup[]>([]);
-	const [newGroup, setNewGroup] = useState<BookmarkGroup>({
+	const defaultGroup = {
 		id: undefined,
 		categoryName: '',
 		categoryIndex: 0,
 		filterName: '',
+	};
+	const linksEndpoint = 'api/links';
+	const { data: linkData, isFetched: linksIsFetched } = useQueryAPI({
+		endpoint: linksEndpoint,
 	});
+	const [bookmarks, setBookmarks] = useState<Bookmark[]>([]);
+	const categoriesEndpoint = 'api/categories';
+	const { data: groupData, isFetched: groupsIsFetched } = useQueryAPI({
+		endpoint: categoriesEndpoint,
+	});
+	const [dragging, setDragging] = useState(false);
+	const [groups, setGroups] = useState<BookmarkGroup[]>([]);
+	const [newGroup, setNewGroup] = useState<BookmarkGroup>(defaultGroup);
 	const [groupList, setGroupList] = useState<BookmarkGroup[]>([]);
-	const { theme, isMobile, modalStyle } = useCommonHooks();
+	const { theme, isMobile } = useCommonHooks();
 	const { mutateAsync } = useMutationAPI();
 	const [searchValue, setSearchValue] = useState('');
 	const [debouncedGroupSearch] = useDebouncedValue(searchValue, 500);
@@ -47,6 +41,11 @@ const BookmarkSettings = () => {
 		return result;
 	};
 
+	const handleClose = () => {
+		setNewGroup(defaultGroup);
+		closeModal();
+	};
+
 	function onDragEnd(result: any) {
 		if (!result.destination) {
 			return;
@@ -95,90 +94,70 @@ const BookmarkSettings = () => {
 
 	return (
 		<Stack>
-			<Modal.Root
-				size={'60%'}
-				className={modalClasses.helpModal}
-				classNames={modalClasses}
-				opened={modalOpened}
-				fullScreen={isMobile}
-				onClose={() => {
-					closeModal();
-				}}
-				style={modalStyle}
-				closeOnEscape
-				closeOnClickOutside
-			>
-				<Modal.Overlay />
-				<Modal.Content>
-					<Modal.Header>
-						<Modal.Title>Add a new Bookmark Group</Modal.Title>
-						<Modal.CloseButton />
-					</Modal.Header>
-					<Modal.Body pb={'2rem'}>
-						<Card className={cardClasses.settingsItem} classNames={cardClasses}>
-							<Stack gap={0} w={'100%'} align='center'>
-								<Group w={'100%'} justify='center'>
-									<TextInput
-										label={'Category Name'}
-										className={textInputClasses.settingsItem}
-										pt={16}
-										classNames={textInputClasses}
-										defaultValue={newGroup.categoryName}
-										onChange={(event) => {
-											setNewGroup({
-												...newGroup,
-												categoryName: event.target.value,
-											});
-										}}
-									/>
-									<TextInput
-										label={'Filter Name'}
-										className={textInputClasses.settingsItem}
-										pt={16}
-										classNames={textInputClasses}
-										defaultValue={newGroup.filterName}
-										onChange={(event) => {
-											setNewGroup({
-												...newGroup,
-												filterName: event.target.value,
-											});
-										}}
-									/>
-								</Group>
+			<AddItemModal
+				modalOpened={modalOpened}
+				handleClose={handleClose}
+				title={'Add a new Bookmark Group'}
+				body={
+					<Stack gap={0} w={'100%'} align='center'>
+						<Group w={'100%'} justify='center'>
+							<TextInput
+								label={'Category Name'}
+								className={textInputClasses.settingsItem}
+								pt={16}
+								classNames={textInputClasses}
+								defaultValue={newGroup.categoryName}
+								onChange={(event) => {
+									setNewGroup({
+										...newGroup,
+										categoryName: event.target.value,
+									});
+								}}
+							/>
+							<TextInput
+								label={'Filter Name'}
+								className={textInputClasses.settingsItem}
+								pt={16}
+								classNames={textInputClasses}
+								defaultValue={newGroup.filterName}
+								onChange={(event) => {
+									setNewGroup({
+										...newGroup,
+										filterName: event.target.value,
+									});
+								}}
+							/>
+						</Group>
 
-								<Divider color='black' my='lg' />
-								<Group pos={'absolute'} bottom={8}>
-									<Button
-										color={'green'}
-										styles={{ label: { color: 'black' } }}
-										onClick={() => {
-											if (newGroup) {
-												mutateAsync({
-													method: 'POST',
-													endpoint: 'api/categories',
-													body: { ...newGroup, categoryIndex: groups.length },
-												});
-												closeModal();
-											}
-										}}
-									>
-										Save
-									</Button>
-									<Button
-										color={'red'}
-										styles={{ label: { color: 'black' } }}
-										onClick={() => {
-											closeModal();
-										}}
-									>
-										Cancel
-									</Button>
-								</Group>
-							</Stack>
-						</Card>
-					</Modal.Body>
-				</Modal.Content>
-			</Modal.Root>
+						<Divider color='black' my='lg' />
+						<Group pos={'absolute'} bottom={8}>
+							<Button
+								color={'green'}
+								styles={{ label: { color: 'black' } }}
+								onClick={() => {
+									if (newGroup) {
+										mutateAsync({
+											method: 'POST',
+											endpoint: categoriesEndpoint,
+											body: { ...newGroup, categoryIndex: groups.length },
+										});
+										handleClose();
+									}
+								}}
+							>
+								Save
+							</Button>
+							<Button
+								color={'red'}
+								styles={{ label: { color: 'black' } }}
+								onClick={handleClose}
+							>
+								Cancel
+							</Button>
+						</Group>
+					</Stack>
+				}
+			/>
 			<SettingsHeader
 				setDragging={setDragging}
 				openModal={openModal}

src/pages/settings/components/Bookmarks/DebouncedBookmarkItem.tsx

@@ -3,21 +3,24 @@ import {
 	Button,
 	Card,
 	Group,
-	Modal,
 	Stack,
 	Text,
 	TextInput,
 	Tooltip,
 } from '@mantine/core';
 import { useDebouncedValue, useDisclosure } from '@mantine/hooks';
-import { IconTrash } from '@tabler/icons-react';
 import { useCommonHooks, useMutationAPI } from 'hooks';
 import { useEffect, useState } from 'react';
-import { cardClasses, modalClasses, textInputClasses } from 'styles';
+import { FiTrash } from 'react-icons/fi';
+import { cardClasses, textInputClasses } from 'styles';
 import type { Bookmark } from 'types';
+import DeleteItemModal from '../Shared/DeleteItemModal';
 
-function DebouncedBookmarkItem({ bookmarkItem }: { bookmarkItem: Bookmark }) {
-	const { theme, isMobile, modalStyle, handleDelete } = useCommonHooks();
+function DebouncedBookmarkItem({
+	bookmarkItem,
+	setIsOpen,
+}: { bookmarkItem: Bookmark; setIsOpen: any }) {
+	const { theme, handleDelete } = useCommonHooks();
 	const [modalOpened, { open: openModal, close: closeModal }] = useDisclosure(false);
 	const { mutateAsync } = useMutationAPI();
 
@@ -39,65 +42,49 @@ function DebouncedBookmarkItem({ bookmarkItem }: { bookmarkItem: Bookmark }) {
 
 	return (
 		<Card className={cardClasses.settingsItem} classNames={cardClasses}>
-			<Modal.Root
-				size={'60%'}
-				className={modalClasses.helpModal}
-				classNames={modalClasses}
-				opened={modalOpened}
-				fullScreen={isMobile}
-				onClose={() => {
-					closeModal();
-				}}
-				style={modalStyle}
-				closeOnEscape
-				closeOnClickOutside
-			>
-				<Modal.Overlay style={{ zIndex: 999 }} />
-				<Modal.Content style={{ zIndex: 1000 }}>
-					<Modal.Header>
-						<Modal.Title>Delete Bookmark</Modal.Title>
-						<Modal.CloseButton />
-					</Modal.Header>
-					<Modal.Body pb={'2rem'}>
-						<Stack gap={0} w={'100%'} h={'150px'} align='center'>
-							<Text>Are you sure you want to delete this bookmark?</Text>
-							<Text
-								style={{
-									fontWeight: 'bold',
-									fontSize: '20px',
-									padding: '8px',
-									margin: '8px',
-									borderRadius: '10px',
-									backgroundColor: 'var(--color-text-acc)',
-									color: 'var(--color-background)',
+			<DeleteItemModal
+				modalOpened={modalOpened}
+				handleClose={closeModal}
+				body={
+					<Stack gap={0} w={'100%'} h={'150px'} align='center'>
+						<Text>Are you sure you want to delete this bookmark?</Text>
+						<Text
+							style={{
+								fontWeight: 'bold',
+								fontSize: '20px',
+								padding: '8px',
+								margin: '8px',
+								borderRadius: '10px',
+								backgroundColor: 'var(--color-text-acc)',
+								color: 'var(--color-background)',
+							}}
+						>{`"${bookmark.name}"`}</Text>
+						<Text c='red'>This action cannot be undone!</Text>
+						<Group pos={'absolute'} bottom={8}>
+							<Button
+								color={'red'}
+								styles={{ label: { color: 'black' } }}
+								onClick={() => {
+									handleDelete(bookmark, 'api/links');
+									closeModal();
 								}}
-							>{`"${bookmark.name}"`}</Text>
-							<Text c='red'>This action cannot be undone!</Text>
-							<Group pos={'absolute'} bottom={8}>
-								<Button
-									color={'red'}
-									styles={{ label: { color: 'black' } }}
-									onClick={() => {
-										handleDelete(bookmark, 'api/links');
-										closeModal();
-									}}
-								>
-									Delete
-								</Button>
-								<Button
-									color={'grey'}
-									styles={{ label: { color: 'black' } }}
-									onClick={() => {
-										closeModal();
-									}}
-								>
-									Cancel
-								</Button>
-							</Group>
-						</Stack>
-					</Modal.Body>
-				</Modal.Content>
-			</Modal.Root>
+							>
+								Delete
+							</Button>
+							<Button
+								color={'grey'}
+								styles={{ label: { color: 'black' } }}
+								onClick={() => {
+									closeModal();
+								}}
+							>
+								Cancel
+							</Button>
+						</Group>
+					</Stack>
+				}
+				title='Delete Bookmark'
+			/>
 			<Tooltip
 				color={theme.primaryColor}
 				bd={`solid 1px ${theme.borderColor}`}
@@ -108,10 +95,11 @@ function DebouncedBookmarkItem({ bookmarkItem }: { bookmarkItem: Bookmark }) {
 					right={16}
 					color='red'
 					onClick={() => {
+						setIsOpen(true);
 						openModal();
 					}}
 				>
-					<IconTrash />
+					<FiTrash />
 				</ActionIcon>
 			</Tooltip>
 			<Group w={'100%'} justify='center'>

src/pages/settings/components/Bookmarks/DebouncedGroupSettingsItem.tsx

@@ -5,7 +5,6 @@ import {
 	Button,
 	Card,
 	Group,
-	Modal,
 	Popover,
 	Stack,
 	Text,
@@ -13,12 +12,12 @@ import {
 	Tooltip,
 } from '@mantine/core';
 import { useDebouncedValue, useDisclosure } from '@mantine/hooks';
-import { IconTrash } from '@tabler/icons-react';
 import { useCommonHooks, useMutationAPI } from 'hooks';
 import { useEffect, useState } from 'react';
-import { FiPlus } from 'react-icons/fi';
-import { buttonClasses, cardClasses, modalClasses, textInputClasses } from 'styles';
+import { FiPlus, FiTrash } from 'react-icons/fi';
+import { buttonClasses, cardClasses, textInputClasses } from 'styles';
 import type { Bookmark, BookmarkGroup } from 'types';
+import DeleteItemModal from '../Shared/DeleteItemModal';
 import BookmarkSettingsItem from './BookmarkSettingsItem';
 import DebouncedBookmarkItem from './DebouncedBookmarkItem';
 
@@ -26,7 +25,7 @@ function DebouncedGroupSettingsItem({
 	bookmarkGroup,
 	bookmarks,
 }: { bookmarkGroup: BookmarkGroup; bookmarks: Bookmark[] }) {
-	const { theme, isMobile, modalStyle, handleDelete } = useCommonHooks();
+	const { theme, isMobile, handleDelete } = useCommonHooks();
 	const [modalOpened, { open: openModal, close: closeModal }] = useDisclosure(false);
 	const [popoverOpened, setPopoverOpened] = useState(false);
 	const { mutateAsync } = useMutationAPI();
@@ -41,6 +40,7 @@ function DebouncedGroupSettingsItem({
 		index: 0,
 	});
 	const [bookmarkList, setBookmarkList] = useState<Bookmark[]>(bookmarks);
+	const [isOpen, setIsOpen] = useState(false);
 
 	const reorder = (list: any, startIndex: any, endIndex: any) => {
 		const result = Array.from(list);
@@ -90,65 +90,49 @@ function DebouncedGroupSettingsItem({
 
 	return (
 		<Card w={'400px'} className={cardClasses.settingsItem} classNames={cardClasses}>
-			<Modal.Root
-				size={'60%'}
-				className={modalClasses.helpModal}
-				classNames={modalClasses}
-				opened={modalOpened}
-				fullScreen={isMobile}
-				onClose={() => {
-					closeModal();
-				}}
-				style={modalStyle}
-				closeOnEscape
-				closeOnClickOutside
-			>
-				<Modal.Overlay />
-				<Modal.Content>
-					<Modal.Header>
-						<Modal.Title>Delete Group</Modal.Title>
-						<Modal.CloseButton />
-					</Modal.Header>
-					<Modal.Body pb={'2rem'}>
-						<Stack gap={0} w={'100%'} h={'150px'} align='center'>
-							<Text>Are you sure you want to delete this bookmark group?</Text>
-							<Text
-								style={{
-									fontWeight: 'bold',
-									fontSize: '20px',
-									padding: '8px',
-									margin: '8px',
-									borderRadius: '10px',
-									backgroundColor: 'var(--color-text-acc)',
-									color: 'var(--color-background)',
+			<DeleteItemModal
+				modalOpened={modalOpened}
+				handleClose={closeModal}
+				title='Delete message'
+				body={
+					<Stack gap={0} w={'100%'} h={'150px'} align='center'>
+						<Text>Are you sure you want to delete this bookmark group?</Text>
+						<Text
+							style={{
+								fontWeight: 'bold',
+								fontSize: '20px',
+								padding: '8px',
+								margin: '8px',
+								borderRadius: '10px',
+								backgroundColor: 'var(--color-text-acc)',
+								color: 'var(--color-background)',
+							}}
+						>{`"${group.categoryName}"`}</Text>
+						<Text c='red'>This action cannot be undone!</Text>
+						<Group pos={'absolute'} bottom={8}>
+							<Button
+								color={'red'}
+								styles={{ label: { color: 'black' } }}
+								onClick={() => {
+									handleDelete(group, 'api/categories');
+									closeModal();
 								}}
-							>{`"${group.categoryName}"`}</Text>
-							<Text c='red'>This action cannot be undone!</Text>
-							<Group pos={'absolute'} bottom={8}>
-								<Button
-									color={'red'}
-									styles={{ label: { color: 'black' } }}
-									onClick={() => {
-										handleDelete(group, 'api/categories');
-										closeModal();
-									}}
-								>
-									Delete
-								</Button>
-								<Button
-									color={'grey'}
-									styles={{ label: { color: 'black' } }}
-									onClick={() => {
-										closeModal();
-									}}
-								>
-									Cancel
-								</Button>
-							</Group>
-						</Stack>
-					</Modal.Body>
-				</Modal.Content>
-			</Modal.Root>
+							>
+								Delete
+							</Button>
+							<Button
+								color={'grey'}
+								styles={{ label: { color: 'black' } }}
+								onClick={() => {
+									closeModal();
+								}}
+							>
+								Cancel
+							</Button>
+						</Group>
+					</Stack>
+				}
+			/>
 			<Card.Section p={16} bg={theme.searchColor} c={theme.backgroundColor}>
 				<Stack gap={0}>
 					<Group gap={0} align='center' justify='space-between'>
@@ -201,7 +185,7 @@ function DebouncedGroupSettingsItem({
 									openModal();
 								}}
 							>
-								<IconTrash />
+								<FiTrash />
 							</ActionIcon>
 						</Tooltip>
 					</Group>
@@ -243,7 +227,7 @@ function DebouncedGroupSettingsItem({
 													{...provided.draggableProps}
 													{...provided.dragHandleProps}
 												>
-													<Popover withArrow withOverlay>
+													<Popover withArrow withOverlay closeOnClickOutside={!isOpen}>
 														<Popover.Target>
 															<Box>
 																<BookmarkSettingsItem bookmark={bookmark} />
@@ -259,7 +243,10 @@ function DebouncedGroupSettingsItem({
 																'--image-background': `url(${theme.backgroundImage})`,
 															}}
 														>
-															<DebouncedBookmarkItem bookmarkItem={bookmark} />
+															<DebouncedBookmarkItem
+																bookmarkItem={bookmark}
+																setIsOpen={setIsOpen}
+															/>
 														</Popover.Dropdown>
 													</Popover>
 													{provided.placeholder}
@@ -284,6 +271,7 @@ function DebouncedGroupSettingsItem({
 						opened={popoverOpened}
 						onChange={setPopoverOpened}
 						closeOnEscape
+						// closeOnClickOutside={}
 					>
 						<Popover.Target>
 							<Button