Merge branch 'dev' into declare

This commit is contained in:
Owen
2025-09-14 21:54:39 -07:00
24 changed files with 1829 additions and 393 deletions

View File

@@ -1,7 +1,6 @@
interface AccessLayoutProps {
children: React.ReactNode;
params: Promise<{
resourceId: number | string;
orgId: string;
}>;
}

View File

@@ -10,7 +10,7 @@ import { HorizontalTabs } from "@app/components/HorizontalTabs";
type SettingsLayoutProps = {
children: React.ReactNode;
params: Promise<{ clientId: number; orgId: string }>;
params: Promise<{ clientId: number | string; orgId: string }>;
}
export default async function SettingsLayout(props: SettingsLayoutProps) {

View File

@@ -1,7 +1,7 @@
import { redirect } from "next/navigation";
export default async function ClientPage(props: {
params: Promise<{ orgId: string; clientId: number }>;
params: Promise<{ orgId: string; clientId: number | string }>;
}) {
const params = await props.params;
redirect(`/${params.orgId}/settings/clients/${params.clientId}/general`);

View File

@@ -1546,7 +1546,7 @@ export default function Page() {
{t("resourceAddEntrypoints")}
</h3>
<p className="text-sm text-muted-foreground">
(Edit file: config/traefik/traefik_config.yml)
{t("resourceAddEntrypointsEditFile")}
</p>
<CopyTextBox
text={`entryPoints:
@@ -1561,7 +1561,7 @@ export default function Page() {
{t("resourceExposePorts")}
</h3>
<p className="text-sm text-muted-foreground">
(Edit file: docker-compose.yml)
{t("resourceExposePortsEditFile")}
</p>
<CopyTextBox
text={`ports: