feat: improve design in edit service modal

src/components/Dashboard/Modals/EditService/Tabs/AppereanceTab/AppereanceTab.tsx

@@ -31,6 +31,7 @@ export const AppearanceTab = ({ form }: AppearanceTabProps) => {
           className={classes.textInput}
           icon={<Image />}
           label="Service Icon"
+          description="Logo of your service displayed in your dashboard. Must return a body content containg an image"
           variant="default"
           withAsterisk
           required

src/components/Dashboard/Modals/EditService/Tabs/AppereanceTab/IconSelector/IconSelector.tsx

@@ -1,6 +1,7 @@
 /* eslint-disable @next/next/no-img-element */
 import {
   ActionIcon,
+  Button,
   createStyles,
   Divider,
   Flex,
@@ -12,7 +13,7 @@ import {
   TextInput,
   Title,
 } from '@mantine/core';
-import { IconFlame, IconSearch, IconX } from '@tabler/icons';
+import { IconSearch, IconX } from '@tabler/icons';
 import { useState } from 'react';
 import { ICON_PICKER_SLICE_LIMIT } from '../../../../../../../../data/constants';
 import { useRepositoryIconsQuery } from '../../../../../../../tools/hooks/useRepositoryIconsQuery';
@@ -38,7 +39,12 @@ export const IconSelector = ({ onChange }: IconSelectorProps) => {
     return <Loader />;
   }
 
-  const filteredItems = searchTerm ? data.filter((x) => x.url.includes(searchTerm)) : data;
+  const replaceCharacters = (value: string) =>
+    value.toLowerCase().replaceAll(' ', '').replaceAll('-', '');
+
+  const filteredItems = searchTerm
+    ? data.filter((x) => replaceCharacters(x.url).includes(replaceCharacters(searchTerm)))
+    : data;
   const slicedFilteredItems = filteredItems.slice(0, ICON_PICKER_SLICE_LIMIT);
   const isTruncated =
     slicedFilteredItems.length > 0 && slicedFilteredItems.length !== filteredItems.length;
@@ -46,9 +52,13 @@ export const IconSelector = ({ onChange }: IconSelectorProps) => {
   return (
     <Popover width={310}>
       <Popover.Target>
-        <ActionIcon className={classes.actionIcon} size={36} variant="default">
-          <IconSearch size={20} />
-        </ActionIcon>
+        <Button
+          className={classes.actionIcon}
+          variant="default"
+          leftIcon={<IconSearch size={20} />}
+        >
+          Icon Picker
+        </Button>
       </Popover.Target>
       <Popover.Dropdown>
         <Stack pt={4}>
@@ -76,7 +86,6 @@ export const IconSelector = ({ onChange }: IconSelectorProps) => {
             {isTruncated && (
               <Stack spacing="xs" pr={15}>
                 <Divider mt={35} mx="xl" />
-                <IconFlame className={classes.flameIcon} size={40} opacity={0.6} strokeWidth={1} />
                 <Title order={6} color="dimmed" align="center">
                   Search is limited to {ICON_PICKER_SLICE_LIMIT} icons
                 </Title>

src/components/Dashboard/Modals/EditService/Tabs/BehaviourTab/BehaviourTab.tsx

@@ -15,13 +15,17 @@ export const BehaviourTab = ({ form }: BehaviourTabProps) => {
       <TextInput
         icon={<IconClick size={16} />}
         label="On click url"
-        placeholder="Override the default service url when clicking on the service"
+        description="Overrides the service URL when clicking on the service"
+        placeholder="URL that should be opened instead when clicking on the service"
         variant="default"
         mb="md"
         {...form.getInputProps('behaviour.onClickUrl')}
       />
 
-      <Switch label="Open in new tab" {...form.getInputProps('behaviour.isOpeningNewTab')} />
+      <Switch
+        label="Open in new tab"
+        {...form.getInputProps('behaviour.isOpeningNewTab', { type: 'checkbox' })}
+      />
     </Tabs.Panel>
   );
 };

src/components/Dashboard/Modals/EditService/Tabs/GeneralTab/GeneralTab.tsx

@@ -1,32 +1,46 @@
-import { Tabs, TextInput } from '@mantine/core';
+import { Group, Tabs, Text, TextInput } from '@mantine/core';
 import { UseFormReturnType } from '@mantine/form';
 import { IconCursorText, IconLink } from '@tabler/icons';
 import { useTranslation } from 'next-i18next';
 import { ServiceType } from '../../../../../../types/service';
+import { EditServiceModalTab } from '../type';
 
 interface GeneralTabProps {
   form: UseFormReturnType<ServiceType, (values: ServiceType) => ServiceType>;
+  openTab: (tab: EditServiceModalTab) => void;
 }
 
-export const GeneralTab = ({ form }: GeneralTabProps) => {
+export const GeneralTab = ({ form, openTab }: GeneralTabProps) => {
   const { t } = useTranslation('');
   return (
     <Tabs.Panel value="general" pt="lg">
       <TextInput
         icon={<IconCursorText size={16} />}
         label="Service name"
+        description="Used for displaying the service on the dashboard"
         placeholder="My example service"
         variant="default"
         mb="md"
-        required
+        withAsterisk
         {...form.getInputProps('name')}
       />
       <TextInput
         icon={<IconLink size={16} />}
         label="Service url"
+        description={
+          <Group spacing={3}>
+            <Text>
+              URL that will be opened when clicking on the service. Can be overwritten using
+            </Text>
+            <Text onClick={() => openTab('behaviour')} variant="link">
+              on click URL
+            </Text>
+            <Text>when using external URLs to enhance security.</Text>
+          </Group>
+        }
         placeholder="https://google.com"
         variant="default"
-        required
+        withAsterisk
         {...form.getInputProps('url')}
       />
     </Tabs.Panel>

src/components/Dashboard/Modals/EditService/Tabs/IntegrationTab/Components/InputElements/IntegrationSelector.tsx

@@ -62,11 +62,9 @@ export const IntegrationSelector = ({ form }: IntegrationSelectorProps) => {
 
   return (
     <>
-      <TextExplanation />
-      <Space h="sm" />
-
       <Select
-        label="Configure this service for the following integration"
+        label="Integration configuration"
+        description="Treats this service as the selected integration and provides you with per-service configuration"
         placeholder="Select your desired configuration"
         itemComponent={SelectItemComponent}
         data={data}

src/components/Dashboard/Modals/EditService/Tabs/IntegrationTab/Components/TextExplanation/TextExplanation.tsx

@@ -1,10 +0,0 @@
-import { Text } from '@mantine/core';
-
-export const TextExplanation = () => {
-  return (
-    <Text color="dimmed">
-      You can optionally connect your services using integrations. Integration elements on your
-      dashboard will communicate to your services using the configuration below.
-    </Text>
-  );
-};

src/components/Dashboard/Modals/EditService/Tabs/NetworkTab/NetworkTab.tsx

@@ -14,6 +14,7 @@ export const NetworkTab = ({ form }: NetworkTabProps) => {
     <Tabs.Panel value="network" pt="lg">
       <Switch
         label="Enable status checker"
+        description="Sends a simple HTTP / HTTPS request to check if your service is online"
         mb="md"
         defaultChecked={form.values.network.enabledStatusChecker}
         {...form.getInputProps('network.enabledStatusChecker')}
@@ -22,6 +23,7 @@ export const NetworkTab = ({ form }: NetworkTabProps) => {
         <MultiSelect
           required
           label="HTTP status codes"
+          description="Determines what response codes are allowed for this service to be 'Online'"
           data={StatusCodes}
           clearable
           searchable

src/components/Dashboard/Modals/EditService/Tabs/type.ts

@@ -0,0 +1 @@
+export type EditServiceModalTab = 'general' | 'behaviour' | 'network' | 'appereance' | 'integration';