Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion back/app/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 5 additions & 5 deletions back/app/templates/response_to_candidate.html
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -61,7 +61,7 @@

<div>
<a href="https://www.simple2b.com/">
<img height="100" src="https://static.simple2b.net/email/simple2b-logo.png">
<img height="100" src="https://static.simple2b.com/email/simple2b-logo.png">
</a>
</div>

Expand Down
10 changes: 5 additions & 5 deletions back/app/templates/response_to_client.html
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -55,7 +55,7 @@

<div>
<a href="https://www.simple2b.com/">
<img height="100" src="https://static.simple2b.net/email/simple2b-logo.png">
<img height="100" src="https://static.simple2b.com/email/simple2b-logo.png">
</a>
</div>

Expand Down
2 changes: 1 addition & 1 deletion back/project.env
Original file line number Diff line number Diff line change
Expand Up @@ -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=""
Expand Down
20 changes: 10 additions & 10 deletions docker-compose.dev.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# docker-compose for deployment
version: '3.8'
version: "3.8"
services:
db:
image: postgres:14
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
35 changes: 16 additions & 19 deletions docker-compose.prod.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# docker-compose for deployment
version: '3.8'
version: "3.8"
services:
db:
image: postgres:14
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion front/next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const nextConfig = {
remotePatterns: [
{
protocol: 'https',
hostname: 'static.simple2b.net',
hostname: 'static.simple2b.com',
port: '',
},
],
Expand Down
4 changes: 2 additions & 2 deletions front/src/app/constants-server.ts
Original file line number Diff line number Diff line change
@@ -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;
6 changes: 3 additions & 3 deletions front/src/app/constants.ts
Original file line number Diff line number Diff line change
@@ -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;
62 changes: 31 additions & 31 deletions front/src/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -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: <explanation>
images: [`https://www.simple2b.net/png/logo.png`],
images: [`https://www.simple2b.com/png/logo.png`],
},
robots: {
index: true,
Expand All @@ -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,
};

Expand All @@ -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 (
<html lang={lang}>
<head>
Expand All @@ -78,7 +78,7 @@ export default function RootLayout({
<Script type="text/javascript" src="//cdn.iubenda.com/cs/iubenda_cs.js" charSet="UTF-8" async /> */}
</head>
<body suppressHydrationWarning={true}>
{process.env.NODE_ENV === "production" && (
{process.env.NODE_ENV === 'production' && (
<>
<Script
id="fraudblocker"
Expand All @@ -103,8 +103,8 @@ export default function RootLayout({
</noscript>
</>
)}
{process.env.NODE_ENV === "production" && <GoogleAnalyticsTag />}
{process.env.NODE_ENV === "production" && isGermany && <GoogleAds />}
{process.env.NODE_ENV === 'production' && <GoogleAnalyticsTag />}
{process.env.NODE_ENV === 'production' && isGermany && <GoogleAds />}
<Providers>
<div className="relative">
{children}
Expand Down
6 changes: 3 additions & 3 deletions front/src/components/Sections/HeaderSection.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
height: 514px;
left: 0;
top: 0;
background: url('https://static.simple2b.net/others/dust1.png');
background: url('https://static.simple2b.com/others/dust1.png');
transition: transform 0.5s ease-out;
}

Expand All @@ -41,7 +41,7 @@
height: 100%;
left: 0;
top: 0;
background: url('https://static.simple2b.net/others/dust2.png');
background: url('https://static.simple2b.com/others/dust2.png');
transition: transform 0.5s ease-out;
}

Expand All @@ -51,7 +51,7 @@
height: 386px;
left: 115px;
top: 100px;
background: url('https://static.simple2b.net/others/dust3.png');
background: url('https://static.simple2b.com/others/dust3.png');
transition: transform 0.5s ease-out;
}
}
Expand Down