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

Minor bug fixes

Browse Source
This commit is contained in:
IRBorisov 2023-08-10 13:54:49 +03:00
parent 1093c4f957
commit 535c45e50f
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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 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 / { location / {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

4
rsconcept/frontend/src/components/RequireAuth.tsx
View File

@ -16,8 +16,8 @@ function RequireAuth({ children }: RequireAuthProps) {
<div className='flex flex-col items-center'> <div className='flex flex-col items-center'>
<InfoMessage message={'Данная функция доступна только зарегистрированным пользователям. Пожалуйста войдите в систему'} /> <InfoMessage message={'Данная функция доступна только зарегистрированным пользователям. Пожалуйста войдите в систему'} />
<div className='flex flex-col items-start'> <div className='flex flex-col items-start'>
<TextURL text='Войти в систему...' href='login' /> <TextURL text='Войти в систему...' href='/login' />
<TextURL text='Зарегистрироваться...' href='signup' /> <TextURL text='Зарегистрироваться...' href='/signup' />
</div> </div>
</div> </div>
} }

3
rsconcept/frontend/src/context/AuthContext.tsx
View File

@ -10,6 +10,7 @@ interface IAuthContext {
login: (data: IUserLoginData, callback?: DataCallback) => void login: (data: IUserLoginData, callback?: DataCallback) => void
logout: (callback?: DataCallback) => void logout: (callback?: DataCallback) => void
signup: (data: IUserSignupData, callback?: DataCallback<IUserProfile>) => void signup: (data: IUserSignupData, callback?: DataCallback<IUserProfile>) => void
reload: (callback?: () => void) => void
loading: boolean loading: boolean
error: ErrorInfo error: ErrorInfo
setError: (error: ErrorInfo) => void setError: (error: ErrorInfo) => void
@ -87,7 +88,7 @@ export const AuthState = ({ children }: AuthStateProps) => {
return ( return (
<AuthContext.Provider <AuthContext.Provider
value={{ user, login, logout, signup, loading, error, setError }} value={{ user, login, logout, signup, loading, error, reload, setError }}
> >
{children} {children}
</AuthContext.Provider> </AuthContext.Provider>

1
rsconcept/frontend/src/utils/constants.ts
View File

@ -2,6 +2,7 @@
const prod = { const prod = {
backend: 'https://dev.concept.ru:8000', backend: 'https://dev.concept.ru:8000',
// backend: 'https://localhost:8000', // backend: 'https://localhost:8000',
// backend: 'https://api.portal.concept.ru',
}; };
const dev = { const dev = {