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}