From 32a757a2479fa7d7cf7c08c9d4fab433352a2b2a Mon Sep 17 00:00:00 2001 From: Tam Nguyen Date: Mon, 13 Jan 2025 16:44:34 +1100 Subject: [PATCH 1/3] fix: query for ssh keys to show servers, rather than default empty --- .../components/dashboard/settings/servers/show-servers.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/apps/dokploy/components/dashboard/settings/servers/show-servers.tsx b/apps/dokploy/components/dashboard/settings/servers/show-servers.tsx index cf616f5e..f3b0526b 100644 --- a/apps/dokploy/components/dashboard/settings/servers/show-servers.tsx +++ b/apps/dokploy/components/dashboard/settings/servers/show-servers.tsx @@ -48,9 +48,7 @@ export const ShowServers = () => { const query = router.query; const { data, refetch, isLoading } = api.server.all.useQuery(); const { mutateAsync } = api.server.remove.useMutation(); - const { data: sshKeys } = { - data: [], - }; + const { data: sshKeys } = api.sshKey.all.useQuery(); const { data: isCloud } = api.settings.isCloud.useQuery(); const { data: canCreateMoreServers } = api.stripe.canCreateMoreServers.useQuery(); From dbca102178dbbe99fdd3c5c7e18793d7666e2668 Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Sun, 12 Jan 2025 23:51:57 -0600 Subject: [PATCH 2/3] fix: adjust size of cards and add ssh keys --- apps/dokploy/components/dashboard/projects/show.tsx | 4 ++-- .../components/dashboard/settings/servers/show-servers.tsx | 4 +--- apps/dokploy/package.json | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/apps/dokploy/components/dashboard/projects/show.tsx b/apps/dokploy/components/dashboard/projects/show.tsx index 1f6c7ab4..cde6a16b 100644 --- a/apps/dokploy/components/dashboard/projects/show.tsx +++ b/apps/dokploy/components/dashboard/projects/show.tsx @@ -117,7 +117,7 @@ export const ShowProjects = () => { )} -
+
{filteredProjects?.map((project) => { const emptyServices = project?.mariadb.length === 0 && @@ -145,7 +145,7 @@ export const ShowProjects = () => { - +
)} -
+
{filteredProjects?.map((project) => { const emptyServices = project?.mariadb.length === 0 && diff --git a/apps/dokploy/components/layouts/side.tsx b/apps/dokploy/components/layouts/side.tsx index e193991f..1d99552b 100644 --- a/apps/dokploy/components/layouts/side.tsx +++ b/apps/dokploy/components/layouts/side.tsx @@ -686,7 +686,7 @@ export default function Page({ children }: Props) { )} -
{children}
+
{children}
); diff --git a/apps/dokploy/pages/dashboard/project/[projectId].tsx b/apps/dokploy/pages/dashboard/project/[projectId].tsx index 29da6bb8..1c224010 100644 --- a/apps/dokploy/pages/dashboard/project/[projectId].tsx +++ b/apps/dokploy/pages/dashboard/project/[projectId].tsx @@ -387,7 +387,7 @@ const Project = (
) : (
-
+
{filteredServices?.map((service) => (