diff --git a/apps/dokploy/components/dashboard/application/advanced/cluster/modify-swarm-settings.tsx b/apps/dokploy/components/dashboard/application/advanced/cluster/modify-swarm-settings.tsx index 6750527d..9b71a042 100644 --- a/apps/dokploy/components/dashboard/application/advanced/cluster/modify-swarm-settings.tsx +++ b/apps/dokploy/components/dashboard/application/advanced/cluster/modify-swarm-settings.tsx @@ -259,7 +259,7 @@ export const AddSwarmSettings = ({ applicationId }: Props) => { refetch(); }) .catch(() => { - toast.error("Error to update the swarm settings"); + toast.error("Error updating the swarm settings"); }); }; return ( diff --git a/apps/dokploy/components/dashboard/application/advanced/cluster/show-cluster-settings.tsx b/apps/dokploy/components/dashboard/application/advanced/cluster/show-cluster-settings.tsx index d8d32e19..cf7314cf 100644 --- a/apps/dokploy/components/dashboard/application/advanced/cluster/show-cluster-settings.tsx +++ b/apps/dokploy/components/dashboard/application/advanced/cluster/show-cluster-settings.tsx @@ -94,7 +94,7 @@ export const ShowClusterSettings = ({ applicationId }: Props) => { }); }) .catch(() => { - toast.error("Error to update the command"); + toast.error("Error updating the command"); }); }; diff --git a/apps/dokploy/components/dashboard/application/advanced/general/add-command.tsx b/apps/dokploy/components/dashboard/application/advanced/general/add-command.tsx index 979660bc..f9e70b42 100644 --- a/apps/dokploy/components/dashboard/application/advanced/general/add-command.tsx +++ b/apps/dokploy/components/dashboard/application/advanced/general/add-command.tsx @@ -71,7 +71,7 @@ export const AddCommand = ({ applicationId }: Props) => { }); }) .catch(() => { - toast.error("Error to update the command"); + toast.error("Error updating the command"); }); }; diff --git a/apps/dokploy/components/dashboard/application/advanced/ports/add-port.tsx b/apps/dokploy/components/dashboard/application/advanced/ports/add-port.tsx index 1b613704..1fc34cac 100644 --- a/apps/dokploy/components/dashboard/application/advanced/ports/add-port.tsx +++ b/apps/dokploy/components/dashboard/application/advanced/ports/add-port.tsx @@ -86,7 +86,7 @@ export const AddPort = ({ setIsOpen(false); }) .catch(() => { - toast.error("Error to create the port"); + toast.error("Error creating the port"); }); }; diff --git a/apps/dokploy/components/dashboard/application/advanced/ports/delete-port.tsx b/apps/dokploy/components/dashboard/application/advanced/ports/delete-port.tsx index cc2c7776..e1723f6e 100644 --- a/apps/dokploy/components/dashboard/application/advanced/ports/delete-port.tsx +++ b/apps/dokploy/components/dashboard/application/advanced/ports/delete-port.tsx @@ -47,10 +47,10 @@ export const DeletePort = ({ portId }: Props) => { applicationId: data?.applicationId, }); - toast.success("Port delete succesfully"); + toast.success("Port delete successfully"); }) .catch(() => { - toast.error("Error to delete the port"); + toast.error("Error deleting the port"); }); }} > diff --git a/apps/dokploy/components/dashboard/application/advanced/ports/update-port.tsx b/apps/dokploy/components/dashboard/application/advanced/ports/update-port.tsx index a9f7f32d..e37a3c5b 100644 --- a/apps/dokploy/components/dashboard/application/advanced/ports/update-port.tsx +++ b/apps/dokploy/components/dashboard/application/advanced/ports/update-port.tsx @@ -93,7 +93,7 @@ export const UpdatePort = ({ portId }: Props) => { setIsOpen(false); }) .catch(() => { - toast.error("Error to update the port"); + toast.error("Error updating the port"); }); }; diff --git a/apps/dokploy/components/dashboard/application/advanced/redirects/add-redirect.tsx b/apps/dokploy/components/dashboard/application/advanced/redirects/add-redirect.tsx index 8ce547a2..abeb2108 100644 --- a/apps/dokploy/components/dashboard/application/advanced/redirects/add-redirect.tsx +++ b/apps/dokploy/components/dashboard/application/advanced/redirects/add-redirect.tsx @@ -124,7 +124,7 @@ export const AddRedirect = ({ onDialogToggle(false); }) .catch(() => { - toast.error("Error to create the redirect"); + toast.error("Error creating the redirect"); }); }; diff --git a/apps/dokploy/components/dashboard/application/advanced/redirects/delete-redirect.tsx b/apps/dokploy/components/dashboard/application/advanced/redirects/delete-redirect.tsx index 08d1f3e0..49f289b2 100644 --- a/apps/dokploy/components/dashboard/application/advanced/redirects/delete-redirect.tsx +++ b/apps/dokploy/components/dashboard/application/advanced/redirects/delete-redirect.tsx @@ -50,10 +50,10 @@ export const DeleteRedirect = ({ redirectId }: Props) => { utils.application.readTraefikConfig.invalidate({ applicationId: data?.applicationId, }); - toast.success("Redirect delete succesfully"); + toast.success("Redirect delete successfully"); }) .catch(() => { - toast.error("Error to delete the redirect"); + toast.error("Error deleting the redirect"); }); }} > diff --git a/apps/dokploy/components/dashboard/application/advanced/redirects/update-redirect.tsx b/apps/dokploy/components/dashboard/application/advanced/redirects/update-redirect.tsx index 52ff310d..c4125846 100644 --- a/apps/dokploy/components/dashboard/application/advanced/redirects/update-redirect.tsx +++ b/apps/dokploy/components/dashboard/application/advanced/redirects/update-redirect.tsx @@ -88,7 +88,7 @@ export const UpdateRedirect = ({ redirectId }: Props) => { setIsOpen(false); }) .catch(() => { - toast.error("Error to update the redirect"); + toast.error("Error updating the redirect"); }); }; diff --git a/apps/dokploy/components/dashboard/application/advanced/security/add-security.tsx b/apps/dokploy/components/dashboard/application/advanced/security/add-security.tsx index aeaebb92..56a1a6a4 100644 --- a/apps/dokploy/components/dashboard/application/advanced/security/add-security.tsx +++ b/apps/dokploy/components/dashboard/application/advanced/security/add-security.tsx @@ -75,7 +75,7 @@ export const AddSecurity = ({ setIsOpen(false); }) .catch(() => { - toast.error("Error to create the security"); + toast.error("Error creating security"); }); }; diff --git a/apps/dokploy/components/dashboard/application/advanced/security/delete-security.tsx b/apps/dokploy/components/dashboard/application/advanced/security/delete-security.tsx index 1a63c234..b44b2ff8 100644 --- a/apps/dokploy/components/dashboard/application/advanced/security/delete-security.tsx +++ b/apps/dokploy/components/dashboard/application/advanced/security/delete-security.tsx @@ -50,10 +50,10 @@ export const DeleteSecurity = ({ securityId }: Props) => { utils.application.readTraefikConfig.invalidate({ applicationId: data?.applicationId, }); - toast.success("Security delete succesfully"); + toast.success("Security delete successfully"); }) .catch(() => { - toast.error("Error to delete the security"); + toast.error("Error deleting the security"); }); }} > diff --git a/apps/dokploy/components/dashboard/application/advanced/security/update-security.tsx b/apps/dokploy/components/dashboard/application/advanced/security/update-security.tsx index 1e5af95f..cec1db0d 100644 --- a/apps/dokploy/components/dashboard/application/advanced/security/update-security.tsx +++ b/apps/dokploy/components/dashboard/application/advanced/security/update-security.tsx @@ -83,7 +83,7 @@ export const UpdateSecurity = ({ securityId }: Props) => { setIsOpen(false); }) .catch(() => { - toast.error("Error to update the security"); + toast.error("Error updating the security"); }); }; diff --git a/apps/dokploy/components/dashboard/application/advanced/show-application-advanced-settings.tsx b/apps/dokploy/components/dashboard/application/advanced/show-application-advanced-settings.tsx index e77be2d1..c603ea32 100644 --- a/apps/dokploy/components/dashboard/application/advanced/show-application-advanced-settings.tsx +++ b/apps/dokploy/components/dashboard/application/advanced/show-application-advanced-settings.tsx @@ -22,6 +22,13 @@ import React, { useEffect } from "react"; import { useForm } from "react-hook-form"; import { toast } from "sonner"; import { z } from "zod"; +import { + Tooltip, + TooltipContent, + TooltipProvider, + TooltipTrigger, +} from "@/components/ui/tooltip"; +import { InfoIcon } from "lucide-react"; const addResourcesApplication = z.object({ memoryReservation: z.number().nullable().optional(), @@ -72,7 +79,7 @@ export const ShowApplicationResources = ({ applicationId }: Props) => { await refetch(); }) .catch(() => { - toast.error("Error to Update the resources"); + toast.error("Error updating the resources"); }); }; return ( @@ -101,10 +108,25 @@ export const ShowApplicationResources = ({ applicationId }: Props) => { name="memoryReservation" render={({ field }) => ( - Memory Reservation +
+ Memory Reservation + + + + + + +

+ Memory soft limit in bytes. Example: 256MB = + 268435456 bytes +

+ + + +
{ @@ -120,7 +142,6 @@ export const ShowApplicationResources = ({ applicationId }: Props) => { }} /> - )} @@ -132,10 +153,25 @@ export const ShowApplicationResources = ({ applicationId }: Props) => { render={({ field }) => { return ( - Memory Limit +
+ Memory Limit + + + + + + +

+ Memory hard limit in bytes. Example: 1GB = + 1073741824 bytes +

+ + + +
{ @@ -163,21 +199,36 @@ export const ShowApplicationResources = ({ applicationId }: Props) => { render={({ field }) => { return ( - Cpu Limit +
+ CPU Limit + + + + + + +

+ CPU quota in units of 10^-9 CPUs. Example: 2 + CPUs = 2000000000 +

+ + + +
{ const value = e.target.value; - if ( - value === "" || - /^[0-9]*\.?[0-9]*$/.test(value) - ) { - const float = Number.parseFloat(value); - field.onChange(float); + if (value === "") { + field.onChange(null); + } else { + const number = Number.parseInt(value, 10); + if (!Number.isNaN(number)) { + field.onChange(number); + } } }} /> @@ -193,21 +244,36 @@ export const ShowApplicationResources = ({ applicationId }: Props) => { render={({ field }) => { return ( - Cpu Reservation +
+ CPU Reservation + + + + + + +

+ CPU shares (relative weight). Example: 1 CPU = + 1000000000 +

+ + + +
{ const value = e.target.value; - if ( - value === "" || - /^[0-9]*\.?[0-9]*$/.test(value) - ) { - const float = Number.parseFloat(value); - field.onChange(float); + if (value === "") { + field.onChange(null); + } else { + const number = Number.parseInt(value, 10); + if (!Number.isNaN(number)) { + field.onChange(number); + } } }} /> diff --git a/apps/dokploy/components/dashboard/application/advanced/traefik/update-traefik-config.tsx b/apps/dokploy/components/dashboard/application/advanced/traefik/update-traefik-config.tsx index 2c2437a1..f563f1ab 100644 --- a/apps/dokploy/components/dashboard/application/advanced/traefik/update-traefik-config.tsx +++ b/apps/dokploy/components/dashboard/application/advanced/traefik/update-traefik-config.tsx @@ -105,7 +105,7 @@ export const UpdateTraefikConfig = ({ applicationId }: Props) => { form.reset(); }) .catch(() => { - toast.error("Error to update the traefik config"); + toast.error("Error updating the Traefik config"); }); }; diff --git a/apps/dokploy/components/dashboard/application/advanced/volumes/add-volumes.tsx b/apps/dokploy/components/dashboard/application/advanced/volumes/add-volumes.tsx index 5c6b95ca..718f98b7 100644 --- a/apps/dokploy/components/dashboard/application/advanced/volumes/add-volumes.tsx +++ b/apps/dokploy/components/dashboard/application/advanced/volumes/add-volumes.tsx @@ -107,7 +107,7 @@ export const AddVolumes = ({ setIsOpen(false); }) .catch(() => { - toast.error("Error to create the Bind mount"); + toast.error("Error creating the Bind mount"); }); } else if (data.type === "volume") { await mutateAsync({ @@ -122,7 +122,7 @@ export const AddVolumes = ({ setIsOpen(false); }) .catch(() => { - toast.error("Error to create the Volume mount"); + toast.error("Error creating the Volume mount"); }); } else if (data.type === "file") { await mutateAsync({ @@ -138,7 +138,7 @@ export const AddVolumes = ({ setIsOpen(false); }) .catch(() => { - toast.error("Error to create the File mount"); + toast.error("Error creating the File mount"); }); } diff --git a/apps/dokploy/components/dashboard/application/advanced/volumes/delete-volume.tsx b/apps/dokploy/components/dashboard/application/advanced/volumes/delete-volume.tsx index 020a6c36..4945bb4b 100644 --- a/apps/dokploy/components/dashboard/application/advanced/volumes/delete-volume.tsx +++ b/apps/dokploy/components/dashboard/application/advanced/volumes/delete-volume.tsx @@ -45,10 +45,10 @@ export const DeleteVolume = ({ mountId, refetch }: Props) => { }) .then(() => { refetch(); - toast.success("Mount deleted succesfully"); + toast.success("Mount deleted successfully"); }) .catch(() => { - toast.error("Error to delete the mount"); + toast.error("Error deleting the mount"); }); }} > diff --git a/apps/dokploy/components/dashboard/application/advanced/volumes/update-volume.tsx b/apps/dokploy/components/dashboard/application/advanced/volumes/update-volume.tsx index 80cc97ad..55ea2120 100644 --- a/apps/dokploy/components/dashboard/application/advanced/volumes/update-volume.tsx +++ b/apps/dokploy/components/dashboard/application/advanced/volumes/update-volume.tsx @@ -139,7 +139,7 @@ export const UpdateVolume = ({ setIsOpen(false); }) .catch(() => { - toast.error("Error to update the Bind mount"); + toast.error("Error updating the Bind mount"); }); } else if (data.type === "volume") { await mutateAsync({ @@ -153,7 +153,7 @@ export const UpdateVolume = ({ setIsOpen(false); }) .catch(() => { - toast.error("Error to update the Volume mount"); + toast.error("Error updating the Volume mount"); }); } else if (data.type === "file") { await mutateAsync({ @@ -168,7 +168,7 @@ export const UpdateVolume = ({ setIsOpen(false); }) .catch(() => { - toast.error("Error to update the File mount"); + toast.error("Error updating the File mount"); }); } refetch(); diff --git a/apps/dokploy/components/dashboard/application/build/show.tsx b/apps/dokploy/components/dashboard/application/build/show.tsx index edfb38ae..ad83f456 100644 --- a/apps/dokploy/components/dashboard/application/build/show.tsx +++ b/apps/dokploy/components/dashboard/application/build/show.tsx @@ -126,7 +126,7 @@ export const ShowBuildChooseForm = ({ applicationId }: Props) => { await refetch(); }) .catch(() => { - toast.error("Error to save the build type"); + toast.error("Error saving the build type"); }); }; diff --git a/apps/dokploy/components/dashboard/application/deployments/refresh-token.tsx b/apps/dokploy/components/dashboard/application/deployments/refresh-token.tsx index 88d5beee..c268e6d5 100644 --- a/apps/dokploy/components/dashboard/application/deployments/refresh-token.tsx +++ b/apps/dokploy/components/dashboard/application/deployments/refresh-token.tsx @@ -47,7 +47,7 @@ export const RefreshToken = ({ applicationId }: Props) => { toast.success("Refresh updated"); }) .catch(() => { - toast.error("Error to update the refresh token"); + toast.error("Error updating the refresh token"); }); }} > diff --git a/apps/dokploy/components/dashboard/application/domains/add-domain.tsx b/apps/dokploy/components/dashboard/application/domains/add-domain.tsx index 38180114..22eaf1d3 100644 --- a/apps/dokploy/components/dashboard/application/domains/add-domain.tsx +++ b/apps/dokploy/components/dashboard/application/domains/add-domain.tsx @@ -105,8 +105,8 @@ export const AddDomain = ({ const dictionary = { success: domainId ? "Domain Updated" : "Domain Created", error: domainId - ? "Error to update the domain" - : "Error to create the domain", + ? "Error updating the domain" + : "Error creating the domain", submit: domainId ? "Update" : "Create", dialogDescription: domainId ? "In this section you can edit a domain" diff --git a/apps/dokploy/components/dashboard/application/domains/delete-domain.tsx b/apps/dokploy/components/dashboard/application/domains/delete-domain.tsx index 5933a99a..3d4425df 100644 --- a/apps/dokploy/components/dashboard/application/domains/delete-domain.tsx +++ b/apps/dokploy/components/dashboard/application/domains/delete-domain.tsx @@ -57,10 +57,10 @@ export const DeleteDomain = ({ domainId }: Props) => { }); } - toast.success("Domain delete succesfully"); + toast.success("Domain delete successfully"); }) .catch(() => { - toast.error("Error to delete Domain"); + toast.error("Error deleting the Domain"); }); }} > diff --git a/apps/dokploy/components/dashboard/application/environment/show.tsx b/apps/dokploy/components/dashboard/application/environment/show.tsx index c7b8d4bb..ec555804 100644 --- a/apps/dokploy/components/dashboard/application/environment/show.tsx +++ b/apps/dokploy/components/dashboard/application/environment/show.tsx @@ -51,7 +51,7 @@ export const ShowEnvironment = ({ applicationId }: Props) => { await refetch(); }) .catch(() => { - toast.error("Error to add environment"); + toast.error("Error adding environment"); }); }; diff --git a/apps/dokploy/components/dashboard/application/general/deploy-application.tsx b/apps/dokploy/components/dashboard/application/general/deploy-application.tsx index 252894dd..c1ab8457 100644 --- a/apps/dokploy/components/dashboard/application/general/deploy-application.tsx +++ b/apps/dokploy/components/dashboard/application/general/deploy-application.tsx @@ -51,7 +51,7 @@ export const DeployApplication = ({ applicationId }: Props) => { applicationId, }) .then(async () => { - toast.success("Application deployed succesfully"); + toast.success("Application deployed successfully"); await refetch(); router.push( `/dashboard/project/${data?.projectId}/services/application/${applicationId}?tab=deployments`, @@ -59,7 +59,7 @@ export const DeployApplication = ({ applicationId }: Props) => { }) .catch(() => { - toast.error("Error to deploy Application"); + toast.error("Error deploying the Application"); }); await refetch(); diff --git a/apps/dokploy/components/dashboard/application/general/generic/save-bitbucket-provider.tsx b/apps/dokploy/components/dashboard/application/general/generic/save-bitbucket-provider.tsx index d6dfa20e..a487452b 100644 --- a/apps/dokploy/components/dashboard/application/general/generic/save-bitbucket-provider.tsx +++ b/apps/dokploy/components/dashboard/application/general/generic/save-bitbucket-provider.tsx @@ -137,7 +137,7 @@ export const SaveBitbucketProvider = ({ applicationId }: Props) => { await refetch(); }) .catch(() => { - toast.error("Error to save the Bitbucket provider"); + toast.error("Error saving the Bitbucket provider"); }); }; diff --git a/apps/dokploy/components/dashboard/application/general/generic/save-docker-provider.tsx b/apps/dokploy/components/dashboard/application/general/generic/save-docker-provider.tsx index b4e33719..fcc4f824 100644 --- a/apps/dokploy/components/dashboard/application/general/generic/save-docker-provider.tsx +++ b/apps/dokploy/components/dashboard/application/general/generic/save-docker-provider.tsx @@ -68,7 +68,7 @@ export const SaveDockerProvider = ({ applicationId }: Props) => { await refetch(); }) .catch(() => { - toast.error("Error to save the Docker provider"); + toast.error("Error saving the Docker provider"); }); }; diff --git a/apps/dokploy/components/dashboard/application/general/generic/save-drag-n-drop.tsx b/apps/dokploy/components/dashboard/application/general/generic/save-drag-n-drop.tsx index 4ed9df16..3732860d 100644 --- a/apps/dokploy/components/dashboard/application/general/generic/save-drag-n-drop.tsx +++ b/apps/dokploy/components/dashboard/application/general/generic/save-drag-n-drop.tsx @@ -56,7 +56,7 @@ export const SaveDragNDrop = ({ applicationId }: Props) => { await refetch(); }) .catch(() => { - toast.error("Error to save the deployment"); + toast.error("Error saving the deployment"); }); }; diff --git a/apps/dokploy/components/dashboard/application/general/generic/save-git-provider.tsx b/apps/dokploy/components/dashboard/application/general/generic/save-git-provider.tsx index 58fd1973..218e004d 100644 --- a/apps/dokploy/components/dashboard/application/general/generic/save-git-provider.tsx +++ b/apps/dokploy/components/dashboard/application/general/generic/save-git-provider.tsx @@ -84,7 +84,7 @@ export const SaveGitProvider = ({ applicationId }: Props) => { await refetch(); }) .catch(() => { - toast.error("Error to save the Git provider"); + toast.error("Error saving the Git provider"); }); }; diff --git a/apps/dokploy/components/dashboard/application/general/generic/save-github-provider.tsx b/apps/dokploy/components/dashboard/application/general/generic/save-github-provider.tsx index 5c432e6a..f5da9ceb 100644 --- a/apps/dokploy/components/dashboard/application/general/generic/save-github-provider.tsx +++ b/apps/dokploy/components/dashboard/application/general/generic/save-github-provider.tsx @@ -131,7 +131,7 @@ export const SaveGithubProvider = ({ applicationId }: Props) => { await refetch(); }) .catch(() => { - toast.error("Error to save the github provider"); + toast.error("Error saving the github provider"); }); }; diff --git a/apps/dokploy/components/dashboard/application/general/generic/save-gitlab-provider.tsx b/apps/dokploy/components/dashboard/application/general/generic/save-gitlab-provider.tsx index 2d498bfd..d190180e 100644 --- a/apps/dokploy/components/dashboard/application/general/generic/save-gitlab-provider.tsx +++ b/apps/dokploy/components/dashboard/application/general/generic/save-gitlab-provider.tsx @@ -144,7 +144,7 @@ export const SaveGitlabProvider = ({ applicationId }: Props) => { await refetch(); }) .catch(() => { - toast.error("Error to save the gitlab provider"); + toast.error("Error saving the gitlab provider"); }); }; diff --git a/apps/dokploy/components/dashboard/application/general/reset-application.tsx b/apps/dokploy/components/dashboard/application/general/reset-application.tsx index cc338658..5be2a185 100644 --- a/apps/dokploy/components/dashboard/application/general/reset-application.tsx +++ b/apps/dokploy/components/dashboard/application/general/reset-application.tsx @@ -56,7 +56,7 @@ export const ResetApplication = ({ applicationId, appName }: Props) => { toast.success("Service Reloaded"); }) .catch(() => { - toast.error("Error to reload the service"); + toast.error("Error reloading the service"); }); await refetch(); }} diff --git a/apps/dokploy/components/dashboard/application/general/show.tsx b/apps/dokploy/components/dashboard/application/general/show.tsx index 65c99e9b..46f185d5 100644 --- a/apps/dokploy/components/dashboard/application/general/show.tsx +++ b/apps/dokploy/components/dashboard/application/general/show.tsx @@ -69,7 +69,7 @@ export const ShowGeneralApplication = ({ applicationId }: Props) => { await refetch(); }) .catch(() => { - toast.error("Error to update Auto Deploy"); + toast.error("Error updating Auto Deploy"); }); }} className="flex flex-row gap-2 items-center" diff --git a/apps/dokploy/components/dashboard/application/logs/show.tsx b/apps/dokploy/components/dashboard/application/logs/show.tsx index 1100a4bf..a73b99d2 100644 --- a/apps/dokploy/components/dashboard/application/logs/show.tsx +++ b/apps/dokploy/components/dashboard/application/logs/show.tsx @@ -1,3 +1,4 @@ +import { Badge } from "@/components/ui/badge"; import { Card, CardContent, @@ -30,6 +31,21 @@ export const DockerLogs = dynamic( }, ); +export const badgeStateColor = (state: string) => { + switch (state) { + case "running": + return "green"; + case "exited": + case "shutdown": + return "red"; + case "accepted": + case "created": + return "blue"; + default: + return "default"; + } +}; + interface Props { appName: string; serverId?: string; @@ -80,7 +96,7 @@ export const ShowDockerLogs = ({ appName, serverId }: Props) => { return ( - Logssss + Logs Watch the logs of the application in real time @@ -123,7 +139,9 @@ export const ShowDockerLogs = ({ appName, serverId }: Props) => { value={container.containerId} > {container.name} ({container.containerId}){" "} - {container.state} + + {container.state} + ))} @@ -135,7 +153,10 @@ export const ShowDockerLogs = ({ appName, serverId }: Props) => { value={container.containerId} > {container.name} ({container.containerId}@{container.node} - ) {container.state} + ) + + {container.state} + ))} diff --git a/apps/dokploy/components/dashboard/application/preview-deployments/add-preview-domain.tsx b/apps/dokploy/components/dashboard/application/preview-deployments/add-preview-domain.tsx index 875a93d4..3a33bbed 100644 --- a/apps/dokploy/components/dashboard/application/preview-deployments/add-preview-domain.tsx +++ b/apps/dokploy/components/dashboard/application/preview-deployments/add-preview-domain.tsx @@ -105,8 +105,8 @@ export const AddPreviewDomain = ({ const dictionary = { success: domainId ? "Domain Updated" : "Domain Created", error: domainId - ? "Error to update the domain" - : "Error to create the domain", + ? "Error updating the domain" + : "Error creating the domain", submit: domainId ? "Update" : "Create", dialogDescription: domainId ? "In this section you can edit a domain" diff --git a/apps/dokploy/components/dashboard/application/rebuild-application.tsx b/apps/dokploy/components/dashboard/application/rebuild-application.tsx index 0284ab8f..66ed3397 100644 --- a/apps/dokploy/components/dashboard/application/rebuild-application.tsx +++ b/apps/dokploy/components/dashboard/application/rebuild-application.tsx @@ -63,7 +63,7 @@ export const RedbuildApplication = ({ applicationId }: Props) => { }); }) .catch(() => { - toast.error("Error to rebuild the application"); + toast.error("Error rebuilding the application"); }); }} > diff --git a/apps/dokploy/components/dashboard/application/start-application.tsx b/apps/dokploy/components/dashboard/application/start-application.tsx index d65997ed..9a65397b 100644 --- a/apps/dokploy/components/dashboard/application/start-application.tsx +++ b/apps/dokploy/components/dashboard/application/start-application.tsx @@ -49,10 +49,10 @@ export const StartApplication = ({ applicationId }: Props) => { await utils.application.one.invalidate({ applicationId, }); - toast.success("Application started succesfully"); + toast.success("Application started successfully"); }) .catch(() => { - toast.error("Error to start the Application"); + toast.error("Error starting the Application"); }); }} > diff --git a/apps/dokploy/components/dashboard/application/stop-application.tsx b/apps/dokploy/components/dashboard/application/stop-application.tsx index 5eb873f4..ea052fab 100644 --- a/apps/dokploy/components/dashboard/application/stop-application.tsx +++ b/apps/dokploy/components/dashboard/application/stop-application.tsx @@ -49,10 +49,10 @@ export const StopApplication = ({ applicationId }: Props) => { await utils.application.one.invalidate({ applicationId, }); - toast.success("Application stopped succesfully"); + toast.success("Application stopped successfully"); }) .catch(() => { - toast.error("Error to stop the Application"); + toast.error("Error stopping the Application"); }); }} > diff --git a/apps/dokploy/components/dashboard/application/update-application.tsx b/apps/dokploy/components/dashboard/application/update-application.tsx index f40a0020..8f8b63fe 100644 --- a/apps/dokploy/components/dashboard/application/update-application.tsx +++ b/apps/dokploy/components/dashboard/application/update-application.tsx @@ -76,14 +76,14 @@ export const UpdateApplication = ({ applicationId }: Props) => { description: formData.description || "", }) .then(() => { - toast.success("Application updated succesfully"); + toast.success("Application updated successfully"); utils.application.one.invalidate({ applicationId: applicationId, }); setIsOpen(false); }) .catch(() => { - toast.error("Error to update the application"); + toast.error("Error updating the Application"); }) .finally(() => {}); }; diff --git a/apps/dokploy/components/dashboard/compose/advanced/add-command.tsx b/apps/dokploy/components/dashboard/compose/advanced/add-command.tsx index 6d1b455f..1bbd3820 100644 --- a/apps/dokploy/components/dashboard/compose/advanced/add-command.tsx +++ b/apps/dokploy/components/dashboard/compose/advanced/add-command.tsx @@ -82,7 +82,7 @@ export const AddCommandCompose = ({ composeId }: Props) => { }); }) .catch(() => { - toast.error("Error to update the command"); + toast.error("Error updating the command"); }); }; diff --git a/apps/dokploy/components/dashboard/compose/deployments/refresh-token-compose.tsx b/apps/dokploy/components/dashboard/compose/deployments/refresh-token-compose.tsx index 66d690e7..95fafaab 100644 --- a/apps/dokploy/components/dashboard/compose/deployments/refresh-token-compose.tsx +++ b/apps/dokploy/components/dashboard/compose/deployments/refresh-token-compose.tsx @@ -47,7 +47,7 @@ export const RefreshTokenCompose = ({ composeId }: Props) => { toast.success("Refresh Token updated"); }) .catch(() => { - toast.error("Error to update the refresh token"); + toast.error("Error updating the refresh token"); }); }} > diff --git a/apps/dokploy/components/dashboard/compose/domains/add-domain.tsx b/apps/dokploy/components/dashboard/compose/domains/add-domain.tsx index 6ea38237..b9ae9a2e 100644 --- a/apps/dokploy/components/dashboard/compose/domains/add-domain.tsx +++ b/apps/dokploy/components/dashboard/compose/domains/add-domain.tsx @@ -127,8 +127,8 @@ export const AddDomainCompose = ({ const dictionary = { success: domainId ? "Domain Updated" : "Domain Created", error: domainId - ? "Error to update the domain" - : "Error to create the domain", + ? "Error updating the domain" + : "Error creating the domain", submit: domainId ? "Update" : "Create", dialogDescription: domainId ? "In this section you can edit a domain" diff --git a/apps/dokploy/components/dashboard/compose/enviroment/show.tsx b/apps/dokploy/components/dashboard/compose/environment/show.tsx similarity index 98% rename from apps/dokploy/components/dashboard/compose/enviroment/show.tsx rename to apps/dokploy/components/dashboard/compose/environment/show.tsx index 4e9b2dfd..8fa1f444 100644 --- a/apps/dokploy/components/dashboard/compose/enviroment/show.tsx +++ b/apps/dokploy/components/dashboard/compose/environment/show.tsx @@ -70,7 +70,7 @@ export const ShowEnvironmentCompose = ({ composeId }: Props) => { await refetch(); }) .catch(() => { - toast.error("Error to add environment"); + toast.error("Error adding environment"); }); }; diff --git a/apps/dokploy/components/dashboard/compose/general/actions.tsx b/apps/dokploy/components/dashboard/compose/general/actions.tsx index 43966966..215e7e42 100644 --- a/apps/dokploy/components/dashboard/compose/general/actions.tsx +++ b/apps/dokploy/components/dashboard/compose/general/actions.tsx @@ -83,7 +83,7 @@ export const ComposeActions = ({ composeId }: Props) => { await refetch(); }) .catch(() => { - toast.error("Error to update Auto Deploy"); + toast.error("Error updating Auto Deploy"); }); }} className="flex flex-row gap-2 items-center" diff --git a/apps/dokploy/components/dashboard/compose/general/compose-file-editor.tsx b/apps/dokploy/components/dashboard/compose/general/compose-file-editor.tsx index 90bf6e30..b368aafc 100644 --- a/apps/dokploy/components/dashboard/compose/general/compose-file-editor.tsx +++ b/apps/dokploy/components/dashboard/compose/general/compose-file-editor.tsx @@ -77,7 +77,7 @@ export const ComposeFileEditor = ({ composeId }: Props) => { }); }) .catch((e) => { - toast.error("Error to update the compose config"); + toast.error("Error updating the Compose config"); }); }; return ( diff --git a/apps/dokploy/components/dashboard/compose/general/deploy-compose.tsx b/apps/dokploy/components/dashboard/compose/general/deploy-compose.tsx index 25b59cc7..2c6f13e0 100644 --- a/apps/dokploy/components/dashboard/compose/general/deploy-compose.tsx +++ b/apps/dokploy/components/dashboard/compose/general/deploy-compose.tsx @@ -57,7 +57,7 @@ export const DeployCompose = ({ composeId }: Props) => { ); }) .catch(() => { - toast.error("Error to deploy Compose"); + toast.error("Error deploying Compose"); }); await refetch(); diff --git a/apps/dokploy/components/dashboard/compose/general/generic/save-bitbucket-provider-compose.tsx b/apps/dokploy/components/dashboard/compose/general/generic/save-bitbucket-provider-compose.tsx index cf5a7d5b..2a083666 100644 --- a/apps/dokploy/components/dashboard/compose/general/generic/save-bitbucket-provider-compose.tsx +++ b/apps/dokploy/components/dashboard/compose/general/generic/save-bitbucket-provider-compose.tsx @@ -139,7 +139,7 @@ export const SaveBitbucketProviderCompose = ({ composeId }: Props) => { await refetch(); }) .catch(() => { - toast.error("Error to save the Bitbucket provider"); + toast.error("Error saving the Bitbucket provider"); }); }; diff --git a/apps/dokploy/components/dashboard/compose/general/generic/save-git-provider-compose.tsx b/apps/dokploy/components/dashboard/compose/general/generic/save-git-provider-compose.tsx index c05dc7ed..e42f6d55 100644 --- a/apps/dokploy/components/dashboard/compose/general/generic/save-git-provider-compose.tsx +++ b/apps/dokploy/components/dashboard/compose/general/generic/save-git-provider-compose.tsx @@ -83,7 +83,7 @@ export const SaveGitProviderCompose = ({ composeId }: Props) => { await refetch(); }) .catch(() => { - toast.error("Error to save the Git provider"); + toast.error("Error saving the Git provider"); }); }; diff --git a/apps/dokploy/components/dashboard/compose/general/generic/save-github-provider-compose.tsx b/apps/dokploy/components/dashboard/compose/general/generic/save-github-provider-compose.tsx index bd5e8874..af1a61d4 100644 --- a/apps/dokploy/components/dashboard/compose/general/generic/save-github-provider-compose.tsx +++ b/apps/dokploy/components/dashboard/compose/general/generic/save-github-provider-compose.tsx @@ -133,7 +133,7 @@ export const SaveGithubProviderCompose = ({ composeId }: Props) => { await refetch(); }) .catch(() => { - toast.error("Error to save the github provider"); + toast.error("Error saving the Github provider"); }); }; diff --git a/apps/dokploy/components/dashboard/compose/general/generic/save-gitlab-provider-compose.tsx b/apps/dokploy/components/dashboard/compose/general/generic/save-gitlab-provider-compose.tsx index c0a871c0..5f28b342 100644 --- a/apps/dokploy/components/dashboard/compose/general/generic/save-gitlab-provider-compose.tsx +++ b/apps/dokploy/components/dashboard/compose/general/generic/save-gitlab-provider-compose.tsx @@ -146,7 +146,7 @@ export const SaveGitlabProviderCompose = ({ composeId }: Props) => { await refetch(); }) .catch(() => { - toast.error("Error to save the gitlab provider"); + toast.error("Error saving the Gitlab provider"); }); }; diff --git a/apps/dokploy/components/dashboard/compose/general/randomize-compose.tsx b/apps/dokploy/components/dashboard/compose/general/randomize-compose.tsx index 2c6184c8..59233acf 100644 --- a/apps/dokploy/components/dashboard/compose/general/randomize-compose.tsx +++ b/apps/dokploy/components/dashboard/compose/general/randomize-compose.tsx @@ -90,7 +90,7 @@ export const RandomizeCompose = ({ composeId }: Props) => { toast.success("Compose updated"); }) .catch(() => { - toast.error("Error to randomize the compose"); + toast.error("Error randomizing the compose"); }); }; @@ -105,7 +105,7 @@ export const RandomizeCompose = ({ composeId }: Props) => { toast.success("Compose randomized"); }) .catch(() => { - toast.error("Error to randomize the compose"); + toast.error("Error randomizing the compose"); }); }; diff --git a/apps/dokploy/components/dashboard/compose/general/rebuild-compose.tsx b/apps/dokploy/components/dashboard/compose/general/rebuild-compose.tsx index 199d4f93..c2f50414 100644 --- a/apps/dokploy/components/dashboard/compose/general/rebuild-compose.tsx +++ b/apps/dokploy/components/dashboard/compose/general/rebuild-compose.tsx @@ -62,7 +62,7 @@ export const RedbuildCompose = ({ composeId }: Props) => { }); }) .catch(() => { - toast.error("Error to rebuild the compose"); + toast.error("Error rebuilding the compose"); }); }} > diff --git a/apps/dokploy/components/dashboard/compose/general/show-converted-compose.tsx b/apps/dokploy/components/dashboard/compose/general/show-converted-compose.tsx index ec441e02..8a2186d9 100644 --- a/apps/dokploy/components/dashboard/compose/general/show-converted-compose.tsx +++ b/apps/dokploy/components/dashboard/compose/general/show-converted-compose.tsx @@ -73,7 +73,7 @@ export const ShowConvertedCompose = ({ composeId }: Props) => { toast.success("Fetched source type"); }) .catch((err) => { - toast.error("Error to fetch source type", { + toast.error("Error fetching source type", { description: err.message, }); }); diff --git a/apps/dokploy/components/dashboard/compose/general/stop-compose.tsx b/apps/dokploy/components/dashboard/compose/general/stop-compose.tsx index 2bb3cdeb..f405481b 100644 --- a/apps/dokploy/components/dashboard/compose/general/stop-compose.tsx +++ b/apps/dokploy/components/dashboard/compose/general/stop-compose.tsx @@ -53,10 +53,10 @@ export const StopCompose = ({ composeId }: Props) => { await utils.compose.one.invalidate({ composeId, }); - toast.success("Compose stopped succesfully"); + toast.success("Compose stopped successfully"); }) .catch(() => { - toast.error("Error to stop the compose"); + toast.error("Error stopping the compose"); }); }} > diff --git a/apps/dokploy/components/dashboard/compose/logs/show-stack.tsx b/apps/dokploy/components/dashboard/compose/logs/show-stack.tsx index cec1e5af..d166f933 100644 --- a/apps/dokploy/components/dashboard/compose/logs/show-stack.tsx +++ b/apps/dokploy/components/dashboard/compose/logs/show-stack.tsx @@ -1,3 +1,5 @@ +import { badgeStateColor } from "@/components/dashboard/application/logs/show"; +import { Badge } from "@/components/ui/badge"; import { Card, CardContent, @@ -35,6 +37,8 @@ interface Props { serverId?: string; } +badgeStateColor; + export const ShowDockerLogsStack = ({ appName, serverId }: Props) => { const [option, setOption] = useState<"swarm" | "native">("native"); const [containerId, setContainerId] = useState(); @@ -123,7 +127,9 @@ export const ShowDockerLogsStack = ({ appName, serverId }: Props) => { value={container.containerId} > {container.name} ({container.containerId}){" "} - {container.state} + + {container.state} + ))} @@ -135,7 +141,10 @@ export const ShowDockerLogsStack = ({ appName, serverId }: Props) => { value={container.containerId} > {container.name} ({container.containerId}@{container.node} - ) {container.state} + ) + + {container.state} + ))} diff --git a/apps/dokploy/components/dashboard/compose/logs/show.tsx b/apps/dokploy/components/dashboard/compose/logs/show.tsx index bf7e2993..4530e0dd 100644 --- a/apps/dokploy/components/dashboard/compose/logs/show.tsx +++ b/apps/dokploy/components/dashboard/compose/logs/show.tsx @@ -1,3 +1,5 @@ +import { badgeStateColor } from "@/components/dashboard/application/logs/show"; +import { Badge } from "@/components/ui/badge"; import { Card, CardContent, @@ -87,7 +89,10 @@ export const ShowDockerLogsCompose = ({ key={container.containerId} value={container.containerId} > - {container.name} ({container.containerId}) {container.state} + {container.name} ({container.containerId}){" "} + + {container.state} + ))} Containers ({data?.length}) diff --git a/apps/dokploy/components/dashboard/compose/start-compose.tsx b/apps/dokploy/components/dashboard/compose/start-compose.tsx index 20f990bb..fae978e2 100644 --- a/apps/dokploy/components/dashboard/compose/start-compose.tsx +++ b/apps/dokploy/components/dashboard/compose/start-compose.tsx @@ -49,10 +49,10 @@ export const StartCompose = ({ composeId }: Props) => { await utils.compose.one.invalidate({ composeId, }); - toast.success("Compose started succesfully"); + toast.success("Compose started successfully"); }) .catch(() => { - toast.error("Error to start the Compose"); + toast.error("Error starting the Compose"); }); }} > diff --git a/apps/dokploy/components/dashboard/compose/stop-compose.tsx b/apps/dokploy/components/dashboard/compose/stop-compose.tsx index 3080e755..da3e3412 100644 --- a/apps/dokploy/components/dashboard/compose/stop-compose.tsx +++ b/apps/dokploy/components/dashboard/compose/stop-compose.tsx @@ -49,10 +49,10 @@ export const StopCompose = ({ composeId }: Props) => { await utils.compose.one.invalidate({ composeId, }); - toast.success("Compose stopped succesfully"); + toast.success("Compose stopped successfully"); }) .catch(() => { - toast.error("Error to stop the Compose"); + toast.error("Error stopping the Compose"); }); }} > diff --git a/apps/dokploy/components/dashboard/compose/update-compose.tsx b/apps/dokploy/components/dashboard/compose/update-compose.tsx index 5991c03d..807f5b26 100644 --- a/apps/dokploy/components/dashboard/compose/update-compose.tsx +++ b/apps/dokploy/components/dashboard/compose/update-compose.tsx @@ -76,14 +76,14 @@ export const UpdateCompose = ({ composeId }: Props) => { description: formData.description || "", }) .then(() => { - toast.success("Compose updated succesfully"); + toast.success("Compose updated successfully"); utils.compose.one.invalidate({ composeId: composeId, }); setIsOpen(false); }) .catch(() => { - toast.error("Error to update the Compose"); + toast.error("Error updating the Compose"); }) .finally(() => {}); }; diff --git a/apps/dokploy/components/dashboard/database/backups/add-backup.tsx b/apps/dokploy/components/dashboard/database/backups/add-backup.tsx index 94f072e7..5f349b24 100644 --- a/apps/dokploy/components/dashboard/database/backups/add-backup.tsx +++ b/apps/dokploy/components/dashboard/database/backups/add-backup.tsx @@ -125,7 +125,7 @@ export const AddBackup = ({ databaseId, databaseType, refetch }: Props) => { refetch(); }) .catch(() => { - toast.error("Error to create a backup"); + toast.error("Error creating a backup"); }); }; return ( diff --git a/apps/dokploy/components/dashboard/database/backups/delete-backup.tsx b/apps/dokploy/components/dashboard/database/backups/delete-backup.tsx index 1a570b54..63c6677d 100644 --- a/apps/dokploy/components/dashboard/database/backups/delete-backup.tsx +++ b/apps/dokploy/components/dashboard/database/backups/delete-backup.tsx @@ -46,10 +46,10 @@ export const DeleteBackup = ({ backupId, refetch }: Props) => { .then(() => { refetch(); - toast.success("Backup delete succesfully"); + toast.success("Backup deleted successfully"); }) .catch(() => { - toast.error("Error to delete the backup"); + toast.error("Error deleting the backup"); }); }} > diff --git a/apps/dokploy/components/dashboard/database/backups/update-backup.tsx b/apps/dokploy/components/dashboard/database/backups/update-backup.tsx index 4c60a31b..55754e9d 100644 --- a/apps/dokploy/components/dashboard/database/backups/update-backup.tsx +++ b/apps/dokploy/components/dashboard/database/backups/update-backup.tsx @@ -109,7 +109,7 @@ export const UpdateBackup = ({ backupId, refetch }: Props) => { setIsOpen(false); }) .catch(() => { - toast.error("Error to update the backup"); + toast.error("Error updating the Backup"); }); }; diff --git a/apps/dokploy/components/dashboard/file-system/show-traefik-file.tsx b/apps/dokploy/components/dashboard/file-system/show-traefik-file.tsx index 3dfe9875..fb5fe8f5 100644 --- a/apps/dokploy/components/dashboard/file-system/show-traefik-file.tsx +++ b/apps/dokploy/components/dashboard/file-system/show-traefik-file.tsx @@ -86,7 +86,7 @@ export const ShowTraefikFile = ({ path, serverId }: Props) => { refetch(); }) .catch(() => { - toast.error("Error to update the traefik config"); + toast.error("Error updating the Traefik config"); }); }; diff --git a/apps/dokploy/components/dashboard/mariadb/advanced/show-mariadb-advanced-settings.tsx b/apps/dokploy/components/dashboard/mariadb/advanced/show-mariadb-advanced-settings.tsx index 062fffcd..b4c0129d 100644 --- a/apps/dokploy/components/dashboard/mariadb/advanced/show-mariadb-advanced-settings.tsx +++ b/apps/dokploy/components/dashboard/mariadb/advanced/show-mariadb-advanced-settings.tsx @@ -65,7 +65,7 @@ export const ShowAdvancedMariadb = ({ mariadbId }: Props) => { await refetch(); }) .catch(() => { - toast.error("Error to Update the resources"); + toast.error("Error updating the resources"); }); }; return ( diff --git a/apps/dokploy/components/dashboard/mariadb/advanced/show-mariadb-resources.tsx b/apps/dokploy/components/dashboard/mariadb/advanced/show-mariadb-resources.tsx index 60cdbda0..7624441e 100644 --- a/apps/dokploy/components/dashboard/mariadb/advanced/show-mariadb-resources.tsx +++ b/apps/dokploy/components/dashboard/mariadb/advanced/show-mariadb-resources.tsx @@ -18,6 +18,13 @@ import { import { Input } from "@/components/ui/input"; import { api } from "@/utils/api"; import { zodResolver } from "@hookform/resolvers/zod"; +import { + TooltipProvider, + TooltipTrigger, + TooltipContent, + Tooltip, +} from "@/components/ui/tooltip"; +import { InfoIcon } from "lucide-react"; import React, { useEffect } from "react"; import { useForm } from "react-hook-form"; import { toast } from "sonner"; @@ -71,7 +78,7 @@ export const ShowMariadbResources = ({ mariadbId }: Props) => { await refetch(); }) .catch(() => { - toast.error("Error to Update the resources"); + toast.error("Error updating the resources"); }); }; return ( @@ -100,28 +107,40 @@ export const ShowMariadbResources = ({ mariadbId }: Props) => { name="memoryReservation" render={({ field }) => ( - Memory Reservation +
+ Memory Reservation + + + + + + +

+ Memory soft limit in bytes. Example: 256MB = + 268435456 bytes +

+ + + +
{ const value = e.target.value; if (value === "") { - // Si el campo está vacío, establece el valor como null. field.onChange(null); } else { const number = Number.parseInt(value, 10); if (!Number.isNaN(number)) { - // Solo actualiza el valor si se convierte a un número válido. field.onChange(number); } } }} /> - )} @@ -133,21 +152,34 @@ export const ShowMariadbResources = ({ mariadbId }: Props) => { render={({ field }) => { return ( - Memory Limit +
+ Memory Limit + + + + + + +

+ Memory hard limit in bytes. Example: 1GB = + 1073741824 bytes +

+ + + +
{ const value = e.target.value; if (value === "") { - // Si el campo está vacío, establece el valor como null. field.onChange(null); } else { const number = Number.parseInt(value, 10); if (!Number.isNaN(number)) { - // Solo actualiza el valor si se convierte a un número válido. field.onChange(number); } } @@ -166,21 +198,34 @@ export const ShowMariadbResources = ({ mariadbId }: Props) => { render={({ field }) => { return ( - Cpu Limit +
+ CPU Limit + + + + + + +

+ CPU quota in units of 10^-9 CPUs. Example: 2 + CPUs = 2000000000 +

+ + + +
{ const value = e.target.value; if (value === "") { - // Si el campo está vacío, establece el valor como null. field.onChange(null); } else { const number = Number.parseInt(value, 10); if (!Number.isNaN(number)) { - // Solo actualiza el valor si se convierte a un número válido. field.onChange(number); } } @@ -198,21 +243,34 @@ export const ShowMariadbResources = ({ mariadbId }: Props) => { render={({ field }) => { return ( - Cpu Reservation +
+ CPU Reservation + + + + + + +

+ CPU shares (relative weight). Example: 1 CPU = + 1000000000 +

+ + + +
{ const value = e.target.value; if (value === "") { - // Si el campo está vacío, establece el valor como null. field.onChange(null); } else { const number = Number.parseInt(value, 10); if (!Number.isNaN(number)) { - // Solo actualiza el valor si se convierte a un número válido. field.onChange(number); } } diff --git a/apps/dokploy/components/dashboard/mariadb/backups/show-backup-mariadb.tsx b/apps/dokploy/components/dashboard/mariadb/backups/show-backup-mariadb.tsx index f3d214e3..cac2820f 100644 --- a/apps/dokploy/components/dashboard/mariadb/backups/show-backup-mariadb.tsx +++ b/apps/dokploy/components/dashboard/mariadb/backups/show-backup-mariadb.tsx @@ -144,7 +144,7 @@ export const ShowBackupMariadb = ({ mariadbId }: Props) => { }) .catch(() => { toast.error( - "Error to Create the manual backup", + "Error creating the manual backup", ); }); }} diff --git a/apps/dokploy/components/dashboard/mariadb/environment/show-mariadb-environment.tsx b/apps/dokploy/components/dashboard/mariadb/environment/show-mariadb-environment.tsx index 61f64cd8..418ae001 100644 --- a/apps/dokploy/components/dashboard/mariadb/environment/show-mariadb-environment.tsx +++ b/apps/dokploy/components/dashboard/mariadb/environment/show-mariadb-environment.tsx @@ -70,7 +70,7 @@ export const ShowMariadbEnvironment = ({ mariadbId }: Props) => { await refetch(); }) .catch(() => { - toast.error("Error to add environment"); + toast.error("Error adding environment"); }); }; diff --git a/apps/dokploy/components/dashboard/mariadb/general/deploy-mariadb.tsx b/apps/dokploy/components/dashboard/mariadb/general/deploy-mariadb.tsx index e3162f00..50bf5819 100644 --- a/apps/dokploy/components/dashboard/mariadb/general/deploy-mariadb.tsx +++ b/apps/dokploy/components/dashboard/mariadb/general/deploy-mariadb.tsx @@ -55,12 +55,12 @@ export const DeployMariadb = ({ mariadbId }: Props) => { await deploy({ mariadbId, }).catch(() => { - toast.error("Error to deploy Database"); + toast.error("Error deploying Database"); }); await refetch(); }) .catch((e) => { - toast.error(e.message || "Error to deploy Database"); + toast.error(e.message || "Error deploying Database"); }); }} > diff --git a/apps/dokploy/components/dashboard/mariadb/general/reset-mariadb.tsx b/apps/dokploy/components/dashboard/mariadb/general/reset-mariadb.tsx index 3adb3b70..bee3d8ba 100644 --- a/apps/dokploy/components/dashboard/mariadb/general/reset-mariadb.tsx +++ b/apps/dokploy/components/dashboard/mariadb/general/reset-mariadb.tsx @@ -55,7 +55,7 @@ export const ResetMariadb = ({ mariadbId, appName }: Props) => { toast.success("Service Reloaded"); }) .catch(() => { - toast.error("Error to reload the service"); + toast.error("Error reloading the service"); }); await refetch(); }} diff --git a/apps/dokploy/components/dashboard/mariadb/general/show-external-mariadb-credentials.tsx b/apps/dokploy/components/dashboard/mariadb/general/show-external-mariadb-credentials.tsx index c06cacaa..f2044917 100644 --- a/apps/dokploy/components/dashboard/mariadb/general/show-external-mariadb-credentials.tsx +++ b/apps/dokploy/components/dashboard/mariadb/general/show-external-mariadb-credentials.tsx @@ -72,7 +72,7 @@ export const ShowExternalMariadbCredentials = ({ mariadbId }: Props) => { await refetch(); }) .catch(() => { - toast.error("Error to save the external port"); + toast.error("Error saving the external port"); }); }; diff --git a/apps/dokploy/components/dashboard/mariadb/general/stop-mariadb.tsx b/apps/dokploy/components/dashboard/mariadb/general/stop-mariadb.tsx index 17eb4bcd..55dc1367 100644 --- a/apps/dokploy/components/dashboard/mariadb/general/stop-mariadb.tsx +++ b/apps/dokploy/components/dashboard/mariadb/general/stop-mariadb.tsx @@ -49,10 +49,10 @@ export const StopMariadb = ({ mariadbId }: Props) => { await utils.mariadb.one.invalidate({ mariadbId, }); - toast.success("Application stopped succesfully"); + toast.success("Application stopped successfully"); }) .catch(() => { - toast.error("Error to stop the Application"); + toast.error("Error stopping the Application"); }); }} > diff --git a/apps/dokploy/components/dashboard/mariadb/start-mariadb.tsx b/apps/dokploy/components/dashboard/mariadb/start-mariadb.tsx index dff62cec..4c62f0a0 100644 --- a/apps/dokploy/components/dashboard/mariadb/start-mariadb.tsx +++ b/apps/dokploy/components/dashboard/mariadb/start-mariadb.tsx @@ -49,10 +49,10 @@ export const StartMariadb = ({ mariadbId }: Props) => { await utils.mariadb.one.invalidate({ mariadbId, }); - toast.success("Database started succesfully"); + toast.success("Database started successfully"); }) .catch(() => { - toast.error("Error to start the Database"); + toast.error("Error starting the Database"); }); }} > diff --git a/apps/dokploy/components/dashboard/mariadb/update-mariadb.tsx b/apps/dokploy/components/dashboard/mariadb/update-mariadb.tsx index 55b7e7e6..9b7c258e 100644 --- a/apps/dokploy/components/dashboard/mariadb/update-mariadb.tsx +++ b/apps/dokploy/components/dashboard/mariadb/update-mariadb.tsx @@ -75,13 +75,13 @@ export const UpdateMariadb = ({ mariadbId }: Props) => { description: formData.description || "", }) .then(() => { - toast.success("MariaDB updated succesfully"); + toast.success("MariaDB updated successfully"); utils.mariadb.one.invalidate({ mariadbId: mariadbId, }); }) .catch(() => { - toast.error("Error to update the Mariadb"); + toast.error("Error updating the Mariadb"); }) .finally(() => {}); }; diff --git a/apps/dokploy/components/dashboard/mongo/advanced/show-mongo-advanced-settings.tsx b/apps/dokploy/components/dashboard/mongo/advanced/show-mongo-advanced-settings.tsx index cbb178f3..d3a308f8 100644 --- a/apps/dokploy/components/dashboard/mongo/advanced/show-mongo-advanced-settings.tsx +++ b/apps/dokploy/components/dashboard/mongo/advanced/show-mongo-advanced-settings.tsx @@ -65,7 +65,7 @@ export const ShowAdvancedMongo = ({ mongoId }: Props) => { await refetch(); }) .catch(() => { - toast.error("Error to Update the resources"); + toast.error("Error updating the resources"); }); }; return ( diff --git a/apps/dokploy/components/dashboard/mongo/advanced/show-mongo-resources.tsx b/apps/dokploy/components/dashboard/mongo/advanced/show-mongo-resources.tsx index c18b54a8..d4824f52 100644 --- a/apps/dokploy/components/dashboard/mongo/advanced/show-mongo-resources.tsx +++ b/apps/dokploy/components/dashboard/mongo/advanced/show-mongo-resources.tsx @@ -19,6 +19,13 @@ import { Input } from "@/components/ui/input"; import { api } from "@/utils/api"; import { zodResolver } from "@hookform/resolvers/zod"; import React, { useEffect } from "react"; +import { + TooltipProvider, + TooltipTrigger, + TooltipContent, + Tooltip, +} from "@/components/ui/tooltip"; +import { InfoIcon } from "lucide-react"; import { useForm } from "react-hook-form"; import { toast } from "sonner"; import { z } from "zod"; @@ -71,7 +78,7 @@ export const ShowMongoResources = ({ mongoId }: Props) => { await refetch(); }) .catch(() => { - toast.error("Error to Update the resources"); + toast.error("Error updating the resources"); }); }; return ( @@ -89,10 +96,6 @@ export const ShowMongoResources = ({ mongoId }: Props) => { the changes.
- - Please remember to click Redeploy after modify the resources to - apply the changes. - { name="memoryReservation" render={({ field }) => ( - Memory Reservation +
+ Memory Reservation + + + + + + +

+ Memory soft limit in bytes. Example: 256MB = + 268435456 bytes +

+ + + +
{ const value = e.target.value; if (value === "") { - // Si el campo está vacío, establece el valor como null. field.onChange(null); } else { const number = Number.parseInt(value, 10); if (!Number.isNaN(number)) { - // Solo actualiza el valor si se convierte a un número válido. field.onChange(number); } } }} /> - )} @@ -137,21 +152,34 @@ export const ShowMongoResources = ({ mongoId }: Props) => { render={({ field }) => { return ( - Memory Limit +
+ Memory Limit + + + + + + +

+ Memory hard limit in bytes. Example: 1GB = + 1073741824 bytes +

+ + + +
{ const value = e.target.value; if (value === "") { - // Si el campo está vacío, establece el valor como null. field.onChange(null); } else { const number = Number.parseInt(value, 10); if (!Number.isNaN(number)) { - // Solo actualiza el valor si se convierte a un número válido. field.onChange(number); } } @@ -170,21 +198,34 @@ export const ShowMongoResources = ({ mongoId }: Props) => { render={({ field }) => { return ( - Cpu Limit +
+ CPU Limit + + + + + + +

+ CPU quota in units of 10^-9 CPUs. Example: 2 + CPUs = 2000000000 +

+ + + +
{ const value = e.target.value; if (value === "") { - // Si el campo está vacío, establece el valor como null. field.onChange(null); } else { const number = Number.parseInt(value, 10); if (!Number.isNaN(number)) { - // Solo actualiza el valor si se convierte a un número válido. field.onChange(number); } } @@ -202,21 +243,34 @@ export const ShowMongoResources = ({ mongoId }: Props) => { render={({ field }) => { return ( - Cpu Reservation +
+ CPU Reservation + + + + + + +

+ CPU shares (relative weight). Example: 1 CPU = + 1000000000 +

+ + + +
{ const value = e.target.value; if (value === "") { - // Si el campo está vacío, establece el valor como null. field.onChange(null); } else { const number = Number.parseInt(value, 10); if (!Number.isNaN(number)) { - // Solo actualiza el valor si se convierte a un número válido. field.onChange(number); } } diff --git a/apps/dokploy/components/dashboard/mongo/backups/show-backup-mongo.tsx b/apps/dokploy/components/dashboard/mongo/backups/show-backup-mongo.tsx index 0f0478c5..bc1b4c61 100644 --- a/apps/dokploy/components/dashboard/mongo/backups/show-backup-mongo.tsx +++ b/apps/dokploy/components/dashboard/mongo/backups/show-backup-mongo.tsx @@ -144,7 +144,7 @@ export const ShowBackupMongo = ({ mongoId }: Props) => { }) .catch(() => { toast.error( - "Error to Create the manual backup", + "Error creating the manual backup", ); }); }} diff --git a/apps/dokploy/components/dashboard/mongo/environment/show-mongo-environment.tsx b/apps/dokploy/components/dashboard/mongo/environment/show-mongo-environment.tsx index 76796796..0aab9c8d 100644 --- a/apps/dokploy/components/dashboard/mongo/environment/show-mongo-environment.tsx +++ b/apps/dokploy/components/dashboard/mongo/environment/show-mongo-environment.tsx @@ -70,7 +70,7 @@ export const ShowMongoEnvironment = ({ mongoId }: Props) => { await refetch(); }) .catch(() => { - toast.error("Error to add environment"); + toast.error("Error adding environment"); }); }; diff --git a/apps/dokploy/components/dashboard/mongo/general/deploy-mongo.tsx b/apps/dokploy/components/dashboard/mongo/general/deploy-mongo.tsx index 0ebda1ca..61f7e5d2 100644 --- a/apps/dokploy/components/dashboard/mongo/general/deploy-mongo.tsx +++ b/apps/dokploy/components/dashboard/mongo/general/deploy-mongo.tsx @@ -55,12 +55,12 @@ export const DeployMongo = ({ mongoId }: Props) => { await deploy({ mongoId, }).catch(() => { - toast.error("Error to deploy Database"); + toast.error("Error deploying Database"); }); await refetch(); }) .catch((e) => { - toast.error(e.message || "Error to deploy Database"); + toast.error(e.message || "Error deploying Database"); }); }} > diff --git a/apps/dokploy/components/dashboard/mongo/general/reset-mongo.tsx b/apps/dokploy/components/dashboard/mongo/general/reset-mongo.tsx index 19388bb7..1c297799 100644 --- a/apps/dokploy/components/dashboard/mongo/general/reset-mongo.tsx +++ b/apps/dokploy/components/dashboard/mongo/general/reset-mongo.tsx @@ -55,7 +55,7 @@ export const ResetMongo = ({ mongoId, appName }: Props) => { toast.success("Service Reloaded"); }) .catch(() => { - toast.error("Error to reload the service"); + toast.error("Error reloading the service"); }); await refetch(); }} diff --git a/apps/dokploy/components/dashboard/mongo/general/show-external-mongo-credentials.tsx b/apps/dokploy/components/dashboard/mongo/general/show-external-mongo-credentials.tsx index 7cfab289..6dd2e919 100644 --- a/apps/dokploy/components/dashboard/mongo/general/show-external-mongo-credentials.tsx +++ b/apps/dokploy/components/dashboard/mongo/general/show-external-mongo-credentials.tsx @@ -72,7 +72,7 @@ export const ShowExternalMongoCredentials = ({ mongoId }: Props) => { await refetch(); }) .catch(() => { - toast.error("Error to save the external port"); + toast.error("Error saving the external port"); }); }; diff --git a/apps/dokploy/components/dashboard/mongo/general/stop-mongo.tsx b/apps/dokploy/components/dashboard/mongo/general/stop-mongo.tsx index 09d2c372..f146145f 100644 --- a/apps/dokploy/components/dashboard/mongo/general/stop-mongo.tsx +++ b/apps/dokploy/components/dashboard/mongo/general/stop-mongo.tsx @@ -49,10 +49,10 @@ export const StopMongo = ({ mongoId }: Props) => { await utils.mongo.one.invalidate({ mongoId, }); - toast.success("Application stopped succesfully"); + toast.success("Application stopped successfully"); }) .catch(() => { - toast.error("Error to stop the Application"); + toast.error("Error stopping the Application"); }); }} > diff --git a/apps/dokploy/components/dashboard/mongo/start-mongo.tsx b/apps/dokploy/components/dashboard/mongo/start-mongo.tsx index 3bc30862..56675cb3 100644 --- a/apps/dokploy/components/dashboard/mongo/start-mongo.tsx +++ b/apps/dokploy/components/dashboard/mongo/start-mongo.tsx @@ -49,10 +49,10 @@ export const StartMongo = ({ mongoId }: Props) => { await utils.mongo.one.invalidate({ mongoId, }); - toast.success("Database started succesfully"); + toast.success("Database started successfully"); }) .catch(() => { - toast.error("Error to start the Database"); + toast.error("Error starting the Database"); }); }} > diff --git a/apps/dokploy/components/dashboard/mongo/update-mongo.tsx b/apps/dokploy/components/dashboard/mongo/update-mongo.tsx index fdfd2639..95ff9e3e 100644 --- a/apps/dokploy/components/dashboard/mongo/update-mongo.tsx +++ b/apps/dokploy/components/dashboard/mongo/update-mongo.tsx @@ -76,14 +76,14 @@ export const UpdateMongo = ({ mongoId }: Props) => { description: formData.description || "", }) .then(() => { - toast.success("Mongo updated succesfully"); + toast.success("Mongo updated successfully"); utils.mongo.one.invalidate({ mongoId: mongoId, }); setIsOpen(false); }) .catch(() => { - toast.error("Error to update mongo database"); + toast.error("Error updating mongo database"); }) .finally(() => {}); }; diff --git a/apps/dokploy/components/dashboard/mysql/advanced/show-mysql-advanced-settings.tsx b/apps/dokploy/components/dashboard/mysql/advanced/show-mysql-advanced-settings.tsx index 82198a0c..02256967 100644 --- a/apps/dokploy/components/dashboard/mysql/advanced/show-mysql-advanced-settings.tsx +++ b/apps/dokploy/components/dashboard/mysql/advanced/show-mysql-advanced-settings.tsx @@ -65,7 +65,7 @@ export const ShowAdvancedMysql = ({ mysqlId }: Props) => { await refetch(); }) .catch(() => { - toast.error("Error to Update the resources"); + toast.error("Error updating the resources"); }); }; return ( diff --git a/apps/dokploy/components/dashboard/mysql/advanced/show-mysql-resources.tsx b/apps/dokploy/components/dashboard/mysql/advanced/show-mysql-resources.tsx index 07ceeae9..bcf5a0b9 100644 --- a/apps/dokploy/components/dashboard/mysql/advanced/show-mysql-resources.tsx +++ b/apps/dokploy/components/dashboard/mysql/advanced/show-mysql-resources.tsx @@ -20,6 +20,13 @@ import { api } from "@/utils/api"; import { zodResolver } from "@hookform/resolvers/zod"; import React, { useEffect } from "react"; import { useForm } from "react-hook-form"; +import { + TooltipProvider, + TooltipTrigger, + TooltipContent, + Tooltip, +} from "@/components/ui/tooltip"; +import { InfoIcon } from "lucide-react"; import { toast } from "sonner"; import { z } from "zod"; @@ -71,7 +78,7 @@ export const ShowMysqlResources = ({ mysqlId }: Props) => { await refetch(); }) .catch(() => { - toast.error("Error to Update the resources"); + toast.error("Error updating the resources"); }); }; return ( @@ -100,28 +107,40 @@ export const ShowMysqlResources = ({ mysqlId }: Props) => { name="memoryReservation" render={({ field }) => ( - Memory Reservation +
+ Memory Reservation + + + + + + +

+ Memory soft limit in bytes. Example: 256MB = + 268435456 bytes +

+ + + +
{ const value = e.target.value; if (value === "") { - // Si el campo está vacío, establece el valor como null. field.onChange(null); } else { const number = Number.parseInt(value, 10); if (!Number.isNaN(number)) { - // Solo actualiza el valor si se convierte a un número válido. field.onChange(number); } } }} /> - )} @@ -133,21 +152,34 @@ export const ShowMysqlResources = ({ mysqlId }: Props) => { render={({ field }) => { return ( - Memory Limit +
+ Memory Limit + + + + + + +

+ Memory hard limit in bytes. Example: 1GB = + 1073741824 bytes +

+ + + +
{ const value = e.target.value; if (value === "") { - // Si el campo está vacío, establece el valor como null. field.onChange(null); } else { const number = Number.parseInt(value, 10); if (!Number.isNaN(number)) { - // Solo actualiza el valor si se convierte a un número válido. field.onChange(number); } } @@ -166,21 +198,34 @@ export const ShowMysqlResources = ({ mysqlId }: Props) => { render={({ field }) => { return ( - Cpu Limit +
+ CPU Limit + + + + + + +

+ CPU quota in units of 10^-9 CPUs. Example: 2 + CPUs = 2000000000 +

+ + + +
{ const value = e.target.value; if (value === "") { - // Si el campo está vacío, establece el valor como null. field.onChange(null); } else { const number = Number.parseInt(value, 10); if (!Number.isNaN(number)) { - // Solo actualiza el valor si se convierte a un número válido. field.onChange(number); } } @@ -198,21 +243,34 @@ export const ShowMysqlResources = ({ mysqlId }: Props) => { render={({ field }) => { return ( - Cpu Reservation +
+ CPU Reservation + + + + + + +

+ CPU shares (relative weight). Example: 1 CPU = + 1000000000 +

+ + + +
{ const value = e.target.value; if (value === "") { - // Si el campo está vacío, establece el valor como null. field.onChange(null); } else { const number = Number.parseInt(value, 10); if (!Number.isNaN(number)) { - // Solo actualiza el valor si se convierte a un número válido. field.onChange(number); } } diff --git a/apps/dokploy/components/dashboard/mysql/backups/show-backup-mysql.tsx b/apps/dokploy/components/dashboard/mysql/backups/show-backup-mysql.tsx index a760fd92..de443c68 100644 --- a/apps/dokploy/components/dashboard/mysql/backups/show-backup-mysql.tsx +++ b/apps/dokploy/components/dashboard/mysql/backups/show-backup-mysql.tsx @@ -144,7 +144,7 @@ export const ShowBackupMySql = ({ mysqlId }: Props) => { }) .catch(() => { toast.error( - "Error to Create the manual backup", + "Error creating the manual backup", ); }); }} diff --git a/apps/dokploy/components/dashboard/mysql/environment/show-mysql-environment.tsx b/apps/dokploy/components/dashboard/mysql/environment/show-mysql-environment.tsx index 036a63ab..7dfa6aed 100644 --- a/apps/dokploy/components/dashboard/mysql/environment/show-mysql-environment.tsx +++ b/apps/dokploy/components/dashboard/mysql/environment/show-mysql-environment.tsx @@ -70,7 +70,7 @@ export const ShowMysqlEnvironment = ({ mysqlId }: Props) => { await refetch(); }) .catch(() => { - toast.error("Error to add environment"); + toast.error("Error adding environment"); }); }; diff --git a/apps/dokploy/components/dashboard/mysql/general/deploy-mysql.tsx b/apps/dokploy/components/dashboard/mysql/general/deploy-mysql.tsx index a773feff..c56c20d5 100644 --- a/apps/dokploy/components/dashboard/mysql/general/deploy-mysql.tsx +++ b/apps/dokploy/components/dashboard/mysql/general/deploy-mysql.tsx @@ -55,12 +55,12 @@ export const DeployMysql = ({ mysqlId }: Props) => { await deploy({ mysqlId, }).catch(() => { - toast.error("Error to deploy Database"); + toast.error("Error deploying Database"); }); await refetch(); }) .catch((e) => { - toast.error(e.message || "Error to deploy Database"); + toast.error(e.message || "Error deploying Database"); }); }} > diff --git a/apps/dokploy/components/dashboard/mysql/general/reset-mysql.tsx b/apps/dokploy/components/dashboard/mysql/general/reset-mysql.tsx index 8b64ca9a..5e989671 100644 --- a/apps/dokploy/components/dashboard/mysql/general/reset-mysql.tsx +++ b/apps/dokploy/components/dashboard/mysql/general/reset-mysql.tsx @@ -55,7 +55,7 @@ export const ResetMysql = ({ mysqlId, appName }: Props) => { toast.success("Service Reloaded"); }) .catch(() => { - toast.error("Error to reload the service"); + toast.error("Error reloading the service"); }); await refetch(); }} diff --git a/apps/dokploy/components/dashboard/mysql/general/show-external-mysql-credentials.tsx b/apps/dokploy/components/dashboard/mysql/general/show-external-mysql-credentials.tsx index 009c8c3a..dc1ca3a7 100644 --- a/apps/dokploy/components/dashboard/mysql/general/show-external-mysql-credentials.tsx +++ b/apps/dokploy/components/dashboard/mysql/general/show-external-mysql-credentials.tsx @@ -72,7 +72,7 @@ export const ShowExternalMysqlCredentials = ({ mysqlId }: Props) => { await refetch(); }) .catch(() => { - toast.error("Error to save the external port"); + toast.error("Error saving the external port"); }); }; diff --git a/apps/dokploy/components/dashboard/mysql/general/stop-mysql.tsx b/apps/dokploy/components/dashboard/mysql/general/stop-mysql.tsx index 3cb0d681..31d4c0f6 100644 --- a/apps/dokploy/components/dashboard/mysql/general/stop-mysql.tsx +++ b/apps/dokploy/components/dashboard/mysql/general/stop-mysql.tsx @@ -49,10 +49,10 @@ export const StopMysql = ({ mysqlId }: Props) => { await utils.mysql.one.invalidate({ mysqlId, }); - toast.success("Application stopped succesfully"); + toast.success("MySQL stopped successfully"); }) .catch(() => { - toast.error("Error to stop the Application"); + toast.error("Error stopping MySQL"); }); }} > diff --git a/apps/dokploy/components/dashboard/mysql/start-mysql.tsx b/apps/dokploy/components/dashboard/mysql/start-mysql.tsx index 60ebc08b..dcf4db22 100644 --- a/apps/dokploy/components/dashboard/mysql/start-mysql.tsx +++ b/apps/dokploy/components/dashboard/mysql/start-mysql.tsx @@ -49,10 +49,10 @@ export const StartMysql = ({ mysqlId }: Props) => { await utils.mysql.one.invalidate({ mysqlId, }); - toast.success("Database started succesfully"); + toast.success("Database started successfully"); }) .catch(() => { - toast.error("Error to start the Database"); + toast.error("Error starting the Database"); }); }} > diff --git a/apps/dokploy/components/dashboard/mysql/update-mysql.tsx b/apps/dokploy/components/dashboard/mysql/update-mysql.tsx index 37b71b6c..5c1af50c 100644 --- a/apps/dokploy/components/dashboard/mysql/update-mysql.tsx +++ b/apps/dokploy/components/dashboard/mysql/update-mysql.tsx @@ -75,13 +75,13 @@ export const UpdateMysql = ({ mysqlId }: Props) => { description: formData.description || "", }) .then(() => { - toast.success("MySQL updated succesfully"); + toast.success("MySQL updated successfully"); utils.mysql.one.invalidate({ mysqlId: mysqlId, }); }) .catch(() => { - toast.error("Error to update the MySQL"); + toast.error("Error updating MySQL"); }) .finally(() => {}); }; diff --git a/apps/dokploy/components/dashboard/postgres/advanced/show-postgres-advanced-settings.tsx b/apps/dokploy/components/dashboard/postgres/advanced/show-postgres-advanced-settings.tsx index c8002fa2..d3ad7213 100644 --- a/apps/dokploy/components/dashboard/postgres/advanced/show-postgres-advanced-settings.tsx +++ b/apps/dokploy/components/dashboard/postgres/advanced/show-postgres-advanced-settings.tsx @@ -65,7 +65,7 @@ export const ShowAdvancedPostgres = ({ postgresId }: Props) => { await refetch(); }) .catch(() => { - toast.error("Error to Update the resources"); + toast.error("Error updating the resources"); }); }; return ( diff --git a/apps/dokploy/components/dashboard/postgres/advanced/show-postgres-resources.tsx b/apps/dokploy/components/dashboard/postgres/advanced/show-postgres-resources.tsx index 7f224ee2..678aec29 100644 --- a/apps/dokploy/components/dashboard/postgres/advanced/show-postgres-resources.tsx +++ b/apps/dokploy/components/dashboard/postgres/advanced/show-postgres-resources.tsx @@ -21,6 +21,13 @@ import { zodResolver } from "@hookform/resolvers/zod"; import React, { useEffect } from "react"; import { useForm } from "react-hook-form"; import { toast } from "sonner"; +import { + TooltipProvider, + TooltipTrigger, + TooltipContent, + Tooltip, +} from "@/components/ui/tooltip"; +import { InfoIcon } from "lucide-react"; import { z } from "zod"; const addResourcesPostgres = z.object({ @@ -71,7 +78,7 @@ export const ShowPostgresResources = ({ postgresId }: Props) => { await refetch(); }) .catch(() => { - toast.error("Error to Update the resources"); + toast.error("Error updating the resources"); }); }; return ( @@ -100,10 +107,25 @@ export const ShowPostgresResources = ({ postgresId }: Props) => { name="memoryReservation" render={({ field }) => ( - Memory Reservation +
+ Memory Reservation + + + + + + +

+ Memory soft limit in bytes. Example: 256MB = + 268435456 bytes +

+ + + +
{ @@ -119,7 +141,6 @@ export const ShowPostgresResources = ({ postgresId }: Props) => { }} /> - )} @@ -131,10 +152,25 @@ export const ShowPostgresResources = ({ postgresId }: Props) => { render={({ field }) => { return ( - Memory Limit +
+ Memory Limit + + + + + + +

+ Memory hard limit in bytes. Example: 1GB = + 1073741824 bytes +

+ + + +
{ @@ -162,10 +198,25 @@ export const ShowPostgresResources = ({ postgresId }: Props) => { render={({ field }) => { return ( - Cpu Limit +
+ CPU Limit + + + + + + +

+ CPU quota in units of 10^-9 CPUs. Example: 2 + CPUs = 2000000000 +

+ + + +
{ @@ -192,10 +243,25 @@ export const ShowPostgresResources = ({ postgresId }: Props) => { render={({ field }) => { return ( - Cpu Reservation +
+ CPU Reservation + + + + + + +

+ CPU shares (relative weight). Example: 1 CPU = + 1000000000 +

+ + + +
{ diff --git a/apps/dokploy/components/dashboard/postgres/backups/show-backup-postgres.tsx b/apps/dokploy/components/dashboard/postgres/backups/show-backup-postgres.tsx index c5a36a6a..dad55d1e 100644 --- a/apps/dokploy/components/dashboard/postgres/backups/show-backup-postgres.tsx +++ b/apps/dokploy/components/dashboard/postgres/backups/show-backup-postgres.tsx @@ -145,7 +145,7 @@ export const ShowBackupPostgres = ({ postgresId }: Props) => { }) .catch(() => { toast.error( - "Error to Create the manual backup", + "Error creating the manual backup", ); }); }} diff --git a/apps/dokploy/components/dashboard/postgres/environment/show-postgres-environment.tsx b/apps/dokploy/components/dashboard/postgres/environment/show-postgres-environment.tsx index b6677695..c2361831 100644 --- a/apps/dokploy/components/dashboard/postgres/environment/show-postgres-environment.tsx +++ b/apps/dokploy/components/dashboard/postgres/environment/show-postgres-environment.tsx @@ -70,7 +70,7 @@ export const ShowPostgresEnvironment = ({ postgresId }: Props) => { await refetch(); }) .catch(() => { - toast.error("Error to add environment"); + toast.error("Error adding environment"); }); }; diff --git a/apps/dokploy/components/dashboard/postgres/general/deploy-postgres.tsx b/apps/dokploy/components/dashboard/postgres/general/deploy-postgres.tsx index e329d9f8..1d78d17e 100644 --- a/apps/dokploy/components/dashboard/postgres/general/deploy-postgres.tsx +++ b/apps/dokploy/components/dashboard/postgres/general/deploy-postgres.tsx @@ -55,12 +55,12 @@ export const DeployPostgres = ({ postgresId }: Props) => { await deploy({ postgresId, }).catch(() => { - toast.error("Error to deploy Database"); + toast.error("Error deploying Database"); }); await refetch(); }) .catch((e) => { - toast.error(e.message || "Error to deploy Database"); + toast.error(e.message || "Error deploying Database"); }); }} > diff --git a/apps/dokploy/components/dashboard/postgres/general/reset-postgres.tsx b/apps/dokploy/components/dashboard/postgres/general/reset-postgres.tsx index 359c2b77..51108f93 100644 --- a/apps/dokploy/components/dashboard/postgres/general/reset-postgres.tsx +++ b/apps/dokploy/components/dashboard/postgres/general/reset-postgres.tsx @@ -55,7 +55,7 @@ export const ResetPostgres = ({ postgresId, appName }: Props) => { toast.success("Service Reloaded"); }) .catch(() => { - toast.error("Error to reload the service"); + toast.error("Error reloading the service"); }); await refetch(); }} diff --git a/apps/dokploy/components/dashboard/postgres/general/show-external-postgres-credentials.tsx b/apps/dokploy/components/dashboard/postgres/general/show-external-postgres-credentials.tsx index e1b4369a..e8fff7dc 100644 --- a/apps/dokploy/components/dashboard/postgres/general/show-external-postgres-credentials.tsx +++ b/apps/dokploy/components/dashboard/postgres/general/show-external-postgres-credentials.tsx @@ -74,7 +74,7 @@ export const ShowExternalPostgresCredentials = ({ postgresId }: Props) => { await refetch(); }) .catch(() => { - toast.error("Error to save the external port"); + toast.error("Error saving the external port"); }); }; diff --git a/apps/dokploy/components/dashboard/postgres/general/stop-postgres.tsx b/apps/dokploy/components/dashboard/postgres/general/stop-postgres.tsx index 9bf1738f..6e2b4557 100644 --- a/apps/dokploy/components/dashboard/postgres/general/stop-postgres.tsx +++ b/apps/dokploy/components/dashboard/postgres/general/stop-postgres.tsx @@ -49,10 +49,10 @@ export const StopPostgres = ({ postgresId }: Props) => { await utils.postgres.one.invalidate({ postgresId, }); - toast.success("Application stopped succesfully"); + toast.success("Postgres stopped successfully"); }) .catch(() => { - toast.error("Error to stop the Application"); + toast.error("Error stopping Postgres"); }); }} > diff --git a/apps/dokploy/components/dashboard/postgres/start-postgres.tsx b/apps/dokploy/components/dashboard/postgres/start-postgres.tsx index 8d945082..4b1c7475 100644 --- a/apps/dokploy/components/dashboard/postgres/start-postgres.tsx +++ b/apps/dokploy/components/dashboard/postgres/start-postgres.tsx @@ -49,10 +49,10 @@ export const StartPostgres = ({ postgresId }: Props) => { await utils.postgres.one.invalidate({ postgresId, }); - toast.success("Database started succesfully"); + toast.success("Database started successfully"); }) .catch(() => { - toast.error("Error to start the Database"); + toast.error("Error starting the Database"); }); }} > diff --git a/apps/dokploy/components/dashboard/postgres/update-postgres.tsx b/apps/dokploy/components/dashboard/postgres/update-postgres.tsx index dcc3e9b1..566fd1d6 100644 --- a/apps/dokploy/components/dashboard/postgres/update-postgres.tsx +++ b/apps/dokploy/components/dashboard/postgres/update-postgres.tsx @@ -76,14 +76,14 @@ export const UpdatePostgres = ({ postgresId }: Props) => { description: formData.description || "", }) .then(() => { - toast.success("Postgres updated succesfully"); + toast.success("Postgres updated successfully"); utils.postgres.one.invalidate({ postgresId: postgresId, }); setIsOpen(false); }) .catch(() => { - toast.error("Error to update the postgres"); + toast.error("Error updating Postgres"); }) .finally(() => {}); }; diff --git a/apps/dokploy/components/dashboard/project/add-application.tsx b/apps/dokploy/components/dashboard/project/add-application.tsx index 6d9c5b40..2c30df8d 100644 --- a/apps/dokploy/components/dashboard/project/add-application.tsx +++ b/apps/dokploy/components/dashboard/project/add-application.tsx @@ -104,7 +104,7 @@ export const AddApplication = ({ projectId, projectName }: Props) => { }); }) .catch((e) => { - toast.error("Error to create the service"); + toast.error("Error creating the service"); }); }; @@ -176,7 +176,7 @@ export const AddApplication = ({ projectId, projectName }: Props) => { side="top" > - If not server is selected, the application will be + If no server is selected, the application will be deployed on the server where the user is logged in. @@ -229,7 +229,7 @@ export const AddApplication = ({ projectId, projectName }: Props) => { Description