From 28f2c1a3c07ab9511be57fb6c110e973b7cf1779 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20T=C3=B8n=20L=C3=B8vhaug?= Date: Mon, 18 Nov 2024 09:03:48 +0100 Subject: [PATCH 1/8] fix: template pointing to wrong TLD --- apps/dokploy/templates/templates.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/dokploy/templates/templates.ts b/apps/dokploy/templates/templates.ts index 40f5e736..d0b29fc6 100644 --- a/apps/dokploy/templates/templates.ts +++ b/apps/dokploy/templates/templates.ts @@ -771,8 +771,8 @@ export const templates: TemplateData[] = [ logo: "postiz.png", links: { github: "https://github.com/gitroomhq/postiz", - website: "https://postiz.io", - docs: "https://docs.postiz.io", + website: "https://postiz.com", + docs: "https://docs.postiz.com", }, tags: ["cms", "content-management", "publishing"], load: () => import("./postiz/index").then((m) => m.generate), From cda66606ec2cca2b8fc028046f58cfb2dde16ab7 Mon Sep 17 00:00:00 2001 From: WoWnik Date: Mon, 18 Nov 2024 11:47:41 +0300 Subject: [PATCH 2/8] feat: add russian translation init --- .../dashboard/settings/appearance-form.tsx | 3 +- apps/dokploy/next-i18next.config.cjs | 2 +- apps/dokploy/pages/_app.tsx | 2 +- apps/dokploy/public/locales/ru/common.json | 1 + apps/dokploy/public/locales/ru/settings.json | 44 +++++++++++++++++++ apps/dokploy/utils/hooks/use-locale.ts | 2 +- 6 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 apps/dokploy/public/locales/ru/common.json create mode 100644 apps/dokploy/public/locales/ru/settings.json diff --git a/apps/dokploy/components/dashboard/settings/appearance-form.tsx b/apps/dokploy/components/dashboard/settings/appearance-form.tsx index 9bafbeda..5d764cac 100644 --- a/apps/dokploy/components/dashboard/settings/appearance-form.tsx +++ b/apps/dokploy/components/dashboard/settings/appearance-form.tsx @@ -37,7 +37,7 @@ const appearanceFormSchema = z.object({ theme: z.enum(["light", "dark", "system"], { required_error: "Please select a theme.", }), - language: z.enum(["en", "pl", "zh-Hans"], { + language: z.enum(["en", "pl", "zh-Hans", "ru"], { required_error: "Please select a language.", }), }); @@ -176,6 +176,7 @@ export function AppearanceForm() { { label: "English", value: "en" }, { label: "Polski", value: "pl" }, { label: "简体中文", value: "zh-Hans" }, + { label: "Русский", value: "ru" }, ].map((preset) => ( {preset.label} diff --git a/apps/dokploy/next-i18next.config.cjs b/apps/dokploy/next-i18next.config.cjs index bac301cb..7a1e5b01 100644 --- a/apps/dokploy/next-i18next.config.cjs +++ b/apps/dokploy/next-i18next.config.cjs @@ -2,7 +2,7 @@ module.exports = { i18n: { defaultLocale: "en", - locales: ["en", "pl", "zh-Hans"], + locales: ["en", "pl", "zh-Hans", "ru"], localeDetection: false, }, fallbackLng: "en", diff --git a/apps/dokploy/pages/_app.tsx b/apps/dokploy/pages/_app.tsx index 18cb3e7e..b74f24aa 100644 --- a/apps/dokploy/pages/_app.tsx +++ b/apps/dokploy/pages/_app.tsx @@ -71,7 +71,7 @@ export default api.withTRPC( { i18n: { defaultLocale: "en", - locales: ["en", "pl", "zh-Hans"], + locales: ["en", "pl", "zh-Hans", "ru"], localeDetection: false, }, fallbackLng: "en", diff --git a/apps/dokploy/public/locales/ru/common.json b/apps/dokploy/public/locales/ru/common.json new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/apps/dokploy/public/locales/ru/common.json @@ -0,0 +1 @@ +{} diff --git a/apps/dokploy/public/locales/ru/settings.json b/apps/dokploy/public/locales/ru/settings.json new file mode 100644 index 00000000..55620c67 --- /dev/null +++ b/apps/dokploy/public/locales/ru/settings.json @@ -0,0 +1,44 @@ +{ + "settings.common.save": "Сохранить", + "settings.server.domain.title": "Домен сервера", + "settings.server.domain.description": "Установите домен для вашего серверного приложения Dokploy.", + "settings.server.domain.form.domain": "Домен", + "settings.server.domain.form.letsEncryptEmail": "Email для Let's Encrypt", + "settings.server.domain.form.certificate.label": "Сертификат", + "settings.server.domain.form.certificate.placeholder": "Выберите сертификат", + "settings.server.domain.form.certificateOptions.none": "Нет", + "settings.server.domain.form.certificateOptions.letsencrypt": "Let's Encrypt (По умолчанию)", + + "settings.server.webServer.title": "Веб-сервер", + "settings.server.webServer.description": "Перезагрузка или очистка веб-сервера.", + "settings.server.webServer.server.label": "Сервер", + "settings.server.webServer.traefik.label": "Traefik", + "settings.server.webServer.storage.label": "Дисковое пространство", + "settings.server.webServer.actions": "Действия", + "settings.server.webServer.reload": "Перезагрузить", + "settings.server.webServer.watchLogs": "Просмотр логов", + "settings.server.webServer.updateServerIp": "Изменить IP адрес", + "settings.server.webServer.traefik.modifyEnv": "Изменить переменные окружения", + "settings.server.webServer.storage.cleanUnusedImages": "Очистить неиспользуемые образы", + "settings.server.webServer.storage.cleanUnusedVolumes": "Очистить неиспользуемые тома", + "settings.server.webServer.storage.cleanStoppedContainers": "Очистить остановленные контейнеры", + "settings.server.webServer.storage.cleanDockerBuilder": "Очистить Docker Builder и систему", + "settings.server.webServer.storage.cleanMonitoring": "Очистить мониторинг", + "settings.server.webServer.storage.cleanAll": "Очистить всё", + + "settings.profile.title": "Аккаунт", + "settings.profile.description": "Измените данные вашего профиля.", + "settings.profile.email": "Email", + "settings.profile.password": "Пароль", + "settings.profile.avatar": "Аватар", + + "settings.appearance.title": "Внешний вид", + "settings.appearance.description": "Настройте тему Dokploy.", + "settings.appearance.theme": "Тема", + "settings.appearance.themeDescription": "Выберите тему системной панели", + "settings.appearance.themes.light": "Светлая", + "settings.appearance.themes.dark": "Тёмная", + "settings.appearance.themes.system": "Системная", + "settings.appearance.language": "Язык", + "settings.appearance.languageDescription": "Select a language for your dashboard" +} diff --git a/apps/dokploy/utils/hooks/use-locale.ts b/apps/dokploy/utils/hooks/use-locale.ts index caad152a..52b5fbf4 100644 --- a/apps/dokploy/utils/hooks/use-locale.ts +++ b/apps/dokploy/utils/hooks/use-locale.ts @@ -1,6 +1,6 @@ import Cookies from "js-cookie"; -const SUPPORTED_LOCALES = ["en", "pl", "zh-Hans"] as const; +const SUPPORTED_LOCALES = ["en", "pl", "zh-Hans", "ru"] as const; type Locale = (typeof SUPPORTED_LOCALES)[number]; From ac033cea22a1a9a904b1f09c751b5534022bc14b Mon Sep 17 00:00:00 2001 From: DrMxrcy Date: Tue, 19 Nov 2024 03:06:54 -0500 Subject: [PATCH 3/8] Add: Chatwoot --- apps/dokploy/public/templates/chatwoot.svg | 3 + .../templates/chatwoot/docker-compose.yml | 76 +++++++++++++++++++ apps/dokploy/templates/chatwoot/index.ts | 46 +++++++++++ apps/dokploy/templates/templates.ts | 14 ++++ 4 files changed, 139 insertions(+) create mode 100644 apps/dokploy/public/templates/chatwoot.svg create mode 100644 apps/dokploy/templates/chatwoot/docker-compose.yml create mode 100644 apps/dokploy/templates/chatwoot/index.ts diff --git a/apps/dokploy/public/templates/chatwoot.svg b/apps/dokploy/public/templates/chatwoot.svg new file mode 100644 index 00000000..56c9a7b8 --- /dev/null +++ b/apps/dokploy/public/templates/chatwoot.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/apps/dokploy/templates/chatwoot/docker-compose.yml b/apps/dokploy/templates/chatwoot/docker-compose.yml new file mode 100644 index 00000000..1b84b618 --- /dev/null +++ b/apps/dokploy/templates/chatwoot/docker-compose.yml @@ -0,0 +1,76 @@ +version: '3' + +x-base-config: &base-config + image: chatwoot/chatwoot:v3.14.1 + volumes: + - chatwoot_storage:/app/storage + networks: + - dokploy-network + environment: + - FRONTEND_URL=${FRONTEND_URL} + - SECRET_KEY_BASE=${SECRET_KEY_BASE} + - RAILS_ENV=${RAILS_ENV} + - NODE_ENV=${NODE_ENV} + - INSTALLATION_ENV=${INSTALLATION_ENV} + - RAILS_LOG_TO_STDOUT=${RAILS_LOG_TO_STDOUT} + - LOG_LEVEL=${LOG_LEVEL} + - DEFAULT_LOCALE=${DEFAULT_LOCALE} + - POSTGRES_HOST=${POSTGRES_HOST} + - POSTGRES_PORT=${POSTGRES_PORT} + - POSTGRES_DATABASE=${POSTGRES_DATABASE} + - POSTGRES_USERNAME=${POSTGRES_USERNAME} + - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} + - REDIS_URL=${REDIS_URL} + - ENABLE_ACCOUNT_SIGNUP=${ENABLE_ACCOUNT_SIGNUP} + - ACTIVE_STORAGE_SERVICE=${ACTIVE_STORAGE_SERVICE} + +services: + rails: + <<: *base-config + depends_on: + postgres: + condition: service_started + redis: + condition: service_started + entrypoint: docker/entrypoints/rails.sh + command: ['bundle', 'exec', 'sh', '-c', 'rails db:chatwoot_prepare && rails s -p 3000 -b 0.0.0.0'] + restart: always + + sidekiq: + <<: *base-config + depends_on: + postgres: + condition: service_started + redis: + condition: service_started + command: ['bundle', 'exec', 'sidekiq', '-C', 'config/sidekiq.yml'] + restart: always + + postgres: + image: postgres:12 + restart: always + volumes: + - postgres_data:/var/lib/postgresql/data + networks: + - dokploy-network + environment: + - POSTGRES_DB=${POSTGRES_DATABASE} + - POSTGRES_USER=${POSTGRES_USERNAME} + - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} + + redis: + image: redis:alpine + restart: always + volumes: + - redis_data:/data + networks: + - dokploy-network + +networks: + dokploy-network: + external: true + +volumes: + chatwoot_storage: + postgres_data: + redis_data: \ No newline at end of file diff --git a/apps/dokploy/templates/chatwoot/index.ts b/apps/dokploy/templates/chatwoot/index.ts new file mode 100644 index 00000000..8e57702f --- /dev/null +++ b/apps/dokploy/templates/chatwoot/index.ts @@ -0,0 +1,46 @@ +import { + type DomainSchema, + type Schema, + type Template, + generateBase64, + generatePassword, + generateRandomDomain, +} from "../utils"; + +export function generate(schema: Schema): Template { + const mainDomain = generateRandomDomain(schema); + const secretKeyBase = generateBase64(64); + const postgresPassword = generatePassword(); + + const domains: DomainSchema[] = [ + { + host: mainDomain, + port: 3000, + serviceName: "rails", + }, + ]; + + const envs = [ + `FRONTEND_URL=http://${mainDomain}`, + `SECRET_KEY_BASE=${secretKeyBase}`, + `RAILS_ENV=production`, + `NODE_ENV=production`, + `INSTALLATION_ENV=docker`, + `RAILS_LOG_TO_STDOUT=true`, + `LOG_LEVEL=info`, + `DEFAULT_LOCALE=en`, + `POSTGRES_HOST=postgres`, + `POSTGRES_PORT=5432`, + `POSTGRES_DATABASE=chatwoot`, + `POSTGRES_USERNAME=postgres`, + `POSTGRES_PASSWORD=${postgresPassword}`, + `REDIS_URL=redis://redis:6379`, + `ENABLE_ACCOUNT_SIGNUP=false`, + `ACTIVE_STORAGE_SERVICE=local`, + ]; + + return { + domains, + envs, + }; +} \ No newline at end of file diff --git a/apps/dokploy/templates/templates.ts b/apps/dokploy/templates/templates.ts index d0b29fc6..bc496c27 100644 --- a/apps/dokploy/templates/templates.ts +++ b/apps/dokploy/templates/templates.ts @@ -837,4 +837,18 @@ export const templates: TemplateData[] = [ tags: ["3d", "rendering", "animation"], load: () => import("./blender/index").then((m) => m.generate), }, + { + id: "chatwoot", + name: "Chatwoot", + version: "v3.14.1", + description: "Open-source customer engagement platform that provides a shared inbox for teams, live chat, and omnichannel support.", + logo: "chatwoot.svg", + links: { + github: "https://github.com/chatwoot/chatwoot", + website: "https://www.chatwoot.com", + docs: "https://www.chatwoot.com/docs", + }, + tags: ["support", "chat", "customer-service"], + load: () => import("./chatwoot/index").then((m) => m.generate), + }, ]; From a83b62f62b2605e8e1523f00e829b2680f941087 Mon Sep 17 00:00:00 2001 From: WoWnik Date: Tue, 19 Nov 2024 18:53:52 +0300 Subject: [PATCH 4/8] refactor: sort alphabetically --- .../dokploy/components/dashboard/settings/appearance-form.tsx | 4 ++-- apps/dokploy/next-i18next.config.cjs | 2 +- apps/dokploy/pages/_app.tsx | 2 +- apps/dokploy/utils/hooks/use-locale.ts | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/dokploy/components/dashboard/settings/appearance-form.tsx b/apps/dokploy/components/dashboard/settings/appearance-form.tsx index 5d764cac..40247fb5 100644 --- a/apps/dokploy/components/dashboard/settings/appearance-form.tsx +++ b/apps/dokploy/components/dashboard/settings/appearance-form.tsx @@ -37,7 +37,7 @@ const appearanceFormSchema = z.object({ theme: z.enum(["light", "dark", "system"], { required_error: "Please select a theme.", }), - language: z.enum(["en", "pl", "zh-Hans", "ru"], { + language: z.enum(["en", "pl", "ru", "zh-Hans"], { required_error: "Please select a language.", }), }); @@ -175,8 +175,8 @@ export function AppearanceForm() { {[ { label: "English", value: "en" }, { label: "Polski", value: "pl" }, - { label: "简体中文", value: "zh-Hans" }, { label: "Русский", value: "ru" }, + { label: "简体中文", value: "zh-Hans" }, ].map((preset) => ( {preset.label} diff --git a/apps/dokploy/next-i18next.config.cjs b/apps/dokploy/next-i18next.config.cjs index 7a1e5b01..eaefab3f 100644 --- a/apps/dokploy/next-i18next.config.cjs +++ b/apps/dokploy/next-i18next.config.cjs @@ -2,7 +2,7 @@ module.exports = { i18n: { defaultLocale: "en", - locales: ["en", "pl", "zh-Hans", "ru"], + locales: ["en", "pl", "ru", "zh-Hans"], localeDetection: false, }, fallbackLng: "en", diff --git a/apps/dokploy/pages/_app.tsx b/apps/dokploy/pages/_app.tsx index b74f24aa..9b621a45 100644 --- a/apps/dokploy/pages/_app.tsx +++ b/apps/dokploy/pages/_app.tsx @@ -71,7 +71,7 @@ export default api.withTRPC( { i18n: { defaultLocale: "en", - locales: ["en", "pl", "zh-Hans", "ru"], + locales: ["en", "pl", "ru", "zh-Hans"], localeDetection: false, }, fallbackLng: "en", diff --git a/apps/dokploy/utils/hooks/use-locale.ts b/apps/dokploy/utils/hooks/use-locale.ts index 52b5fbf4..e45a0e6e 100644 --- a/apps/dokploy/utils/hooks/use-locale.ts +++ b/apps/dokploy/utils/hooks/use-locale.ts @@ -1,6 +1,6 @@ import Cookies from "js-cookie"; -const SUPPORTED_LOCALES = ["en", "pl", "zh-Hans", "ru"] as const; +const SUPPORTED_LOCALES = ["en", "pl", "ru", "zh-Hans"] as const; type Locale = (typeof SUPPORTED_LOCALES)[number]; From 3698e8a827614758b02d53f808b46264e392d015 Mon Sep 17 00:00:00 2001 From: DrMxrcy Date: Tue, 19 Nov 2024 11:19:33 -0500 Subject: [PATCH 5/8] Fix Chatwoot Schema --- .../templates/chatwoot/docker-compose.yml | 28 +++++++++---------- apps/dokploy/templates/chatwoot/index.ts | 6 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/apps/dokploy/templates/chatwoot/docker-compose.yml b/apps/dokploy/templates/chatwoot/docker-compose.yml index 1b84b618..8b762e36 100644 --- a/apps/dokploy/templates/chatwoot/docker-compose.yml +++ b/apps/dokploy/templates/chatwoot/docker-compose.yml @@ -3,7 +3,7 @@ version: '3' x-base-config: &base-config image: chatwoot/chatwoot:v3.14.1 volumes: - - chatwoot_storage:/app/storage + - chatwoot-storage:/app/storage networks: - dokploy-network environment: @@ -25,32 +25,32 @@ x-base-config: &base-config - ACTIVE_STORAGE_SERVICE=${ACTIVE_STORAGE_SERVICE} services: - rails: + chatwoot-rails: <<: *base-config depends_on: - postgres: + chatwoot-postgres: condition: service_started - redis: + chatwoot-redis: condition: service_started entrypoint: docker/entrypoints/rails.sh command: ['bundle', 'exec', 'sh', '-c', 'rails db:chatwoot_prepare && rails s -p 3000 -b 0.0.0.0'] restart: always - sidekiq: + chatwoot-sidekiq: <<: *base-config depends_on: - postgres: + chatwoot-postgres: condition: service_started - redis: + chatwoot-redis: condition: service_started command: ['bundle', 'exec', 'sidekiq', '-C', 'config/sidekiq.yml'] restart: always - postgres: + chatwoot-postgres: image: postgres:12 restart: always volumes: - - postgres_data:/var/lib/postgresql/data + - chatwoot-postgres-data:/var/lib/postgresql/data networks: - dokploy-network environment: @@ -58,11 +58,11 @@ services: - POSTGRES_USER=${POSTGRES_USERNAME} - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - redis: + chatwoot-redis: image: redis:alpine restart: always volumes: - - redis_data:/data + - chatwoot-redis-data:/data networks: - dokploy-network @@ -71,6 +71,6 @@ networks: external: true volumes: - chatwoot_storage: - postgres_data: - redis_data: \ No newline at end of file + chatwoot-storage: + chatwoot-postgres-data: + chatwoot-redis-data: \ No newline at end of file diff --git a/apps/dokploy/templates/chatwoot/index.ts b/apps/dokploy/templates/chatwoot/index.ts index 8e57702f..dfd751d4 100644 --- a/apps/dokploy/templates/chatwoot/index.ts +++ b/apps/dokploy/templates/chatwoot/index.ts @@ -16,7 +16,7 @@ export function generate(schema: Schema): Template { { host: mainDomain, port: 3000, - serviceName: "rails", + serviceName: "chatwoot-rails", }, ]; @@ -29,12 +29,12 @@ export function generate(schema: Schema): Template { `RAILS_LOG_TO_STDOUT=true`, `LOG_LEVEL=info`, `DEFAULT_LOCALE=en`, - `POSTGRES_HOST=postgres`, + `POSTGRES_HOST=chatwoot-postgres`, `POSTGRES_PORT=5432`, `POSTGRES_DATABASE=chatwoot`, `POSTGRES_USERNAME=postgres`, `POSTGRES_PASSWORD=${postgresPassword}`, - `REDIS_URL=redis://redis:6379`, + `REDIS_URL=redis://chatwoot-redis:6379`, `ENABLE_ACCOUNT_SIGNUP=false`, `ACTIVE_STORAGE_SERVICE=local`, ]; From 5cbdc8fad98fe8437d097475d5c987315e84eaa6 Mon Sep 17 00:00:00 2001 From: DrMxrcy Date: Tue, 19 Nov 2024 11:56:23 -0500 Subject: [PATCH 6/8] Fix: Linting issues --- apps/dokploy/templates/chatwoot/index.ts | 78 ++++++++++++------------ apps/dokploy/templates/templates.ts | 3 +- 2 files changed, 41 insertions(+), 40 deletions(-) diff --git a/apps/dokploy/templates/chatwoot/index.ts b/apps/dokploy/templates/chatwoot/index.ts index dfd751d4..d6abe6e7 100644 --- a/apps/dokploy/templates/chatwoot/index.ts +++ b/apps/dokploy/templates/chatwoot/index.ts @@ -1,46 +1,46 @@ import { - type DomainSchema, - type Schema, - type Template, - generateBase64, - generatePassword, - generateRandomDomain, + type DomainSchema, + type Schema, + type Template, + generateBase64, + generatePassword, + generateRandomDomain, } from "../utils"; export function generate(schema: Schema): Template { - const mainDomain = generateRandomDomain(schema); - const secretKeyBase = generateBase64(64); - const postgresPassword = generatePassword(); + const mainDomain = generateRandomDomain(schema); + const secretKeyBase = generateBase64(64); + const postgresPassword = generatePassword(); - const domains: DomainSchema[] = [ - { - host: mainDomain, - port: 3000, - serviceName: "chatwoot-rails", - }, - ]; + const domains: DomainSchema[] = [ + { + host: mainDomain, + port: 3000, + serviceName: "chatwoot-rails", + }, + ]; - const envs = [ - `FRONTEND_URL=http://${mainDomain}`, - `SECRET_KEY_BASE=${secretKeyBase}`, - `RAILS_ENV=production`, - `NODE_ENV=production`, - `INSTALLATION_ENV=docker`, - `RAILS_LOG_TO_STDOUT=true`, - `LOG_LEVEL=info`, - `DEFAULT_LOCALE=en`, - `POSTGRES_HOST=chatwoot-postgres`, - `POSTGRES_PORT=5432`, - `POSTGRES_DATABASE=chatwoot`, - `POSTGRES_USERNAME=postgres`, - `POSTGRES_PASSWORD=${postgresPassword}`, - `REDIS_URL=redis://chatwoot-redis:6379`, - `ENABLE_ACCOUNT_SIGNUP=false`, - `ACTIVE_STORAGE_SERVICE=local`, - ]; + const envs = [ + `FRONTEND_URL=http://${mainDomain}`, + `SECRET_KEY_BASE=${secretKeyBase}`, + "RAILS_ENV=production", + "NODE_ENV=production", + "INSTALLATION_ENV=docker", + "RAILS_LOG_TO_STDOUT=true", + "LOG_LEVEL=info", + "DEFAULT_LOCALE=en", + "POSTGRES_HOST=chatwoot-postgres", + "POSTGRES_PORT=5432", + "POSTGRES_DATABASE=chatwoot", + "POSTGRES_USERNAME=postgres", + `POSTGRES_PASSWORD=${postgresPassword}`, + "REDIS_URL=redis://chatwoot-redis:6379", + "ENABLE_ACCOUNT_SIGNUP=false", + "ACTIVE_STORAGE_SERVICE=local", + ]; - return { - domains, - envs, - }; -} \ No newline at end of file + return { + domains, + envs, + }; +} diff --git a/apps/dokploy/templates/templates.ts b/apps/dokploy/templates/templates.ts index bc496c27..ec3b0354 100644 --- a/apps/dokploy/templates/templates.ts +++ b/apps/dokploy/templates/templates.ts @@ -841,7 +841,8 @@ export const templates: TemplateData[] = [ id: "chatwoot", name: "Chatwoot", version: "v3.14.1", - description: "Open-source customer engagement platform that provides a shared inbox for teams, live chat, and omnichannel support.", + description: + "Open-source customer engagement platform that provides a shared inbox for teams, live chat, and omnichannel support.", logo: "chatwoot.svg", links: { github: "https://github.com/chatwoot/chatwoot", From 32b3a7645720d16afa383deab98b23023f3bfe0c Mon Sep 17 00:00:00 2001 From: DrMxrcy Date: Tue, 19 Nov 2024 12:30:36 -0500 Subject: [PATCH 7/8] fix: Lint Issues --- apps/dokploy/templates/chatwoot/index.ts | 76 ++++++++++++------------ 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/apps/dokploy/templates/chatwoot/index.ts b/apps/dokploy/templates/chatwoot/index.ts index d6abe6e7..9c5e44c6 100644 --- a/apps/dokploy/templates/chatwoot/index.ts +++ b/apps/dokploy/templates/chatwoot/index.ts @@ -1,46 +1,46 @@ import { - type DomainSchema, - type Schema, - type Template, - generateBase64, - generatePassword, - generateRandomDomain, + type DomainSchema, + type Schema, + type Template, + generateBase64, + generatePassword, + generateRandomDomain, } from "../utils"; export function generate(schema: Schema): Template { - const mainDomain = generateRandomDomain(schema); - const secretKeyBase = generateBase64(64); - const postgresPassword = generatePassword(); + const mainDomain = generateRandomDomain(schema); + const secretKeyBase = generateBase64(64); + const postgresPassword = generatePassword(); - const domains: DomainSchema[] = [ - { - host: mainDomain, - port: 3000, - serviceName: "chatwoot-rails", - }, - ]; + const domains: DomainSchema[] = [ + { + host: mainDomain, + port: 3000, + serviceName: "chatwoot-rails", + }, + ]; - const envs = [ - `FRONTEND_URL=http://${mainDomain}`, - `SECRET_KEY_BASE=${secretKeyBase}`, - "RAILS_ENV=production", - "NODE_ENV=production", - "INSTALLATION_ENV=docker", - "RAILS_LOG_TO_STDOUT=true", - "LOG_LEVEL=info", - "DEFAULT_LOCALE=en", - "POSTGRES_HOST=chatwoot-postgres", - "POSTGRES_PORT=5432", - "POSTGRES_DATABASE=chatwoot", - "POSTGRES_USERNAME=postgres", - `POSTGRES_PASSWORD=${postgresPassword}`, - "REDIS_URL=redis://chatwoot-redis:6379", - "ENABLE_ACCOUNT_SIGNUP=false", - "ACTIVE_STORAGE_SERVICE=local", - ]; + const envs = [ + `FRONTEND_URL=http://${mainDomain}`, + `SECRET_KEY_BASE=${secretKeyBase}`, + "RAILS_ENV=production", + "NODE_ENV=production", + "INSTALLATION_ENV=docker", + "RAILS_LOG_TO_STDOUT=true", + "LOG_LEVEL=info", + "DEFAULT_LOCALE=en", + "POSTGRES_HOST=chatwoot-postgres", + "POSTGRES_PORT=5432", + "POSTGRES_DATABASE=chatwoot", + "POSTGRES_USERNAME=postgres", + `POSTGRES_PASSWORD=${postgresPassword}`, + "REDIS_URL=redis://chatwoot-redis:6379", + "ENABLE_ACCOUNT_SIGNUP=false", + "ACTIVE_STORAGE_SERVICE=local", + ]; - return { - domains, - envs, - }; + return { + domains, + envs, + }; } From c2125d82b130db7ea1df869f2d42ad5d07ab9287 Mon Sep 17 00:00:00 2001 From: WoWnik Date: Wed, 20 Nov 2024 00:00:34 +0300 Subject: [PATCH 8/8] =?UTF-8?q?refactor:=20remove=20"=D1=91"=20letter?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/dokploy/public/locales/ru/settings.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/dokploy/public/locales/ru/settings.json b/apps/dokploy/public/locales/ru/settings.json index 55620c67..1e71d710 100644 --- a/apps/dokploy/public/locales/ru/settings.json +++ b/apps/dokploy/public/locales/ru/settings.json @@ -24,7 +24,7 @@ "settings.server.webServer.storage.cleanStoppedContainers": "Очистить остановленные контейнеры", "settings.server.webServer.storage.cleanDockerBuilder": "Очистить Docker Builder и систему", "settings.server.webServer.storage.cleanMonitoring": "Очистить мониторинг", - "settings.server.webServer.storage.cleanAll": "Очистить всё", + "settings.server.webServer.storage.cleanAll": "Очистить все", "settings.profile.title": "Аккаунт", "settings.profile.description": "Измените данные вашего профиля.", @@ -37,7 +37,7 @@ "settings.appearance.theme": "Тема", "settings.appearance.themeDescription": "Выберите тему системной панели", "settings.appearance.themes.light": "Светлая", - "settings.appearance.themes.dark": "Тёмная", + "settings.appearance.themes.dark": "Темная", "settings.appearance.themes.system": "Системная", "settings.appearance.language": "Язык", "settings.appearance.languageDescription": "Select a language for your dashboard"