Fixing console errors and adding category modal

This commit is contained in:
ajnart
2023-01-02 01:44:24 +09:00
parent 8a1b44fd27
commit 38815d754f
7 changed files with 94 additions and 77 deletions

View File

@@ -23,7 +23,6 @@ export const AppearanceTab = ({
<Tabs.Panel value="appearance" pt="lg"> <Tabs.Panel value="appearance" pt="lg">
<Flex gap={5}> <Flex gap={5}>
<TextInput <TextInput
defaultValue={form.values.appearance.iconUrl}
className={classes.textInput} className={classes.textInput}
icon={<DebouncedAppIcon form={form} width={20} height={20} />} icon={<DebouncedAppIcon form={form} width={20} height={20} />}
label={t('appearance.icon.label')} label={t('appearance.icon.label')}

View File

@@ -31,6 +31,8 @@ interface IconSelectorProps {
} }
export const IconSelector = ({ onChange, allowAppNamePropagation, form }: IconSelectorProps) => { export const IconSelector = ({ onChange, allowAppNamePropagation, form }: IconSelectorProps) => {
const { t } = useTranslation('layout/tools');
const { data, isLoading } = useRepositoryIconsQuery<WalkxcodeRepositoryIcon>({ const { data, isLoading } = useRepositoryIconsQuery<WalkxcodeRepositoryIcon>({
url: 'https://api.github.com/repos/walkxcode/Dashboard-Icons/contents/png', url: 'https://api.github.com/repos/walkxcode/Dashboard-Icons/contents/png',
converter: (item) => ({ converter: (item) => ({
@@ -73,8 +75,6 @@ export const IconSelector = ({ onChange, allowAppNamePropagation, form }: IconSe
const isTruncated = const isTruncated =
slicedFilteredItems.length > 0 && slicedFilteredItems.length !== filteredItems.length; slicedFilteredItems.length > 0 && slicedFilteredItems.length !== filteredItems.length;
const { t } = useTranslation('layout/tools');
return ( return (
<Popover width={310}> <Popover width={310}>
<Popover.Target> <Popover.Target>

View File

@@ -1,5 +1,6 @@
import { Group, Space, Stack, Text, UnstyledButton } from '@mantine/core'; import { Group, Space, Stack, Text, UnstyledButton } from '@mantine/core';
import { closeModal } from '@mantine/modals'; import { closeModal } from '@mantine/modals';
import { showNotification } from '@mantine/notifications';
import { IconBox, IconBoxAlignTop, IconStack } from '@tabler/icons'; import { IconBox, IconBoxAlignTop, IconStack } from '@tabler/icons';
import { useTranslation } from 'next-i18next'; import { useTranslation } from 'next-i18next';
import { ReactNode } from 'react'; import { ReactNode } from 'react';
@@ -9,6 +10,7 @@ import { useConfigStore } from '../../../../../../config/store';
import { openContextModalGeneric } from '../../../../../../tools/mantineModalManagerExtensions'; import { openContextModalGeneric } from '../../../../../../tools/mantineModalManagerExtensions';
import { AppType } from '../../../../../../types/app'; import { AppType } from '../../../../../../types/app';
import { appTileDefinition } from '../../../../Tiles/Apps/AppTile'; import { appTileDefinition } from '../../../../Tiles/Apps/AppTile';
import { CategoryEditModalInnerProps } from '../../../../Wrappers/Category/CategoryEditModal';
import { useStyles } from '../Shared/styles'; import { useStyles } from '../Shared/styles';
interface AvailableElementTypesProps { interface AvailableElementTypesProps {
@@ -28,9 +30,18 @@ export const AvailableElementTypes = ({
const getLowestWrapper = () => config?.wrappers.sort((a, b) => a.position - b.position)[0]; const getLowestWrapper = () => config?.wrappers.sort((a, b) => a.position - b.position)[0];
const onClickCreateCategory = async () => { const onClickCreateCategory = async () => {
if (!configName) { openContextModalGeneric<CategoryEditModalInnerProps>({
return; modal: 'categoryEditModal',
} title: 'Name of new category',
withCloseButton: false,
innerProps: {
category: {
id: uuidv4(),
name: 'New category',
position: 0,
},
onSuccess: async (category) => {
if (!configName) return;
await updateConfig(configName, (previousConfig) => ({ await updateConfig(configName, (previousConfig) => ({
...previousConfig, ...previousConfig,
@@ -48,13 +59,21 @@ export const AvailableElementTypes = ({
...previousConfig.categories, ...previousConfig.categories,
{ {
id: uuidv4(), id: uuidv4(),
name: `Category ${previousConfig.categories.length + 1}`, name: category.name,
position: previousConfig.categories.length, position: previousConfig.categories.length,
}, },
], ],
})); })).then(() => {
closeModal(modalId); closeModal(modalId);
showNotification({
title: 'Category created',
message: `The category ${category.name} has been created`,
color: 'teal',
});
});
},
},
});
}; };
return ( return (

View File

@@ -36,7 +36,7 @@ export const CategoryEditModal = ({
return ( return (
<form onSubmit={form.onSubmit(handleSubmit)}> <form onSubmit={form.onSubmit(handleSubmit)}>
<TextInput data-autoFocus {...form.getInputProps('name')} label="Name of category" /> <TextInput data-autoFocus {...form.getInputProps('name')} autoFocus />
<Group mt="md" grow> <Group mt="md" grow>
<Button onClick={() => context.closeModal(id)} variant="filled" color="gray"> <Button onClick={() => context.closeModal(id)} variant="filled" color="gray">

View File

@@ -210,6 +210,7 @@ export const useCategoryActions = (configName: string | undefined, category: Cat
const edit = async () => { const edit = async () => {
openContextModalGeneric<CategoryEditModalInnerProps>({ openContextModalGeneric<CategoryEditModalInnerProps>({
modal: 'categoryEditModal', modal: 'categoryEditModal',
withCloseButton: false,
innerProps: { innerProps: {
category, category,
onSuccess: async (category) => { onSuccess: async (category) => {

View File

@@ -59,7 +59,6 @@ export const ToggleEditModeAction = () => {
); );
return ( return (
<Tooltip label={t('tooltip')} withinPortal>
<Popover <Popover
opened={enabled && !smallerThanSm && !popoverManuallyHidden} opened={enabled && !smallerThanSm && !popoverManuallyHidden}
width={250} width={250}
@@ -67,6 +66,7 @@ export const ToggleEditModeAction = () => {
withArrow withArrow
> >
<Popover.Target> <Popover.Target>
<Tooltip label={t('tooltip')} withinPortal>
{smallerThanSm ? ( {smallerThanSm ? (
enabled ? ( enabled ? (
<Group style={{ flexWrap: 'nowrap' }}> <Group style={{ flexWrap: 'nowrap' }}>
@@ -84,6 +84,7 @@ export const ToggleEditModeAction = () => {
) : ( ) : (
<ToggleButtonDesktop /> <ToggleButtonDesktop />
)} )}
</Tooltip>
</Popover.Target> </Popover.Target>
<Popover.Dropdown p={4} px={6}> <Popover.Dropdown p={4} px={6}>
@@ -100,6 +101,5 @@ export const ToggleEditModeAction = () => {
</Text> </Text>
</Popover.Dropdown> </Popover.Dropdown>
</Popover> </Popover>
</Tooltip>
); );
}; };

View File

@@ -13,7 +13,6 @@ export function SettingsMenu({ newVersionAvailable }: { newVersionAvailable: str
return ( return (
<> <>
<Tooltip label="Open Menu">
<Menu width={250}> <Menu width={250}>
<Menu.Target> <Menu.Target>
<ActionIcon variant="default" radius="md" size="xl" color="blue"> <ActionIcon variant="default" radius="md" size="xl" color="blue">
@@ -41,7 +40,6 @@ export function SettingsMenu({ newVersionAvailable }: { newVersionAvailable: str
</Menu.Item> </Menu.Item>
</Menu.Dropdown> </Menu.Dropdown>
</Menu> </Menu>
</Tooltip>
<SettingsDrawer <SettingsDrawer
opened={drawerOpened} opened={drawerOpened}
closeDrawer={drawer.close} closeDrawer={drawer.close}