From 3e573243ceef15025b59476014539e9baeb63a2e Mon Sep 17 00:00:00 2001 From: Taraslysak Date: Sat, 18 Oct 2025 16:47:11 +0300 Subject: [PATCH] switched to .com --- back/app/config.py | 2 +- back/app/templates/response_to_candidate.html | 10 +-- back/app/templates/response_to_client.html | 10 +-- back/project.env | 2 +- docker-compose.dev.yaml | 20 +++--- docker-compose.prod.yaml | 35 +++++------ front/next.config.js | 2 +- front/src/app/constants-server.ts | 4 +- front/src/app/constants.ts | 6 +- front/src/app/layout.tsx | 62 +++++++++---------- .../Sections/HeaderSection.module.scss | 6 +- 11 files changed, 78 insertions(+), 81 deletions(-) diff --git a/back/app/config.py b/back/app/config.py index a1a9ebb2..72971cda 100644 --- a/back/app/config.py +++ b/back/app/config.py @@ -5,7 +5,7 @@ test_env_file = os.path.abspath("tests/test.env") -IMG_DOMAIN_SERVER = "https://static.simple2b.net" +IMG_DOMAIN_SERVER = "https://static.simple2b.com" def get_version() -> str: diff --git a/back/app/templates/response_to_candidate.html b/back/app/templates/response_to_candidate.html index 834a7d2a..baba2fa8 100644 --- a/back/app/templates/response_to_candidate.html +++ b/back/app/templates/response_to_candidate.html @@ -26,8 +26,8 @@ .bg-styles { color: #718096; background-image: - url(https://static.simple2b.net/email/user-response.png), - url(https://static.simple2b.net/email/user-response-2.png); + url(https://static.simple2b.com/email/user-response.png), + url(https://static.simple2b.com/email/user-response-2.png); background-repeat: no-repeat, no-repeat; background-position: left, right; background-size: 232px, 160px; @@ -36,8 +36,8 @@ @media screen and (max-width: 972px) { .bg-styles { background-image: - url(https://static.simple2b.net/email/user-response.png), - url(https://static.simple2b.net/email/user-response-2.png); + url(https://static.simple2b.com/email/user-response.png), + url(https://static.simple2b.com/email/user-response-2.png); background-repeat: no-repeat, no-repeat; background-position: left, right; @@ -61,7 +61,7 @@
- +
diff --git a/back/app/templates/response_to_client.html b/back/app/templates/response_to_client.html index 9b7157a9..02c9768f 100644 --- a/back/app/templates/response_to_client.html +++ b/back/app/templates/response_to_client.html @@ -26,8 +26,8 @@ .bg-styles { color: #718096; background-image: - url(https://static.simple2b.net/email/user-response.png), - url(https://static.simple2b.net/email/user-response-2.png); + url(https://static.simple2b.com/email/user-response.png), + url(https://static.simple2b.com/email/user-response-2.png); background-repeat: no-repeat, no-repeat; background-position: left, right; background-size: 232px, 160px; @@ -36,8 +36,8 @@ @media screen and (max-width: 972px) { .bg-styles { background-image: - url(https://static.simple2b.net/email/user-response.png), - url(https://static.simple2b.net/email/user-response-2.png); + url(https://static.simple2b.com/email/user-response.png), + url(https://static.simple2b.com/email/user-response-2.png); background-repeat: no-repeat, no-repeat; background-position: left, right; @@ -55,7 +55,7 @@
- +
diff --git a/back/project.env b/back/project.env index 12a51096..26e6241b 100644 --- a/back/project.env +++ b/back/project.env @@ -50,7 +50,7 @@ TELEGRAM_CHAT_ID_CANDIDATE=0 TELEGRAM_CHAT_ID_INFO=0 # Odoo -ODOO_URL=https://odoo.simple2b.net +ODOO_URL=https://odoo.simple2b.com ODOO_DB=simple2b ODOO_UID=1 ODOO_PASSWORD="" diff --git a/docker-compose.dev.yaml b/docker-compose.dev.yaml index 5a248c74..58e639fe 100644 --- a/docker-compose.dev.yaml +++ b/docker-compose.dev.yaml @@ -1,5 +1,5 @@ # docker-compose for deployment -version: '3.8' +version: "3.8" services: db: image: postgres:14 @@ -22,10 +22,10 @@ services: ports: - 127.0.0.1:${APP_LOCAL_PORT}:3000 labels: - - 'traefik.enable=true' - - 'traefik.http.routers.site_dev.rule=Host(`dev.simple2b.net`, `dev.simple2b.org`, `dev.simple2b.de`)' - - 'traefik.http.routers.site_dev.tls=true' - - 'traefik.http.routers.site_dev.tls.certresolver=myresolver' + - "traefik.enable=true" + - "traefik.http.routers.site_dev.rule=Host(`dev.simple2b.com`, `dev.simple2b.org`, `dev.simple2b.de`)" + - "traefik.http.routers.site_dev.tls=true" + - "traefik.http.routers.site_dev.tls.certresolver=myresolver" back: image: simple2b/site-s2b-back:latest @@ -51,10 +51,10 @@ services: ports: - 127.0.0.1:${FORWARD_ADMIN_PORT}:80 labels: - - 'traefik.enable=true' - - 'traefik.http.routers.admin_site_dev.rule=Host(`dev.admin.site.simple2b.net`)' - - 'traefik.http.routers.admin_site_dev.tls=true' - - 'traefik.http.routers.admin_site_dev.tls.certresolver=myresolver' + - "traefik.enable=true" + - "traefik.http.routers.admin_site_dev.rule=Host(`dev.admin.site.simple2b.com`)" + - "traefik.http.routers.admin_site_dev.tls=true" + - "traefik.http.routers.admin_site_dev.tls.certresolver=myresolver" backup: image: simple2b/pg-backup:1.0 restart: unless-stopped @@ -70,7 +70,7 @@ services: POSTGRES_HOST: db POSTGRES_USER: ${DATABASE_USERNAME:-postgres} POSTGRES_PASSWORD: ${DATABASE_PASSWORD:-password} - POSTGRES_EXTRA_OPTS: '--schema=public --blobs' + POSTGRES_EXTRA_OPTS: "--schema=public --blobs" DAYS_HISTORY: 7 SCHEDULE_HOUR: 0 SCHEDULE_MINUTE: 0 diff --git a/docker-compose.prod.yaml b/docker-compose.prod.yaml index 89bc5348..7a7c4e5c 100644 --- a/docker-compose.prod.yaml +++ b/docker-compose.prod.yaml @@ -1,5 +1,5 @@ # docker-compose for deployment -version: '3.8' +version: "3.8" services: db: image: postgres:14 @@ -19,22 +19,19 @@ services: env_file: - .env labels: - - 'traefik.enable=true' - - 'traefik.http.routers.simple2b-site.rule=Host(`site.simple2b.net`) || Host(`www.simple2b.net`) || Host(`www.simple2b.com`) || Host(`www.simple2b.org`) || Host(`www.simple2b.de`) || Host(`simple2b.net`) || Host(`simple2b.com`) || Host(`simple2b.org`) || Host(`simple2b.de`)' - - 'traefik.http.routers.simple2b-site.tls=true' - - 'traefik.http.routers.simple2b-site.tls.certresolver=myresolver' - # .net - - 'traefik.http.routers.simple2b-site.tls.domains[0].main=simple2b.net' - - 'traefik.http.routers.simple2b-site.tls.domains[0].sans=site.simple2b.net, www.simple2b.net' + - "traefik.enable=true" + - "traefik.http.routers.simple2b-site.rule=Host(`site.simple2b.com`) || Host(`www.simple2b.com`) || Host(`www.simple2b.org`) || Host(`www.simple2b.de`) || Host(`simple2b.net`) || Host(`simple2b.com`) || Host(`simple2b.org`) || Host(`simple2b.de`)" + - "traefik.http.routers.simple2b-site.tls=true" + - "traefik.http.routers.simple2b-site.tls.certresolver=myresolver" # .com - - 'traefik.http.routers.simple2b-site.tls.domains[1].main=simple2b.com' - - 'traefik.http.routers.simple2b-site.tls.domains[1].sans=www.simple2b.com' + - "traefik.http.routers.simple2b-site.tls.domains[1].main=simple2b.com" + - "traefik.http.routers.simple2b-site.tls.domains[1].sans=www.simple2b.com" # .org - - 'traefik.http.routers.simple2b-site.tls.domains[2].main=simple2b.org' - - 'traefik.http.routers.simple2b-site.tls.domains[2].sans=www.simple2b.org' + - "traefik.http.routers.simple2b-site.tls.domains[2].main=simple2b.org" + - "traefik.http.routers.simple2b-site.tls.domains[2].sans=www.simple2b.org" # .de - - 'traefik.http.routers.simple2b-site.tls.domains[3].main=simple2b.de' - - 'traefik.http.routers.simple2b-site.tls.domains[3].sans=www.simple2b.de' + - "traefik.http.routers.simple2b-site.tls.domains[3].main=simple2b.de" + - "traefik.http.routers.simple2b-site.tls.domains[3].sans=www.simple2b.de" back: image: simple2b/site-s2b-back:latest restart: always @@ -52,10 +49,10 @@ services: env_file: - .env labels: - - 'traefik.enable=true' - - 'traefik.http.routers.admin-simple2b-site.rule=Host(`admin.site.simple2b.net`)' - - 'traefik.http.routers.admin-simple2b-site.tls=true' - - 'traefik.http.routers.admin-simple2b-site.tls.certresolver=myresolver' + - "traefik.enable=true" + - "traefik.http.routers.admin-simple2b-site.rule=Host(`admin.site.simple2b.com`)" + - "traefik.http.routers.admin-simple2b-site.tls=true" + - "traefik.http.routers.admin-simple2b-site.tls.certresolver=myresolver" environment: DATABASE_URI: ${PROD_DATABASE_URI} APP_ENV: production @@ -76,7 +73,7 @@ services: POSTGRES_HOST: db POSTGRES_USER: ${DATABASE_USERNAME:-postgres} POSTGRES_PASSWORD: ${DATABASE_PASSWORD:-password} - POSTGRES_EXTRA_OPTS: '--schema=public --blobs' + POSTGRES_EXTRA_OPTS: "--schema=public --blobs" DAYS_HISTORY: 7 SCHEDULE_HOUR: 0 SCHEDULE_MINUTE: 0 diff --git a/front/next.config.js b/front/next.config.js index 4bc477cc..ab7f322b 100644 --- a/front/next.config.js +++ b/front/next.config.js @@ -12,7 +12,7 @@ const nextConfig = { remotePatterns: [ { protocol: 'https', - hostname: 'static.simple2b.net', + hostname: 'static.simple2b.com', port: '', }, ], diff --git a/front/src/app/constants-server.ts b/front/src/app/constants-server.ts index b34a6bac..0e3c79ab 100644 --- a/front/src/app/constants-server.ts +++ b/front/src/app/constants-server.ts @@ -1,4 +1,4 @@ /**For server components */ -export const IMG_DOMAIN_SERVER = "https://static.simple2b.net"; +export const IMG_DOMAIN_SERVER = 'https://static.simple2b.com'; // load package version from package.json -export const PACKAGE_VERSION = require("../../package.json").version; +export const PACKAGE_VERSION = require('../../package.json').version; diff --git a/front/src/app/constants.ts b/front/src/app/constants.ts index da0f5240..4ec08175 100644 --- a/front/src/app/constants.ts +++ b/front/src/app/constants.ts @@ -1,7 +1,7 @@ -"use client"; +'use client'; /**For client components */ -export const IMG_DOMAIN = "https://static.simple2b.net" +export const IMG_DOMAIN = 'https://static.simple2b.com'; // load package version from package.json -export const PACKAGE_VERSION = require("../../package.json").version; +export const PACKAGE_VERSION = require('../../package.json').version; diff --git a/front/src/app/layout.tsx b/front/src/app/layout.tsx index 2535a616..dd492b84 100644 --- a/front/src/app/layout.tsx +++ b/front/src/app/layout.tsx @@ -1,35 +1,35 @@ -import { GoogleAds } from "@/components"; -import { GoogleAnalyticsTag } from "@/components/GoogleAnalytics/GoogleAnalytics"; -import { Metadata } from "next"; -import { cookies, headers } from "next/headers"; -import Script from "next/script"; -import Providers from "./providers"; -import "./styles/globals.css"; -import CookieConsentBanner from "@/components/CookiesConsentBanner/CookiesConsentBanner"; +import { GoogleAds } from '@/components'; +import { GoogleAnalyticsTag } from '@/components/GoogleAnalytics/GoogleAnalytics'; +import { Metadata } from 'next'; +import { cookies, headers } from 'next/headers'; +import Script from 'next/script'; +import Providers from './providers'; +import './styles/globals.css'; +import CookieConsentBanner from '@/components/CookiesConsentBanner/CookiesConsentBanner'; export const metadata: Metadata = { - metadataBase: new URL("https://www.simple2b.com"), + metadataBase: new URL('https://www.simple2b.com'), description: - "We help businesses to succeed through innovative and reliable solutions.", + 'We help businesses to succeed through innovative and reliable solutions.', title: { - template: "%s | Simple2B", - default: "Simple2B", // a default is required when creating a template + template: '%s | Simple2B', + default: 'Simple2B', // a default is required when creating a template }, openGraph: { - title: "Simple2B", - siteName: "Simple2B", + title: 'Simple2B', + siteName: 'Simple2B', description: - "We help businesses to succeed through innovative and reliable solutions.", - type: "website", - images: ["https://www.simple2b.net/png/logo.png"], + 'We help businesses to succeed through innovative and reliable solutions.', + type: 'website', + images: ['https://www.simple2b.com/png/logo.png'], }, twitter: { - card: "summary_large_image", - title: "Simple2B", + card: 'summary_large_image', + title: 'Simple2B', description: - "We help businesses to succeed through innovative and reliable solutions.", + 'We help businesses to succeed through innovative and reliable solutions.', // biome-ignore lint/style/noUnusedTemplateLiteral: - images: [`https://www.simple2b.net/png/logo.png`], + images: [`https://www.simple2b.com/png/logo.png`], }, robots: { index: true, @@ -38,15 +38,15 @@ export const metadata: Metadata = { googleBot: { index: true, follow: true, - "max-video-preview": -1, - "max-image-preview": "large", - "max-snippet": -1, + 'max-video-preview': -1, + 'max-image-preview': 'large', + 'max-snippet': -1, }, }, }; export const viewport = { - width: "device-width", + width: 'device-width', initialScale: 1, }; @@ -56,9 +56,9 @@ export default function RootLayout({ children: React.ReactNode; }) { const cookieStore = cookies(); - const lang = cookieStore.get("n18i")?.value || "en"; - const host = headers().get("host"); - const isGermany = !!host?.includes(".de"); + const lang = cookieStore.get('n18i')?.value || 'en'; + const host = headers().get('host'); + const isGermany = !!host?.includes('.de'); return ( @@ -78,7 +78,7 @@ export default function RootLayout({