refactor: standardize import statements and improve code structure across multiple components

- Updated import statements to maintain consistency and clarity.
- Refactored components to enhance readability and organization.
- Ensured proper usage of type imports and removed unnecessary comments.
- Improved user feedback mechanisms in forms and alerts for better user experience.

apps/dokploy/components/dashboard/application/domains/add-domain.tsx

@@ -41,8 +41,8 @@ import { toast } from "sonner";
 import { domain } from "@/server/db/validations/domain";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { Dices } from "lucide-react";
-import type z from "zod";
 import Link from "next/link";
+import type z from "zod";
 
 type Domain = z.infer<typeof domain>;
 

apps/dokploy/components/dashboard/compose/domains/add-domain.tsx

@@ -41,8 +41,8 @@ import {
 import { domainCompose } from "@/server/db/validations/domain";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { DatabaseZap, Dices, RefreshCw } from "lucide-react";
-import type z from "zod";
 import Link from "next/link";
+import type z from "zod";
 
 type Domain = z.infer<typeof domainCompose>;
 

apps/dokploy/components/dashboard/compose/general/actions.tsx

@@ -8,7 +8,7 @@ import {
 	TooltipTrigger,
 } from "@/components/ui/tooltip";
 import { api } from "@/utils/api";
-import { Ban, CheckCircle2, Hammer, HelpCircle, Terminal, RefreshCcw, Rocket } from "lucide-react";
+import { Ban, CheckCircle2, RefreshCcw, Rocket, Terminal } from "lucide-react";
 import { useRouter } from "next/router";
 import { toast } from "sonner";
 import { DockerTerminalModal } from "../../settings/web-server/docker-terminal-modal";

apps/dokploy/components/dashboard/database/backups/restore-backup.tsx

@@ -1,3 +1,5 @@
+import { DrawerLogs } from "@/components/shared/drawer-logs";
+import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import {
 	Command,
@@ -23,6 +25,7 @@ import {
 	FormLabel,
 	FormMessage,
 } from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
 import {
 	Popover,
 	PopoverContent,
@@ -32,18 +35,15 @@ import { ScrollArea } from "@/components/ui/scroll-area";
 import { cn } from "@/lib/utils";
 import { api } from "@/utils/api";
 import { zodResolver } from "@hookform/resolvers/zod";
+import copy from "copy-to-clipboard";
+import { debounce } from "lodash";
 import { CheckIcon, ChevronsUpDown, Copy, RotateCcw } from "lucide-react";
 import { useState } from "react";
 import { useForm } from "react-hook-form";
+import { toast } from "sonner";
 import { z } from "zod";
 import type { ServiceType } from "../../application/advanced/show-resources";
-import { debounce } from "lodash";
-import { Input } from "@/components/ui/input";
 import { type LogLine, parseLogs } from "../../docker/logs/utils";
-import { DrawerLogs } from "@/components/shared/drawer-logs";
-import { Badge } from "@/components/ui/badge";
-import copy from "copy-to-clipboard";
-import { toast } from "sonner";
 
 interface Props {
 	databaseId: string;

apps/dokploy/components/dashboard/database/backups/show-backups.tsx

@@ -20,9 +20,8 @@ import { useState } from "react";
 import { toast } from "sonner";
 import type { ServiceType } from "../../application/advanced/show-resources";
 import { AddBackup } from "./add-backup";
-import { UpdateBackup } from "./update-backup";
 import { RestoreBackup } from "./restore-backup";
-import { useState } from "react";
+import { UpdateBackup } from "./update-backup";
 
 interface Props {
 	id: string;

apps/dokploy/components/dashboard/mariadb/general/show-external-mariadb-credentials.tsx

@@ -33,7 +33,11 @@ const DockerProviderSchema = z.object({
 			return Number.isNaN(parsed) ? null : parsed;
 		}
 		return null;
-  }, z.number().gte(0, "Range must be 0 - 65535").lte(65535, "Range must be 0 - 65535").nullable()),
+	}, z
+		.number()
+		.gte(0, "Range must be 0 - 65535")
+		.lte(65535, "Range must be 0 - 65535")
+		.nullable()),
 });
 
 type DockerProvider = z.infer<typeof DockerProviderSchema>;

apps/dokploy/components/dashboard/mariadb/general/show-general-mariadb.tsx

@@ -10,14 +10,7 @@ import {
 } from "@/components/ui/tooltip";
 import { api } from "@/utils/api";
 import * as TooltipPrimitive from "@radix-ui/react-tooltip";
