From d3b2cee7fb8c95c26d24dc20f8c1f902b35442d4 Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Sun, 23 Feb 2025 18:11:27 -0600 Subject: [PATCH] refactor(ui): improve log highlighting and template formatting --- .../dashboard/docker/logs/terminal-line.tsx | 46 +++++++------- apps/dokploy/templates/convex/index.ts | 60 +++++++++---------- apps/dokploy/templates/templates.ts | 1 - 3 files changed, 53 insertions(+), 54 deletions(-) diff --git a/apps/dokploy/components/dashboard/docker/logs/terminal-line.tsx b/apps/dokploy/components/dashboard/docker/logs/terminal-line.tsx index 116efedf..359fbfa9 100644 --- a/apps/dokploy/components/dashboard/docker/logs/terminal-line.tsx +++ b/apps/dokploy/components/dashboard/docker/logs/terminal-line.tsx @@ -35,34 +35,34 @@ export function TerminalLine({ log, noTimestamp, searchTerm }: LogLineProps) { }) : "--- No time found ---"; - const highlightMessage = (text: string, term: string) => { - if (!term) { - return ( - - ); - } - - const htmlContent = fancyAnsi.toHtml(text); - const searchRegex = new RegExp(`(${escapeRegExp(term)})`, "gi"); - - const modifiedContent = htmlContent.replace( - searchRegex, - (match) => - `${match}`, - ); - + const highlightMessage = (text: string, term: string) => { + if (!term) { return ( ); - }; + } + + const htmlContent = fancyAnsi.toHtml(text); + const searchRegex = new RegExp(`(${escapeRegExp(term)})`, "gi"); + + const modifiedContent = htmlContent.replace( + searchRegex, + (match) => + `${match}`, + ); + + return ( + + ); + }; const tooltip = (color: string, timestamp: string | null) => { const square = ( diff --git a/apps/dokploy/templates/convex/index.ts b/apps/dokploy/templates/convex/index.ts index 6a112cde..badfe732 100644 --- a/apps/dokploy/templates/convex/index.ts +++ b/apps/dokploy/templates/convex/index.ts @@ -1,38 +1,38 @@ import { - type DomainSchema, - type Schema, - type Template, - generateRandomDomain, + type DomainSchema, + type Schema, + type Template, + generateRandomDomain, } from "../utils"; export function generate(schema: Schema): Template { - const dashboardDomain = generateRandomDomain(schema); - const backendDomain = generateRandomDomain(schema); - const actionsDomain = generateRandomDomain(schema); + const dashboardDomain = generateRandomDomain(schema); + const backendDomain = generateRandomDomain(schema); + const actionsDomain = generateRandomDomain(schema); - const domains: DomainSchema[] = [ - { - host: dashboardDomain, - port: 6791, - serviceName: "dashboard", - }, - { - host: backendDomain, - port: 3210, - serviceName: "backend", - }, - { - host: actionsDomain, - port: 3211, - serviceName: "backend", - }, - ]; + const domains: DomainSchema[] = [ + { + host: dashboardDomain, + port: 6791, + serviceName: "dashboard", + }, + { + host: backendDomain, + port: 3210, + serviceName: "backend", + }, + { + host: actionsDomain, + port: 3211, + serviceName: "backend", + }, + ]; - const envs = [ - `NEXT_PUBLIC_DEPLOYMENT_URL=http://${backendDomain}`, - `CONVEX_CLOUD_ORIGIN=http://${backendDomain}`, - `CONVEX_SITE_ORIGIN=http://${actionsDomain}`, - ]; + const envs = [ + `NEXT_PUBLIC_DEPLOYMENT_URL=http://${backendDomain}`, + `CONVEX_CLOUD_ORIGIN=http://${backendDomain}`, + `CONVEX_SITE_ORIGIN=http://${actionsDomain}`, + ]; - return { envs, domains }; + return { envs, domains }; } diff --git a/apps/dokploy/templates/templates.ts b/apps/dokploy/templates/templates.ts index dc5205ef..d39465a8 100644 --- a/apps/dokploy/templates/templates.ts +++ b/apps/dokploy/templates/templates.ts @@ -1619,4 +1619,3 @@ export const templates: TemplateData[] = [ load: () => import("./wikijs/index").then((m) => m.generate), }, ]; -