From 7b9abef68726a611870f7156c007bfac27aab28f Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Thu, 22 Aug 2024 00:02:02 -0600
Subject: [PATCH] refactor: add localhos traefik domains

---
 .../components/dashboard/requests/columns.tsx |  25 ++++
 apps/dokploy/pages/dashboard/requests.tsx     | 125 +-----------------
 apps/dokploy/templates/utils/index.ts         |   2 +-
 3 files changed, 27 insertions(+), 125 deletions(-)

diff --git a/apps/dokploy/components/dashboard/requests/columns.tsx b/apps/dokploy/components/dashboard/requests/columns.tsx
index 7e5765d5..0d8de250 100644
--- a/apps/dokploy/components/dashboard/requests/columns.tsx
+++ b/apps/dokploy/components/dashboard/requests/columns.tsx
@@ -11,6 +11,7 @@ import {
 
 import { Badge } from "@/components/ui/badge";
 import type { LogEntry } from "./show-requests";
+import { format } from "date-fns";
 
 export const columns: ColumnDef<LogEntry>[] = [
 	{
@@ -65,6 +66,30 @@ export const columns: ColumnDef<LogEntry>[] = [
 			);
 		},
 	},
+	{
+		accessorKey: "time",
+		header: ({ column }) => {
+			return (
+				<Button
+					variant="ghost"
+					onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
+				>
+					Time
+					<ArrowUpDown className="ml-2 h-4 w-4" />
+				</Button>
+			);
+		},
+		cell: ({ row }) => {
+			const log = row.original;
+			return (
+				<div className=" flex flex-col gap-2">
+					<div className="flex flex-row gap-3 w-full">
+						{format(new Date(log.time), "yyyy-MM-dd HH:mm:ss")}
+					</div>
+				</div>
+			);
+		},
+	},
 	{
 		id: "actions",
 		enableHiding: false,
diff --git a/apps/dokploy/pages/dashboard/requests.tsx b/apps/dokploy/pages/dashboard/requests.tsx
index 5b48d71a..3ea739f5 100644
--- a/apps/dokploy/pages/dashboard/requests.tsx
+++ b/apps/dokploy/pages/dashboard/requests.tsx
@@ -6,130 +6,7 @@ import * as React from "react";
 import { ShowRequests } from "@/components/dashboard/requests/show-requests";
 
 export default function Requests() {
-	return (
-		<>
-			{/* <Card className="bg-transparent mt-10">
-				<CardHeader>
-					<CardTitle>Request Distribution</CardTitle>
-					<CardDescription>
-						Showing web and API requests over time
-					</CardDescription>
-				</CardHeader>
-				<CardContent>
-					<ResponsiveContainer width="100%" height={200}>
-						<ChartContainer config={chartConfig}>
-							<AreaChart
-								accessibilityLayer
-								data={data?.hourlyData || []}
-								margin={{
-									left: 12,
-									right: 12,
-								}}
-							>
-								<CartesianGrid vertical={false} />
-								<XAxis
-									dataKey="hour"
-									tickLine={false}
-									axisLine={false}
-									tickMargin={8}
-									tickFormatter={(value) =>
-										new Date(value).toLocaleTimeString([], {
-											hour: "2-digit",
-											minute: "2-digit",
-										})
-									}
-								/>
-								<YAxis tickLine={false} axisLine={false} tickMargin={8} />
-								<ChartTooltip
-									cursor={false}
-									content={<ChartTooltipContent indicator="line" />}
-									labelFormatter={(value) =>
-										new Date(value).toLocaleString([], {
-											month: "short",
-											day: "numeric",
-											hour: "2-digit",
-											minute: "2-digit",
-										})
-									}
-								/>
-								<Area
-									dataKey="count"
-									type="natural"
-									fill="hsl(var(--chart-1))"
-									fillOpacity={0.4}
-									stroke="hsl(var(--chart-1))"
-								/>
-							</AreaChart>
-						</ChartContainer>
-					</ResponsiveContainer>
-				</CardContent>
-			</Card> */}
-
-			{/* <div className="flex flex-col gap-6">
-				<Table>
-					<TableCaption>See all users</TableCaption>
-					<TableHeader>
-						<TableRow>
-							<TableHead className="w-[100px]">Level</TableHead>
-							<TableHead className="text-center">Message</TableHead>
-							<TableHead className="text-center">Created</TableHead>
-							<TableHead className="text-right">Actions</TableHead>
-						</TableRow>
-					</TableHeader>
-					<TableBody>
-						{data?.data?.map((log, index) => {
-							return (
-								<TableRow
-									key={`${log.time}-${index}`}
-									onClick={() => console.log(log)}
-								>
-									<TableCell className="text-center">
-										<Badge variant={"secondary"}>{log.level}</Badge>
-									</TableCell>
-									<TableCell className=" flex flex-col gap-2">
-										<div>
-											{log.RequestMethod} {log.RequestPath}
-										</div>
-										<div className="flex flex-row gap-3 w-full">
-											<Badge variant={"secondary"}>
-												Status: {log.OriginStatus}
-											</Badge>
-											<Badge variant={"secondary"}>
-												Exec Time: {log.Duration} ms
-											</Badge>
-											<Badge variant={"secondary"}>{log.ClientAddr}</Badge>
-										</div>
-									</TableCell>
-									<TableCell className="text-center">
-										{new Date(log.time).toLocaleString([], {
-											month: "short",
-											day: "numeric",
-											hour: "2-digit",
-											minute: "2-digit",
-										})}
-									</TableCell>
-									<TableCell className="text-right flex justify-end">
-										<DropdownMenu>
-											<DropdownMenuTrigger asChild>
-												<Button variant="ghost" className="h-8 w-8 p-0">
-													<span className="sr-only">Open menu</span>
-													<MoreHorizontal className="h-4 w-4" />
-												</Button>
-											</DropdownMenuTrigger>
-											<DropdownMenuContent align="end">
-												<DropdownMenuLabel>Actions</DropdownMenuLabel>
-											</DropdownMenuContent>
-										</DropdownMenu>
-									</TableCell>
-								</TableRow>
-							);
-						})}
-					</TableBody>
-				</Table>
-			</div> */}
-			<ShowRequests />
-		</>
-	);
+	return <ShowRequests />;
 }
 Requests.getLayout = (page: ReactElement) => {
 	return <DashboardLayout tab={"requests"}>{page}</DashboardLayout>;
diff --git a/apps/dokploy/templates/utils/index.ts b/apps/dokploy/templates/utils/index.ts
index 9040e83a..7be92dad 100644
--- a/apps/dokploy/templates/utils/index.ts
+++ b/apps/dokploy/templates/utils/index.ts
@@ -28,7 +28,7 @@ export const generateRandomDomain = ({
 }: Schema): string => {
 	const hash = randomBytes(3).toString("hex");
 	const slugIp = serverIp.replaceAll(".", "-");
-	return `${projectName}-${hash}-${slugIp}.traefik.me`;
+	return `${projectName}-${hash}${process.env.NODE_ENV === "production" ? `-${slugIp}` : ""}.traefik.me`;
 };
 
 export const generateHash = (projectName: string, quantity = 3): string => {