Compare commits
17
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4361ccf7f0 | ||
|
|
d5fd6905ea | ||
|
|
c252b4f9ac | ||
|
|
4f2b3cf3ee | ||
|
|
b19549b601 | ||
|
|
a0cc68798d | ||
|
|
9a538941ee | ||
|
|
fc12500b3e | ||
|
|
64dccec362 | ||
|
|
f7ea1b33a0 | ||
|
|
fe3cebb902 | ||
|
|
ba1d213870 | ||
|
|
8f03a38de5 | ||
|
|
b99f28f8c1 | ||
|
|
1d7c121dad | ||
|
|
0a4a9f98ab | ||
|
|
f902ca439d |
No files matched your search
@@ -42,14 +42,14 @@ jobs:
|
|||||||
- name: Get changed files
|
- name: Get changed files
|
||||||
id: changed
|
id: changed
|
||||||
run: |
|
run: |
|
||||||
FILES=$(git diff --name-only --diff-filter=ACMR origin/${{ github.base_ref }}...HEAD -- '*.ts' '*.tsx' '*.js' '*.jsx' | tr '\n' ' ')
|
git diff --name-only --diff-filter=ACMR origin/${{ github.base_ref }}...HEAD -- '*.ts' '*.tsx' '*.js' '*.jsx' > /tmp/changed-files
|
||||||
echo "files=$FILES" >> $GITHUB_OUTPUT
|
echo "count=$(wc -l < /tmp/changed-files | tr -d '[:space:]')" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
- name: Auto-fix lint + format
|
- name: Auto-fix lint + format
|
||||||
if: steps.changed.outputs.files != ''
|
if: steps.changed.outputs.count != '0'
|
||||||
run: |
|
run: |
|
||||||
pnpm exec oxlint --fix ${{ steps.changed.outputs.files }} || true
|
xargs -r -a /tmp/changed-files pnpm exec oxlint --fix || true
|
||||||
pnpm exec oxfmt --write ${{ steps.changed.outputs.files }}
|
xargs -r -a /tmp/changed-files pnpm exec oxfmt --write
|
||||||
|
|
||||||
- name: Commit fixes
|
- name: Commit fixes
|
||||||
uses: stefanzweifel/git-auto-commit-action@v5
|
uses: stefanzweifel/git-auto-commit-action@v5
|
||||||
|
|||||||
@@ -66,7 +66,7 @@ jobs:
|
|||||||
- uses: actions/setup-node@v6
|
- uses: actions/setup-node@v6
|
||||||
if: env.SKIP_RELEASE == 'false'
|
if: env.SKIP_RELEASE == 'false'
|
||||||
with:
|
with:
|
||||||
node-version: 24.15.0
|
node-version: 24.16.0
|
||||||
package-manager-cache: false
|
package-manager-cache: false
|
||||||
- run: npm i -g pnpm
|
- run: npm i -g pnpm
|
||||||
if: env.SKIP_RELEASE == 'false'
|
if: env.SKIP_RELEASE == 'false'
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
FROM node:24.15.0-alpine AS base
|
FROM node:24.16.0-alpine AS base
|
||||||
|
|
||||||
FROM base AS builder
|
FROM base AS builder
|
||||||
RUN apk add --no-cache libc6-compat
|
RUN apk add --no-cache libc6-compat
|
||||||
|
|||||||
@@ -2,13 +2,14 @@
|
|||||||
|
|
||||||
import type { PropsWithChildren } from "react";
|
import type { PropsWithChildren } from "react";
|
||||||
import type { MantineColorScheme, MantineColorSchemeManager } from "@mantine/core";
|
import type { MantineColorScheme, MantineColorSchemeManager } from "@mantine/core";
|
||||||
import { createTheme, DirectionProvider, MantineProvider } from "@mantine/core";
|
import { DirectionProvider, MantineProvider } from "@mantine/core";
|
||||||
import dayjs from "dayjs";
|
import dayjs from "dayjs";
|
||||||
|
|
||||||
import { clientApi } from "@homarr/api/client";
|
import { clientApi } from "@homarr/api/client";
|
||||||
import { useSession } from "@homarr/auth/client";
|
import { useSession } from "@homarr/auth/client";
|
||||||
import { parseCookies, setClientCookie } from "@homarr/common";
|
import { parseCookies, setClientCookie } from "@homarr/common";
|
||||||
import { colorSchemeCookieKey } from "@homarr/definitions";
|
import { colorSchemeCookieKey } from "@homarr/definitions";
|
||||||
|
import { theme } from "@homarr/ui";
|
||||||
|
|
||||||
export const CustomMantineProvider = ({
|
export const CustomMantineProvider = ({
|
||||||
children,
|
children,
|
||||||
@@ -23,6 +24,7 @@ export const CustomMantineProvider = ({
|
|||||||
theme={createTheme({
|
theme={createTheme({
|
||||||
primaryColor: "red",
|
primaryColor: "red",
|
||||||
autoContrast: true,
|
autoContrast: true,
|
||||||
|
defaultRadius: "sm",
|
||||||
})}
|
})}
|
||||||
>
|
>
|
||||||
{children}
|
{children}
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ export default async function InviteUsagePage(props: InviteUsagePageProps) {
|
|||||||
{t("subtitle")}
|
{t("subtitle")}
|
||||||
</Text>
|
</Text>
|
||||||
</Stack>
|
</Stack>
|
||||||
<Card withBorder w={64 * 6} maw="90vw">
|
<Card w={64 * 6} maw="90vw">
|
||||||
<RegistrationForm invite={invite} />
|
<RegistrationForm invite={invite} />
|
||||||
</Card>
|
</Card>
|
||||||
<Text size="xs" c="gray.5" ta="center">
|
<Text size="xs" c="gray.5" ta="center">
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import { z } from "zod/v4";
|
|||||||
|
|
||||||
import { signIn } from "@homarr/auth/client";
|
import { signIn } from "@homarr/auth/client";
|
||||||
import { revalidatePathActionAsync } from "@homarr/common/client";
|
import { revalidatePathActionAsync } from "@homarr/common/client";
|
||||||
import type { useForm } from "@homarr/form";
|
import type { UseFormReturnType } from "@homarr/form";
|
||||||
import { useZodForm } from "@homarr/form";
|
import { useZodForm } from "@homarr/form";
|
||||||
import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
|
import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
|
||||||
import { useScopedI18n } from "@homarr/translation/client";
|
import { useScopedI18n } from "@homarr/translation/client";
|
||||||
@@ -162,7 +162,7 @@ export const LoginForm = ({ providers, oidcClientName, isOidcAutoLoginEnabled, c
|
|||||||
|
|
||||||
interface SubmitButtonProps {
|
interface SubmitButtonProps {
|
||||||
isPending: boolean;
|
isPending: boolean;
|
||||||
form: ReturnType<typeof useForm<FormType, (values: FormType) => FormType>>;
|
form: UseFormReturnType<FormType>;
|
||||||
provider: "credentials" | "ldap";
|
provider: "credentials" | "ldap";
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -198,7 +198,7 @@ const PasswordForgottenCollapse = ({ username }: PasswordForgottenCollapseProps)
|
|||||||
{tForgotPassword("label")}
|
{tForgotPassword("label")}
|
||||||
</Anchor>
|
</Anchor>
|
||||||
|
|
||||||
<Collapse in={visible}>
|
<Collapse expanded={visible}>
|
||||||
<Card>
|
<Card>
|
||||||
<Stack gap="xs">
|
<Stack gap="xs">
|
||||||
<Text size="sm">{tForgotPassword("description")}</Text>
|
<Text size="sm">{tForgotPassword("description")}</Text>
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ export default async function Login(props: LoginProps) {
|
|||||||
{t("subtitle")}
|
{t("subtitle")}
|
||||||
</Text>
|
</Text>
|
||||||
</Stack>
|
</Stack>
|
||||||
<Card withBorder w={64 * 6} maw="90vw">
|
<Card w={64 * 6} maw="90vw">
|
||||||
<LoginForm
|
<LoginForm
|
||||||
providers={env.AUTH_PROVIDERS}
|
providers={env.AUTH_PROVIDERS}
|
||||||
oidcClientName={env.AUTH_OIDC_CLIENT_NAME}
|
oidcClientName={env.AUTH_OIDC_CLIENT_NAME}
|
||||||
|
|||||||
@@ -41,13 +41,11 @@ export const createBoardContentPage = <TParams extends Record<string, unknown>>(
|
|||||||
}),
|
}),
|
||||||
// eslint-disable-next-line no-restricted-syntax
|
// eslint-disable-next-line no-restricted-syntax
|
||||||
page: async ({ params }: { params: Promise<TParams> }) => {
|
page: async ({ params }: { params: Promise<TParams> }) => {
|
||||||
const session = await auth();
|
const resolvedParams = await params;
|
||||||
const integrations = await getIntegrationsWithPermissionsAsync(session);
|
|
||||||
|
|
||||||
const board = await getInitialBoard(await params);
|
|
||||||
const queryClient = getQueryClient();
|
const queryClient = getQueryClient();
|
||||||
|
|
||||||
// Prefetch item data
|
const [board, session] = await Promise.all([getInitialBoard(resolvedParams), auth()]);
|
||||||
|
|
||||||
const itemsMap = board.items.reduce((acc, item) => {
|
const itemsMap = board.items.reduce((acc, item) => {
|
||||||
const existing = acc.get(item.kind);
|
const existing = acc.get(item.kind);
|
||||||
if (existing) {
|
if (existing) {
|
||||||
@@ -58,17 +56,20 @@ export const createBoardContentPage = <TParams extends Record<string, unknown>>(
|
|||||||
return acc;
|
return acc;
|
||||||
}, new Map<WidgetKind, Item[]>());
|
}, new Map<WidgetKind, Item[]>());
|
||||||
|
|
||||||
for (const [kind, items] of itemsMap) {
|
const [integrations] = await Promise.all([
|
||||||
await prefetchForKindAsync(kind, queryClient, items).catch((error) => {
|
getIntegrationsWithPermissionsAsync(session),
|
||||||
logger.error(
|
...Array.from(itemsMap).map(([kind, items]) =>
|
||||||
new ErrorWithMetadata(
|
prefetchForKindAsync(kind, queryClient, items).catch((error) => {
|
||||||
"Failed to prefetch widget",
|
logger.error(
|
||||||
{ widgetKind: kind, itemCount: items.length },
|
new ErrorWithMetadata(
|
||||||
{ cause: error },
|
"Failed to prefetch widget",
|
||||||
),
|
{ widgetKind: kind, itemCount: items.length },
|
||||||
);
|
{ cause: error },
|
||||||
});
|
),
|
||||||
}
|
);
|
||||||
|
}),
|
||||||
|
),
|
||||||
|
]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<HydrationBoundary state={dehydrate(queryClient)}>
|
<HydrationBoundary state={dehydrate(queryClient)}>
|
||||||
|
|||||||
@@ -109,7 +109,7 @@ const AddMenu = () => {
|
|||||||
}, [openAppSelectModal, createItem]);
|
}, [openAppSelectModal, createItem]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Menu position="bottom-end" withArrow>
|
<Menu position="bottom-end">
|
||||||
<Menu.Target>
|
<Menu.Target>
|
||||||
<HeaderButton w="auto" px={4}>
|
<HeaderButton w="auto" px={4}>
|
||||||
<Group gap={4} wrap="nowrap">
|
<Group gap={4} wrap="nowrap">
|
||||||
@@ -183,7 +183,7 @@ const SelectBoardsMenu = () => {
|
|||||||
const { data: boards = [] } = clientApi.board.getAllBoards.useQuery();
|
const { data: boards = [] } = clientApi.board.getAllBoards.useQuery();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Menu position="bottom-end" withArrow>
|
<Menu position="bottom-end">
|
||||||
<Menu.Target>
|
<Menu.Target>
|
||||||
<HeaderButton w="auto" px={4}>
|
<HeaderButton w="auto" px={4}>
|
||||||
<IconReplace stroke={1.5} />
|
<IconReplace stroke={1.5} />
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ export const BoardMantineProvider = ({
|
|||||||
},
|
},
|
||||||
primaryColor: "primaryColor",
|
primaryColor: "primaryColor",
|
||||||
autoContrast: true,
|
autoContrast: true,
|
||||||
|
defaultRadius: "sm",
|
||||||
fontSizes: {
|
fontSizes: {
|
||||||
"2xl": rem(24),
|
"2xl": rem(24),
|
||||||
"3xl": rem(28),
|
"3xl": rem(28),
|
||||||
|
|||||||
@@ -83,7 +83,7 @@ export const ColorSettingsContent = ({ board }: Props) => {
|
|||||||
<Anchor onClick={toggle}>{showPreview ? t("common.preview.hide") : t("common.preview.show")}</Anchor>
|
<Anchor onClick={toggle}>{showPreview ? t("common.preview.hide") : t("common.preview.show")}</Anchor>
|
||||||
</Grid.Col>
|
</Grid.Col>
|
||||||
<Grid.Col span={12}>
|
<Grid.Col span={12}>
|
||||||
<Collapse in={showPreview}>
|
<Collapse expanded={showPreview}>
|
||||||
<Stack>
|
<Stack>
|
||||||
<ColorsPreview previewColor={form.values.primaryColor} />
|
<ColorsPreview previewColor={form.values.primaryColor} />
|
||||||
<ColorsPreview previewColor={form.values.secondaryColor} />
|
<ColorsPreview previewColor={form.values.secondaryColor} />
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ export const InitFinish = async () => {
|
|||||||
const tFinish = await getScopedI18n("init.step.finish");
|
const tFinish = await getScopedI18n("init.step.finish");
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Card w={64 * 6} maw="90vw" withBorder>
|
<Card w={64 * 6} maw="90vw">
|
||||||
<Stack>
|
<Stack>
|
||||||
<Text>{tFinish("description")}</Text>
|
<Text>{tFinish("description")}</Text>
|
||||||
|
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ export const InitGroup = () => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Card w={64 * 6} maw="90vw" withBorder>
|
<Card w={64 * 6} maw="90vw">
|
||||||
<form onSubmit={form.onSubmit(handleSubmitAsync)}>
|
<form onSubmit={form.onSubmit(handleSubmitAsync)}>
|
||||||
<Stack>
|
<Stack>
|
||||||
<TextInput
|
<TextInput
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ interface FileInfoCardProps {
|
|||||||
export const FileInfoCard = ({ file, onRemove }: FileInfoCardProps) => {
|
export const FileInfoCard = ({ file, onRemove }: FileInfoCardProps) => {
|
||||||
const tFileInfo = useScopedI18n("init.step.import.fileInfo");
|
const tFileInfo = useScopedI18n("init.step.import.fileInfo");
|
||||||
return (
|
return (
|
||||||
<Card w={64 * 12 + 8} maw="90vw">
|
<Card w={64 * 12 + 8} maw="90vw" withBorder={false}>
|
||||||
<Group justify="space-between" align="center" wrap="nowrap">
|
<Group justify="space-between" align="center" wrap="nowrap">
|
||||||
<Group>
|
<Group>
|
||||||
<Text fw={500} lineClamp={1} style={{ wordBreak: "break-all" }}>
|
<Text fw={500} lineClamp={1} style={{ wordBreak: "break-all" }}>
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ export const InitImport = () => {
|
|||||||
|
|
||||||
if (!file) {
|
if (!file) {
|
||||||
return (
|
return (
|
||||||
<Card w={64 * 12 + 8} maw="90vw" withBorder>
|
<Card w={64 * 12 + 8} maw="90vw">
|
||||||
<ImportDropZone
|
<ImportDropZone
|
||||||
loading={isPending}
|
loading={isPending}
|
||||||
updateFile={(file) => {
|
updateFile={(file) => {
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ export const InitSettings = () => {
|
|||||||
return (
|
return (
|
||||||
<form onSubmit={form.onSubmit(handleSubmitAsync)}>
|
<form onSubmit={form.onSubmit(handleSubmitAsync)}>
|
||||||
<Stack>
|
<Stack>
|
||||||
<Card w={64 * 12 + 8} maw="90vw" withBorder>
|
<Card w={64 * 12 + 8} maw="90vw">
|
||||||
<Stack gap="sm">
|
<Stack gap="sm">
|
||||||
<Text fw={500}>{tSection("analytics.title")}</Text>
|
<Text fw={500}>{tSection("analytics.title")}</Text>
|
||||||
|
|
||||||
@@ -39,7 +39,7 @@ export const InitSettings = () => {
|
|||||||
</Stack>
|
</Stack>
|
||||||
</Stack>
|
</Stack>
|
||||||
</Card>
|
</Card>
|
||||||
<Card w={64 * 12 + 8} maw="90vw" withBorder>
|
<Card w={64 * 12 + 8} maw="90vw">
|
||||||
<Stack gap="sm">
|
<Stack gap="sm">
|
||||||
<Text fw={500}>{tSection("crawlingAndIndexing.title")}</Text>
|
<Text fw={500}>{tSection("crawlingAndIndexing.title")}</Text>
|
||||||
|
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ export const InitStart = async () => {
|
|||||||
const tStart = await getScopedI18n("init.step.start");
|
const tStart = await getScopedI18n("init.step.start");
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Card w={64 * 6} maw="90vw" withBorder>
|
<Card w={64 * 6} maw="90vw">
|
||||||
<Stack>
|
<Stack>
|
||||||
<Text>{tStart("description")}</Text>
|
<Text>{tStart("description")}</Text>
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import { InitUserForm } from "./init-user-form";
|
|||||||
|
|
||||||
export const InitUser = () => {
|
export const InitUser = () => {
|
||||||
return (
|
return (
|
||||||
<Card w={64 * 6} maw="90vw" withBorder>
|
<Card w={64 * 6} maw="90vw">
|
||||||
<InitUserForm />
|
<InitUserForm />
|
||||||
</Card>
|
</Card>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -44,13 +44,13 @@ const fontSans = Inter({
|
|||||||
export const generateMetadata = async (): Promise<Metadata> => ({
|
export const generateMetadata = async (): Promise<Metadata> => ({
|
||||||
title: "Homarr",
|
title: "Homarr",
|
||||||
description:
|
description:
|
||||||
"Simplify the management of your server with Homarr - a sleek, modern dashboard that puts all of your apps and services at your fingertips.",
|
"A self-hosted dashboard for the *arr stack and your entire homelab. Integrates with 50+ services, real-time widgets, no config files.",
|
||||||
openGraph: {
|
openGraph: {
|
||||||
title: "Homarr Dashboard",
|
title: "Homarr Dashboard",
|
||||||
description:
|
description:
|
||||||
"Simplify the management of your server with Homarr - a sleek, modern dashboard that puts all of your apps and services at your fingertips.",
|
"A self-hosted dashboard for the *arr stack and your entire homelab. Integrates with 50+ services, real-time widgets, no config files.",
|
||||||
url: "https://homarr.dev",
|
url: "https://homarr.dev",
|
||||||
siteName: "Homarr Documentation",
|
siteName: "Homarr",
|
||||||
},
|
},
|
||||||
icons: {
|
icons: {
|
||||||
icon: "/logo/logo.png",
|
icon: "/logo/logo.png",
|
||||||
@@ -142,7 +142,7 @@ export default async function Layout(props: {
|
|||||||
</head>
|
</head>
|
||||||
<body className={["font-sans", fontSans.variable].join(" ")}>
|
<body className={["font-sans", fontSans.variable].join(" ")}>
|
||||||
<StackedProvider>
|
<StackedProvider>
|
||||||
<Notifications />
|
<Notifications pauseResetOnHover="notification" />
|
||||||
<ServiceWorkerRegistration />
|
<ServiceWorkerRegistration />
|
||||||
{props.children}
|
{props.children}
|
||||||
</StackedProvider>
|
</StackedProvider>
|
||||||
|
|||||||
@@ -45,7 +45,6 @@ export const HeroBanner = async () => {
|
|||||||
<Image
|
<Image
|
||||||
key={`grid-column-${columnIndex}-scroll-1-${index}`}
|
key={`grid-column-${columnIndex}-scroll-1-${index}`}
|
||||||
src={icon}
|
src={icon}
|
||||||
radius="md"
|
|
||||||
fit={"contain"}
|
fit={"contain"}
|
||||||
w={50}
|
w={50}
|
||||||
h={50}
|
h={50}
|
||||||
@@ -57,7 +56,6 @@ export const HeroBanner = async () => {
|
|||||||
<Image
|
<Image
|
||||||
key={`grid-column-${columnIndex}-scroll-2-${index}`}
|
key={`grid-column-${columnIndex}-scroll-2-${index}`}
|
||||||
src={icon}
|
src={icon}
|
||||||
radius="md"
|
|
||||||
fit={"contain"}
|
fit={"contain"}
|
||||||
w={50}
|
w={50}
|
||||||
h={50}
|
h={50}
|
||||||
|
|||||||
@@ -90,9 +90,7 @@ export default async function AboutPage() {
|
|||||||
<Group py="lg">
|
<Group py="lg">
|
||||||
<Image src={homarrLogoPath} width={100} height={100} alt="" />
|
<Image src={homarrLogoPath} width={100} height={100} alt="" />
|
||||||
<Stack gap={0}>
|
<Stack gap={0}>
|
||||||
<Title order={1} tt="uppercase">
|
<Title order={1}>Homarr</Title>
|
||||||
Homarr
|
|
||||||
</Title>
|
|
||||||
<Title order={2}>{t("version", { version })}</Title>
|
<Title order={2}>{t("version", { version })}</Title>
|
||||||
</Stack>
|
</Stack>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -187,7 +185,7 @@ export default async function AboutPage() {
|
|||||||
<SimpleGrid cols={{ xs: 1, sm: 2, md: 3, lg: 4, xl: 5 }} spacing="md">
|
<SimpleGrid cols={{ xs: 1, sm: 2, md: 3, lg: 4, xl: 5 }} spacing="md">
|
||||||
{Object.entries(dependencies)
|
{Object.entries(dependencies)
|
||||||
.filter(([, value]) => !value.includes("workspace:"))
|
.filter(([, value]) => !value.includes("workspace:"))
|
||||||
.sort(([key1], [key2]) => key1.localeCompare(key2))
|
.toSorted(([key1], [key2]) => key1.localeCompare(key2))
|
||||||
.map(([name, version]) => (
|
.map(([name, version]) => (
|
||||||
<UnstyledButton
|
<UnstyledButton
|
||||||
key={name}
|
key={name}
|
||||||
@@ -195,9 +193,9 @@ export default async function AboutPage() {
|
|||||||
href={`https://www.npmjs.com/package/${name}`}
|
href={`https://www.npmjs.com/package/${name}`}
|
||||||
target="_blank"
|
target="_blank"
|
||||||
>
|
>
|
||||||
<Card withBorder radius="md" p="xs" className={classes.dependencyCard}>
|
<Card radius="md" p="xs" className={classes.dependencyCard}>
|
||||||
<Group gap="sm" wrap="nowrap">
|
<Group gap="sm" wrap="nowrap">
|
||||||
<ThemeIcon variant="light" size="lg" radius="md">
|
<ThemeIcon variant="light" size="lg">
|
||||||
<IconPackage size="1.5rem" stroke={1.5} />
|
<IconPackage size="1.5rem" stroke={1.5} />
|
||||||
</ThemeIcon>
|
</ThemeIcon>
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { Fragment } from "react";
|
import { Fragment } from "react";
|
||||||
import { redirect } from "next/navigation";
|
import { redirect } from "next/navigation";
|
||||||
import { ActionIcon, ActionIconGroup, Anchor, Avatar, Card, Group, Stack, Text, Title } from "@mantine/core";
|
import { ActionIcon, ActionIconGroup, Anchor, Avatar, Card, Group, Stack, Text } from "@mantine/core";
|
||||||
import { IconBox, IconPencil } from "@tabler/icons-react";
|
import { IconBox, IconPencil } from "@tabler/icons-react";
|
||||||
import { z } from "zod/v4";
|
import { z } from "zod/v4";
|
||||||
|
|
||||||
@@ -11,9 +11,8 @@ import type { inferSearchParamsFromSchema } from "@homarr/common/types";
|
|||||||
import { getI18n, getScopedI18n } from "@homarr/translation/server";
|
import { getI18n, getScopedI18n } from "@homarr/translation/server";
|
||||||
import { Link, SearchInput, TablePagination } from "@homarr/ui";
|
import { Link, SearchInput, TablePagination } from "@homarr/ui";
|
||||||
|
|
||||||
import { ManageContainer } from "~/components/manage/manage-container";
|
import { ManagePageLayout } from "~/components/manage/manage-page-layout";
|
||||||
import { MobileAffixButton } from "~/components/manage/mobile-affix-button";
|
import { MobileAffixButton } from "~/components/manage/mobile-affix-button";
|
||||||
import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
|
|
||||||
import { NoResults } from "~/components/no-results";
|
import { NoResults } from "~/components/no-results";
|
||||||
import { AppDeleteButton } from "./_app-delete-button";
|
import { AppDeleteButton } from "./_app-delete-button";
|
||||||
|
|
||||||
@@ -39,34 +38,31 @@ export default async function AppsPage(props: AppsPageProps) {
|
|||||||
const { items: apps, totalCount } = await api.app.getPaginated(searchParams);
|
const { items: apps, totalCount } = await api.app.getPaginated(searchParams);
|
||||||
const t = await getScopedI18n("app");
|
const t = await getScopedI18n("app");
|
||||||
|
|
||||||
return (
|
const canCreate = session.user.permissions.includes("app-create");
|
||||||
<ManageContainer>
|
|
||||||
<DynamicBreadcrumb />
|
|
||||||
<Stack>
|
|
||||||
<Title>{t("page.list.title")}</Title>
|
|
||||||
<Group justify="space-between" align="center">
|
|
||||||
<SearchInput placeholder={`${t("search")}...`} defaultValue={searchParams.search} flexExpand />
|
|
||||||
{session.user.permissions.includes("app-create") && (
|
|
||||||
<MobileAffixButton component={Link} href="/manage/apps/new">
|
|
||||||
{t("page.create.title")}
|
|
||||||
</MobileAffixButton>
|
|
||||||
)}
|
|
||||||
</Group>
|
|
||||||
{apps.length === 0 && <AppNoResults />}
|
|
||||||
{apps.length > 0 && (
|
|
||||||
<Stack gap="sm">
|
|
||||||
{apps.map((app) => (
|
|
||||||
<AppCard key={app.id} app={app} />
|
|
||||||
))}
|
|
||||||
</Stack>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* Added margin to not hide pagination behind affix-button */}
|
return (
|
||||||
<Group justify="end" mb={48}>
|
<ManagePageLayout
|
||||||
<TablePagination total={Math.ceil(totalCount / searchParams.pageSize)} />
|
title={t("page.list.title")}
|
||||||
</Group>
|
primaryAction={
|
||||||
</Stack>
|
canCreate ? (
|
||||||
</ManageContainer>
|
<MobileAffixButton component={Link} href="/manage/apps/new">
|
||||||
|
{t("page.create.title")}
|
||||||
|
</MobileAffixButton>
|
||||||
|
) : undefined
|
||||||
|
}
|
||||||
|
toolbar={<SearchInput placeholder={`${t("search")}...`} defaultValue={searchParams.search} flexExpand />}
|
||||||
|
footer={<TablePagination total={Math.ceil(totalCount / searchParams.pageSize)} />}
|
||||||
|
floatingPrimaryAction={canCreate}
|
||||||
|
>
|
||||||
|
{apps.length === 0 && <AppNoResults />}
|
||||||
|
{apps.length > 0 && (
|
||||||
|
<Stack gap="sm">
|
||||||
|
{apps.map((app) => (
|
||||||
|
<AppCard key={app.id} app={app} />
|
||||||
|
))}
|
||||||
|
</Stack>
|
||||||
|
)}
|
||||||
|
</ManagePageLayout>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -79,7 +75,7 @@ const AppCard = async ({ app }: AppCardProps) => {
|
|||||||
const session = await auth();
|
const session = await auth();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Card withBorder>
|
<Card>
|
||||||
<Group justify="space-between" wrap="nowrap">
|
<Group justify="space-between" wrap="nowrap">
|
||||||
<Group align="top" justify="start" wrap="nowrap" style={{ flex: "1" }}>
|
<Group align="top" justify="start" wrap="nowrap" style={{ flex: "1" }}>
|
||||||
<Avatar
|
<Avatar
|
||||||
|
|||||||
@@ -1,43 +1,38 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import { Affix, Button, Menu } from "@mantine/core";
|
import { Button, Menu } from "@mantine/core";
|
||||||
import { IconCategoryPlus, IconChevronDown, IconFileImport } from "@tabler/icons-react";
|
import { IconCategoryPlus, IconChevronDown, IconFileImport } from "@tabler/icons-react";
|
||||||
|
|
||||||
import { useModalAction } from "@homarr/modals";
|
import { useModalAction } from "@homarr/modals";
|
||||||
import { AddBoardModal, ImportBoardModal } from "@homarr/modals-collection";
|
import { AddBoardModal, ImportBoardModal } from "@homarr/modals-collection";
|
||||||
import { useI18n } from "@homarr/translation/client";
|
import { useI18n } from "@homarr/translation/client";
|
||||||
|
|
||||||
|
import { ManageMobilePrimaryAction } from "~/components/manage/manage-mobile-primary-action";
|
||||||
|
|
||||||
export const CreateBoardButton = () => {
|
export const CreateBoardButton = () => {
|
||||||
const t = useI18n();
|
const t = useI18n();
|
||||||
const { openModal: openAddModal } = useModalAction(AddBoardModal);
|
const { openModal: openAddModal } = useModalAction(AddBoardModal);
|
||||||
const { openModal: openImportModal } = useModalAction(ImportBoardModal);
|
const { openModal: openImportModal } = useModalAction(ImportBoardModal);
|
||||||
|
|
||||||
const buttonGroupContent = (
|
|
||||||
<>
|
|
||||||
<Button leftSection={<IconCategoryPlus size="1rem" />} onClick={openAddModal}>
|
|
||||||
{t("management.page.board.action.new.label")}
|
|
||||||
</Button>
|
|
||||||
<Menu position="bottom-end">
|
|
||||||
<Menu.Target>
|
|
||||||
<Button px="xs" ms={1}>
|
|
||||||
<IconChevronDown size="1rem" />
|
|
||||||
</Button>
|
|
||||||
</Menu.Target>
|
|
||||||
<Menu.Dropdown>
|
|
||||||
<Menu.Item onClick={openImportModal} leftSection={<IconFileImport size="1rem" />}>
|
|
||||||
{t("board.action.oldImport.label")}
|
|
||||||
</Menu.Item>
|
|
||||||
</Menu.Dropdown>
|
|
||||||
</Menu>
|
|
||||||
</>
|
|
||||||
);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<ManageMobilePrimaryAction>
|
||||||
<Button.Group visibleFrom="md">{buttonGroupContent}</Button.Group>
|
<Button.Group>
|
||||||
<Affix hiddenFrom="md" position={{ bottom: 20, right: 20 }}>
|
<Button leftSection={<IconCategoryPlus size="1rem" />} onClick={openAddModal}>
|
||||||
<Button.Group>{buttonGroupContent}</Button.Group>
|
{t("management.page.board.action.new.label")}
|
||||||
</Affix>
|
</Button>
|
||||||
</>
|
<Menu position="bottom-end">
|
||||||
|
<Menu.Target>
|
||||||
|
<Button px="xs" ms={1}>
|
||||||
|
<IconChevronDown size="1rem" />
|
||||||
|
</Button>
|
||||||
|
</Menu.Target>
|
||||||
|
<Menu.Dropdown>
|
||||||
|
<Menu.Item onClick={openImportModal} leftSection={<IconFileImport size="1rem" />}>
|
||||||
|
{t("board.action.oldImport.label")}
|
||||||
|
</Menu.Item>
|
||||||
|
</Menu.Dropdown>
|
||||||
|
</Menu>
|
||||||
|
</Button.Group>
|
||||||
|
</ManageMobilePrimaryAction>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
@@ -9,12 +9,17 @@ import {
|
|||||||
Group,
|
Group,
|
||||||
Menu,
|
Menu,
|
||||||
MenuTarget,
|
MenuTarget,
|
||||||
Stack,
|
|
||||||
Text,
|
Text,
|
||||||
Title,
|
|
||||||
Tooltip,
|
Tooltip,
|
||||||
} from "@mantine/core";
|
} from "@mantine/core";
|
||||||
import { IconDeviceMobile, IconDotsVertical, IconHomeFilled, IconLock, IconWorld } from "@tabler/icons-react";
|
import {
|
||||||
|
IconDeviceMobile,
|
||||||
|
IconDotsVertical,
|
||||||
|
IconHomeFilled,
|
||||||
|
IconLayoutDashboard,
|
||||||
|
IconLock,
|
||||||
|
IconWorld,
|
||||||
|
} from "@tabler/icons-react";
|
||||||
|
|
||||||
import type { RouterOutputs } from "@homarr/api";
|
import type { RouterOutputs } from "@homarr/api";
|
||||||
import { api } from "@homarr/api/server";
|
import { api } from "@homarr/api/server";
|
||||||
@@ -23,8 +28,8 @@ import { getScopedI18n } from "@homarr/translation/server";
|
|||||||
import { Link, UserAvatar } from "@homarr/ui";
|
import { Link, UserAvatar } from "@homarr/ui";
|
||||||
|
|
||||||
import { getBoardPermissionsAsync } from "~/components/board/permissions/server";
|
import { getBoardPermissionsAsync } from "~/components/board/permissions/server";
|
||||||
import { ManageContainer } from "~/components/manage/manage-container";
|
import { ManagePageLayout } from "~/components/manage/manage-page-layout";
|
||||||
import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
|
import { NoResults } from "~/components/no-results";
|
||||||
import { BoardCardMenuDropdown } from "./_components/board-card-menu-dropdown";
|
import { BoardCardMenuDropdown } from "./_components/board-card-menu-dropdown";
|
||||||
import { CreateBoardButton } from "./_components/create-board-button";
|
import { CreateBoardButton } from "./_components/create-board-button";
|
||||||
|
|
||||||
@@ -35,23 +40,22 @@ export default async function ManageBoardsPage() {
|
|||||||
const canCreateBoards = session?.user.permissions.includes("board-create");
|
const canCreateBoards = session?.user.permissions.includes("board-create");
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ManageContainer>
|
<ManagePageLayout
|
||||||
<DynamicBreadcrumb />
|
title={t("title")}
|
||||||
<Stack>
|
primaryAction={canCreateBoards ? <CreateBoardButton /> : undefined}
|
||||||
<Group justify="space-between">
|
floatingPrimaryAction={canCreateBoards}
|
||||||
<Title mb="md">{t("title")}</Title>
|
>
|
||||||
{canCreateBoards && <CreateBoardButton />}
|
{boards.length === 0 && <NoResults icon={IconLayoutDashboard} title={t("noResults.title")} />}
|
||||||
</Group>
|
{boards.length > 0 && (
|
||||||
|
<Grid>
|
||||||
<Grid mb={{ base: "xl", md: 0 }}>
|
|
||||||
{boards.map((board) => (
|
{boards.map((board) => (
|
||||||
<GridCol span={{ base: 12, md: 6 }} key={board.id}>
|
<GridCol span={{ base: 12, md: 6 }} key={board.id}>
|
||||||
<BoardCard board={board} />
|
<BoardCard board={board} />
|
||||||
</GridCol>
|
</GridCol>
|
||||||
))}
|
))}
|
||||||
</Grid>
|
</Grid>
|
||||||
</Stack>
|
)}
|
||||||
</ManageContainer>
|
</ManagePageLayout>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -66,16 +70,14 @@ const BoardCard = async ({ board }: BoardCardProps) => {
|
|||||||
const VisibilityIcon = board.isPublic ? IconWorld : IconLock;
|
const VisibilityIcon = board.isPublic ? IconWorld : IconLock;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Card radius="lg" withBorder>
|
<Card>
|
||||||
<CardSection p="sm" withBorder>
|
<CardSection p="sm" withBorder>
|
||||||
<Group justify="space-between" align="center">
|
<Group justify="space-between" align="center">
|
||||||
<Group gap="sm">
|
<Group gap="sm">
|
||||||
<Tooltip label={t(`visibility.${visibility}`)}>
|
<Tooltip label={t(`visibility.${visibility}`)}>
|
||||||
<VisibilityIcon size={20} stroke={1.5} />
|
<VisibilityIcon size={20} stroke={1.5} />
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
<Text fw="bolder" tt="uppercase">
|
<Text fw={700}>{board.name}</Text>
|
||||||
{board.name}
|
|
||||||
</Text>
|
|
||||||
</Group>
|
</Group>
|
||||||
|
|
||||||
<Group>
|
<Group>
|
||||||
@@ -123,6 +125,7 @@ const BoardCard = async ({ board }: BoardCardProps) => {
|
|||||||
style={{ borderTop: "none", borderBottom: "none", borderRight: "none", borderRadius: 0 }}
|
style={{ borderTop: "none", borderBottom: "none", borderRight: "none", borderRadius: 0 }}
|
||||||
variant="default"
|
variant="default"
|
||||||
size="lg"
|
size="lg"
|
||||||
|
aria-label={t("action.settings.label")}
|
||||||
>
|
>
|
||||||
<IconDotsVertical size={16} stroke={1.5} />
|
<IconDotsVertical size={16} stroke={1.5} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
|
|||||||
+8
-3
@@ -33,7 +33,7 @@ export const SecretCard = ({ secret, children, onCancel }: SecretCardProps) => {
|
|||||||
const KindIcon = integrationSecretIcons[secret.kind];
|
const KindIcon = integrationSecretIcons[secret.kind];
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Card withBorder>
|
<Card>
|
||||||
<Stack>
|
<Stack>
|
||||||
<Group justify="space-between">
|
<Group justify="space-between">
|
||||||
<Group>
|
<Group>
|
||||||
@@ -58,7 +58,12 @@ export const SecretCard = ({ secret, children, onCancel }: SecretCardProps) => {
|
|||||||
</Tooltip>
|
</Tooltip>
|
||||||
)}
|
)}
|
||||||
{isPublic ? (
|
{isPublic ? (
|
||||||
<ActionIcon color="gray" variant="subtle" onClick={togglePublicSecretDisplay}>
|
<ActionIcon
|
||||||
|
color="gray"
|
||||||
|
variant="subtle"
|
||||||
|
onClick={togglePublicSecretDisplay}
|
||||||
|
aria-label={t(publicSecretDisplayOpened ? "common.action.hide" : "common.action.show")}
|
||||||
|
>
|
||||||
<DisplayIcon size={16} stroke={1.5} />
|
<DisplayIcon size={16} stroke={1.5} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
) : null}
|
) : null}
|
||||||
@@ -79,7 +84,7 @@ export const SecretCard = ({ secret, children, onCancel }: SecretCardProps) => {
|
|||||||
</Button>
|
</Button>
|
||||||
</Group>
|
</Group>
|
||||||
</Group>
|
</Group>
|
||||||
<Collapse in={editMode}>{children}</Collapse>
|
<Collapse expanded={editMode}>{children}</Collapse>
|
||||||
</Stack>
|
</Stack>
|
||||||
</Card>
|
</Card>
|
||||||
);
|
);
|
||||||
|
|||||||
+1
-1
@@ -12,7 +12,7 @@ interface FormType {
|
|||||||
interface SecretKindsSegmentedControlProps<TFormType extends FormType> {
|
interface SecretKindsSegmentedControlProps<TFormType extends FormType> {
|
||||||
defaultKinds?: IntegrationSecretKind[];
|
defaultKinds?: IntegrationSecretKind[];
|
||||||
secretKinds: IntegrationSecretKind[][];
|
secretKinds: IntegrationSecretKind[][];
|
||||||
form: UseFormReturnType<TFormType, (values: TFormType) => TFormType>;
|
form: UseFormReturnType<TFormType, TFormType>;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const SecretKindsSegmentedControl = <TFormType extends FormType>({
|
export const SecretKindsSegmentedControl = <TFormType extends FormType>({
|
||||||
|
|||||||
+1
-1
@@ -18,7 +18,7 @@ export const IntegrationTestConnectionError = ({ error, url }: IntegrationTestCo
|
|||||||
const causeArray = useMemo(() => toCauseArray(error.cause), [error.cause]);
|
const causeArray = useMemo(() => toCauseArray(error.cause), [error.cause]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Card withBorder style={{ borderColor: getMantineColor("red", 8) }}>
|
<Card style={{ borderColor: getMantineColor("red", 8) }}>
|
||||||
<Stack>
|
<Stack>
|
||||||
<Stack gap="sm">
|
<Stack gap="sm">
|
||||||
<Text size="lg" fw={500} c="red.8">
|
<Text size="lg" fw={500} c="red.8">
|
||||||
|
|||||||
+1
-1
@@ -216,7 +216,7 @@ export const CertificateDetailsCard = ({ certificate }: CertificateDetailsProps)
|
|||||||
const tCertificateField = useScopedI18n("certificate.field");
|
const tCertificateField = useScopedI18n("certificate.field");
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Card withBorder>
|
<Card>
|
||||||
<Text fw={500}>{tDetails("title")}</Text>
|
<Text fw={500}>{tDetails("title")}</Text>
|
||||||
<Group justify="space-between">
|
<Group justify="space-between">
|
||||||
<Text size="sm" c="dimmed">
|
<Text size="sm" c="dimmed">
|
||||||
|
|||||||
@@ -226,7 +226,7 @@ const AppForm = ({ form, canCreateApps }: { form: UseFormReturnType<FormType>; c
|
|||||||
description={t("integration.field.createApp.description")}
|
description={t("integration.field.createApp.description")}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<Collapse in={form.values.hasApp}>
|
<Collapse expanded={form.values.hasApp}>
|
||||||
<Fieldset legend={t("integration.field.app.sectionTitle")}>
|
<Fieldset legend={t("integration.field.app.sectionTitle")}>
|
||||||
<Stack gap="sm">
|
<Stack gap="sm">
|
||||||
{canCreateApps && (
|
{canCreateApps && (
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
border: 1px solid transparent;
|
border: 1px solid transparent;
|
||||||
position: relative;
|
position: relative;
|
||||||
z-index: 0;
|
z-index: 0;
|
||||||
transition: transform 150ms ease;
|
transition: background-color 150ms ease;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
|
||||||
&[data-first="true"] {
|
&[data-first="true"] {
|
||||||
@@ -20,11 +20,9 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
&[data-active] {
|
&[data-active] {
|
||||||
transform: scale(1.01);
|
|
||||||
z-index: 1;
|
z-index: 1;
|
||||||
background-color: var(--mantine-color-body);
|
background-color: var(--mantine-color-body);
|
||||||
border-color: light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-4));
|
border-color: light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-4));
|
||||||
box-shadow: var(--mantine-shadow-md);
|
|
||||||
border-radius: var(--mantine-radius-lg);
|
border-radius: var(--mantine-radius-lg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,9 +7,7 @@ import {
|
|||||||
AccordionPanel,
|
AccordionPanel,
|
||||||
ActionIcon,
|
ActionIcon,
|
||||||
ActionIconGroup,
|
ActionIconGroup,
|
||||||
Affix,
|
|
||||||
Anchor,
|
Anchor,
|
||||||
Box,
|
|
||||||
Button,
|
Button,
|
||||||
Divider,
|
Divider,
|
||||||
Group,
|
Group,
|
||||||
@@ -24,9 +22,8 @@ import {
|
|||||||
TableThead,
|
TableThead,
|
||||||
TableTr,
|
TableTr,
|
||||||
Text,
|
Text,
|
||||||
Title,
|
|
||||||
} from "@mantine/core";
|
} from "@mantine/core";
|
||||||
import { IconChevronDown, IconChevronUp, IconPencil, IconPlugX } from "@tabler/icons-react";
|
import { IconChevronDown, IconPencil, IconPlugX } from "@tabler/icons-react";
|
||||||
|
|
||||||
import type { RouterOutputs } from "@homarr/api";
|
import type { RouterOutputs } from "@homarr/api";
|
||||||
import { api } from "@homarr/api/server";
|
import { api } from "@homarr/api/server";
|
||||||
@@ -37,8 +34,8 @@ import { getIntegrationName } from "@homarr/definitions";
|
|||||||
import { getScopedI18n } from "@homarr/translation/server";
|
import { getScopedI18n } from "@homarr/translation/server";
|
||||||
import { CountBadge, IntegrationAvatar, Link } from "@homarr/ui";
|
import { CountBadge, IntegrationAvatar, Link } from "@homarr/ui";
|
||||||
|
|
||||||
import { ManageContainer } from "~/components/manage/manage-container";
|
import { ManageMobilePrimaryAction } from "~/components/manage/manage-mobile-primary-action";
|
||||||
import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
|
import { ManagePageLayout } from "~/components/manage/manage-page-layout";
|
||||||
import { NoResults } from "~/components/no-results";
|
import { NoResults } from "~/components/no-results";
|
||||||
import { env } from "~/env";
|
import { env } from "~/env";
|
||||||
import { ActiveTabAccordion } from "../../../../components/active-tab-accordion";
|
import { ActiveTabAccordion } from "../../../../components/active-tab-accordion";
|
||||||
@@ -66,38 +63,23 @@ export default async function IntegrationsPage(props: IntegrationsPageProps) {
|
|||||||
const canCreateIntegrations = session.user.permissions.includes("integration-create");
|
const canCreateIntegrations = session.user.permissions.includes("integration-create");
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ManageContainer>
|
<ManagePageLayout
|
||||||
<DynamicBreadcrumb />
|
title={t("page.list.title")}
|
||||||
<Stack>
|
primaryAction={
|
||||||
<Group justify="space-between" align="center">
|
canCreateIntegrations ? (
|
||||||
<Title>{t("page.list.title")}</Title>
|
<ManageMobilePrimaryAction>
|
||||||
|
<IntegrationSelectMenu>
|
||||||
{canCreateIntegrations && (
|
<MenuTarget>
|
||||||
<>
|
<Button rightSection={<IconChevronDown size={16} stroke={1.5} />}>{t("action.create")}</Button>
|
||||||
<Box>
|
</MenuTarget>
|
||||||
<IntegrationSelectMenu>
|
</IntegrationSelectMenu>
|
||||||
<Affix hiddenFrom="md" position={{ bottom: 20, right: 20 }}>
|
</ManageMobilePrimaryAction>
|
||||||
<MenuTarget>
|
) : undefined
|
||||||
<Button rightSection={<IconChevronUp size={16} stroke={1.5} />}>{t("action.create")}</Button>
|
}
|
||||||
</MenuTarget>
|
floatingPrimaryAction={canCreateIntegrations}
|
||||||
</Affix>
|
>
|
||||||
</IntegrationSelectMenu>
|
<IntegrationList integrations={integrations} activeTab={searchParams.tab} />
|
||||||
</Box>
|
</ManagePageLayout>
|
||||||
|
|
||||||
<Box visibleFrom="md">
|
|
||||||
<IntegrationSelectMenu>
|
|
||||||
<MenuTarget>
|
|
||||||
<Button rightSection={<IconChevronDown size={16} stroke={1.5} />}>{t("action.create")}</Button>
|
|
||||||
</MenuTarget>
|
|
||||||
</IntegrationSelectMenu>
|
|
||||||
</Box>
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
</Group>
|
|
||||||
|
|
||||||
<IntegrationList integrations={integrations} activeTab={searchParams.tab} />
|
|
||||||
</Stack>
|
|
||||||
</ManageContainer>
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,17 +4,15 @@ import {
|
|||||||
Anchor,
|
Anchor,
|
||||||
Group,
|
Group,
|
||||||
Image,
|
Image,
|
||||||
Stack,
|
|
||||||
Table,
|
Table,
|
||||||
TableTbody,
|
TableTbody,
|
||||||
TableTd,
|
TableTd,
|
||||||
TableTh,
|
TableTh,
|
||||||
TableThead,
|
TableThead,
|
||||||
TableTr,
|
TableTr,
|
||||||
Title,
|
|
||||||
Tooltip,
|
Tooltip,
|
||||||
} from "@mantine/core";
|
} from "@mantine/core";
|
||||||
import { IconExternalLink } from "@tabler/icons-react";
|
import { IconExternalLink, IconPhoto } from "@tabler/icons-react";
|
||||||
import { z } from "zod/v4";
|
import { z } from "zod/v4";
|
||||||
|
|
||||||
import type { RouterOutputs } from "@homarr/api";
|
import type { RouterOutputs } from "@homarr/api";
|
||||||
@@ -26,8 +24,9 @@ import { createLocalImageUrl } from "@homarr/icons/local";
|
|||||||
import { getI18n } from "@homarr/translation/server";
|
import { getI18n } from "@homarr/translation/server";
|
||||||
import { Link, SearchInput, TablePagination, UserAvatar } from "@homarr/ui";
|
import { Link, SearchInput, TablePagination, UserAvatar } from "@homarr/ui";
|
||||||
|
|
||||||
import { ManageContainer } from "~/components/manage/manage-container";
|
import { ManageMobilePrimaryAction } from "~/components/manage/manage-mobile-primary-action";
|
||||||
import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
|
import { ManagePageLayout } from "~/components/manage/manage-page-layout";
|
||||||
|
import { NoResults } from "~/components/no-results";
|
||||||
import { CopyMedia } from "./_actions/copy-media";
|
import { CopyMedia } from "./_actions/copy-media";
|
||||||
import { DeleteMedia } from "./_actions/delete-media";
|
import { DeleteMedia } from "./_actions/delete-media";
|
||||||
import { IncludeFromAllUsersSwitch } from "./_actions/show-all";
|
import { IncludeFromAllUsersSwitch } from "./_actions/show-all";
|
||||||
@@ -48,7 +47,7 @@ interface MediaListPageProps {
|
|||||||
searchParams: Promise<inferSearchParamsFromSchema<typeof searchParamsSchema>>;
|
searchParams: Promise<inferSearchParamsFromSchema<typeof searchParamsSchema>>;
|
||||||
}
|
}
|
||||||
|
|
||||||
export default async function GroupsListPage(props: MediaListPageProps) {
|
export default async function MediaListPage(props: MediaListPageProps) {
|
||||||
const session = await auth();
|
const session = await auth();
|
||||||
|
|
||||||
if (!session) {
|
if (!session) {
|
||||||
@@ -58,22 +57,31 @@ export default async function GroupsListPage(props: MediaListPageProps) {
|
|||||||
const t = await getI18n();
|
const t = await getI18n();
|
||||||
const searchParams = searchParamsSchema.parse(await props.searchParams);
|
const searchParams = searchParamsSchema.parse(await props.searchParams);
|
||||||
const { items: medias, totalCount } = await api.media.getPaginated(searchParams);
|
const { items: medias, totalCount } = await api.media.getPaginated(searchParams);
|
||||||
|
const canUpload = session.user.permissions.includes("media-upload");
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ManageContainer>
|
<ManagePageLayout
|
||||||
<DynamicBreadcrumb />
|
title={t("media.plural")}
|
||||||
<Stack>
|
primaryAction={
|
||||||
<Title>{t("media.plural")}</Title>
|
canUpload ? (
|
||||||
<Group justify="space-between">
|
<ManageMobilePrimaryAction>
|
||||||
<Group>
|
<UploadMediaButton />
|
||||||
<SearchInput placeholder={`${t("media.search")}...`} defaultValue={searchParams.search} />
|
</ManageMobilePrimaryAction>
|
||||||
{session.user.permissions.includes("media-view-all") && (
|
) : undefined
|
||||||
<IncludeFromAllUsersSwitch defaultChecked={searchParams.includeFromAllUsers} />
|
}
|
||||||
)}
|
toolbar={
|
||||||
</Group>
|
<Group>
|
||||||
|
<SearchInput placeholder={`${t("media.search")}...`} defaultValue={searchParams.search} />
|
||||||
{session.user.permissions.includes("media-upload") && <UploadMediaButton />}
|
{session.user.permissions.includes("media-view-all") && (
|
||||||
|
<IncludeFromAllUsersSwitch defaultChecked={searchParams.includeFromAllUsers} />
|
||||||
|
)}
|
||||||
</Group>
|
</Group>
|
||||||
|
}
|
||||||
|
footer={<TablePagination total={Math.ceil(totalCount / searchParams.pageSize)} />}
|
||||||
|
floatingPrimaryAction={canUpload}
|
||||||
|
>
|
||||||
|
{medias.length === 0 && <NoResults icon={IconPhoto} title={t("media.noResults.title")} />}
|
||||||
|
{medias.length > 0 && (
|
||||||
<Table striped highlightOnHover>
|
<Table striped highlightOnHover>
|
||||||
<TableThead>
|
<TableThead>
|
||||||
<TableTr>
|
<TableTr>
|
||||||
@@ -90,13 +98,8 @@ export default async function GroupsListPage(props: MediaListPageProps) {
|
|||||||
))}
|
))}
|
||||||
</TableTbody>
|
</TableTbody>
|
||||||
</Table>
|
</Table>
|
||||||
|
)}
|
||||||
{/* Added margin to not hide pagination behind affix-button */}
|
</ManagePageLayout>
|
||||||
<Group justify="end" mb={48}>
|
|
||||||
<TablePagination total={Math.ceil(totalCount / searchParams.pageSize)} />
|
|
||||||
</Group>
|
|
||||||
</Stack>
|
|
||||||
</ManageContainer>
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -7,9 +7,7 @@ export default async function NotFound() {
|
|||||||
return (
|
return (
|
||||||
<Center h="100%">
|
<Center h="100%">
|
||||||
<Stack align="center">
|
<Stack align="center">
|
||||||
<Title order={1} tt="uppercase">
|
<Title order={1}>{t("title")}</Title>
|
||||||
{t("title")}
|
|
||||||
</Title>
|
|
||||||
<Text>{t("text")}</Text>
|
<Text>{t("text")}</Text>
|
||||||
</Stack>
|
</Stack>
|
||||||
</Center>
|
</Center>
|
||||||
|
|||||||
@@ -29,20 +29,20 @@ export default async function ManagementPage() {
|
|||||||
<Space h="md" />
|
<Space h="md" />
|
||||||
<SimpleGrid cols={{ xs: 1, sm: 2, md: 3 }}>
|
<SimpleGrid cols={{ xs: 1, sm: 2, md: 3 }}>
|
||||||
{statistics.map((statistic) => (
|
{statistics.map((statistic) => (
|
||||||
<Card component={Link} href={statistic.path} key={statistic.path} radius="lg">
|
<Card component={Link} href={statistic.path} key={statistic.path}>
|
||||||
<Group justify="space-between" wrap="nowrap">
|
<Group justify="space-between" wrap="nowrap">
|
||||||
<Group wrap="nowrap">
|
<Group wrap="nowrap">
|
||||||
<Text size="2.4rem" fw="bolder">
|
<Text size="xl" fw={700}>
|
||||||
{statistic.count}
|
{statistic.count}
|
||||||
</Text>
|
</Text>
|
||||||
<Stack gap={0}>
|
<Stack gap={0}>
|
||||||
<Text c="red" size="xs">
|
<Text c="dimmed" size="xs">
|
||||||
{t(`statisticLabel.${statistic.subtitleKey}`)}
|
{t(`statisticLabel.${statistic.subtitleKey}`)}
|
||||||
</Text>
|
</Text>
|
||||||
<Text fw="bold">{t(`statistic.${statistic.titleKey}`)}</Text>
|
<Text fw={600}>{t(`statistic.${statistic.titleKey}`)}</Text>
|
||||||
</Stack>
|
</Stack>
|
||||||
</Group>
|
</Group>
|
||||||
<IconArrowRight />
|
<IconArrowRight size={16} stroke={1.5} color="var(--mantine-color-dimmed)" />
|
||||||
</Group>
|
</Group>
|
||||||
</Card>
|
</Card>
|
||||||
))}
|
))}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { redirect } from "next/navigation";
|
import { redirect } from "next/navigation";
|
||||||
import { ActionIcon, ActionIconGroup, Anchor, Avatar, Card, Group, Stack, Text, Title } from "@mantine/core";
|
import { ActionIcon, ActionIconGroup, Anchor, Avatar, Card, Group, Stack, Text } from "@mantine/core";
|
||||||
import { IconPencil, IconSearch } from "@tabler/icons-react";
|
import { IconPencil, IconSearch } from "@tabler/icons-react";
|
||||||
import { z } from "zod/v4";
|
import { z } from "zod/v4";
|
||||||
|
|
||||||
@@ -10,9 +10,8 @@ import type { inferSearchParamsFromSchema } from "@homarr/common/types";
|
|||||||
import { getI18n, getScopedI18n } from "@homarr/translation/server";
|
import { getI18n, getScopedI18n } from "@homarr/translation/server";
|
||||||
import { Link, SearchInput, TablePagination } from "@homarr/ui";
|
import { Link, SearchInput, TablePagination } from "@homarr/ui";
|
||||||
|
|
||||||
import { ManageContainer } from "~/components/manage/manage-container";
|
import { ManagePageLayout } from "~/components/manage/manage-page-layout";
|
||||||
import { MobileAffixButton } from "~/components/manage/mobile-affix-button";
|
import { MobileAffixButton } from "~/components/manage/mobile-affix-button";
|
||||||
import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
|
|
||||||
import { NoResults } from "~/components/no-results";
|
import { NoResults } from "~/components/no-results";
|
||||||
import { SearchEngineDeleteButton } from "./_search-engine-delete-button";
|
import { SearchEngineDeleteButton } from "./_search-engine-delete-button";
|
||||||
|
|
||||||
@@ -38,34 +37,31 @@ export default async function SearchEnginesPage(props: SearchEnginesPageProps) {
|
|||||||
|
|
||||||
const tEngine = await getScopedI18n("search.engine");
|
const tEngine = await getScopedI18n("search.engine");
|
||||||
|
|
||||||
return (
|
const canCreate = session.user.permissions.includes("search-engine-create");
|
||||||
<ManageContainer>
|
|
||||||
<DynamicBreadcrumb />
|
|
||||||
<Stack>
|
|
||||||
<Title>{tEngine("page.list.title")}</Title>
|
|
||||||
<Group justify="space-between" align="center">
|
|
||||||
<SearchInput placeholder={`${tEngine("search")}...`} defaultValue={searchParams.search} flexExpand />
|
|
||||||
{session.user.permissions.includes("search-engine-create") && (
|
|
||||||
<MobileAffixButton component={Link} href="/manage/search-engines/new">
|
|
||||||
{tEngine("page.create.title")}
|
|
||||||
</MobileAffixButton>
|
|
||||||
)}
|
|
||||||
</Group>
|
|
||||||
{searchEngines.length === 0 && <SearchEngineNoResults />}
|
|
||||||
{searchEngines.length > 0 && (
|
|
||||||
<Stack gap="sm">
|
|
||||||
{searchEngines.map((searchEngine) => (
|
|
||||||
<SearchEngineCard key={searchEngine.id} searchEngine={searchEngine} />
|
|
||||||
))}
|
|
||||||
</Stack>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* Added margin to not hide pagination behind affix-button */}
|
return (
|
||||||
<Group justify="end" mb={48}>
|
<ManagePageLayout
|
||||||
<TablePagination total={Math.ceil(totalCount / searchParams.pageSize)} />
|
title={tEngine("page.list.title")}
|
||||||
</Group>
|
primaryAction={
|
||||||
</Stack>
|
canCreate ? (
|
||||||
</ManageContainer>
|
<MobileAffixButton component={Link} href="/manage/search-engines/new">
|
||||||
|
{tEngine("page.create.title")}
|
||||||
|
</MobileAffixButton>
|
||||||
|
) : undefined
|
||||||
|
}
|
||||||
|
toolbar={<SearchInput placeholder={`${tEngine("search")}...`} defaultValue={searchParams.search} flexExpand />}
|
||||||
|
footer={<TablePagination total={Math.ceil(totalCount / searchParams.pageSize)} />}
|
||||||
|
floatingPrimaryAction={canCreate}
|
||||||
|
>
|
||||||
|
{searchEngines.length === 0 && <SearchEngineNoResults />}
|
||||||
|
{searchEngines.length > 0 && (
|
||||||
|
<Stack gap="sm">
|
||||||
|
{searchEngines.map((searchEngine) => (
|
||||||
|
<SearchEngineCard key={searchEngine.id} searchEngine={searchEngine} />
|
||||||
|
))}
|
||||||
|
</Stack>
|
||||||
|
)}
|
||||||
|
</ManagePageLayout>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -78,7 +74,7 @@ const SearchEngineCard = async ({ searchEngine }: SearchEngineCardProps) => {
|
|||||||
const session = await auth();
|
const session = await auth();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Card withBorder>
|
<Card>
|
||||||
<Group justify="space-between" wrap="nowrap">
|
<Group justify="space-between" wrap="nowrap">
|
||||||
<Group align="top" justify="start" wrap="nowrap" style={{ flex: 1 }}>
|
<Group align="top" justify="start" wrap="nowrap" style={{ flex: 1 }}>
|
||||||
<Avatar
|
<Avatar
|
||||||
|
|||||||
@@ -41,8 +41,8 @@ export const AnalyticsSettings = ({ initialData }: AnalyticsSettingsProps) => {
|
|||||||
<>
|
<>
|
||||||
<Title order={2}>{t("title")}</Title>
|
<Title order={2}>{t("title")}</Title>
|
||||||
|
|
||||||
<Card pos="relative" withBorder>
|
<Card pos="relative">
|
||||||
<LoadingOverlay visible={isPending} zIndex={1000} overlayProps={{ radius: "sm", blur: 2 }} />
|
<LoadingOverlay visible={isPending} />
|
||||||
<Stack>
|
<Stack>
|
||||||
<SwitchSetting form={form} formKey="enableGeneral" title={t("general.title")} text={t("general.text")} />
|
<SwitchSetting form={form} formKey="enableGeneral" title={t("general.title")} text={t("general.text")} />
|
||||||
</Stack>
|
</Stack>
|
||||||
|
|||||||
+2
-2
@@ -41,11 +41,11 @@ export const CrawlingAndIndexingSettings = ({ initialData }: CrawlingAndIndexing
|
|||||||
<>
|
<>
|
||||||
<Title order={2}>{t("title")}</Title>
|
<Title order={2}>{t("title")}</Title>
|
||||||
|
|
||||||
<Card pos="relative" withBorder>
|
<Card pos="relative">
|
||||||
<Text c={"dimmed"} mb={"lg"}>
|
<Text c={"dimmed"} mb={"lg"}>
|
||||||
{t("warning")}
|
{t("warning")}
|
||||||
</Text>
|
</Text>
|
||||||
<LoadingOverlay visible={isPending} zIndex={1000} overlayProps={{ radius: "sm", blur: 2 }} />
|
<LoadingOverlay visible={isPending} />
|
||||||
<Stack>
|
<Stack>
|
||||||
<SwitchSetting form={form} formKey="noIndex" title={t("noIndex.title")} text={t("noIndex.text")} />
|
<SwitchSetting form={form} formKey="noIndex" title={t("noIndex.title")} text={t("noIndex.text")} />
|
||||||
<SwitchSetting form={form} formKey="noFollow" title={t("noFollow.title")} text={t("noFollow.text")} />
|
<SwitchSetting form={form} formKey="noFollow" title={t("noFollow.title")} text={t("noFollow.text")} />
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ export const SwitchSetting = <TFormValue extends Record<string, boolean>>({
|
|||||||
disabled,
|
disabled,
|
||||||
}: {
|
}: {
|
||||||
form: Modify<
|
form: Modify<
|
||||||
UseFormReturnType<TFormValue, () => TFormValue>,
|
UseFormReturnType<TFormValue, TFormValue>,
|
||||||
{
|
{
|
||||||
setFieldValue: (key: keyof TFormValue, value: (previous: boolean) => boolean) => void;
|
setFieldValue: (key: keyof TFormValue, value: (previous: boolean) => boolean) => void;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ export default async function CertificatesPage({ params }: CertificatesPageProps
|
|||||||
} as const;
|
} as const;
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.sort((certA, certB) => {
|
.toSorted((certA, certB) => {
|
||||||
if (certA.isError) return -1;
|
if (certA.isError) return -1;
|
||||||
if (certB.isError) return 1;
|
if (certB.isError) return 1;
|
||||||
return certA.x509.validToDate.getTime() - certB.x509.validToDate.getTime();
|
return certA.x509.validToDate.getTime() - certB.x509.validToDate.getTime();
|
||||||
@@ -79,7 +79,7 @@ export default async function CertificatesPage({ params }: CertificatesPageProps
|
|||||||
|
|
||||||
<SimpleGrid cols={{ sm: 1, lg: 2, xl: 3 }} spacing="lg">
|
<SimpleGrid cols={{ sm: 1, lg: 2, xl: 3 }} spacing="lg">
|
||||||
{x509Certificates.map((cert) => (
|
{x509Certificates.map((cert) => (
|
||||||
<Card key={cert.fileName} withBorder>
|
<Card key={cert.fileName}>
|
||||||
<Group wrap="nowrap">
|
<Group wrap="nowrap">
|
||||||
{cert.isError ? (
|
{cert.isError ? (
|
||||||
<IconAlertTriangle
|
<IconAlertTriangle
|
||||||
|
|||||||
@@ -202,7 +202,7 @@ const ContainerActionBar = ({ selectedContainers }: ContainerActionBarProps) =>
|
|||||||
<ContainerActionBarButton icon={IconPlayerStop} color="red" action="stop" selectedIds={selectedIds} />
|
<ContainerActionBarButton icon={IconPlayerStop} color="red" action="stop" selectedIds={selectedIds} />
|
||||||
<ContainerActionBarButton icon={IconRotateClockwise} color="orange" action="restart" selectedIds={selectedIds} />
|
<ContainerActionBarButton icon={IconRotateClockwise} color="orange" action="restart" selectedIds={selectedIds} />
|
||||||
<ContainerActionBarButton icon={IconTrash} color="red" action="remove" selectedIds={selectedIds} />
|
<ContainerActionBarButton icon={IconTrash} color="red" action="remove" selectedIds={selectedIds} />
|
||||||
<Button leftSection={<IconCategoryPlus />} color={"red"} onClick={handleClick} variant="light" radius="md">
|
<Button leftSection={<IconCategoryPlus />} color={"red"} onClick={handleClick} variant="light">
|
||||||
{t("addToHomarr.label")}
|
{t("addToHomarr.label")}
|
||||||
</Button>
|
</Button>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -253,7 +253,6 @@ const ContainerActionBarButton = (props: ContainerActionBarButtonProps) => {
|
|||||||
onClick={handleClickAsync}
|
onClick={handleClickAsync}
|
||||||
loading={isPending}
|
loading={isPending}
|
||||||
variant="light"
|
variant="light"
|
||||||
radius="md"
|
|
||||||
>
|
>
|
||||||
{t(`${props.action}.label`)}
|
{t(`${props.action}.label`)}
|
||||||
</Button>
|
</Button>
|
||||||
|
|||||||
+7
-19
@@ -4,28 +4,16 @@
|
|||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
padding: var(--mantine-spacing-xs);
|
padding: var(--mantine-spacing-xs);
|
||||||
padding-left: calc(var(--mantine-spacing-xs) * 2);
|
padding-left: calc(var(--mantine-spacing-xs) * 2);
|
||||||
|
border-left: 1px solid var(--mantine-color-blue-6);
|
||||||
@mixin hover {
|
background-color: light-dark(
|
||||||
box-shadow: var(--mantine-shadow-md);
|
var(--mantine-color-blue-0),
|
||||||
}
|
color-mix(in oklch, var(--mantine-color-blue-9), transparent 85%)
|
||||||
|
);
|
||||||
&::before {
|
|
||||||
content: "";
|
|
||||||
position: absolute;
|
|
||||||
top: 0;
|
|
||||||
bottom: 0;
|
|
||||||
left: 0;
|
|
||||||
width: 6px;
|
|
||||||
background-image: linear-gradient(0, var(--mantine-color-blue-4), var(--mantine-color-blue-9));
|
|
||||||
}
|
|
||||||
|
|
||||||
@mixin rtl {
|
@mixin rtl {
|
||||||
padding-left: var(--mantine-spacing-xs);
|
padding-left: var(--mantine-spacing-xs);
|
||||||
padding-right: calc(var(--mantine-spacing-xs) * 2);
|
padding-right: calc(var(--mantine-spacing-xs) * 2);
|
||||||
|
border-left: none;
|
||||||
&::before {
|
border-right: 1px solid var(--mantine-color-blue-6);
|
||||||
left: unset;
|
|
||||||
right: 0;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
-1
@@ -23,7 +23,6 @@ export function HeaderCard(props: HeaderCardProps) {
|
|||||||
<Flex align="center" justify={isRTL ? "space-between" : "flex-start"} gap="md" direction={"row"}>
|
<Flex align="center" justify={isRTL ? "space-between" : "flex-start"} gap="md" direction={"row"}>
|
||||||
<ThemeIcon
|
<ThemeIcon
|
||||||
size="xl"
|
size="xl"
|
||||||
radius="md"
|
|
||||||
variant="gradient"
|
variant="gradient"
|
||||||
gradient={{
|
gradient={{
|
||||||
deg: 0,
|
deg: 0,
|
||||||
|
|||||||
+4
-2
@@ -8,6 +8,8 @@ import { useCurrentLocale, useI18n } from "@homarr/translation/client";
|
|||||||
import { ResourceIcon } from "~/app/[locale]/manage/tools/kubernetes/cluster-dashboard/resource-gauge/resource-icon";
|
import { ResourceIcon } from "~/app/[locale]/manage/tools/kubernetes/cluster-dashboard/resource-gauge/resource-icon";
|
||||||
import classes from "./resource-gauge.module.css";
|
import classes from "./resource-gauge.module.css";
|
||||||
|
|
||||||
|
const KUBERNETES_BRAND_COLOR = "#326ce5";
|
||||||
|
|
||||||
interface KubernetesResourceGaugeProps {
|
interface KubernetesResourceGaugeProps {
|
||||||
kubernetesCapacity: KubernetesCapacity;
|
kubernetesCapacity: KubernetesCapacity;
|
||||||
}
|
}
|
||||||
@@ -18,8 +20,8 @@ export function ResourceGauge(props: KubernetesResourceGaugeProps) {
|
|||||||
const isRTL = Boolean(isLocaleRTL(currentLocale));
|
const isRTL = Boolean(isLocaleRTL(currentLocale));
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Paper radius="md" withBorder className={classes.paper} mt={20}>
|
<Paper className={classes.paper} mt={20}>
|
||||||
<ThemeIcon className={classes.icon} size={60} radius={60} bg={"#326ce5"}>
|
<ThemeIcon className={classes.icon} size={60} radius={60} bg={KUBERNETES_BRAND_COLOR}>
|
||||||
<ResourceIcon type={props.kubernetesCapacity.type} />
|
<ResourceIcon type={props.kubernetesCapacity.type} />
|
||||||
</ThemeIcon>
|
</ThemeIcon>
|
||||||
|
|
||||||
|
|||||||
+1
-6
@@ -17,12 +17,7 @@ interface ResourceTileProps {
|
|||||||
export function ResourceTile(props: ResourceTileProps) {
|
export function ResourceTile(props: ResourceTileProps) {
|
||||||
const t = useI18n();
|
const t = useI18n();
|
||||||
return (
|
return (
|
||||||
<Card
|
<Card component={Link} href={`/manage/tools/kubernetes/${props.label}`} className={classes.cardContainer}>
|
||||||
withBorder
|
|
||||||
component={Link}
|
|
||||||
href={`/manage/tools/kubernetes/${props.label}`}
|
|
||||||
className={classes.cardContainer}
|
|
||||||
>
|
|
||||||
<Group justify="space-between" wrap="nowrap">
|
<Group justify="space-between" wrap="nowrap">
|
||||||
<Image src={`/images/kubernetes/${props.label}.svg`} alt={props.label} width={64} height={64} />
|
<Image src={`/images/kubernetes/${props.label}.svg`} alt={props.label} width={64} height={64} />
|
||||||
<Group gap="xs">
|
<Group gap="xs">
|
||||||
|
|||||||
@@ -2,12 +2,14 @@
|
|||||||
|
|
||||||
import { Select } from "@mantine/core";
|
import { Select } from "@mantine/core";
|
||||||
|
|
||||||
import type { LogLevel } from "@homarr/core/infrastructure/logs/constants";
|
|
||||||
import { logLevelConfiguration, logLevels } from "@homarr/core/infrastructure/logs/constants";
|
import { logLevelConfiguration, logLevels } from "@homarr/core/infrastructure/logs/constants";
|
||||||
|
import type { LogLevel } from "@homarr/core/infrastructure/logs/constants";
|
||||||
import { useI18n } from "@homarr/translation/client";
|
import { useI18n } from "@homarr/translation/client";
|
||||||
|
|
||||||
import { useLogContext } from "./log-context";
|
import { useLogContext } from "./log-context";
|
||||||
|
|
||||||
|
const levelByValue = Object.fromEntries(logLevels.map((logLevel) => [logLevel, logLevel])) as Record<string, LogLevel>;
|
||||||
|
|
||||||
export const LogLevelSelection = () => {
|
export const LogLevelSelection = () => {
|
||||||
const { level, setLevel } = useLogContext();
|
const { level, setLevel } = useLogContext();
|
||||||
const t = useI18n();
|
const t = useI18n();
|
||||||
@@ -19,7 +21,12 @@ export const LogLevelSelection = () => {
|
|||||||
label: `${logLevelConfiguration[level].prefix} ${t(`log.level.option.${level}`)}`,
|
label: `${logLevelConfiguration[level].prefix} ${t(`log.level.option.${level}`)}`,
|
||||||
}))}
|
}))}
|
||||||
value={level}
|
value={level}
|
||||||
onChange={(value) => setLevel(value as LogLevel)}
|
onChange={(value) => {
|
||||||
|
const nextLevel = value && levelByValue[value];
|
||||||
|
if (nextLevel) {
|
||||||
|
setLevel(nextLevel);
|
||||||
|
}
|
||||||
|
}}
|
||||||
checkIconPosition="right"
|
checkIconPosition="right"
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
|
|||||||
+1
-1
@@ -62,7 +62,7 @@ export const FirstDayOfWeek = ({ user }: FirstDayOfWeekProps) => {
|
|||||||
return (
|
return (
|
||||||
<form onSubmit={form.onSubmit(handleSubmit)}>
|
<form onSubmit={form.onSubmit(handleSubmit)}>
|
||||||
<Stack gap="md">
|
<Stack gap="md">
|
||||||
<Radio.Group {...inputProps} value={value} onChange={(value) => onChange(parseInt(value))}>
|
<Radio.Group {...inputProps} value={value} onChange={(nextValue: string) => onChange(parseInt(nextValue, 10))}>
|
||||||
<Group mt="xs">
|
<Group mt="xs">
|
||||||
<Radio value="1" label={weekDays[1]} />
|
<Radio value="1" label={weekDays[1]} />
|
||||||
<Radio value="6" label={weekDays[6]} />
|
<Radio value="6" label={weekDays[6]} />
|
||||||
|
|||||||
+1
-1
@@ -95,7 +95,7 @@ export const UserProfileAvatarForm = ({ user }: UserProfileAvatarForm) => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Box pos="relative">
|
<Box pos="relative">
|
||||||
<Menu opened={opened} keepMounted onChange={toggle} position="bottom-start" withArrow>
|
<Menu opened={opened} keepMounted onChange={toggle} position="bottom-start">
|
||||||
<Menu.Target>
|
<Menu.Target>
|
||||||
<UnstyledButton onClick={toggle}>
|
<UnstyledButton onClick={toggle}>
|
||||||
<UserAvatar user={user} size={200} />
|
<UserAvatar user={user} size={200} />
|
||||||
|
|||||||
@@ -1,24 +1,22 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import { useMemo } from "react";
|
import { useMemo } from "react";
|
||||||
import { Anchor, Button, Group, Text, Title, Tooltip } from "@mantine/core";
|
import { Anchor, Group, Text, Tooltip } from "@mantine/core";
|
||||||
import { IconCheck } from "@tabler/icons-react";
|
import { IconCheck } from "@tabler/icons-react";
|
||||||
import type { MRT_ColumnDef } from "mantine-react-table";
|
import type { MRT_ColumnDef } from "mantine-react-table";
|
||||||
import { MantineReactTable } from "mantine-react-table";
|
import { MantineReactTable } from "mantine-react-table";
|
||||||
|
|
||||||
import type { RouterOutputs } from "@homarr/api";
|
import type { RouterOutputs } from "@homarr/api";
|
||||||
import { clientApi } from "@homarr/api/client";
|
import { clientApi } from "@homarr/api/client";
|
||||||
import { useI18n, useScopedI18n } from "@homarr/translation/client";
|
import { useI18n } from "@homarr/translation/client";
|
||||||
import { Link, UserAvatar } from "@homarr/ui";
|
import { Link, UserAvatar } from "@homarr/ui";
|
||||||
import { useTranslatedMantineReactTable } from "@homarr/ui/hooks";
|
import { useTranslatedMantineReactTable } from "@homarr/ui/hooks";
|
||||||
|
|
||||||
interface UserListComponentProps {
|
interface UserListComponentProps {
|
||||||
initialUserList: RouterOutputs["user"]["getAll"];
|
initialUserList: RouterOutputs["user"]["getAll"];
|
||||||
credentialsProviderEnabled: boolean;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export const UserListComponent = ({ initialUserList, credentialsProviderEnabled }: UserListComponentProps) => {
|
export const UserListComponent = ({ initialUserList }: UserListComponentProps) => {
|
||||||
const tUserList = useScopedI18n("management.page.user.list");
|
|
||||||
const t = useI18n();
|
const t = useI18n();
|
||||||
const { data, isLoading } = clientApi.user.getAll.useQuery(undefined, {
|
const { data, isLoading } = clientApi.user.getAll.useQuery(undefined, {
|
||||||
initialData: initialUserList,
|
initialData: initialUserList,
|
||||||
@@ -69,21 +67,10 @@ export const UserListComponent = ({ initialUserList, credentialsProviderEnabled
|
|||||||
enableFullScreenToggle: false,
|
enableFullScreenToggle: false,
|
||||||
layoutMode: "grid-no-grow",
|
layoutMode: "grid-no-grow",
|
||||||
getRowId: (row) => row.id,
|
getRowId: (row) => row.id,
|
||||||
renderTopToolbarCustomActions: () =>
|
|
||||||
credentialsProviderEnabled ? (
|
|
||||||
<Button component={Link} href="/manage/users/create">
|
|
||||||
{t("management.page.user.create.title")}
|
|
||||||
</Button>
|
|
||||||
) : null,
|
|
||||||
state: {
|
state: {
|
||||||
isLoading,
|
isLoading,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
return (
|
return <MantineReactTable table={table} />;
|
||||||
<>
|
|
||||||
<Title mb="md">{tUserList("title")}</Title>
|
|
||||||
<MantineReactTable table={table} />
|
|
||||||
</>
|
|
||||||
);
|
|
||||||
};
|
};
|
||||||
+6
-6
@@ -149,7 +149,7 @@ export const UserCreateStepperComponent = ({ initialGroups }: UserCreateStepperC
|
|||||||
color={!generalForm.isValid() ? "red" : undefined}
|
color={!generalForm.isValid() ? "red" : undefined}
|
||||||
>
|
>
|
||||||
<form>
|
<form>
|
||||||
<Card p="xl" shadow="md" withBorder>
|
<Card p="xl">
|
||||||
<Stack gap="md">
|
<Stack gap="md">
|
||||||
<TextInput
|
<TextInput
|
||||||
label={tUserField("username.label")}
|
label={tUserField("username.label")}
|
||||||
@@ -165,7 +165,7 @@ export const UserCreateStepperComponent = ({ initialGroups }: UserCreateStepperC
|
|||||||
</Stepper.Step>
|
</Stepper.Step>
|
||||||
<Stepper.Step label={t("step.security.label")} allowStepSelect={false} allowStepClick={false}>
|
<Stepper.Step label={t("step.security.label")} allowStepSelect={false} allowStepClick={false}>
|
||||||
<form>
|
<form>
|
||||||
<Card p="xl" shadow="md" withBorder>
|
<Card p="xl">
|
||||||
<Stack gap="md">
|
<Stack gap="md">
|
||||||
<CustomPasswordInput
|
<CustomPasswordInput
|
||||||
withPasswordRequirements
|
withPasswordRequirements
|
||||||
@@ -185,7 +185,7 @@ export const UserCreateStepperComponent = ({ initialGroups }: UserCreateStepperC
|
|||||||
</form>
|
</form>
|
||||||
</Stepper.Step>
|
</Stepper.Step>
|
||||||
<Stepper.Step label={t("step.groups.label")} allowStepSelect={false} allowStepClick={false}>
|
<Stepper.Step label={t("step.groups.label")} allowStepSelect={false} allowStepClick={false}>
|
||||||
<Card p="xl" shadow="md" withBorder>
|
<Card p="xl">
|
||||||
<GroupsForm
|
<GroupsForm
|
||||||
initialGroups={initialGroups}
|
initialGroups={initialGroups}
|
||||||
addGroup={(groupId) =>
|
addGroup={(groupId) =>
|
||||||
@@ -198,20 +198,20 @@ export const UserCreateStepperComponent = ({ initialGroups }: UserCreateStepperC
|
|||||||
</Card>
|
</Card>
|
||||||
</Stepper.Step>
|
</Stepper.Step>
|
||||||
<Stepper.Step label={t("step.review.label")} allowStepSelect={false} allowStepClick={false}>
|
<Stepper.Step label={t("step.review.label")} allowStepSelect={false} allowStepClick={false}>
|
||||||
<Card p="xl" shadow="md" withBorder>
|
<Card p="xl">
|
||||||
<Stack maw={300} align="center" mx="auto">
|
<Stack maw={300} align="center" mx="auto">
|
||||||
<UserAvatar
|
<UserAvatar
|
||||||
size="xl"
|
size="xl"
|
||||||
user={{ name: generalForm.values.username, email: generalForm.values.email ?? null, image: null }}
|
user={{ name: generalForm.values.username, email: generalForm.values.email ?? null, image: null }}
|
||||||
/>
|
/>
|
||||||
<Text tt="uppercase" fw="bolder" size="xl">
|
<Text fw={700} size="xl">
|
||||||
{generalForm.values.username}
|
{generalForm.values.username}
|
||||||
</Text>
|
</Text>
|
||||||
</Stack>
|
</Stack>
|
||||||
</Card>
|
</Card>
|
||||||
</Stepper.Step>
|
</Stepper.Step>
|
||||||
<Stepper.Completed>
|
<Stepper.Completed>
|
||||||
<Card p="xl" shadow="md" withBorder>
|
<Card p="xl">
|
||||||
<Stack align="center" maw={300} mx="auto">
|
<Stack align="center" maw={300} mx="auto">
|
||||||
<IconUserCheck size="3rem" />
|
<IconUserCheck size="3rem" />
|
||||||
<Title order={2}>{t("step.completed.title")}</Title>
|
<Title order={2}>{t("step.completed.title")}</Title>
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ export const StepperNavigationComponent = ({
|
|||||||
}: StepperNavigationComponentProps) => {
|
}: StepperNavigationComponentProps) => {
|
||||||
const t = useI18n();
|
const t = useI18n();
|
||||||
return (
|
return (
|
||||||
<Card shadow="md" withBorder>
|
<Card>
|
||||||
{!isComplete ? (
|
{!isComplete ? (
|
||||||
<Group justify="space-between" wrap="nowrap">
|
<Group justify="space-between" wrap="nowrap">
|
||||||
<Button
|
<Button
|
||||||
|
|||||||
+1
-1
@@ -101,7 +101,7 @@ export const SaveAffix = ({ groupId }: SaveAffixProps) => {
|
|||||||
<div style={{ position: "sticky", bottom: 20 }}>
|
<div style={{ position: "sticky", bottom: 20 }}>
|
||||||
<Transition transition="slide-up" mounted={form.isDirty()}>
|
<Transition transition="slide-up" mounted={form.isDirty()}>
|
||||||
{(transitionStyles) => (
|
{(transitionStyles) => (
|
||||||
<Card style={transitionStyles} withBorder>
|
<Card style={transitionStyles}>
|
||||||
<Group justify="space-between">
|
<Group justify="space-between">
|
||||||
<Text fw={500}>{tForm("unsavedChanges")}</Text>
|
<Text fw={500}>{tForm("unsavedChanges")}</Text>
|
||||||
<Group>
|
<Group>
|
||||||
|
|||||||
@@ -68,7 +68,6 @@ const PermissionCard = async ({ group, isDanger }: PermissionCardProps) => {
|
|||||||
return (
|
return (
|
||||||
<Card
|
<Card
|
||||||
p="md"
|
p="md"
|
||||||
withBorder
|
|
||||||
style={{
|
style={{
|
||||||
borderColor: isDanger ? "var(--mantine-color-red-8)" : undefined,
|
borderColor: isDanger ? "var(--mantine-color-red-8)" : undefined,
|
||||||
}}
|
}}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import { useCallback, useMemo, useState } from "react";
|
import { useMemo, useState } from "react";
|
||||||
import { Group, TextInput } from "@mantine/core";
|
import { TextInput } from "@mantine/core";
|
||||||
import { IconSearch } from "@tabler/icons-react";
|
import { IconSearch } from "@tabler/icons-react";
|
||||||
|
|
||||||
import type { RouterOutputs } from "@homarr/api";
|
import type { RouterOutputs } from "@homarr/api";
|
||||||
@@ -33,29 +33,20 @@ export const GroupsList = ({ groups }: GroupsListProps) => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Group justify="space-between">
|
<TextInput
|
||||||
<TextInput
|
leftSection={<IconSearch size={20} stroke={1.5} />}
|
||||||
leftSection={<IconSearch size={20} stroke={1.5} />}
|
value={search}
|
||||||
value={search}
|
onChange={(event) => setSearch(event.currentTarget.value)}
|
||||||
onChange={(event) => setSearch(event.currentTarget.value)}
|
placeholder={`${t("group.search")}...`}
|
||||||
placeholder={`${t("group.search")}...`}
|
/>
|
||||||
style={{ flex: 1 }}
|
|
||||||
/>
|
|
||||||
<AddGroup />
|
|
||||||
</Group>
|
|
||||||
|
|
||||||
<GroupsTable groups={filteredGroups} initialGroupIds={initialGroupIds} hasFilter={search.length !== 0} />
|
<GroupsTable groups={filteredGroups} initialGroupIds={initialGroupIds} hasFilter={search.length !== 0} />
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
const AddGroup = () => {
|
export const AddGroupButton = () => {
|
||||||
const t = useI18n();
|
const t = useI18n();
|
||||||
const { openModal } = useModalAction(AddGroupModal);
|
const { openModal } = useModalAction(AddGroupModal);
|
||||||
|
|
||||||
const handleAddGroup = useCallback(() => {
|
return <MobileAffixButton onClick={() => openModal()}>{t("group.action.create.label")}</MobileAffixButton>;
|
||||||
openModal();
|
|
||||||
}, [openModal]);
|
|
||||||
|
|
||||||
return <MobileAffixButton onClick={handleAddGroup}>{t("group.action.create.label")}</MobileAffixButton>;
|
|
||||||
};
|
};
|
||||||
@@ -259,7 +259,7 @@ const SaveAffix = ({ visible, isPending, onDiscard, onSave }: SaveAffixProps) =>
|
|||||||
<div style={{ position: "sticky", bottom: 20 }}>
|
<div style={{ position: "sticky", bottom: 20 }}>
|
||||||
<Transition transition="slide-up" mounted={visible}>
|
<Transition transition="slide-up" mounted={visible}>
|
||||||
{(transitionStyles) => (
|
{(transitionStyles) => (
|
||||||
<Card style={transitionStyles} withBorder>
|
<Card style={transitionStyles}>
|
||||||
<Group justify="space-between">
|
<Group justify="space-between">
|
||||||
<Text fw={500}>{t("common.unsavedChanges")}</Text>
|
<Text fw={500}>{t("common.unsavedChanges")}</Text>
|
||||||
<Group>
|
<Group>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { notFound } from "next/navigation";
|
import { notFound } from "next/navigation";
|
||||||
import { Card, Group, Stack, Text, ThemeIcon, Title, UnstyledButton } from "@mantine/core";
|
import { Card, Group, Stack, Text, ThemeIcon, UnstyledButton } from "@mantine/core";
|
||||||
import { IconChevronRight, IconUsersGroup } from "@tabler/icons-react";
|
import { IconChevronRight, IconUsersGroup } from "@tabler/icons-react";
|
||||||
|
|
||||||
import { api } from "@homarr/api/server";
|
import { api } from "@homarr/api/server";
|
||||||
@@ -8,9 +8,8 @@ import { everyoneGroup } from "@homarr/definitions";
|
|||||||
import { getI18n } from "@homarr/translation/server";
|
import { getI18n } from "@homarr/translation/server";
|
||||||
import { Link } from "@homarr/ui";
|
import { Link } from "@homarr/ui";
|
||||||
|
|
||||||
import { ManageContainer } from "~/components/manage/manage-container";
|
import { ManagePageLayout } from "~/components/manage/manage-page-layout";
|
||||||
import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
|
import { AddGroupButton, GroupsList } from "./_client";
|
||||||
import { GroupsList } from "./_client";
|
|
||||||
import classes from "./groups.module.css";
|
import classes from "./groups.module.css";
|
||||||
|
|
||||||
export default async function GroupsListPage() {
|
export default async function GroupsListPage() {
|
||||||
@@ -26,11 +25,8 @@ export default async function GroupsListPage() {
|
|||||||
const groupsWithoutEveryone = groups.filter((group) => group.name !== everyoneGroup);
|
const groupsWithoutEveryone = groups.filter((group) => group.name !== everyoneGroup);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ManageContainer size="xl">
|
<ManagePageLayout title={t("group.title")} primaryAction={<AddGroupButton />} floatingPrimaryAction>
|
||||||
<DynamicBreadcrumb />
|
|
||||||
<Stack>
|
<Stack>
|
||||||
<Title>{t("group.title")}</Title>
|
|
||||||
|
|
||||||
{dbEveryoneGroup && (
|
{dbEveryoneGroup && (
|
||||||
<UnstyledButton component={Link} href={`/manage/users/groups/${dbEveryoneGroup.id}`}>
|
<UnstyledButton component={Link} href={`/manage/users/groups/${dbEveryoneGroup.id}`}>
|
||||||
<Card className={classes.everyoneGroup}>
|
<Card className={classes.everyoneGroup}>
|
||||||
@@ -53,6 +49,6 @@ export default async function GroupsListPage() {
|
|||||||
|
|
||||||
<GroupsList groups={groupsWithoutEveryone} />
|
<GroupsList groups={groupsWithoutEveryone} />
|
||||||
</Stack>
|
</Stack>
|
||||||
</ManageContainer>
|
</ManagePageLayout>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
+20
@@ -0,0 +1,20 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { Button } from "@mantine/core";
|
||||||
|
|
||||||
|
import { useModalAction } from "@homarr/modals";
|
||||||
|
import { InviteCreateModal } from "@homarr/modals-collection";
|
||||||
|
import { useScopedI18n } from "@homarr/translation/client";
|
||||||
|
|
||||||
|
import { MANAGE_ACTION_BUTTON_MIN_WIDTH } from "~/components/manage/manage-page.constants";
|
||||||
|
|
||||||
|
export const InviteCreateButton = () => {
|
||||||
|
const t = useScopedI18n("management.page.user.invite");
|
||||||
|
const { openModal } = useModalAction(InviteCreateModal);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Button miw={MANAGE_ACTION_BUTTON_MIN_WIDTH} onClick={() => openModal()}>
|
||||||
|
{t("action.new.title")}
|
||||||
|
</Button>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import { useCallback, useMemo } from "react";
|
import { useCallback, useMemo } from "react";
|
||||||
import { ActionIcon, Button, Title } from "@mantine/core";
|
import { ActionIcon } from "@mantine/core";
|
||||||
import { IconTrash } from "@tabler/icons-react";
|
import { IconTrash } from "@tabler/icons-react";
|
||||||
import dayjs from "dayjs";
|
import dayjs from "dayjs";
|
||||||
import relativeTime from "dayjs/plugin/relativeTime";
|
import relativeTime from "dayjs/plugin/relativeTime";
|
||||||
@@ -10,8 +10,7 @@ import { MantineReactTable } from "mantine-react-table";
|
|||||||
|
|
||||||
import type { RouterOutputs } from "@homarr/api";
|
import type { RouterOutputs } from "@homarr/api";
|
||||||
import { clientApi } from "@homarr/api/client";
|
import { clientApi } from "@homarr/api/client";
|
||||||
import { useConfirmModal, useModalAction } from "@homarr/modals";
|
import { useConfirmModal } from "@homarr/modals";
|
||||||
import { InviteCreateModal } from "@homarr/modals-collection";
|
|
||||||
import { useScopedI18n } from "@homarr/translation/client";
|
import { useScopedI18n } from "@homarr/translation/client";
|
||||||
import { useTranslatedMantineReactTable } from "@homarr/ui/hooks";
|
import { useTranslatedMantineReactTable } from "@homarr/ui/hooks";
|
||||||
|
|
||||||
@@ -65,7 +64,6 @@ export const InviteListComponent = ({ initialInvites }: InviteListComponentProps
|
|||||||
enableFullScreenToggle: false,
|
enableFullScreenToggle: false,
|
||||||
layoutMode: "grid-no-grow",
|
layoutMode: "grid-no-grow",
|
||||||
getRowId: (row) => row.id,
|
getRowId: (row) => row.id,
|
||||||
renderTopToolbarCustomActions: RenderTopToolbarCustomActions,
|
|
||||||
state: {
|
state: {
|
||||||
isLoading,
|
isLoading,
|
||||||
},
|
},
|
||||||
@@ -74,22 +72,7 @@ export const InviteListComponent = ({ initialInvites }: InviteListComponentProps
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
return (
|
return <MantineReactTable table={table} />;
|
||||||
<>
|
|
||||||
<Title mb="md">{t("title")}</Title>
|
|
||||||
<MantineReactTable table={table} />
|
|
||||||
</>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
const RenderTopToolbarCustomActions = () => {
|
|
||||||
const t = useScopedI18n("management.page.user.invite");
|
|
||||||
const { openModal } = useModalAction(InviteCreateModal);
|
|
||||||
const handleNewInvite = useCallback(() => {
|
|
||||||
openModal();
|
|
||||||
}, [openModal]);
|
|
||||||
|
|
||||||
return <Button onClick={handleNewInvite}>{t("action.new.title")}</Button>;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const RenderRowActions = ({ row }: { row: MRT_Row<RouterOutputs["invite"]["getAll"][number]> }) => {
|
const RenderRowActions = ({ row }: { row: MRT_Row<RouterOutputs["invite"]["getAll"][number]> }) => {
|
||||||
|
|||||||
@@ -3,8 +3,11 @@ import { notFound } from "next/navigation";
|
|||||||
import { api } from "@homarr/api/server";
|
import { api } from "@homarr/api/server";
|
||||||
import { auth } from "@homarr/auth/next";
|
import { auth } from "@homarr/auth/next";
|
||||||
import { isProviderEnabled } from "@homarr/auth/server";
|
import { isProviderEnabled } from "@homarr/auth/server";
|
||||||
|
import { getScopedI18n } from "@homarr/translation/server";
|
||||||
|
|
||||||
import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
|
import { ManageMobilePrimaryAction } from "~/components/manage/manage-mobile-primary-action";
|
||||||
|
import { ManagePageLayout } from "~/components/manage/manage-page-layout";
|
||||||
|
import { InviteCreateButton } from "./_components/invite-create-button";
|
||||||
import { InviteListComponent } from "./_components/invite-list";
|
import { InviteListComponent } from "./_components/invite-list";
|
||||||
|
|
||||||
export default async function InvitesOverviewPage() {
|
export default async function InvitesOverviewPage() {
|
||||||
@@ -17,11 +20,20 @@ export default async function InvitesOverviewPage() {
|
|||||||
return notFound();
|
return notFound();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const t = await getScopedI18n("management.page.user.invite");
|
||||||
const initialInvites = await api.invite.getAll();
|
const initialInvites = await api.invite.getAll();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<ManagePageLayout
|
||||||
<DynamicBreadcrumb />
|
title={t("title")}
|
||||||
|
primaryAction={
|
||||||
|
<ManageMobilePrimaryAction>
|
||||||
|
<InviteCreateButton />
|
||||||
|
</ManageMobilePrimaryAction>
|
||||||
|
}
|
||||||
|
floatingPrimaryAction
|
||||||
|
>
|
||||||
<InviteListComponent initialInvites={initialInvites} />
|
<InviteListComponent initialInvites={initialInvites} />
|
||||||
</>
|
</ManagePageLayout>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -4,8 +4,10 @@ import { api } from "@homarr/api/server";
|
|||||||
import { auth } from "@homarr/auth/next";
|
import { auth } from "@homarr/auth/next";
|
||||||
import { isProviderEnabled } from "@homarr/auth/server";
|
import { isProviderEnabled } from "@homarr/auth/server";
|
||||||
import { getScopedI18n } from "@homarr/translation/server";
|
import { getScopedI18n } from "@homarr/translation/server";
|
||||||
|
import { Link } from "@homarr/ui";
|
||||||
|
|
||||||
import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
|
import { ManagePageLayout } from "~/components/manage/manage-page-layout";
|
||||||
|
import { MobileAffixButton } from "~/components/manage/mobile-affix-button";
|
||||||
import { createMetaTitle } from "~/metadata";
|
import { createMetaTitle } from "~/metadata";
|
||||||
import { UserListComponent } from "./_components/user-list";
|
import { UserListComponent } from "./_components/user-list";
|
||||||
|
|
||||||
@@ -27,13 +29,23 @@ export default async function UsersPage() {
|
|||||||
return notFound();
|
return notFound();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const t = await getScopedI18n("management.page.user");
|
||||||
const userList = await api.user.getAll();
|
const userList = await api.user.getAll();
|
||||||
const credentialsProviderEnabled = isProviderEnabled("credentials");
|
const credentialsProviderEnabled = isProviderEnabled("credentials");
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<ManagePageLayout
|
||||||
<DynamicBreadcrumb />
|
title={t("list.title")}
|
||||||
<UserListComponent initialUserList={userList} credentialsProviderEnabled={credentialsProviderEnabled} />
|
primaryAction={
|
||||||
</>
|
credentialsProviderEnabled ? (
|
||||||
|
<MobileAffixButton component={Link} href="/manage/users/create">
|
||||||
|
{t("create.title")}
|
||||||
|
</MobileAffixButton>
|
||||||
|
) : undefined
|
||||||
|
}
|
||||||
|
floatingPrimaryAction={credentialsProviderEnabled}
|
||||||
|
>
|
||||||
|
<UserListComponent initialUserList={userList} />
|
||||||
|
</ManagePageLayout>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -99,7 +99,7 @@ export const WidgetPreviewPageContent = ({ kind, integrationData }: WidgetPrevie
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Card withBorder w={dimensions.width} h={dimensions.height} p={dimensions.height >= 96 ? undefined : 4}>
|
<Card w={dimensions.width} h={dimensions.height} p={dimensions.height >= 96 ? undefined : 4}>
|
||||||
<QueryErrorResetBoundary>
|
<QueryErrorResetBoundary>
|
||||||
{({ reset }) => (
|
{({ reset }) => (
|
||||||
<ErrorBoundary
|
<ErrorBoundary
|
||||||
@@ -123,17 +123,35 @@ export const WidgetPreviewPageContent = ({ kind, integrationData }: WidgetPrevie
|
|||||||
</QueryErrorResetBoundary>
|
</QueryErrorResetBoundary>
|
||||||
</Card>
|
</Card>
|
||||||
<Affix bottom={12} right={72}>
|
<Affix bottom={12} right={72}>
|
||||||
<ActionIcon size={48} variant="default" radius="xl" onClick={handleOpenEditWidgetModal}>
|
<ActionIcon
|
||||||
|
size={48}
|
||||||
|
variant="default"
|
||||||
|
radius="xl"
|
||||||
|
onClick={handleOpenEditWidgetModal}
|
||||||
|
aria-label={t("common.action.edit")}
|
||||||
|
>
|
||||||
<IconPencil size={24} />
|
<IconPencil size={24} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
</Affix>
|
</Affix>
|
||||||
<Affix bottom={12} right={72 + 60}>
|
<Affix bottom={12} right={72 + 60}>
|
||||||
<ActionIcon size={48} variant="default" radius="xl" onClick={toggleEditMode}>
|
<ActionIcon
|
||||||
|
size={48}
|
||||||
|
variant="default"
|
||||||
|
radius="xl"
|
||||||
|
onClick={toggleEditMode}
|
||||||
|
aria-label={editMode ? t("widgetPreview.toggle.disabled") : t("widgetPreview.toggle.enabled")}
|
||||||
|
>
|
||||||
{editMode ? <IconToggleLeft size={24} /> : <IconToggleRight size={24} />}
|
{editMode ? <IconToggleLeft size={24} /> : <IconToggleRight size={24} />}
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
</Affix>
|
</Affix>
|
||||||
<Affix bottom={12} right={72 + 120}>
|
<Affix bottom={12} right={72 + 120}>
|
||||||
<ActionIcon size={48} variant="default" radius="xl" onClick={openDimensionsModal}>
|
<ActionIcon
|
||||||
|
size={48}
|
||||||
|
variant="default"
|
||||||
|
radius="xl"
|
||||||
|
onClick={openDimensionsModal}
|
||||||
|
aria-label={t("widgetPreview.dimensions.title")}
|
||||||
|
>
|
||||||
<IconDimensions size={24} />
|
<IconDimensions size={24} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
</Affix>
|
</Affix>
|
||||||
|
|||||||
@@ -42,7 +42,6 @@ export const BoardItemContent = ({ item }: BoardItemContentProps) => {
|
|||||||
item.advancedOptions.customCssClasses.join(" "),
|
item.advancedOptions.customCssClasses.join(" "),
|
||||||
)}
|
)}
|
||||||
radius={board.itemRadius}
|
radius={board.itemRadius}
|
||||||
withBorder
|
|
||||||
styles={{
|
styles={{
|
||||||
root: {
|
root: {
|
||||||
"--opacity": board.opacity / 100,
|
"--opacity": board.opacity / 100,
|
||||||
|
|||||||
@@ -105,9 +105,17 @@ const BoardItemMenuInner = ({ offset, item, resetErrorBoundary }: BoardItemMenuP
|
|||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Menu withinPortal withArrow position="right-start" arrowPosition="center">
|
<Menu withinPortal position="right-start" arrowPosition="center">
|
||||||
<Menu.Target>
|
<Menu.Target>
|
||||||
<ActionIcon variant="default" radius={"xl"} pos="absolute" top={offset} right={offset} style={{ zIndex: 10 }}>
|
<ActionIcon
|
||||||
|
variant="default"
|
||||||
|
radius={"xl"}
|
||||||
|
pos="absolute"
|
||||||
|
top={offset}
|
||||||
|
right={offset}
|
||||||
|
style={{ zIndex: 10 }}
|
||||||
|
aria-label={tItem("menu.label.settings")}
|
||||||
|
>
|
||||||
<IconDotsVertical size={"1rem"} />
|
<IconDotsVertical size={"1rem"} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
</Menu.Target>
|
</Menu.Target>
|
||||||
|
|||||||
@@ -145,7 +145,7 @@ const WidgetItem = ({
|
|||||||
</Text>
|
</Text>
|
||||||
</Stack>
|
</Stack>
|
||||||
<SupportedIntegrations mt="auto" integrations={item.supportedIntegrations} />
|
<SupportedIntegrations mt="auto" integrations={item.supportedIntegrations} />
|
||||||
<Button onClick={onSelect} variant="light" size="xs" radius="md" fullWidth>
|
<Button onClick={onSelect} variant="light" size="xs" fullWidth>
|
||||||
{t(`item.create.addToBoard`)}
|
{t(`item.create.addToBoard`)}
|
||||||
</Button>
|
</Button>
|
||||||
</Stack>
|
</Stack>
|
||||||
@@ -170,7 +170,7 @@ const SupportedIntegrations = ({ integrations, mt }: SupportedIntegrationsProps)
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Center mt={mt}>
|
<Center mt={mt}>
|
||||||
<Tooltip.Group openDelay={300} closeDelay={100}>
|
<Tooltip.Group closeDelay={100}>
|
||||||
<Group gap={2}>
|
<Group gap={2}>
|
||||||
{integrations.slice(0, countToShow).map((integration) => (
|
{integrations.slice(0, countToShow).map((integration) => (
|
||||||
<Tooltip key={integration} label={getIntegrationName(integration)} withArrow>
|
<Tooltip key={integration} label={getIntegrationName(integration)} withArrow>
|
||||||
|
|||||||
@@ -45,13 +45,7 @@ export const BoardCategorySection = ({ section }: Props) => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Card
|
<Card style={{ "--opacity": board.opacity / 100 }} radius={board.itemRadius} p={0} className={classes.itemCard}>
|
||||||
style={{ "--opacity": board.opacity / 100 }}
|
|
||||||
radius={board.itemRadius}
|
|
||||||
withBorder
|
|
||||||
p={0}
|
|
||||||
className={classes.itemCard}
|
|
||||||
>
|
|
||||||
<Stack>
|
<Stack>
|
||||||
<Group wrap="nowrap" gap="sm">
|
<Group wrap="nowrap" gap="sm">
|
||||||
<UnstyledButton w="100%" p="sm" onClick={toggle}>
|
<UnstyledButton w="100%" p="sm" onClick={toggle}>
|
||||||
@@ -62,7 +56,7 @@ export const BoardCategorySection = ({ section }: Props) => {
|
|||||||
</UnstyledButton>
|
</UnstyledButton>
|
||||||
<CategoryMenu category={section} />
|
<CategoryMenu category={section} />
|
||||||
</Group>
|
</Group>
|
||||||
<Collapse in={opened} p="sm" pt={0}>
|
<Collapse expanded={opened} p="sm" pt={0}>
|
||||||
<GridStack section={section} />
|
<GridStack section={section} />
|
||||||
</Collapse>
|
</Collapse>
|
||||||
</Stack>
|
</Stack>
|
||||||
|
|||||||
@@ -30,9 +30,9 @@ export const CategoryMenu = ({ category }: Props) => {
|
|||||||
const t = useScopedI18n("section.category");
|
const t = useScopedI18n("section.category");
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Menu withArrow>
|
<Menu>
|
||||||
<Menu.Target>
|
<Menu.Target>
|
||||||
<ActionIcon mr="sm" variant="transparent">
|
<ActionIcon mr="sm" variant="transparent" aria-label={t("menu.label.settings")}>
|
||||||
<IconDotsVertical size={20} />
|
<IconDotsVertical size={20} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
</Menu.Target>
|
</Menu.Target>
|
||||||
|
|||||||
@@ -28,7 +28,6 @@ export const BoardDynamicSection = ({ section }: Props) => {
|
|||||||
className={combineClasses(classes.itemCard, section.options.customCssClasses.join(" "))}
|
className={combineClasses(classes.itemCard, section.options.customCssClasses.join(" "))}
|
||||||
w="100%"
|
w="100%"
|
||||||
h="100%"
|
h="100%"
|
||||||
withBorder
|
|
||||||
styles={{
|
styles={{
|
||||||
root: {
|
root: {
|
||||||
overflow: "visible",
|
overflow: "visible",
|
||||||
|
|||||||
@@ -43,9 +43,17 @@ export const BoardDynamicSectionMenu = ({ section }: { section: DynamicSectionIt
|
|||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Menu withinPortal withArrow position="right-start" arrowPosition="center">
|
<Menu withinPortal position="right-start" arrowPosition="center">
|
||||||
<Menu.Target>
|
<Menu.Target>
|
||||||
<ActionIcon variant="default" radius={"xl"} pos="absolute" top={4} right={4} style={{ zIndex: 10 }}>
|
<ActionIcon
|
||||||
|
variant="default"
|
||||||
|
radius={"xl"}
|
||||||
|
pos="absolute"
|
||||||
|
top={4}
|
||||||
|
right={4}
|
||||||
|
style={{ zIndex: 10 }}
|
||||||
|
aria-label={tItem("menu.label.settings")}
|
||||||
|
>
|
||||||
<IconDotsVertical size={"1rem"} />
|
<IconDotsVertical size={"1rem"} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
</Menu.Target>
|
</Menu.Target>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import type { RefObject } from "react";
|
import type { Ref, RefObject } from "react";
|
||||||
import { createRef, useCallback, useEffect, useRef } from "react";
|
import { createRef, useCallback, useEffect, useRef } from "react";
|
||||||
import { useElementSize } from "@mantine/hooks";
|
import { useElementSize, useMergedRef } from "@mantine/hooks";
|
||||||
|
|
||||||
import { useCurrentLayout, useRequiredBoard } from "@homarr/boards/context";
|
import { useCurrentLayout, useRequiredBoard } from "@homarr/boards/context";
|
||||||
import { useEditMode } from "@homarr/boards/edit-mode";
|
import { useEditMode } from "@homarr/boards/edit-mode";
|
||||||
@@ -13,7 +13,7 @@ import { useSectionActions } from "../section-actions";
|
|||||||
import { initializeGridstack } from "./init-gridstack";
|
import { initializeGridstack } from "./init-gridstack";
|
||||||
|
|
||||||
export interface UseGridstackRefs {
|
export interface UseGridstackRefs {
|
||||||
wrapper: RefObject<HTMLDivElement | null>;
|
wrapper: Ref<HTMLDivElement | null>;
|
||||||
items: RefObject<Record<string, RefObject<GridItemHTMLElement | null>>>;
|
items: RefObject<Record<string, RefObject<GridItemHTMLElement | null>>>;
|
||||||
gridstack: RefObject<GridStack | null>;
|
gridstack: RefObject<GridStack | null>;
|
||||||
}
|
}
|
||||||
@@ -59,8 +59,9 @@ export const useGridstack = (section: Omit<Section, "items">, itemIds: string[])
|
|||||||
const { moveAndResizeItem, moveItemToSection } = useItemActions();
|
const { moveAndResizeItem, moveItemToSection } = useItemActions();
|
||||||
const { moveAndResizeInnerSection, moveInnerSectionToSection } = useSectionActions();
|
const { moveAndResizeInnerSection, moveInnerSectionToSection } = useSectionActions();
|
||||||
|
|
||||||
// define reference for wrapper - is used to calculate the width of the wrapper
|
const wrapperElementRef = useRef<HTMLDivElement | null>(null);
|
||||||
const { ref: wrapperRef, width, height } = useElementSize<HTMLDivElement>();
|
const { ref: measureWrapperRef, width, height } = useElementSize<HTMLDivElement>();
|
||||||
|
const wrapperRef = useMergedRef(measureWrapperRef, wrapperElementRef);
|
||||||
// references to the diffrent items contained in the gridstack
|
// references to the diffrent items contained in the gridstack
|
||||||
const itemRefs = useRef<Record<string, RefObject<GridItemHTMLElement | null>>>({});
|
const itemRefs = useRef<Record<string, RefObject<GridItemHTMLElement | null>>>({});
|
||||||
// reference of the gridstack object for modifications after initialization
|
// reference of the gridstack object for modifications after initialization
|
||||||
@@ -193,7 +194,7 @@ export const useGridstack = (section: Omit<Section, "items">, itemIds: string[])
|
|||||||
itemIds,
|
itemIds,
|
||||||
refs: {
|
refs: {
|
||||||
items: itemRefs,
|
items: itemRefs,
|
||||||
wrapper: wrapperRef,
|
wrapper: wrapperElementRef,
|
||||||
gridstack: gridRef,
|
gridstack: gridRef,
|
||||||
},
|
},
|
||||||
sectionColumnCount: columnCount,
|
sectionColumnCount: columnCount,
|
||||||
@@ -276,7 +277,7 @@ export const useGridstack = (section: Omit<Section, "items">, itemIds: string[])
|
|||||||
useCssVariableConfiguration({
|
useCssVariableConfiguration({
|
||||||
columnCount,
|
columnCount,
|
||||||
gridRef,
|
gridRef,
|
||||||
wrapperRef,
|
wrapperRef: wrapperElementRef,
|
||||||
width,
|
width,
|
||||||
height,
|
height,
|
||||||
isDynamic: section.kind === "dynamic",
|
isDynamic: section.kind === "dynamic",
|
||||||
@@ -293,7 +294,7 @@ export const useGridstack = (section: Omit<Section, "items">, itemIds: string[])
|
|||||||
|
|
||||||
interface UseCssVariableConfiguration {
|
interface UseCssVariableConfiguration {
|
||||||
gridRef: UseGridstackRefs["gridstack"];
|
gridRef: UseGridstackRefs["gridstack"];
|
||||||
wrapperRef: UseGridstackRefs["wrapper"];
|
wrapperRef: RefObject<HTMLDivElement | null>;
|
||||||
width: number;
|
width: number;
|
||||||
height: number;
|
height: number;
|
||||||
columnCount: number;
|
columnCount: number;
|
||||||
|
|||||||
@@ -12,16 +12,7 @@ export const CommonNavLink = (props: ClientNavigationLink) =>
|
|||||||
const NavLinkHref = (props: NavigationLinkHref) => {
|
const NavLinkHref = (props: NavigationLinkHref) => {
|
||||||
const pathname = usePathname();
|
const pathname = usePathname();
|
||||||
return props.external ? (
|
return props.external ? (
|
||||||
<NavLink
|
<NavLink component="a" label={props.label} leftSection={props.icon} href={props.href} target="_blank" />
|
||||||
component="a"
|
|
||||||
label={props.label}
|
|
||||||
leftSection={props.icon}
|
|
||||||
href={props.href}
|
|
||||||
style={{
|
|
||||||
borderRadius: 5,
|
|
||||||
}}
|
|
||||||
target="_blank"
|
|
||||||
/>
|
|
||||||
) : (
|
) : (
|
||||||
<NavLink
|
<NavLink
|
||||||
component={Link}
|
component={Link}
|
||||||
@@ -29,9 +20,6 @@ const NavLinkHref = (props: NavigationLinkHref) => {
|
|||||||
leftSection={props.icon}
|
leftSection={props.icon}
|
||||||
href={props.href}
|
href={props.href}
|
||||||
active={pathname === props.href}
|
active={pathname === props.href}
|
||||||
style={{
|
|
||||||
borderRadius: 5,
|
|
||||||
}}
|
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
@@ -40,14 +28,7 @@ const NavLinkWithItems = (props: NavigationLinkWithItems) => {
|
|||||||
const pathname = usePathname();
|
const pathname = usePathname();
|
||||||
const isActive = props.items.some((item) => item.href === pathname);
|
const isActive = props.items.some((item) => item.href === pathname);
|
||||||
return (
|
return (
|
||||||
<NavLink
|
<NavLink label={props.label} leftSection={props.icon} defaultOpened={isActive}>
|
||||||
style={{
|
|
||||||
borderRadius: 5,
|
|
||||||
}}
|
|
||||||
label={props.label}
|
|
||||||
leftSection={props.icon}
|
|
||||||
defaultOpened={isActive}
|
|
||||||
>
|
|
||||||
{props.items.map((item) => (
|
{props.items.map((item) => (
|
||||||
<NavLinkHref key={item.label} {...item} />
|
<NavLinkHref key={item.label} {...item} />
|
||||||
))}
|
))}
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ export const DangerZoneRoot = async ({ children }: DangerZoneRootProps) => {
|
|||||||
<Title c="red.8" order={2}>
|
<Title c="red.8" order={2}>
|
||||||
{t("common.dangerZone")}
|
{t("common.dangerZone")}
|
||||||
</Title>
|
</Title>
|
||||||
<Card withBorder style={{ borderColor: "var(--mantine-color-red-8)", borderWidth: 3 }}>
|
<Card style={{ borderColor: "var(--mantine-color-red-8)", borderWidth: 3 }}>
|
||||||
<Stack gap="sm">
|
<Stack gap="sm">
|
||||||
{Array.isArray(children)
|
{Array.isArray(children)
|
||||||
? children.map((child, index) => (
|
? children.map((child, index) => (
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
import type { PropsWithChildren } from "react";
|
||||||
|
import { Affix, Box } from "@mantine/core";
|
||||||
|
|
||||||
|
import { MANAGE_ACTION_BUTTON_MIN_WIDTH, MANAGE_AFFIX_POSITION } from "./manage-page.constants";
|
||||||
|
|
||||||
|
export const ManageMobilePrimaryAction = ({ children }: PropsWithChildren) => (
|
||||||
|
<>
|
||||||
|
<Box visibleFrom="md" miw={MANAGE_ACTION_BUTTON_MIN_WIDTH}>
|
||||||
|
{children}
|
||||||
|
</Box>
|
||||||
|
<Affix hiddenFrom="md" position={MANAGE_AFFIX_POSITION}>
|
||||||
|
{children}
|
||||||
|
</Affix>
|
||||||
|
</>
|
||||||
|
);
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
import type { ReactNode } from "react";
|
||||||
|
import type { MantineSize } from "@mantine/core";
|
||||||
|
import { Group, Stack, Title } from "@mantine/core";
|
||||||
|
|
||||||
|
import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
|
||||||
|
import { ManageContainer } from "./manage-container";
|
||||||
|
import { MANAGE_FLOATING_ACTION_BOTTOM_OFFSET } from "./manage-page.constants";
|
||||||
|
|
||||||
|
interface ManagePageLayoutProps {
|
||||||
|
title: ReactNode;
|
||||||
|
primaryAction?: ReactNode;
|
||||||
|
toolbar?: ReactNode;
|
||||||
|
footer?: ReactNode;
|
||||||
|
floatingPrimaryAction?: boolean;
|
||||||
|
size?: MantineSize;
|
||||||
|
children: ReactNode;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const ManagePageLayout = ({
|
||||||
|
title,
|
||||||
|
primaryAction,
|
||||||
|
toolbar,
|
||||||
|
footer,
|
||||||
|
floatingPrimaryAction,
|
||||||
|
size,
|
||||||
|
children,
|
||||||
|
}: ManagePageLayoutProps) => {
|
||||||
|
const titleNode = typeof title === "string" ? <Title>{title}</Title> : title;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<ManageContainer size={size}>
|
||||||
|
<DynamicBreadcrumb />
|
||||||
|
<Stack pb={floatingPrimaryAction ? { base: MANAGE_FLOATING_ACTION_BOTTOM_OFFSET, md: 0 } : undefined}>
|
||||||
|
<Group justify="space-between" align="center">
|
||||||
|
{titleNode}
|
||||||
|
{primaryAction}
|
||||||
|
</Group>
|
||||||
|
{toolbar}
|
||||||
|
{children}
|
||||||
|
{footer && <Group justify="end">{footer}</Group>}
|
||||||
|
</Stack>
|
||||||
|
</ManageContainer>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
export const MANAGE_AFFIX_POSITION = { bottom: 20, right: 20 } as const;
|
||||||
|
|
||||||
|
export const MANAGE_FLOATING_ACTION_BOTTOM_OFFSET = 48;
|
||||||
|
|
||||||
|
export const MANAGE_ACTION_BUTTON_MIN_WIDTH = 160;
|
||||||
@@ -2,13 +2,15 @@ import { forwardRef } from "react";
|
|||||||
import type { ButtonProps } from "@mantine/core";
|
import type { ButtonProps } from "@mantine/core";
|
||||||
import { Affix, Button, createPolymorphicComponent } from "@mantine/core";
|
import { Affix, Button, createPolymorphicComponent } from "@mantine/core";
|
||||||
|
|
||||||
|
import { MANAGE_ACTION_BUTTON_MIN_WIDTH, MANAGE_AFFIX_POSITION } from "./manage-page.constants";
|
||||||
|
|
||||||
type MobileAffixButtonProps = Omit<ButtonProps, "visibleFrom" | "hiddenFrom">;
|
type MobileAffixButtonProps = Omit<ButtonProps, "visibleFrom" | "hiddenFrom">;
|
||||||
|
|
||||||
export const MobileAffixButton = createPolymorphicComponent<"button", MobileAffixButtonProps>(
|
export const MobileAffixButton = createPolymorphicComponent<"button", MobileAffixButtonProps>(
|
||||||
forwardRef<HTMLButtonElement, MobileAffixButtonProps>((props, ref) => (
|
forwardRef<HTMLButtonElement, MobileAffixButtonProps>((props, ref) => (
|
||||||
<>
|
<>
|
||||||
<Button ref={ref} visibleFrom="md" {...props} />
|
<Button ref={ref} visibleFrom="md" miw={MANAGE_ACTION_BUTTON_MIN_WIDTH} {...props} />
|
||||||
<Affix hiddenFrom="md" position={{ bottom: 20, right: 20 }}>
|
<Affix hiddenFrom="md" position={MANAGE_AFFIX_POSITION}>
|
||||||
<Button ref={ref} {...props} />
|
<Button ref={ref} {...props} />
|
||||||
</Affix>
|
</Affix>
|
||||||
</>
|
</>
|
||||||
|
|||||||
@@ -14,13 +14,13 @@ interface NoResultsProps {
|
|||||||
|
|
||||||
export const NoResults = ({ icon: Icon, title, action }: NoResultsProps) => {
|
export const NoResults = ({ icon: Icon, title, action }: NoResultsProps) => {
|
||||||
return (
|
return (
|
||||||
<Card withBorder bg="transparent">
|
<Card bg="transparent" withBorder={false}>
|
||||||
<Stack align="center" gap="sm">
|
<Stack align="center" gap="sm">
|
||||||
<Icon size="2rem" />
|
<Icon size="2rem" />
|
||||||
<Text fw={500} size="lg">
|
<Text fw={500} size="lg">
|
||||||
{title}
|
{title}
|
||||||
</Text>
|
</Text>
|
||||||
{!action?.hidden && <Anchor href={action?.href}>{action?.label}</Anchor>}
|
{action && !action.hidden && <Anchor href={action.href}>{action.label}</Anchor>}
|
||||||
</Stack>
|
</Stack>
|
||||||
</Card>
|
</Card>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ export const UserAvatarMenu = ({ children, availableUpdatesPromise }: UserAvatar
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
// We use keepMounted so we can add event listeners to prevent navigating away without saving the board
|
// We use keepMounted so we can add event listeners to prevent navigating away without saving the board
|
||||||
<Menu width={300} withArrow withinPortal keepMounted>
|
<Menu width={300} withinPortal keepMounted>
|
||||||
<Menu.Dropdown>
|
<Menu.Dropdown>
|
||||||
<AvailableUpdatesMenuItem availableUpdatesPromise={availableUpdatesPromise} />
|
<AvailableUpdatesMenuItem availableUpdatesPromise={availableUpdatesPromise} />
|
||||||
<Menu.Item component={Link} href="/boards" leftSection={<IconHome size="1rem" />}>
|
<Menu.Item component={Link} href="/boards" leftSection={<IconHome size="1rem" />}>
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
FROM node:24.15.0-trixie AS base
|
FROM node:24.16.0-trixie AS base
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY package.json .
|
COPY package.json .
|
||||||
COPY pnpm-lock.yaml .
|
COPY pnpm-lock.yaml .
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
"better-sqlite3": "^12.10.0"
|
"better-sqlite3": "^12.10.0"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=24.15.0",
|
"node": ">=24.16.0",
|
||||||
"pnpm": ">=10.33.4"
|
"pnpm": ">=10.33.4"
|
||||||
},
|
},
|
||||||
"packageManager": "pnpm@10.33.4",
|
"packageManager": "pnpm@10.33.4",
|
||||||
|
|||||||
+1
-1
@@ -45,7 +45,7 @@ describe("LLDAP authorization", () => {
|
|||||||
// Act
|
// Act
|
||||||
await page.goto(`http://${homarrContainer.getHost()}:${homarrContainer.getMappedPort(7575)}/auth/login`);
|
await page.goto(`http://${homarrContainer.getHost()}:${homarrContainer.getMappedPort(7575)}/auth/login`);
|
||||||
await page.getByLabel("Username").fill(defaultCredentials.username);
|
await page.getByLabel("Username").fill(defaultCredentials.username);
|
||||||
await page.getByLabel("Password").fill(defaultCredentials.password);
|
await page.locator("#password").fill(defaultCredentials.password);
|
||||||
await page.locator("css=button[type='submit']").click();
|
await page.locator("css=button[type='submit']").click();
|
||||||
|
|
||||||
// Assert
|
// Assert
|
||||||
|
|||||||
+2
-2
@@ -59,7 +59,7 @@
|
|||||||
"vitest": "catalog:"
|
"vitest": "catalog:"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=24.15.0",
|
"node": ">=24.16.0",
|
||||||
"pnpm": ">=10.33.4"
|
"pnpm": ">=10.33.4"
|
||||||
},
|
},
|
||||||
"packageManager": "pnpm@10.33.4",
|
"packageManager": "pnpm@10.33.4",
|
||||||
@@ -83,7 +83,7 @@
|
|||||||
"brace-expansion@>=1.0.0 <=1.1.11": ">=5.0.6",
|
"brace-expansion@>=1.0.0 <=1.1.11": ">=5.0.6",
|
||||||
"esbuild@<=0.24.2": ">=0.28.0",
|
"esbuild@<=0.24.2": ">=0.28.0",
|
||||||
"form-data@>=4.0.0 <4.0.4": ">=4.0.5",
|
"form-data@>=4.0.0 <4.0.4": ">=4.0.5",
|
||||||
"hono@<4.6.5": ">=4.12.21",
|
"hono@<4.6.5": ">=4.12.22",
|
||||||
"linkifyjs@<4.3.2": ">=4.3.3",
|
"linkifyjs@<4.3.2": ">=4.3.3",
|
||||||
"nanoid@>=4.0.0 <5.0.9": ">=5.1.11",
|
"nanoid@>=4.0.0 <5.0.9": ">=5.1.11",
|
||||||
"prismjs@<1.30.0": ">=1.30.0",
|
"prismjs@<1.30.0": ">=1.30.0",
|
||||||
|
|||||||
@@ -26,7 +26,6 @@
|
|||||||
"@homarr/translation": "workspace:^0.1.0",
|
"@homarr/translation": "workspace:^0.1.0",
|
||||||
"@homarr/validation": "workspace:^0.1.0",
|
"@homarr/validation": "workspace:^0.1.0",
|
||||||
"@mantine/form": "catalog:",
|
"@mantine/form": "catalog:",
|
||||||
"mantine-form-zod-resolver": "catalog:",
|
|
||||||
"zod": "catalog:"
|
"zod": "catalog:"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
import { useForm } from "@mantine/form";
|
import { schemaResolver, useForm } from "@mantine/form";
|
||||||
import { zod4Resolver } from "mantine-form-zod-resolver";
|
|
||||||
import type { ZodDiscriminatedUnion, ZodIntersection, ZodObject, ZodPipe } from "zod/v4";
|
import type { ZodDiscriminatedUnion, ZodIntersection, ZodObject, ZodPipe } from "zod/v4";
|
||||||
import { z } from "zod/v4";
|
import { z } from "zod/v4";
|
||||||
|
|
||||||
@@ -34,6 +33,6 @@ export const useZodForm = <
|
|||||||
...options,
|
...options,
|
||||||
validateInputOnBlur: true,
|
validateInputOnBlur: true,
|
||||||
validateInputOnChange: true,
|
validateInputOnChange: true,
|
||||||
validate: zod4Resolver(schema),
|
validate: schemaResolver(schema, { sync: true }),
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
@@ -108,10 +108,9 @@ export const IconPicker = ({
|
|||||||
cursor: "pointer",
|
cursor: "pointer",
|
||||||
}}
|
}}
|
||||||
className={classes.iconCard}
|
className={classes.iconCard}
|
||||||
withBorder
|
|
||||||
>
|
>
|
||||||
<Box w={25} h={25}>
|
<Box w={25} h={25}>
|
||||||
<Image src={item.url} w={25} h={25} radius="md" />
|
<Image src={item.url} w={25} h={25} />
|
||||||
</Box>
|
</Box>
|
||||||
</Card>
|
</Card>
|
||||||
</Indicator>
|
</Indicator>
|
||||||
|
|||||||
@@ -114,7 +114,7 @@ export const AppForm = ({
|
|||||||
mt="md"
|
mt="md"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<Collapse in={opened}>
|
<Collapse expanded={opened}>
|
||||||
<TextInput {...form.getInputProps("pingUrl")} />
|
<TextInput {...form.getInputProps("pingUrl")} />
|
||||||
</Collapse>
|
</Collapse>
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import { z } from "zod/v4";
|
|||||||
|
|
||||||
const createEnvelopeSchema = <T extends z.ZodType>(dataSchema: T) => z.object({ data: dataSchema });
|
const createEnvelopeSchema = <T extends z.ZodType>(dataSchema: T) => z.object({ data: dataSchema });
|
||||||
|
|
||||||
const parseTimestamp = (timestamp: string): Date => new Date(`${timestamp.replace(" ", "T")}Z`);
|
const parseTimestamp = (timestamp: string): Date => new Date(timestamp.replace(" ", "T"));
|
||||||
|
|
||||||
export const speedtestTrackerResultSchema = z.object({
|
export const speedtestTrackerResultSchema = z.object({
|
||||||
id: z.number().int(),
|
id: z.number().int(),
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
import { describe, expect, test } from "vitest";
|
||||||
|
|
||||||
|
import { speedtestTrackerResultSchema } from "../speedtest-tracker-types";
|
||||||
|
|
||||||
|
describe("speedtestTrackerResultSchema", () => {
|
||||||
|
test("parses created_at as Speedtest Tracker local wall time", () => {
|
||||||
|
const result = speedtestTrackerResultSchema.parse({
|
||||||
|
id: 1,
|
||||||
|
ping: 12,
|
||||||
|
download_bits: 100,
|
||||||
|
upload_bits: 50,
|
||||||
|
healthy: true,
|
||||||
|
created_at: "2026-05-18 18:30:01",
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(result.created_at.getHours()).toBe(18);
|
||||||
|
expect(result.created_at.getMinutes()).toBe(30);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -77,7 +77,7 @@ export const AppSelectModal = createModal<AppSelectModalProps>(({ actions, inner
|
|||||||
{t("app.action.create.description")}
|
{t("app.action.create.description")}
|
||||||
</Text>
|
</Text>
|
||||||
</Stack>
|
</Stack>
|
||||||
<Button onClick={handleAddNewApp} variant="light" size="xs" mt="auto" radius="md" fullWidth>
|
<Button onClick={handleAddNewApp} variant="light" size="xs" mt="auto" fullWidth>
|
||||||
{t("app.action.create.action")}
|
{t("app.action.create.action")}
|
||||||
</Button>
|
</Button>
|
||||||
</Stack>
|
</Stack>
|
||||||
@@ -100,7 +100,7 @@ export const AppSelectModal = createModal<AppSelectModalProps>(({ actions, inner
|
|||||||
{app.description ?? ""}
|
{app.description ?? ""}
|
||||||
</Text>
|
</Text>
|
||||||
</Stack>
|
</Stack>
|
||||||
<Button onClick={() => handleSelect(app)} variant="light" size="xs" mt="auto" radius="md" fullWidth>
|
<Button onClick={() => handleSelect(app)} variant="light" size="xs" mt="auto" fullWidth>
|
||||||
{t("app.action.select.action", { app: app.name })}
|
{t("app.action.select.action", { app: app.name })}
|
||||||
</Button>
|
</Button>
|
||||||
</Stack>
|
</Stack>
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ export const AddDockerAppToHomarrModal = createModal<AddDockerAppToHomarrProps>(
|
|||||||
};
|
};
|
||||||
return (
|
return (
|
||||||
<form onSubmit={form.onSubmit(handleSubmit)}>
|
<form onSubmit={form.onSubmit(handleSubmit)}>
|
||||||
<LoadingOverlay visible={isPending} zIndex={1000} overlayProps={{ radius: "sm", blur: 2 }} />
|
<LoadingOverlay visible={isPending} />
|
||||||
<Stack>
|
<Stack>
|
||||||
<List spacing={"xs"}>
|
<List spacing={"xs"}>
|
||||||
{innerProps.selectedContainers.map((container, index) => (
|
{innerProps.selectedContainers.map((container, index) => (
|
||||||
|
|||||||
@@ -83,15 +83,10 @@ export const RequestMediaModal = createModal<RequestMediaModalProps>(({ actions,
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Stack>
|
<Stack>
|
||||||
<LoadingOverlay visible={isPending} zIndex={1000} overlayProps={{ radius: "sm", blur: 2 }} />
|
<LoadingOverlay visible={isPending} />
|
||||||
{data && (
|
{data && (
|
||||||
<Group wrap="nowrap" align="start">
|
<Group wrap="nowrap" align="start">
|
||||||
<Image
|
<Image src={`https://image.tmdb.org/t/p/w600_and_h900_bestv2${data.posterPath}`} alt="poster" w={100} />
|
||||||
src={`https://image.tmdb.org/t/p/w600_and_h900_bestv2${data.posterPath}`}
|
|
||||||
alt="poster"
|
|
||||||
w={100}
|
|
||||||
radius="md"
|
|
||||||
/>
|
|
||||||
<Text c="dimmed" style={{ flex: "1" }}>
|
<Text c="dimmed" style={{ flex: "1" }}>
|
||||||
{data.overview}
|
{data.overview}
|
||||||
</Text>
|
</Text>
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ export const BoardSelectionCard = ({ selections, updateSelections }: BoardSelect
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Card w={64 * 12 + 8} maw="90vw">
|
<Card w={64 * 12 + 8} maw="90vw" withBorder={false}>
|
||||||
<Stack gap="sm">
|
<Stack gap="sm">
|
||||||
<Stack gap={0}>
|
<Stack gap={0}>
|
||||||
<Group justify="space-between" align="center">
|
<Group justify="space-between" align="center">
|
||||||
@@ -57,7 +57,7 @@ export const BoardSelectionCard = ({ selections, updateSelections }: BoardSelect
|
|||||||
|
|
||||||
<Stack gap="sm">
|
<Stack gap="sm">
|
||||||
{[...selections.entries()].map(([name, selected]) => (
|
{[...selections.entries()].map(([name, selected]) => (
|
||||||
<Card key={name} withBorder>
|
<Card key={name}>
|
||||||
<Checkbox
|
<Checkbox
|
||||||
checked={selected}
|
checked={selected}
|
||||||
onChange={registerToggle(name)}
|
onChange={registerToggle(name)}
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ interface ImportSettingsCardProps {
|
|||||||
export const ImportSettingsCard = ({ settings, updateSetting }: ImportSettingsCardProps) => {
|
export const ImportSettingsCard = ({ settings, updateSetting }: ImportSettingsCardProps) => {
|
||||||
const tImportSettings = useScopedI18n("init.step.import.importSettings");
|
const tImportSettings = useScopedI18n("init.step.import.importSettings");
|
||||||
return (
|
return (
|
||||||
<Card w={64 * 12 + 8} maw="90vw">
|
<Card w={64 * 12 + 8} maw="90vw" withBorder={false}>
|
||||||
<Stack gap="sm">
|
<Stack gap="sm">
|
||||||
<Stack gap={0}>
|
<Stack gap={0}>
|
||||||
<Text fw={500}>{tImportSettings("title")}</Text>
|
<Text fw={500}>{tImportSettings("title")}</Text>
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ interface ImportSummaryCardProps {
|
|||||||
export const ImportSummaryCard = ({ counts, onSubmit, loading }: ImportSummaryCardProps) => {
|
export const ImportSummaryCard = ({ counts, onSubmit, loading }: ImportSummaryCardProps) => {
|
||||||
const tSummary = useScopedI18n("init.step.import.summary");
|
const tSummary = useScopedI18n("init.step.import.summary");
|
||||||
return (
|
return (
|
||||||
<Card w={64 * 12 + 8} maw="90vw">
|
<Card w={64 * 12 + 8} maw="90vw" withBorder={false}>
|
||||||
<Stack gap="sm">
|
<Stack gap="sm">
|
||||||
<Stack gap={0}>
|
<Stack gap={0}>
|
||||||
<Text fw={500}>{tSummary("title")}</Text>
|
<Text fw={500}>{tSummary("title")}</Text>
|
||||||
@@ -24,7 +24,7 @@ export const ImportSummaryCard = ({ counts, onSubmit, loading }: ImportSummaryCa
|
|||||||
|
|
||||||
<Stack gap="xs">
|
<Stack gap="xs">
|
||||||
{objectEntries(counts).map(([key, count]) => (
|
{objectEntries(counts).map(([key, count]) => (
|
||||||
<Card key={key} withBorder p="sm">
|
<Card key={key} p="sm">
|
||||||
<Group justify="space-between" align="center">
|
<Group justify="space-between" align="center">
|
||||||
<Text fw={500} size="sm">
|
<Text fw={500} size="sm">
|
||||||
{tSummary(`entities.${key}`)}
|
{tSummary(`entities.${key}`)}
|
||||||
|
|||||||
@@ -110,6 +110,7 @@ const SpotlightWithActiveMode = ({ modeState, queryState, activeMode }: Spotligh
|
|||||||
inputRef.current?.focus();
|
inputRef.current?.focus();
|
||||||
}}
|
}}
|
||||||
variant="subtle"
|
variant="subtle"
|
||||||
|
aria-label={t("common.action.close")}
|
||||||
>
|
>
|
||||||
<IconX stroke={1.5} />
|
<IconX stroke={1.5} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
|
|||||||
@@ -1054,6 +1054,9 @@
|
|||||||
"open": {
|
"open": {
|
||||||
"label": "Open media"
|
"label": "Open media"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"noResults": {
|
||||||
|
"title": "No media uploaded"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"common": {
|
"common": {
|
||||||
@@ -1084,7 +1087,9 @@
|
|||||||
"checkoutDocs": "Check out the documentation",
|
"checkoutDocs": "Check out the documentation",
|
||||||
"checkLogs": "Check logs for more details",
|
"checkLogs": "Check logs for more details",
|
||||||
"tryAgain": "Try again",
|
"tryAgain": "Try again",
|
||||||
"loading": "Loading"
|
"loading": "Loading",
|
||||||
|
"show": "Show",
|
||||||
|
"hide": "Hide"
|
||||||
},
|
},
|
||||||
"here": "here",
|
"here": "here",
|
||||||
"iconPicker": {
|
"iconPicker": {
|
||||||
@@ -1249,7 +1254,8 @@
|
|||||||
"menu": {
|
"menu": {
|
||||||
"label": {
|
"label": {
|
||||||
"create": "New category",
|
"create": "New category",
|
||||||
"changePosition": "Change position"
|
"changePosition": "Change position",
|
||||||
|
"settings": "Settings"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"openAllInNewTabs": {
|
"openAllInNewTabs": {
|
||||||
@@ -3452,6 +3458,9 @@
|
|||||||
"public": "This board is public",
|
"public": "This board is public",
|
||||||
"private": "This board is private"
|
"private": "This board is private"
|
||||||
},
|
},
|
||||||
|
"noResults": {
|
||||||
|
"title": "No boards yet"
|
||||||
|
},
|
||||||
"modal": {
|
"modal": {
|
||||||
"createBoard": {
|
"createBoard": {
|
||||||
"field": {
|
"field": {
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ interface UserAvatarGroupProps {
|
|||||||
|
|
||||||
export const UserAvatarGroup = ({ size, limit, users }: UserAvatarGroupProps) => {
|
export const UserAvatarGroup = ({ size, limit, users }: UserAvatarGroupProps) => {
|
||||||
return (
|
return (
|
||||||
<TooltipGroup openDelay={300} closeDelay={300}>
|
<TooltipGroup closeDelay={300}>
|
||||||
<AvatarGroup>
|
<AvatarGroup>
|
||||||
{users.slice(0, limit).map((user) => (
|
{users.slice(0, limit).map((user) => (
|
||||||
<Tooltip key={user.name} label={user.name} withArrow>
|
<Tooltip key={user.name} label={user.name} withArrow>
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import type { MantineProviderProps } from "@mantine/core";
|
|||||||
|
|
||||||
import { theme } from "./theme";
|
import { theme } from "./theme";
|
||||||
|
|
||||||
|
export { theme } from "./theme";
|
||||||
export * from "./components";
|
export * from "./components";
|
||||||
|
|
||||||
export const uiConfiguration = {
|
export const uiConfiguration = {
|
||||||
|
|||||||
@@ -1,12 +1,103 @@
|
|||||||
import { createTheme } from "@mantine/core";
|
import { createTheme, rem } from "@mantine/core";
|
||||||
|
|
||||||
import { primaryColor } from "./theme/colors/primary";
|
|
||||||
import { secondaryColor } from "./theme/colors/secondary";
|
|
||||||
|
|
||||||
export const theme = createTheme({
|
export const theme = createTheme({
|
||||||
colors: {
|
primaryColor: "red",
|
||||||
primaryColor,
|
autoContrast: true,
|
||||||
secondaryColor,
|
respectReducedMotion: true,
|
||||||
|
cursorType: "pointer",
|
||||||
|
|
||||||
|
fontFamily: "Inter, system-ui, -apple-system, sans-serif",
|
||||||
|
fontFamilyMonospace: "ui-monospace, 'Cascadia Code', 'Fira Code', monospace",
|
||||||
|
|
||||||
|
headings: {
|
||||||
|
fontFamily: "Inter, system-ui, -apple-system, sans-serif",
|
||||||
|
fontWeight: "600",
|
||||||
|
sizes: {
|
||||||
|
h1: { fontSize: rem(36), lineHeight: "1.1", fontWeight: "700" },
|
||||||
|
h2: { fontSize: rem(24), lineHeight: "1.2", fontWeight: "700" },
|
||||||
|
h3: { fontSize: rem(20), lineHeight: "1.3", fontWeight: "600" },
|
||||||
|
h4: { fontSize: rem(16), lineHeight: "1.4", fontWeight: "600" },
|
||||||
|
h5: { fontSize: rem(14), lineHeight: "1.5", fontWeight: "600" },
|
||||||
|
h6: { fontSize: rem(12), lineHeight: "1.5", fontWeight: "600" },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
fontSizes: {
|
||||||
|
xs: rem(12),
|
||||||
|
sm: rem(14),
|
||||||
|
md: rem(16),
|
||||||
|
lg: rem(18),
|
||||||
|
xl: rem(20),
|
||||||
|
},
|
||||||
|
|
||||||
|
spacing: {
|
||||||
|
xs: rem(10),
|
||||||
|
sm: rem(12),
|
||||||
|
md: rem(16),
|
||||||
|
lg: rem(20),
|
||||||
|
xl: rem(32),
|
||||||
|
},
|
||||||
|
|
||||||
|
radius: {
|
||||||
|
xs: rem(4),
|
||||||
|
sm: rem(4),
|
||||||
|
md: rem(8),
|
||||||
|
lg: rem(12),
|
||||||
|
xl: rem(16),
|
||||||
|
},
|
||||||
|
defaultRadius: "md",
|
||||||
|
|
||||||
|
shadows: {
|
||||||
|
xs: "0 1px 2px rgba(0, 0, 0, 0.04)",
|
||||||
|
sm: "0 1px 3px rgba(0, 0, 0, 0.06)",
|
||||||
|
md: "0 2px 8px rgba(0, 0, 0, 0.08)",
|
||||||
|
lg: "0 4px 12px rgba(0, 0, 0, 0.10)",
|
||||||
|
xl: "0 8px 24px rgba(0, 0, 0, 0.12)",
|
||||||
|
},
|
||||||
|
|
||||||
|
components: {
|
||||||
|
Card: {
|
||||||
|
defaultProps: {
|
||||||
|
withBorder: true,
|
||||||
|
radius: "lg",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
Paper: {
|
||||||
|
defaultProps: {
|
||||||
|
withBorder: true,
|
||||||
|
radius: "md",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
Button: {
|
||||||
|
defaultProps: {
|
||||||
|
radius: "md",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
ActionIcon: {
|
||||||
|
defaultProps: {
|
||||||
|
radius: "md",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
Tooltip: {
|
||||||
|
defaultProps: {
|
||||||
|
openDelay: 300,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
Menu: {
|
||||||
|
defaultProps: {
|
||||||
|
withArrow: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
NavLink: {
|
||||||
|
defaultProps: {
|
||||||
|
style: { borderRadius: 5 },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
LoadingOverlay: {
|
||||||
|
defaultProps: {
|
||||||
|
zIndex: 1000,
|
||||||
|
overlayProps: { radius: "sm", blur: 2 },
|
||||||
|
},
|
||||||
|
},
|
||||||
},
|
},
|
||||||
primaryColor: "primaryColor",
|
|
||||||
});
|
});
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
import type { MantineColorsTuple } from "@mantine/core";
|
|
||||||
|
|
||||||
export const primaryColor: MantineColorsTuple = [
|
|
||||||
"#eafbf0",
|
|
||||||
"#ddefe3",
|
|
||||||
"#bedcc7",
|
|
||||||
"#9bc8aa",
|
|
||||||
"#7eb892",
|
|
||||||
"#6bad81",
|
|
||||||
"#60a878",
|
|
||||||
"#509265",
|
|
||||||
"#438359",
|
|
||||||
"#35724a",
|
|
||||||
];
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
import type { MantineColorsTuple } from "@mantine/core";
|
|
||||||
|
|
||||||
export const secondaryColor: MantineColorsTuple = [
|
|
||||||
"#e6f7ff",
|
|
||||||
"#d9e8f6",
|
|
||||||
"#b6cde6",
|
|
||||||
"#90b2d4",
|
|
||||||
"#6f9ac5",
|
|
||||||
"#5a8bbd",
|
|
||||||
"#4d84ba",
|
|
||||||
"#3d71a4",
|
|
||||||
"#326595",
|
|
||||||
"#205885",
|
|
||||||
];
|
|
||||||
Loaded 100 of 136 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user