diff --git a/apps/client/src/components/common/recent-changes.tsx b/apps/client/src/components/common/recent-changes.tsx index 75935fa5..81fdc899 100644 --- a/apps/client/src/components/common/recent-changes.tsx +++ b/apps/client/src/components/common/recent-changes.tsx @@ -5,26 +5,27 @@ import { Badge, Table, ActionIcon, -} from '@mantine/core'; -import {Link} from 'react-router-dom'; -import PageListSkeleton from '@/components/ui/page-list-skeleton.tsx'; -import { buildPageUrl } from '@/features/page/page.utils.ts'; -import { formattedDate } from '@/lib/time.ts'; -import { useRecentChangesQuery } from '@/features/page/queries/page-query.ts'; -import { IconFileDescription } from '@tabler/icons-react'; -import { getSpaceUrl } from '@/lib/config.ts'; +} from "@mantine/core"; +import { Link } from "react-router-dom"; +import PageListSkeleton from "@/components/ui/page-list-skeleton.tsx"; +import { buildPageUrl } from "@/features/page/page.utils.ts"; +import { formattedDate } from "@/lib/time.ts"; +import { useRecentChangesQuery } from "@/features/page/queries/page-query.ts"; +import { IconFileDescription } from "@tabler/icons-react"; +import { getSpaceUrl } from "@/lib/config.ts"; import { useTranslation } from "react-i18next"; +import { getInitialsColor } from "@/lib/get-initials-color.ts"; interface Props { spaceId?: string; } -export default function RecentChanges({spaceId}: Props) { +export default function RecentChanges({ spaceId }: Props) { const { t } = useTranslation(); - const {data: pages, isLoading, isError} = useRecentChangesQuery(spaceId); + const { data: pages, isLoading, isError } = useRecentChangesQuery(spaceId); if (isLoading) { - return ; + return ; } if (isError) { @@ -44,8 +45,8 @@ export default function RecentChanges({spaceId}: Props) { > {page.icon || ( - - + + )} @@ -58,18 +59,23 @@ export default function RecentChanges({spaceId}: Props) { {!spaceId && ( {page?.space.name} )} - + {formattedDate(page.updatedAt)} diff --git a/apps/client/src/features/group/components/group-list.tsx b/apps/client/src/features/group/components/group-list.tsx index f1f1ffe0..5ce17973 100644 --- a/apps/client/src/features/group/components/group-list.tsx +++ b/apps/client/src/features/group/components/group-list.tsx @@ -10,6 +10,7 @@ import Paginate from "@/components/common/paginate.tsx"; import { queryClient } from "@/main.tsx"; import { getSpaces } from "@/features/space/services/space-service.ts"; import { getGroupMembers } from "@/features/group/services/group-service.ts"; +import { AutoTooltipText } from "@/components/ui/auto-tooltip-text.tsx"; export default function GroupList() { const { t } = useTranslation(); @@ -51,9 +52,9 @@ export default function GroupList() {
- + {group.name} - + {group.description} diff --git a/apps/client/src/features/space/components/space-list.tsx b/apps/client/src/features/space/components/space-list.tsx index b7fc3ec7..79b661ea 100644 --- a/apps/client/src/features/space/components/space-list.tsx +++ b/apps/client/src/features/space/components/space-list.tsx @@ -8,6 +8,7 @@ import { useTranslation } from "react-i18next"; import Paginate from "@/components/common/paginate.tsx"; import { CustomAvatar } from "@/components/ui/custom-avatar.tsx"; import { AvatarIconType } from "@/features/attachments/types/attachment.types.ts"; +import { AutoTooltipText } from "@/components/ui/auto-tooltip-text.tsx"; export default function SpaceList() { const { t } = useTranslation(); @@ -49,9 +50,9 @@ export default function SpaceList() { name={space.name} />
- + {space.name} - + {space.description} diff --git a/apps/client/src/features/space/components/space-members.tsx b/apps/client/src/features/space/components/space-members.tsx index 06300293..9186daaf 100644 --- a/apps/client/src/features/space/components/space-members.tsx +++ b/apps/client/src/features/space/components/space-members.tsx @@ -27,6 +27,7 @@ import { useTranslation } from "react-i18next"; import Paginate from "@/components/common/paginate.tsx"; import { SearchInput } from "@/components/common/search-input.tsx"; import { usePaginateAndSearch } from "@/hooks/use-paginate-and-search.tsx"; +import { AutoTooltipText } from "@/components/ui/auto-tooltip-text.tsx"; type MemberType = "user" | "group"; @@ -138,10 +139,10 @@ export default function SpaceMembersList({ {member.type === "group" && } -
- +
+ {member?.name} - + {member.type == "user" && member?.email} diff --git a/apps/client/src/features/space/components/spaces-page/all-spaces-list.tsx b/apps/client/src/features/space/components/spaces-page/all-spaces-list.tsx index 4106f203..acfae399 100644 --- a/apps/client/src/features/space/components/spaces-page/all-spaces-list.tsx +++ b/apps/client/src/features/space/components/spaces-page/all-spaces-list.tsx @@ -23,6 +23,7 @@ import SpaceSettingsModal from "@/features/space/components/settings-modal"; import classes from "./all-spaces-list.module.css"; import { CustomAvatar } from "@/components/ui/custom-avatar.tsx"; import { AvatarIconType } from "@/features/attachments/types/attachment.types.ts"; +import { AutoTooltipText } from "@/components/ui/auto-tooltip-text.tsx"; interface AllSpacesListProps { spaces: any[]; @@ -96,10 +97,10 @@ export default function AllSpacesList({ variant="filled" size="md" /> -
- +
+ {space.name} - + {space.description && ( {space.description} diff --git a/apps/client/src/lib/get-initials-color.ts b/apps/client/src/lib/get-initials-color.ts new file mode 100644 index 00000000..cbf90680 --- /dev/null +++ b/apps/client/src/lib/get-initials-color.ts @@ -0,0 +1,34 @@ +import { MantineColor } from "@mantine/core"; + +function hashCode(input: string) { + let hash = 0; + for (let i = 0; i < input.length; i += 1) { + const char = input.charCodeAt(i); + hash = (hash << 5) - hash + char; + hash |= 0; + } + return hash; +} + +const defaultColors: MantineColor[] = [ + "blue", + "cyan", + "grape", + "green", + "indigo", + "lime", + "orange", + "pink", + "red", + "teal", + "violet", +]; + +export function getInitialsColor( + name: string, + colors: MantineColor[] = defaultColors, +) { + const hash = hashCode(name); + const index = Math.abs(hash) % colors.length; + return colors[index]; +}