-import {
-    Ban,
-    CheckCircle2,
-    HelpCircle,
-    RefreshCcw,
-    Rocket,
-    Terminal,
-} from "lucide-react";
+import { Ban, CheckCircle2, RefreshCcw, Rocket, Terminal } from "lucide-react";
 import { useState } from "react";
 import { toast } from "sonner";
 import { type LogLine, parseLogs } from "../../docker/logs/utils";

apps/dokploy/components/dashboard/mongo/general/show-external-mongo-credentials.tsx

@@ -33,7 +33,11 @@ const DockerProviderSchema = z.object({
 			return Number.isNaN(parsed) ? null : parsed;
 		}
 		return null;
-  }, z.number().gte(0, "Range must be 0 - 65535").lte(65535, "Range must be 0 - 65535").nullable()),
+	}, z
+		.number()
+		.gte(0, "Range must be 0 - 65535")
+		.lte(65535, "Range must be 0 - 65535")
+		.nullable()),
 });
 
 type DockerProvider = z.infer<typeof DockerProviderSchema>;

apps/dokploy/components/dashboard/mongo/general/show-general-mongo.tsx

@@ -10,14 +10,7 @@ import {
 } from "@/components/ui/tooltip";
 import { api } from "@/utils/api";
 import * as TooltipPrimitive from "@radix-ui/react-tooltip";
-import {
-    Ban,
-    CheckCircle2,
-    HelpCircle,
-    RefreshCcw,
-    Rocket,
-    Terminal,
-} from "lucide-react";
+import { Ban, CheckCircle2, RefreshCcw, Rocket, Terminal } from "lucide-react";
 import { useState } from "react";
 import { toast } from "sonner";
 import { type LogLine, parseLogs } from "../../docker/logs/utils";

apps/dokploy/components/dashboard/mysql/general/show-external-mysql-credentials.tsx

@@ -33,7 +33,11 @@ const DockerProviderSchema = z.object({
 			return Number.isNaN(parsed) ? null : parsed;
 		}
 		return null;
-  }, z.number().gte(0, "Range must be 0 - 65535").lte(65535, "Range must be 0 - 65535").nullable()),
+	}, z
+		.number()
+		.gte(0, "Range must be 0 - 65535")
+		.lte(65535, "Range must be 0 - 65535")
+		.nullable()),
 });
 
 type DockerProvider = z.infer<typeof DockerProviderSchema>;

apps/dokploy/components/dashboard/mysql/general/show-general-mysql.tsx

@@ -10,14 +10,7 @@ import {
 } from "@/components/ui/tooltip";
 import { api } from "@/utils/api";
 import * as TooltipPrimitive from "@radix-ui/react-tooltip";
-import {
-    Ban,
-    CheckCircle2,
-    HelpCircle,
-    RefreshCcw,
-    Rocket,
-    Terminal,
-} from "lucide-react";
+import { Ban, CheckCircle2, RefreshCcw, Rocket, Terminal } from "lucide-react";
 import { useState } from "react";
 import { toast } from "sonner";
 import { type LogLine, parseLogs } from "../../docker/logs/utils";

apps/dokploy/components/dashboard/postgres/general/show-external-postgres-credentials.tsx

@@ -33,7 +33,11 @@ const DockerProviderSchema = z.object({
 			return Number.isNaN(parsed) ? null : parsed;
 		}
 		return null;
-  }, z.number().gte(0, "Range must be 0 - 65535").lte(65535, "Range must be 0 - 65535").nullable()),
+	}, z
+		.number()
+		.gte(0, "Range must be 0 - 65535")
+		.lte(65535, "Range must be 0 - 65535")
+		.nullable()),
 });
 
 type DockerProvider = z.infer<typeof DockerProviderSchema>;

apps/dokploy/components/dashboard/postgres/general/show-general-postgres.tsx

@@ -10,14 +10,7 @@ import {
 } from "@/components/ui/tooltip";
 import { api } from "@/utils/api";
 import * as TooltipPrimitive from "@radix-ui/react-tooltip";
-import {
-   Ban,
-   CheckCircle2,
-   HelpCircle,
-   RefreshCcw,
-   Rocket,
-   Terminal,
-} from "lucide-react";
+import { Ban, CheckCircle2, RefreshCcw, Rocket, Terminal } from "lucide-react";
 import { useState } from "react";
 import { toast } from "sonner";
 import { type LogLine, parseLogs } from "../../docker/logs/utils";

