ConceptProd/ConceptPortal-public
1
0
Fork 0
mirror of https://github.com/IRBorisov/ConceptPortal.git synced 2025-06-26 13:00:39 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix prod

Browse Source
This commit is contained in:
IRBorisov 2023-08-11 11:30:45 +03:00
parent 7a3ea1bbba
commit efa1fdef2e
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nginx/default.conf
View File

@ -10,7 +10,7 @@ server {
listen 8000 ssl; listen 8000 ssl;
ssl_certificate /etc/ssl/private/portal-cert.pem; ssl_certificate /etc/ssl/private/portal-cert.pem;
ssl_certificate_key /etc/ssl/private/portal-key.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 / { location / {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@ -30,7 +30,7 @@ server {
listen 3000 ssl; listen 3000 ssl;
ssl_certificate /etc/ssl/private/portal-cert.pem; ssl_certificate /etc/ssl/private/portal-cert.pem;
ssl_certificate_key /etc/ssl/private/portal-key.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 / { location / {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

6
rsconcept/backend/.env.prod
View File

@ -1,8 +1,8 @@
# Application settings # Application settings
ALLOWED_HOSTS=localhost;portal.acconcept.ru;dev.concept.ru;mail.acoconcept.ru; 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 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 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 # File locations

2
rsconcept/frontend/src/pages/RSFormPage/elements/RSInput.tsx
View File

@ -6,7 +6,6 @@ import { Ref } from 'react';
import { useConceptTheme } from '../../../context/ThemeContext'; import { useConceptTheme } from '../../../context/ThemeContext';
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
const lightTheme: Extension = createTheme({ const lightTheme: Extension = createTheme({
theme: 'light', theme: 'light',
settings: { 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({ const darkTheme: Extension = createTheme({
theme: 'dark', theme: 'dark',
settings: { settings: {