diff --git a/nginx/default.conf b/nginx/default.conf index e309b358..6ed9538c 100644 --- a/nginx/default.conf +++ b/nginx/default.conf @@ -10,7 +10,7 @@ server { listen 8000 ssl; ssl_certificate /etc/ssl/private/portal-cert.pem; ssl_certificate_key /etc/ssl/private/portal-key.pem; - server_name dev.concept.ru www.dev.concept.ru api.portal.acconcept.ru www.api.portal.acconcept.ru mail.acoconcept.ru www.mail.acoconcept.ru; + server_name dev.concept.ru www.dev.concept.ru api.portal.acconcept.ru www.api.portal.acconcept.ru mail.acconcept.ru www.mail.acconcept.ru; location / { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -30,7 +30,7 @@ server { listen 3000 ssl; ssl_certificate /etc/ssl/private/portal-cert.pem; ssl_certificate_key /etc/ssl/private/portal-key.pem; - server_name dev.concept.ru www.dev.concept.ru portal.acconcept.ru www.portal.acconcept.ru mail.acoconcept.ru www.mail.acoconcept.ru; + server_name dev.concept.ru www.dev.concept.ru portal.acconcept.ru www.portal.acconcept.ru mail.acconcept.ru www.mail.acconcept.ru; location / { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; diff --git a/rsconcept/backend/.env.prod b/rsconcept/backend/.env.prod index 63fcbcef..fdd7a073 100644 --- a/rsconcept/backend/.env.prod +++ b/rsconcept/backend/.env.prod @@ -1,8 +1,8 @@ # Application settings -ALLOWED_HOSTS=localhost;portal.acconcept.ru;dev.concept.ru;mail.acoconcept.ru; -CSRF_TRUSTED_ORIGINS=https://dev.concept.ru:3000;https://localhost:3000;https://portal.acconcept.ru;https://mail.acconcept.ru:8081;https://mail.acconcept.ru:8082 -CORS_ALLOWED_ORIGINS=https://dev.concept.ru:3000;https://localhost:3000;https://portal.acconcept.ru;https://mail.acconcept.ru:8081;https://mail.acconcept.ru:8082 +ALLOWED_HOSTS=localhost;portal.acconcept.ru;dev.concept.ru;mail.acconcept.ru; +CSRF_TRUSTED_ORIGINS=https://dev.concept.ru:3000;https://localhost:3000;https://portal.acconcept.ru;https://mail.acconcept.ru:8081;https://mail.acconcept.ru:8082; +CORS_ALLOWED_ORIGINS=https://dev.concept.ru:3000;https://localhost:3000;https://portal.acconcept.ru;https://mail.acconcept.ru:8081;https://mail.acconcept.ru:8082; # File locations diff --git a/rsconcept/frontend/src/pages/RSFormPage/elements/RSInput.tsx b/rsconcept/frontend/src/pages/RSFormPage/elements/RSInput.tsx index 2a85e060..ba3ac765 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/elements/RSInput.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/elements/RSInput.tsx @@ -6,7 +6,6 @@ import { Ref } from 'react'; import { useConceptTheme } from '../../../context/ThemeContext'; -// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call const lightTheme: Extension = createTheme({ theme: 'light', settings: { @@ -23,7 +22,6 @@ const lightTheme: Extension = createTheme({ ] }); -// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call const darkTheme: Extension = createTheme({ theme: 'dark', settings: {