From a03b87245ffc15baa0833e4576c5f817778b3280 Mon Sep 17 00:00:00 2001
From: Sean Edmunds <sean.edmunds@cottonteam.com>
Date: Mon, 7 Apr 2025 17:29:54 -0500
Subject: [PATCH] Bookmark group deletion update; Icon updates

---
 README.md                                     |  4 ---
 .../components/Applications/AppItem.tsx       |  8 +++--
 .../Applications/AppSettingsItem.tsx          |  6 ++--
 .../components/Applications/Applications.tsx  | 31 ++++++++++++++-----
 .../Applications/DebouncedApplication.tsx     | 29 ++++++++++++++---
 .../Bookmarks/DebouncedGroupSettingsItem.tsx  | 10 ++++--
 6 files changed, 63 insertions(+), 25 deletions(-)

diff --git a/README.md b/README.md
index dfb1fd9..56c39ab 100644
--- a/README.md
+++ b/README.md
@@ -27,10 +27,6 @@ sudo pm2 serve ./dist --no-daemon --spa --port 3000
 sudo pm2 start server.cjs
 
 # TODO
-- Reassign/delete bookmarks when group is deleted
-
-- Find way to list all available icons in dropdown
-
 - Expand settings search to fields other than name
 
 - ? Image uploads for backgrounds ?
\ No newline at end of file
diff --git a/src/pages/homepage/components/Applications/AppItem.tsx b/src/pages/homepage/components/Applications/AppItem.tsx
index 0c8c476..aac3f50 100644
--- a/src/pages/homepage/components/Applications/AppItem.tsx
+++ b/src/pages/homepage/components/Applications/AppItem.tsx
@@ -1,10 +1,14 @@
-import { Icon } from '@iconify/react';
 import { Box, Stack, Text } from '@mantine/core';
 import { useCommonHooks } from 'hooks';
 import { useState } from 'react';
+import * as fa6 from 'react-icons/fa6';
+import * as si from 'react-icons/si';
+import * as vsc from 'react-icons/vsc';
 import { stackClasses, textClasses } from 'styles';
 
 function AppItem({ url, icon, name }: any) {
+	const allIcons: any = { ...fa6, ...vsc, ...si };
+	const Icon = allIcons[icon];
 	const { isMobile } = useCommonHooks();
 	const [textDecoration, setTextDecoration] = useState<string>('none');
 	const [hover, setHover] = useState<boolean>(false);
@@ -45,7 +49,7 @@ function AppItem({ url, icon, name }: any) {
 					paddingTop: isMobile ? '0' : '15px',
 				}}
 			>