apps/dokploy/components/dashboard/postgres/update-postgres.tsx

@@ -51,7 +51,7 @@ export const UpdatePostgres = ({ postgresId }: Props) => {
 		},
 		{
 			enabled: !!postgresId,
-    }
+		},
 	);
 	const form = useForm<UpdatePostgres>({
 		defaultValues: {

apps/dokploy/components/dashboard/project/ai/step-one.tsx

@@ -22,7 +22,7 @@ const examples = [
 	"Sendgrid service opensource analogue",
 ];
 
-export const StepOne = ({ nextStep, setTemplateInfo, templateInfo }: any) => {
+export const StepOne = ({ setTemplateInfo, templateInfo }: any) => {
 	// Get servers from the API
 	const { data: servers } = api.server.withSSHKey.useQuery();
 

apps/dokploy/components/dashboard/redis/general/show-external-redis-credentials.tsx

@@ -33,7 +33,11 @@ const DockerProviderSchema = z.object({
 			return Number.isNaN(parsed) ? null : parsed;
 		}
 		return null;
-  }, z.number().gte(0, "Range must be 0 - 65535").lte(65535, "Range must be 0 - 65535").nullable()),
+	}, z
+		.number()
+		.gte(0, "Range must be 0 - 65535")
+		.lte(65535, "Range must be 0 - 65535")
+		.nullable()),
 });
 
 type DockerProvider = z.infer<typeof DockerProviderSchema>;

apps/dokploy/components/dashboard/redis/general/show-general-redis.tsx

@@ -10,14 +10,7 @@ import {
 } from "@/components/ui/tooltip";
 import { api } from "@/utils/api";
 import * as TooltipPrimitive from "@radix-ui/react-tooltip";
-import {
-   Ban,
-   CheckCircle2,
-   HelpCircle,
-   RefreshCcw,
-   Rocket,
-   Terminal,
-} from "lucide-react";
+import { Ban, CheckCircle2, RefreshCcw, Rocket, Terminal } from "lucide-react";
 import { useState } from "react";
 import { toast } from "sonner";
 import { type LogLine, parseLogs } from "../../docker/logs/utils";

apps/dokploy/components/dashboard/settings/git/show-git-providers.tsx

