diff --git a/nginx/default.conf b/nginx/default.conf index 958d36c3..ad278dca 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 portal.acconcept.ru www.portal.acconcept.ru; + server_name dev.concept.ru www.dev.concept.ru api.portal.acconcept.ru www.api.portal.acconcept.ru; location / { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; diff --git a/rsconcept/frontend/src/components/RequireAuth.tsx b/rsconcept/frontend/src/components/RequireAuth.tsx index e20837be..ca69e708 100644 --- a/rsconcept/frontend/src/components/RequireAuth.tsx +++ b/rsconcept/frontend/src/components/RequireAuth.tsx @@ -16,8 +16,8 @@ function RequireAuth({ children }: RequireAuthProps) {
- - + +
} diff --git a/rsconcept/frontend/src/context/AuthContext.tsx b/rsconcept/frontend/src/context/AuthContext.tsx index c6ed667f..cd8e01b8 100644 --- a/rsconcept/frontend/src/context/AuthContext.tsx +++ b/rsconcept/frontend/src/context/AuthContext.tsx @@ -10,6 +10,7 @@ interface IAuthContext { login: (data: IUserLoginData, callback?: DataCallback) => void logout: (callback?: DataCallback) => void signup: (data: IUserSignupData, callback?: DataCallback) => void + reload: (callback?: () => void) => void loading: boolean error: ErrorInfo setError: (error: ErrorInfo) => void @@ -87,7 +88,7 @@ export const AuthState = ({ children }: AuthStateProps) => { return ( {children} diff --git a/rsconcept/frontend/src/utils/constants.ts b/rsconcept/frontend/src/utils/constants.ts index 1831603d..40928e58 100644 --- a/rsconcept/frontend/src/utils/constants.ts +++ b/rsconcept/frontend/src/utils/constants.ts @@ -2,6 +2,7 @@ const prod = { backend: 'https://dev.concept.ru:8000', // backend: 'https://localhost:8000', + // backend: 'https://api.portal.concept.ru', }; const dev = {