From 81d35656baf4d0063c6ddbad8f33d264e72bc499 Mon Sep 17 00:00:00 2001 From: Meier Lukas Date: Wed, 3 Jan 2024 06:04:42 +0100 Subject: [PATCH] refactor: move integration pages to main directory for main layout --- apps/nextjs/package.json | 3 --- .../integrations/_integration-accordion.tsx} | 0 .../integrations/_integration-avatar.tsx} | 0 .../integrations/_integration-buttons.tsx} | 4 ++-- .../integrations/_integration-secret-card.tsx} | 2 +- .../integrations/_integration-secret-icons.ts} | 0 .../integrations/_integration-secret-inputs.tsx} | 2 +- .../integrations/_integration-test-connection.tsx} | 0 .../integrations/edit/[id]/_integration-edit-form.tsx} | 8 ++++---- .../[locale]/{ => (main)}/integrations/edit/[id]/page.tsx | 4 ++-- .../integrations/new/_integration-new-dropdown.tsx} | 2 +- .../integrations/new/_integration-new-form.tsx} | 6 +++--- .../app/[locale]/{ => (main)}/integrations/new/page.tsx | 4 ++-- .../src/app/[locale]/{ => (main)}/integrations/page.tsx | 8 ++++---- .../login/{_components/login-form.tsx => _login-form.tsx} | 0 apps/nextjs/src/app/[locale]/auth/login/page.tsx | 2 +- .../init-user-form.tsx => _init-user-form.tsx} | 0 apps/nextjs/src/app/[locale]/init/user/page.tsx | 2 +- 18 files changed, 22 insertions(+), 25 deletions(-) rename apps/nextjs/src/app/[locale]/{integrations/_accordion.tsx => (main)/integrations/_integration-accordion.tsx} (100%) rename apps/nextjs/src/app/[locale]/{integrations/_avatar.tsx => (main)/integrations/_integration-avatar.tsx} (100%) rename apps/nextjs/src/app/[locale]/{integrations/_buttons.tsx => (main)/integrations/_integration-buttons.tsx} (94%) rename apps/nextjs/src/app/[locale]/{integrations/_secret-card.tsx => (main)/integrations/_integration-secret-card.tsx} (97%) rename apps/nextjs/src/app/[locale]/{integrations/_secret-icons.ts => (main)/integrations/_integration-secret-icons.ts} (100%) rename apps/nextjs/src/app/[locale]/{integrations/_secret-inputs.tsx => (main)/integrations/_integration-secret-inputs.tsx} (95%) rename apps/nextjs/src/app/[locale]/{integrations/_test-connection.tsx => (main)/integrations/_integration-test-connection.tsx} (100%) rename apps/nextjs/src/app/[locale]/{integrations/edit/[id]/_form.tsx => (main)/integrations/edit/[id]/_integration-edit-form.tsx} (95%) rename apps/nextjs/src/app/[locale]/{ => (main)}/integrations/edit/[id]/page.tsx (87%) rename apps/nextjs/src/app/[locale]/{integrations/new/_dropdown.tsx => (main)/integrations/new/_integration-new-dropdown.tsx} (96%) rename apps/nextjs/src/app/[locale]/{integrations/new/_form.tsx => (main)/integrations/new/_integration-new-form.tsx} (95%) rename apps/nextjs/src/app/[locale]/{ => (main)}/integrations/new/page.tsx (90%) rename apps/nextjs/src/app/[locale]/{ => (main)}/integrations/page.tsx (94%) rename apps/nextjs/src/app/[locale]/auth/login/{_components/login-form.tsx => _login-form.tsx} (100%) rename apps/nextjs/src/app/[locale]/init/user/{_components/init-user-form.tsx => _init-user-form.tsx} (100%) diff --git a/apps/nextjs/package.json b/apps/nextjs/package.json index 770c54a2d..5ea42ea9d 100644 --- a/apps/nextjs/package.json +++ b/apps/nextjs/package.json @@ -21,9 +21,6 @@ "@homarr/form": "workspace:^0.1.0", "@homarr/notifications": "workspace:^0.1.0", "@homarr/spotlight": "workspace:^0.1.0", - "@homarr/form": "workspace:^0.1.0", - "@homarr/notifications": "workspace:^0.1.0", - "@homarr/spotlight": "workspace:^0.1.0", "@homarr/translation": "workspace:^0.1.0", "@homarr/ui": "workspace:^0.1.0", "@homarr/validation": "workspace:^0.1.0", diff --git a/apps/nextjs/src/app/[locale]/integrations/_accordion.tsx b/apps/nextjs/src/app/[locale]/(main)/integrations/_integration-accordion.tsx similarity index 100% rename from apps/nextjs/src/app/[locale]/integrations/_accordion.tsx rename to apps/nextjs/src/app/[locale]/(main)/integrations/_integration-accordion.tsx diff --git a/apps/nextjs/src/app/[locale]/integrations/_avatar.tsx b/apps/nextjs/src/app/[locale]/(main)/integrations/_integration-avatar.tsx similarity index 100% rename from apps/nextjs/src/app/[locale]/integrations/_avatar.tsx rename to apps/nextjs/src/app/[locale]/(main)/integrations/_integration-avatar.tsx diff --git a/apps/nextjs/src/app/[locale]/integrations/_buttons.tsx b/apps/nextjs/src/app/[locale]/(main)/integrations/_integration-buttons.tsx similarity index 94% rename from apps/nextjs/src/app/[locale]/integrations/_buttons.tsx rename to apps/nextjs/src/app/[locale]/(main)/integrations/_integration-buttons.tsx index 0378d3c0c..1606cc891 100644 --- a/apps/nextjs/src/app/[locale]/integrations/_buttons.tsx +++ b/apps/nextjs/src/app/[locale]/(main)/integrations/_integration-buttons.tsx @@ -10,8 +10,8 @@ import { useScopedI18n } from "@homarr/translation/client"; import { ActionIcon, IconTrash } from "@homarr/ui"; import { api } from "~/trpc/react"; -import { revalidatePathAction } from "../../revalidatePathAction"; -import { modalEvents } from "../modals"; +import { revalidatePathAction } from "../../../revalidatePathAction"; +import { modalEvents } from "../../modals"; interface DeleteIntegrationActionButtonProps { count: number; diff --git a/apps/nextjs/src/app/[locale]/integrations/_secret-card.tsx b/apps/nextjs/src/app/[locale]/(main)/integrations/_integration-secret-card.tsx similarity index 97% rename from apps/nextjs/src/app/[locale]/integrations/_secret-card.tsx rename to apps/nextjs/src/app/[locale]/(main)/integrations/_integration-secret-card.tsx index 1f0ac74c4..eecc4b6c1 100644 --- a/apps/nextjs/src/app/[locale]/integrations/_secret-card.tsx +++ b/apps/nextjs/src/app/[locale]/(main)/integrations/_integration-secret-card.tsx @@ -23,7 +23,7 @@ import { Text, } from "@homarr/ui"; -import { integrationSecretIcons } from "./_secret-icons"; +import { integrationSecretIcons } from "./_integration-secret-icons"; dayjs.extend(relativeTime); diff --git a/apps/nextjs/src/app/[locale]/integrations/_secret-icons.ts b/apps/nextjs/src/app/[locale]/(main)/integrations/_integration-secret-icons.ts similarity index 100% rename from apps/nextjs/src/app/[locale]/integrations/_secret-icons.ts rename to apps/nextjs/src/app/[locale]/(main)/integrations/_integration-secret-icons.ts diff --git a/apps/nextjs/src/app/[locale]/integrations/_secret-inputs.tsx b/apps/nextjs/src/app/[locale]/(main)/integrations/_integration-secret-inputs.tsx similarity index 95% rename from apps/nextjs/src/app/[locale]/integrations/_secret-inputs.tsx rename to apps/nextjs/src/app/[locale]/(main)/integrations/_integration-secret-inputs.tsx index a40f25b81..a874c7d5c 100644 --- a/apps/nextjs/src/app/[locale]/integrations/_secret-inputs.tsx +++ b/apps/nextjs/src/app/[locale]/(main)/integrations/_integration-secret-inputs.tsx @@ -7,7 +7,7 @@ import type { IntegrationSecretKind } from "@homarr/definitions"; import { useI18n } from "@homarr/translation/client"; import { PasswordInput, TextInput } from "@homarr/ui"; -import { integrationSecretIcons } from "./_secret-icons"; +import { integrationSecretIcons } from "./_integration-secret-icons"; interface IntegrationSecretInputProps { label?: string; diff --git a/apps/nextjs/src/app/[locale]/integrations/_test-connection.tsx b/apps/nextjs/src/app/[locale]/(main)/integrations/_integration-test-connection.tsx similarity index 100% rename from apps/nextjs/src/app/[locale]/integrations/_test-connection.tsx rename to apps/nextjs/src/app/[locale]/(main)/integrations/_integration-test-connection.tsx diff --git a/apps/nextjs/src/app/[locale]/integrations/edit/[id]/_form.tsx b/apps/nextjs/src/app/[locale]/(main)/integrations/edit/[id]/_integration-edit-form.tsx similarity index 95% rename from apps/nextjs/src/app/[locale]/integrations/edit/[id]/_form.tsx rename to apps/nextjs/src/app/[locale]/(main)/integrations/edit/[id]/_integration-edit-form.tsx index 7b8bd8490..2de518af5 100644 --- a/apps/nextjs/src/app/[locale]/integrations/edit/[id]/_form.tsx +++ b/apps/nextjs/src/app/[locale]/(main)/integrations/edit/[id]/_integration-edit-form.tsx @@ -17,14 +17,14 @@ import { validation } from "@homarr/validation"; import { modalEvents } from "~/app/[locale]/modals"; import { api } from "~/trpc/react"; -import { SecretCard } from "../../_secret-card"; -import { IntegrationSecretInput } from "../../_secret-inputs"; +import { SecretCard } from "../../_integration-secret-card"; +import { IntegrationSecretInput } from "../../_integration-secret-inputs"; import { TestConnection, TestConnectionNoticeAlert, useTestConnectionDirty, -} from "../../_test-connection"; -import { revalidatePathAction } from "../../../../revalidatePathAction"; +} from "../../_integration-test-connection"; +import { revalidatePathAction } from "../../../../../revalidatePathAction"; interface EditIntegrationForm { integration: RouterOutputs["integration"]["byId"]; diff --git a/apps/nextjs/src/app/[locale]/integrations/edit/[id]/page.tsx b/apps/nextjs/src/app/[locale]/(main)/integrations/edit/[id]/page.tsx similarity index 87% rename from apps/nextjs/src/app/[locale]/integrations/edit/[id]/page.tsx rename to apps/nextjs/src/app/[locale]/(main)/integrations/edit/[id]/page.tsx index b6a1441a8..c903ff163 100644 --- a/apps/nextjs/src/app/[locale]/integrations/edit/[id]/page.tsx +++ b/apps/nextjs/src/app/[locale]/(main)/integrations/edit/[id]/page.tsx @@ -3,8 +3,8 @@ import { getScopedI18n } from "@homarr/translation/server"; import { Container, Group, Stack, Title } from "@homarr/ui"; import { api } from "~/trpc/server"; -import { IntegrationAvatar } from "../../_avatar"; -import { EditIntegrationForm } from "./_form"; +import { IntegrationAvatar } from "../../_integration-avatar"; +import { EditIntegrationForm } from "./_integration-edit-form"; interface EditIntegrationPageProps { params: { id: string }; diff --git a/apps/nextjs/src/app/[locale]/integrations/new/_dropdown.tsx b/apps/nextjs/src/app/[locale]/(main)/integrations/new/_integration-new-dropdown.tsx similarity index 96% rename from apps/nextjs/src/app/[locale]/integrations/new/_dropdown.tsx rename to apps/nextjs/src/app/[locale]/(main)/integrations/new/_integration-new-dropdown.tsx index 0609d92e6..354024c10 100644 --- a/apps/nextjs/src/app/[locale]/integrations/new/_dropdown.tsx +++ b/apps/nextjs/src/app/[locale]/(main)/integrations/new/_integration-new-dropdown.tsx @@ -15,7 +15,7 @@ import { TextInput, } from "@homarr/ui"; -import { IntegrationAvatar } from "../_avatar"; +import { IntegrationAvatar } from "../_integration-avatar"; export const IntegrationCreateDropdownContent = () => { const t = useI18n(); diff --git a/apps/nextjs/src/app/[locale]/integrations/new/_form.tsx b/apps/nextjs/src/app/[locale]/(main)/integrations/new/_integration-new-form.tsx similarity index 95% rename from apps/nextjs/src/app/[locale]/integrations/new/_form.tsx rename to apps/nextjs/src/app/[locale]/(main)/integrations/new/_integration-new-form.tsx index 8fcad8a5f..706cc3df1 100644 --- a/apps/nextjs/src/app/[locale]/integrations/new/_form.tsx +++ b/apps/nextjs/src/app/[locale]/(main)/integrations/new/_integration-new-form.tsx @@ -16,13 +16,13 @@ import type { z } from "@homarr/validation"; import { validation } from "@homarr/validation"; import { api } from "~/trpc/react"; -import { IntegrationSecretInput } from "../_secret-inputs"; +import { IntegrationSecretInput } from "../_integration-secret-inputs"; import { TestConnection, TestConnectionNoticeAlert, useTestConnectionDirty, -} from "../_test-connection"; -import { revalidatePathAction } from "../../../revalidatePathAction"; +} from "../_integration-test-connection"; +import { revalidatePathAction } from "../../../../revalidatePathAction"; interface NewIntegrationFormProps { searchParams: Partial> & { diff --git a/apps/nextjs/src/app/[locale]/integrations/new/page.tsx b/apps/nextjs/src/app/[locale]/(main)/integrations/new/page.tsx similarity index 90% rename from apps/nextjs/src/app/[locale]/integrations/new/page.tsx rename to apps/nextjs/src/app/[locale]/(main)/integrations/new/page.tsx index 5affefb09..8df0cad7b 100644 --- a/apps/nextjs/src/app/[locale]/integrations/new/page.tsx +++ b/apps/nextjs/src/app/[locale]/(main)/integrations/new/page.tsx @@ -7,8 +7,8 @@ import { Container, Group, Stack, Title } from "@homarr/ui"; import type { validation } from "@homarr/validation"; import { z } from "@homarr/validation"; -import { IntegrationAvatar } from "../_avatar"; -import { NewIntegrationForm } from "./_form"; +import { IntegrationAvatar } from "../_integration-avatar"; +import { NewIntegrationForm } from "./_integration-new-form"; interface NewIntegrationPageProps { searchParams: Partial> & { diff --git a/apps/nextjs/src/app/[locale]/integrations/page.tsx b/apps/nextjs/src/app/[locale]/(main)/integrations/page.tsx similarity index 94% rename from apps/nextjs/src/app/[locale]/integrations/page.tsx rename to apps/nextjs/src/app/[locale]/(main)/integrations/page.tsx index b3e2226be..5c7f706c9 100644 --- a/apps/nextjs/src/app/[locale]/integrations/page.tsx +++ b/apps/nextjs/src/app/[locale]/(main)/integrations/page.tsx @@ -33,10 +33,10 @@ import { } from "@homarr/ui"; import { api } from "~/trpc/server"; -import { IntegrationGroupAccordion } from "./_accordion"; -import { IntegrationAvatar } from "./_avatar"; -import { DeleteIntegrationActionButton } from "./_buttons"; -import { IntegrationCreateDropdownContent } from "./new/_dropdown"; +import { IntegrationGroupAccordion } from "./_integration-accordion"; +import { IntegrationAvatar } from "./_integration-avatar"; +import { DeleteIntegrationActionButton } from "./_integration-buttons"; +import { IntegrationCreateDropdownContent } from "./new/_integration-new-dropdown"; interface IntegrationsPageProps { searchParams: { diff --git a/apps/nextjs/src/app/[locale]/auth/login/_components/login-form.tsx b/apps/nextjs/src/app/[locale]/auth/login/_login-form.tsx similarity index 100% rename from apps/nextjs/src/app/[locale]/auth/login/_components/login-form.tsx rename to apps/nextjs/src/app/[locale]/auth/login/_login-form.tsx diff --git a/apps/nextjs/src/app/[locale]/auth/login/page.tsx b/apps/nextjs/src/app/[locale]/auth/login/page.tsx index ba4d5dd00..e9d8ec451 100644 --- a/apps/nextjs/src/app/[locale]/auth/login/page.tsx +++ b/apps/nextjs/src/app/[locale]/auth/login/page.tsx @@ -2,7 +2,7 @@ import { getScopedI18n } from "@homarr/translation/server"; import { Card, Center, Stack, Text, Title } from "@homarr/ui"; import { LogoWithTitle } from "~/components/layout/logo"; -import { LoginForm } from "./_components/login-form"; +import { LoginForm } from "./_login-form"; export default async function Login() { const t = await getScopedI18n("user.page.login"); diff --git a/apps/nextjs/src/app/[locale]/init/user/_components/init-user-form.tsx b/apps/nextjs/src/app/[locale]/init/user/_init-user-form.tsx similarity index 100% rename from apps/nextjs/src/app/[locale]/init/user/_components/init-user-form.tsx rename to apps/nextjs/src/app/[locale]/init/user/_init-user-form.tsx diff --git a/apps/nextjs/src/app/[locale]/init/user/page.tsx b/apps/nextjs/src/app/[locale]/init/user/page.tsx index 6c234827a..63e87e249 100644 --- a/apps/nextjs/src/app/[locale]/init/user/page.tsx +++ b/apps/nextjs/src/app/[locale]/init/user/page.tsx @@ -5,7 +5,7 @@ import { getScopedI18n } from "@homarr/translation/server"; import { Card, Center, Stack, Text, Title } from "@homarr/ui"; import { LogoWithTitle } from "~/components/layout/logo"; -import { InitUserForm } from "./_components/init-user-form"; +import { InitUserForm } from "./_init-user-form"; export default async function InitUser() { const firstUser = await db.query.users.findFirst({