@@ -124,10 +124,10 @@ export const ShowGitProviders = () => {
 													gitProvider.gitlab?.accessToken &&
 													gitProvider.gitlab?.refreshToken;
 
-												const haveGiteaRequirements =
-													isGitea &&
-													gitProvider.gitea?.accessToken &&
-													gitProvider.gitea?.refreshToken;
+												// const haveGiteaRequirements =
+												// 	isGitea &&
+												// 	gitProvider.gitea?.accessToken &&
+												// 	gitProvider.gitea?.refreshToken;
 
 												return (
 													<div

apps/dokploy/components/ui/input.tsx

@@ -39,7 +39,11 @@ const NumberInput = React.forwardRef<HTMLInputElement, InputProps>(
 				className={cn("text-left", className)}
 				ref={ref}
 				{...props}
-				value={props.value === undefined || props.value === "" ? "" : String(props.value)}
+				value={
+					props.value === undefined || props.value === ""
+						? ""
+						: String(props.value)
+				}
 				onChange={(e) => {
 					const value = e.target.value;
 					if (value === "") {

apps/dokploy/server/api/routers/backup.ts

@@ -29,21 +29,21 @@ import {
 	updateBackupById,
 } from "@dokploy/server";
 
-import { TRPCError } from "@trpc/server";
-import { z } from "zod";
+import { findDestinationById } from "@dokploy/server/services/destination";
+import { getS3Credentials } from "@dokploy/server/utils/backups/utils";
 import {
 	execAsync,
 	execAsyncRemote,
 } from "@dokploy/server/utils/process/execAsync";
-import { getS3Credentials } from "@dokploy/server/utils/backups/utils";
-import { findDestinationById } from "@dokploy/server/services/destination";
 import {
 	restoreMariadbBackup,
 	restoreMongoBackup,
 	restoreMySqlBackup,
 	restorePostgresBackup,
 } from "@dokploy/server/utils/restore";
+import { TRPCError } from "@trpc/server";
 import { observable } from "@trpc/server/observable";
+import { z } from "zod";
 
 export const backupRouter = createTRPCRouter({
 	create: protectedProcedure

packages/server/src/lib/auth.ts

@@ -2,16 +2,16 @@ import type { IncomingMessage } from "node:http";
 import * as bcrypt from "bcrypt";
 import { betterAuth } from "better-auth";
 import { drizzleAdapter } from "better-auth/adapters/drizzle";
+import { APIError } from "better-auth/api";
 import { apiKey, organization, twoFactor } from "better-auth/plugins";
 import { and, desc, eq } from "drizzle-orm";
+import { IS_CLOUD } from "../constants";
 import { db } from "../db";
 import * as schema from "../db/schema";
-import { sendEmail } from "../verification/send-verification-email";
-import { IS_CLOUD } from "../constants";
-import { getPublicIpWithFallback } from "../wss/utils";
-import { updateUser } from "../services/user";
 import { getUserByToken } from "../services/admin";
-import { APIError } from "better-auth/api";
+import { updateUser } from "../services/user";
+import { sendEmail } from "../verification/send-verification-email";
+import { getPublicIpWithFallback } from "../wss/utils";
 
 const { handler, api } = betterAuth({
 	database: drizzleAdapter(db, {

packages/server/src/setup/traefik-setup.ts

@@ -101,11 +101,11 @@ export const initializeTraefik = async ({
 					console.log("Waiting for service cleanup...");
 					await new Promise((resolve) => setTimeout(resolve, 5000));
 					attempts++;
-				} catch (e) {
+				} catch (_e) {
 					break;
 				}
 			}
-		} catch (err) {
+		} catch (_err) {
 			console.log("No existing service to remove");
 		}
 
@@ -120,7 +120,7 @@ export const initializeTraefik = async ({
 
 			await container.remove({ force: true });
 			await new Promise((resolve) => setTimeout(resolve, 5000));
-		} catch (error) {
+		} catch (_err) {
 			console.log("No existing container to remove");
 		}
 

packages/server/src/utils/restore/mariadb.ts

@@ -1,11 +1,11 @@
-import type { Mariadb } from "@dokploy/server/services/mariadb";
 import type { Destination } from "@dokploy/server/services/destination";
+import type { Mariadb } from "@dokploy/server/services/mariadb";
+import { getS3Credentials } from "../backups/utils";
 import {
 	getRemoteServiceContainer,
 	getServiceContainer,
 } from "../docker/utils";
 import { execAsync, execAsyncRemote } from "../process/execAsync";
-import { getS3Credentials } from "../backups/utils";
 
 export const restoreMariadbBackup = async (
 	mariadb: Mariadb,

packages/server/src/utils/restore/mongo.ts

@@ -1,11 +1,11 @@
-import type { Mongo } from "@dokploy/server/services/mongo";
 import type { Destination } from "@dokploy/server/services/destination";
+import type { Mongo } from "@dokploy/server/services/mongo";
+import { getS3Credentials } from "../backups/utils";
 import {
 	getRemoteServiceContainer,
 	getServiceContainer,
 } from "../docker/utils";
 import { execAsync, execAsyncRemote } from "../process/execAsync";
-import { getS3Credentials } from "../backups/utils";
 
 export const restoreMongoBackup = async (
 	mongo: Mongo,

packages/server/src/utils/restore/mysql.ts

@@ -1,11 +1,11 @@
-import type { MySql } from "@dokploy/server/services/mysql";
 import type { Destination } from "@dokploy/server/services/destination";
+import type { MySql } from "@dokploy/server/services/mysql";
+import { getS3Credentials } from "../backups/utils";
 import {
 	getRemoteServiceContainer,
 	getServiceContainer,
 } from "../docker/utils";
 import { execAsync, execAsyncRemote } from "../process/execAsync";
-import { getS3Credentials } from "../backups/utils";
 
 export const restoreMySqlBackup = async (
 	mysql: MySql,

packages/server/src/utils/restore/postgres.ts

@@ -1,11 +1,11 @@
-import type { Postgres } from "@dokploy/server/services/postgres";
 import type { Destination } from "@dokploy/server/services/destination";
+import type { Postgres } from "@dokploy/server/services/postgres";
+import { getS3Credentials } from "../backups/utils";
 import {
 	getRemoteServiceContainer,
 	getServiceContainer,
 } from "../docker/utils";
 import { execAsync, execAsyncRemote } from "../process/execAsync";
-import { getS3Credentials } from "../backups/utils";
 
 export const restorePostgresBackup = async (
 	postgres: Postgres,