-				<Icon icon={`mdi:${icon}`} height={32} width={32} />
+				{Icon && <Icon style={{ height: '32px', width: '32px' }} />}
 			</Stack>
 			<Stack
 				style={{
diff --git a/src/pages/settings/components/Applications/AppSettingsItem.tsx b/src/pages/settings/components/Applications/AppSettingsItem.tsx
index d765245..0302833 100644
--- a/src/pages/settings/components/Applications/AppSettingsItem.tsx
+++ b/src/pages/settings/components/Applications/AppSettingsItem.tsx
@@ -1,11 +1,11 @@
-import { Icon } from '@iconify/react';
 import { ActionIcon, Box, Stack, Text, Tooltip } from '@mantine/core';
 import { useCommonHooks } from 'hooks';
 import { useState } from 'react';
 import { FiAlertCircle } from 'react-icons/fi';
 import { actionIconClasses, boxClasses, textClasses } from 'styles';
 
-function AppSettingsItem({ url, icon, name, enabled }: any) {
+function AppSettingsItem({ url, icon, name, enabled, allIcons }: any) {
+	const Icon = allIcons[icon];
 	const [textDecoration, setTextDecoration] = useState<string>('none');
 	const [hover, setHover] = useState<boolean>(false);
 	const { isMobile, theme } = useCommonHooks();
@@ -58,7 +58,7 @@ function AppSettingsItem({ url, icon, name, enabled }: any) {
 						paddingTop: isMobile ? '0' : '32px',
 					}}
 				>
-					<Icon icon={`mdi:${icon}`} height={64} width={64} />
+					{Icon && <Icon style={{ height: '64px', width: '64px' }} />}
 				</Stack>
 				<Stack
 					style={{
diff --git a/src/pages/settings/components/Applications/Applications.tsx b/src/pages/settings/components/Applications/Applications.tsx
index 32740f3..a958446 100644
--- a/src/pages/settings/components/Applications/Applications.tsx
+++ b/src/pages/settings/components/Applications/Applications.tsx
@@ -8,6 +8,7 @@ import {
 	GridCol,
 	Group,
 	Popover,
+	Select,
 	Stack,
 	Text,
 	TextInput,
@@ -15,6 +16,9 @@ import {
 import { useDebouncedValue, useDisclosure } from '@mantine/hooks';
 import { useCommonHooks, useMutationAPI, useQueryAPI } from 'hooks';
 import { useEffect, useState } from 'react';
+import * as fa6 from 'react-icons/fa6';
+import * as si from 'react-icons/si';
+import * as vsc from 'react-icons/vsc';
 import { textInputClasses } from 'styles';
 import type { Application } from 'types';
 import AddItemModal from '../Shared/AddItemModal';
@@ -23,6 +27,7 @@ import AppSettingsItem from './AppSettingsItem';
 import DebouncedApplication from './DebouncedApplication';
 
 const ApplicationSettings = () => {
+	const allIcons: any = { ...fa6, ...vsc, ...si };
 	const defaultApplication: Application = {
 		id: null,
 		name: '',
@@ -157,18 +162,26 @@ const ApplicationSettings = () => {
 							/>
 						</Group>
 						<Group justify='center'>
-							<TextInput
+							<Select
 								label={'Icon'}
 								className={textInputClasses.settingsItem}
-								pt={16}
 								classNames={textInputClasses}
-								defaultValue={newApplication.icon}
-								onChange={(event) => {
-									setNewApplication({
-										...newApplication,
-										icon: event.target.value,
-									});
+								data={Object.keys(allIcons).map((icon) => {
+									return { value: icon, label: icon };
+								})}
+								comboboxProps={{
+									zIndex: 1000,
 								}}
+								renderOption={(item: any) => {
+									const Icon = allIcons[item.option.value];
+									return (
+										<Group>
+											{item.option.value}
+											<Icon />
+										</Group>
+									);
+								}}
+								searchable
 							/>
 							<TextInput
 								label={'Filter'}
@@ -347,6 +360,7 @@ const ApplicationSettings = () => {
 												icon={application.icon}
 												name={application.name}
 												enabled={application.enabled}
+												allIcons={allIcons}
 											/>
 										</Box>
 									</Popover.Target>
@@ -354,6 +368,7 @@ const ApplicationSettings = () => {
 										<DebouncedApplication
 											application={application}
 											setIsOpen={setIsOpen}
+											allIcons={allIcons}
 										/>
 									</Popover.Dropdown>
 								</Popover>
diff --git a/src/pages/settings/components/Applications/DebouncedApplication.tsx b/src/pages/settings/components/Applications/DebouncedApplication.tsx
index 7a0a43b..20cc29f 100644
--- a/src/pages/settings/components/Applications/DebouncedApplication.tsx
+++ b/src/pages/settings/components/Applications/DebouncedApplication.tsx
@@ -3,6 +3,7 @@ import {
 	Button,
 	Card,
 	Group,
+	Select,
 	Stack,
 	Switch,
 	Text,
@@ -20,7 +21,8 @@ import DeleteItemModal from '../Shared/DeleteItemModal';
 function DebouncedApplication({
 	application,
 	setIsOpen,
-}: { application: Application; setIsOpen: any }) {
+	allIcons,
+}: { application: Application; setIsOpen: any; allIcons: any }) {
 	const { theme, handleDelete } = useCommonHooks();
 	const [modalOpened, { open: openModal, close: closeModal }] = useDisclosure(false);
 	const { mutateAsync } = useMutationAPI();
@@ -169,18 +171,35 @@ function DebouncedApplication({
 				/>
 			</Group>
 			<Group w={'100%'} justify='center'>
-				<TextInput
+				<Select
 					label={'Icon'}
 					className={textInputClasses.settingsItem}
-					pt={16}
 					classNames={textInputClasses}
+					data={Object.keys(allIcons).map((icon) => {
+						return { value: icon, label: icon };
+					})}
 					defaultValue={app.icon}
-					onChange={(event) => {
+					comboboxProps={{
+						zIndex: 3000,
+					}}
+					onChange={(event: any) => {
 						setUpdate({
 							...app,
-							icon: event.target.value,
+							icon: event,
 						});
 					}}
+					renderOption={(item: any) => {
+						const Icon = allIcons[item.option.value];
+						return (
+							<Group>
+								{item.option.value}
+								<Icon />
+							</Group>
+						);
+					}}
+					searchable
+					onDropdownOpen={() => setIsOpen(true)}
+					onDropdownClose={() => setIsOpen(false)}
 				/>
 				<TextInput
 					label={'Filter'}
diff --git a/src/pages/settings/components/Bookmarks/DebouncedGroupSettingsItem.tsx b/src/pages/settings/components/Bookmarks/DebouncedGroupSettingsItem.tsx
index 79fcc8c..8491c08 100644
--- a/src/pages/settings/components/Bookmarks/DebouncedGroupSettingsItem.tsx
+++ b/src/pages/settings/components/Bookmarks/DebouncedGroupSettingsItem.tsx
@@ -95,7 +95,7 @@ function DebouncedGroupSettingsItem({
 				handleClose={closeModal}
 				title='Delete message'
 				body={
-					<Stack gap={0} w={'100%'} h={'150px'} align='center'>
+					<Stack gap={0} w={'100%'} h={'175px'} align='center'>
 						<Text>Are you sure you want to delete this bookmark group?</Text>
 						<Text
 							style={{
@@ -108,12 +108,16 @@ function DebouncedGroupSettingsItem({
 								color: 'var(--color-background)',
 							}}
 						>{`"${group.categoryName}"`}</Text>
+						<Text style={{ fontWeight: 'bold', textTransform: 'uppercase' }}>
+							This will also delete all bookmarks in this group!
+						</Text>
 						<Text c='red'>This action cannot be undone!</Text>
 						<Group pos={'absolute'} bottom={8}>
 							<Button
 								color={'red'}
 								styles={{ label: { color: 'black' } }}
 								onClick={() => {
+									handleDelete(bookmarks, 'api/links');
 									handleDelete(group, 'api/categories');
 									closeModal();
 								}}
@@ -121,8 +125,8 @@ function DebouncedGroupSettingsItem({
 								Delete
 							</Button>
 							<Button
-								color={'grey'}
-								styles={{ label: { color: 'black' } }}
+								color={'var(--color-text-acc)'}
+								styles={{ label: { color: 'var(--color-text-pri)' } }}
 								onClick={() => {
 									closeModal();
 								}}