diff --git a/inertia/components/dashboard/dashboard_header.tsx b/inertia/components/dashboard/dashboard_header.tsx index fd3fdbb..d41857a 100644 --- a/inertia/components/dashboard/dashboard_header.tsx +++ b/inertia/components/dashboard/dashboard_header.tsx @@ -4,8 +4,8 @@ import { ActionIcon, AppShell, Badge, + Box, Burger, - Flex, Group, Menu, Text, @@ -36,14 +36,14 @@ export function DashboardHeader({ navbar, aside }: DashboardHeaderProps) { return ( - + - + {activeCollection?.name}{' '} {activeCollection?.visibility === Visibility.PUBLIC && ( @@ -55,7 +55,7 @@ export function DashboardHeader({ navbar, aside }: DashboardHeaderProps) { {activeCollection.description} )} - + diff --git a/inertia/components/dashboard/favorite/favorite_list.module.css b/inertia/components/dashboard/favorite/favorite_list.module.css deleted file mode 100644 index 95c73cc..0000000 --- a/inertia/components/dashboard/favorite/favorite_list.module.css +++ /dev/null @@ -1,28 +0,0 @@ -.sideMenu { - height: 100%; - width: 100%; - display: flex; - gap: 0.35em; - flex-direction: column; -} - -.listContainer { - height: 100%; - min-height: 0; - display: flex; - flex-direction: column; -} - -.collectionList { - padding: 1px; - padding-right: 5px; - display: flex; - flex: 1; - gap: 0.35em; - flex-direction: column; - overflow: auto; -} - -.noFavorite { - text-align: center; -} diff --git a/inertia/components/dashboard/favorite/favorite_list.tsx b/inertia/components/dashboard/favorite/favorite_list.tsx index 015aec0..d48bd87 100644 --- a/inertia/components/dashboard/favorite/favorite_list.tsx +++ b/inertia/components/dashboard/favorite/favorite_list.tsx @@ -1,8 +1,7 @@ -import { Box, Group, ScrollArea, Stack, Text } from '@mantine/core'; +import { Flex, Group, Stack, Text } from '@mantine/core'; import { useTranslation } from 'react-i18next'; import { FavoriteItem } from '~/components/dashboard/favorite/item/favorite_item'; import { useFavorites } from '~/stores/collection_store'; -import styles from './favorite_list.module.css'; export function FavoriteList() { const { t } = useTranslation('common'); @@ -19,21 +18,15 @@ export function FavoriteList() { } return ( - - -
- - {t('favorite')} • {favorites.length} - - - - {favorites.map((link) => ( - - ))} - - -
-
-
+ + + {t('favorite')} • {favorites.length} + + + {favorites.map((link) => ( + + ))} + + ); } diff --git a/inertia/components/dashboard/favorite/item/favorite_item.tsx b/inertia/components/dashboard/favorite/item/favorite_item.tsx index 2d7e345..b3ab8ae 100644 --- a/inertia/components/dashboard/favorite/item/favorite_item.tsx +++ b/inertia/components/dashboard/favorite/item/favorite_item.tsx @@ -1,4 +1,4 @@ -import { Box, Card, Group, Text } from '@mantine/core'; +import { Card, Flex, Group, Text } from '@mantine/core'; import { ExternalLinkStyled } from '~/components/common/external_link_styled'; import LinkFavicon from '~/components/dashboard/link/item/favicon/link_favicon'; import LinkControls from '~/components/dashboard/link/item/link_controls'; @@ -6,22 +6,18 @@ import { LinkWithCollection } from '~/types/app'; import styles from './favorite_item.module.css'; export const FavoriteItem = ({ link }: { link: LinkWithCollection }) => ( - + - - + + {link.name} {link.collection.name} - + diff --git a/inertia/components/dashboard/link/item/link.module.css b/inertia/components/dashboard/link/item/link.module.css index bd23de8..f87c485 100644 --- a/inertia/components/dashboard/link/item/link.module.css +++ b/inertia/components/dashboard/link/item/link.module.css @@ -12,7 +12,6 @@ } .linkUrl { - max-width: calc(100% - 50px); transition: opacity 0.15s; } diff --git a/inertia/components/dashboard/link/item/link_item.tsx b/inertia/components/dashboard/link/item/link_item.tsx index 52e6800..4c7edd6 100644 --- a/inertia/components/dashboard/link/item/link_item.tsx +++ b/inertia/components/dashboard/link/item/link_item.tsx @@ -43,7 +43,7 @@ function LinkItemURL({ url }: { url: Link['url'] }) { return ( {origin} - {pathname} + {pathname !== '/' && pathname} ); } catch (error) {