Merge branch 'dev' into clients-user

src/app/[orgId]/settings/logs/analytics/page.tsx

@@ -0,0 +1,28 @@
+import { LogAnalyticsData } from "@app/components/LogAnalyticsData";
+import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
+import { getTranslations } from "next-intl/server";
+import { Suspense } from "react";
+
+export interface AnalyticsPageProps {
+    params: Promise<{ orgId: string }>;
+    searchParams: Promise<Record<string, string>>;
+}
+
+export default async function AnalyticsPage(props: AnalyticsPageProps) {
+    const t = await getTranslations();
+
+    const orgId = (await props.params).orgId;
+
+    return (
+        <>
+            <SettingsSectionTitle
+                title={t("requestAnalytics")}
+                description={t("requestAnalyticsDescription")}
+            />
+
+            <div className="container mx-auto max-w-12xl">
+                <LogAnalyticsData orgId={orgId} />
+            </div>
+        </>
+    );
+}

src/app/[orgId]/settings/resources/proxy/create/page.tsx

@@ -98,7 +98,7 @@ import { ListTargetsResponse } from "@server/routers/target";
 import { DockerManager, DockerState } from "@app/lib/docker";
 import { parseHostTarget } from "@app/lib/parseHostTarget";
 import { toASCII, toUnicode } from "punycode";
-import { DomainRow } from "../../../../../components/DomainsTable";
+import { DomainRow } from "@app/components/DomainsTable";
 import { finalizeSubdomainSanitize } from "@app/lib/subdomain-utils";
 import {
     Tooltip,