основа веб интерфейса
This commit is contained in:
parent
408325a277
commit
e082bd3b45
@ -15,7 +15,6 @@ auth_router = APIRouter()
|
||||
description='Logs in the user and outputs the `access_token` ',
|
||||
)
|
||||
async def auth_user(
|
||||
response: Response,
|
||||
user_data: LoginRequest,
|
||||
db: AsyncSession = Depends(get_db)
|
||||
):
|
||||
|
||||
26
api/app/controllers/users_router.py
Normal file
26
api/app/controllers/users_router.py
Normal file
@ -0,0 +1,26 @@
|
||||
from typing import List, Optional
|
||||
|
||||
from fastapi import APIRouter, Depends, Response
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from app.database.session import get_db
|
||||
from app.domain.entities.users import UserRead
|
||||
from app.domain.models import User
|
||||
from app.infrastructure.dependencies import require_auth_user
|
||||
from app.infrastructure.users_service import UsersService
|
||||
|
||||
users_router = APIRouter()
|
||||
|
||||
|
||||
@users_router.get(
|
||||
'/me/',
|
||||
response_model=Optional[UserRead],
|
||||
summary='Returns current authenticated user data',
|
||||
description='Returns current authenticated user data',
|
||||
)
|
||||
async def get_authenticated_user_data(
|
||||
db: AsyncSession = Depends(get_db),
|
||||
user: User = Depends(require_auth_user)
|
||||
):
|
||||
users_service = UsersService(db)
|
||||
return await users_service.get_by_id(user.id)
|
||||
9
api/app/domain/entities/roles.py
Normal file
9
api/app/domain/entities/roles.py
Normal file
@ -0,0 +1,9 @@
|
||||
from pydantic import BaseModel
|
||||
|
||||
|
||||
class RoleRead(BaseModel):
|
||||
id: int
|
||||
title: str
|
||||
|
||||
class Config:
|
||||
from_attributes = True
|
||||
9
api/app/domain/entities/statuses.py
Normal file
9
api/app/domain/entities/statuses.py
Normal file
@ -0,0 +1,9 @@
|
||||
from pydantic import BaseModel
|
||||
|
||||
|
||||
class StatusRead(BaseModel):
|
||||
id: int
|
||||
title: str
|
||||
|
||||
class Config:
|
||||
from_attributes = True
|
||||
@ -3,6 +3,9 @@ from typing import Optional
|
||||
|
||||
from pydantic import BaseModel, EmailStr, Field
|
||||
|
||||
from app.domain.entities.roles import RoleRead
|
||||
from app.domain.entities.statuses import StatusRead
|
||||
|
||||
|
||||
class UserRegister(BaseModel):
|
||||
first_name: str = Field(max_length=250)
|
||||
@ -30,6 +33,8 @@ class UserRead(BaseModel):
|
||||
status_id: int
|
||||
role_id: int
|
||||
|
||||
role: RoleRead
|
||||
status: StatusRead
|
||||
|
||||
class Config:
|
||||
orm_mode = True
|
||||
from_attributes = True
|
||||
|
||||
@ -16,7 +16,7 @@ security = HTTPBearer()
|
||||
async def require_auth_user(
|
||||
credentials: HTTPAuthorizationCredentials = Security(security),
|
||||
db: AsyncSession = Depends(get_db)
|
||||
):
|
||||
) -> User:
|
||||
auth_data = get_auth_data()
|
||||
|
||||
try:
|
||||
@ -34,7 +34,7 @@ async def require_auth_user(
|
||||
if user is None:
|
||||
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail='Ошибка авторизации')
|
||||
|
||||
if user.status != UserStatuses.ACTIVE:
|
||||
if user.status.title != UserStatuses.ACTIVE:
|
||||
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail='Ошибка авторизации')
|
||||
|
||||
return user
|
||||
|
||||
@ -1,17 +1,20 @@
|
||||
import re
|
||||
from typing import Optional
|
||||
|
||||
from fastapi import HTTPException, status
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from app.application.roles_repository import RolesRepository
|
||||
from app.application.statuses_repository import StatusesRepository
|
||||
from app.application.users_repository import UsersRepository
|
||||
from app.domain.entities.users import UserRegister, UserRead
|
||||
from app.domain.models.users import User
|
||||
from app.settings import Settings
|
||||
from app.domain.entities.users import UserRead
|
||||
|
||||
|
||||
class UsersService:
|
||||
def __init__(self, db: AsyncSession):
|
||||
pass
|
||||
self.users_repository = UsersRepository(db)
|
||||
|
||||
async def get_by_id(self, user_id: int) -> UserRead:
|
||||
user = await self.users_repository.get_by_id(user_id)
|
||||
if not user:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail='Пользователь не найден',
|
||||
)
|
||||
|
||||
return UserRead.model_validate(user)
|
||||
|
||||
@ -3,6 +3,7 @@ from starlette.middleware.cors import CORSMiddleware
|
||||
|
||||
from app.controllers.auth_router import auth_router
|
||||
from app.controllers.register_router import register_router
|
||||
from app.controllers.users_router import users_router
|
||||
from app.settings import Settings
|
||||
|
||||
|
||||
@ -20,6 +21,7 @@ def start_app():
|
||||
|
||||
api_app.include_router(auth_router, prefix=f'{settings.prefix}/auth', tags=['auth'])
|
||||
api_app.include_router(register_router, prefix=f'{settings.prefix}/register', tags=['register'])
|
||||
api_app.include_router(users_router, prefix=f'{settings.prefix}/users', tags=['users'])
|
||||
|
||||
return api_app
|
||||
|
||||
|
||||
@ -14,7 +14,7 @@ class Settings(BaseSettings):
|
||||
db_schema: str = Field(alias='DB_SCHEMA')
|
||||
|
||||
secret_key: str = Field(alias='SECRET_KEY')
|
||||
algorithm: str = Field(alias='ALGORITHM', default='sha256')
|
||||
algorithm: str = Field(alias='ALGORITHM', default='HS256')
|
||||
|
||||
default_role_name: str = Field(alias='DEFAULT_ROLE_NAME', default='student')
|
||||
root_role_name: str = Field(alias='ROOT_ROLE_NAME', default='root')
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
|
||||
<link rel="icon" href="/rounded_logo.png" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>web</title>
|
||||
</head>
|
||||
<body>
|
||||
<div id="root"></div>
|
||||
<script type="module" src="/src/main.jsx"></script>
|
||||
<script type="module" src="/src/App/main.jsx"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
173
web/package-lock.json
generated
173
web/package-lock.json
generated
@ -8,9 +8,14 @@
|
||||
"name": "web",
|
||||
"version": "0.0.0",
|
||||
"dependencies": {
|
||||
"@ant-design/icons": "^6.1.0",
|
||||
"@reduxjs/toolkit": "^2.11.0",
|
||||
"antd": "^6.0.0",
|
||||
"dayjs": "^1.11.19",
|
||||
"react": "^19.2.0",
|
||||
"react-dom": "^19.2.0"
|
||||
"react-dom": "^19.2.0",
|
||||
"react-redux": "^9.2.0",
|
||||
"react-router-dom": "^7.9.6"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@eslint/js": "^9.39.1",
|
||||
@ -1801,6 +1806,32 @@
|
||||
"react-dom": ">=18.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@reduxjs/toolkit": {
|
||||
"version": "2.11.0",
|
||||
"resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.11.0.tgz",
|
||||
"integrity": "sha512-hBjYg0aaRL1O2Z0IqWhnTLytnjDIxekmRxm1snsHjHaKVmIF1HiImWqsq+PuEbn6zdMlkIj9WofK1vR8jjx+Xw==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@standard-schema/spec": "^1.0.0",
|
||||
"@standard-schema/utils": "^0.3.0",
|
||||
"immer": "^11.0.0",
|
||||
"redux": "^5.0.1",
|
||||
"redux-thunk": "^3.1.0",
|
||||
"reselect": "^5.1.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"react": "^16.9.0 || ^17.0.0 || ^18 || ^19",
|
||||
"react-redux": "^7.2.1 || ^8.1.3 || ^9.0.0"
|
||||
},
|
||||
"peerDependenciesMeta": {
|
||||
"react": {
|
||||
"optional": true
|
||||
},
|
||||
"react-redux": {
|
||||
"optional": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"node_modules/@rolldown/pluginutils": {
|
||||
"version": "1.0.0-beta.47",
|
||||
"resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.47.tgz",
|
||||
@ -2116,6 +2147,18 @@
|
||||
"win32"
|
||||
]
|
||||
},
|
||||
"node_modules/@standard-schema/spec": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.0.0.tgz",
|
||||
"integrity": "sha512-m2bOd0f2RT9k8QJx1JN85cZYyH1RqFBdlwtkSlf4tBDYLCiiZnv1fIIwacK6cqwXavOydf0NPToMQgpKq+dVlA==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@standard-schema/utils": {
|
||||
"version": "0.3.0",
|
||||
"resolved": "https://registry.npmjs.org/@standard-schema/utils/-/utils-0.3.0.tgz",
|
||||
"integrity": "sha512-e7Mew686owMaPJVNNLs55PUvgz371nKgwsc4vxE49zsODpJEnxgxRo2y/OKrqueavXgZNMDVj3DdHFlaSAeU8g==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@types/babel__core": {
|
||||
"version": "7.20.5",
|
||||
"resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
|
||||
@ -2179,7 +2222,7 @@
|
||||
"version": "19.2.7",
|
||||
"resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.7.tgz",
|
||||
"integrity": "sha512-MWtvHrGZLFttgeEj28VXHxpmwYbor/ATPYbBfSFZEIRK0ecCFLl2Qo55z52Hss+UV9CRN7trSeq1zbgx7YDWWg==",
|
||||
"dev": true,
|
||||
"devOptional": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"csstype": "^3.2.2"
|
||||
@ -2195,6 +2238,12 @@
|
||||
"@types/react": "^19.2.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@types/use-sync-external-store": {
|
||||
"version": "0.0.6",
|
||||
"resolved": "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.6.tgz",
|
||||
"integrity": "sha512-zFDAD+tlpf2r4asuHEj0XH6pY6i0g5NeAHPn+15wk3BV6JA69eERFXC1gyGThDkVa1zCyKr5jox1+2LbV/AMLg==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@vitejs/plugin-react": {
|
||||
"version": "5.1.1",
|
||||
"resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-5.1.1.tgz",
|
||||
@ -2507,6 +2556,19 @@
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/cookie": {
|
||||
"version": "1.1.1",
|
||||
"resolved": "https://registry.npmjs.org/cookie/-/cookie-1.1.1.tgz",
|
||||
"integrity": "sha512-ei8Aos7ja0weRpFzJnEA9UHJ/7XQmqglbRwnf2ATjcB9Wq874VKH9kfjjirM6UhU2/E5fFYadylyhFldcqSidQ==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
},
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
"url": "https://opencollective.com/express"
|
||||
}
|
||||
},
|
||||
"node_modules/cross-spawn": {
|
||||
"version": "7.0.6",
|
||||
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
|
||||
@ -2993,6 +3055,16 @@
|
||||
"node": ">= 4"
|
||||
}
|
||||
},
|
||||
"node_modules/immer": {
|
||||
"version": "11.0.0",
|
||||
"resolved": "https://registry.npmjs.org/immer/-/immer-11.0.0.tgz",
|
||||
"integrity": "sha512-XtRG4SINt4dpqlnJvs70O2j6hH7H0X8fUzFsjMn1rwnETaxwp83HLNimXBjZ78MrKl3/d3/pkzDH0o0Lkxm37Q==",
|
||||
"license": "MIT",
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
"url": "https://opencollective.com/immer"
|
||||
}
|
||||
},
|
||||
"node_modules/import-fresh": {
|
||||
"version": "3.3.1",
|
||||
"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
|
||||
@ -3486,6 +3558,29 @@
|
||||
"integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/react-redux": {
|
||||
"version": "9.2.0",
|
||||
"resolved": "https://registry.npmjs.org/react-redux/-/react-redux-9.2.0.tgz",
|
||||
"integrity": "sha512-ROY9fvHhwOD9ySfrF0wmvu//bKCQ6AeZZq1nJNtbDC+kk5DuSuNX/n6YWYF/SYy7bSba4D4FSz8DJeKY/S/r+g==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@types/use-sync-external-store": "^0.0.6",
|
||||
"use-sync-external-store": "^1.4.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@types/react": "^18.2.25 || ^19",
|
||||
"react": "^18.0 || ^19",
|
||||
"redux": "^5.0.0"
|
||||
},
|
||||
"peerDependenciesMeta": {
|
||||
"@types/react": {
|
||||
"optional": true
|
||||
},
|
||||
"redux": {
|
||||
"optional": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"node_modules/react-refresh": {
|
||||
"version": "0.18.0",
|
||||
"resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.18.0.tgz",
|
||||
@ -3496,6 +3591,65 @@
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/react-router": {
|
||||
"version": "7.9.6",
|
||||
"resolved": "https://registry.npmjs.org/react-router/-/react-router-7.9.6.tgz",
|
||||
"integrity": "sha512-Y1tUp8clYRXpfPITyuifmSoE2vncSME18uVLgaqyxh9H35JWpIfzHo+9y3Fzh5odk/jxPW29IgLgzcdwxGqyNA==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"cookie": "^1.0.1",
|
||||
"set-cookie-parser": "^2.6.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=20.0.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"react": ">=18",
|
||||
"react-dom": ">=18"
|
||||
},
|
||||
"peerDependenciesMeta": {
|
||||
"react-dom": {
|
||||
"optional": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"node_modules/react-router-dom": {
|
||||
"version": "7.9.6",
|
||||
"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.9.6.tgz",
|
||||
"integrity": "sha512-2MkC2XSXq6HjGcihnx1s0DBWQETI4mlis4Ux7YTLvP67xnGxCvq+BcCQSO81qQHVUTM1V53tl4iVVaY5sReCOA==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"react-router": "7.9.6"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=20.0.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"react": ">=18",
|
||||
"react-dom": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/redux": {
|
||||
"version": "5.0.1",
|
||||
"resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz",
|
||||
"integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/redux-thunk": {
|
||||
"version": "3.1.0",
|
||||
"resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-3.1.0.tgz",
|
||||
"integrity": "sha512-NW2r5T6ksUKXCabzhL9z+h206HQw/NJkcLm1GPImRQ8IzfXwRGqjVhKJGauHirT0DAuyy6hjdnMZaRoAcy0Klw==",
|
||||
"license": "MIT",
|
||||
"peerDependencies": {
|
||||
"redux": "^5.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/reselect": {
|
||||
"version": "5.1.1",
|
||||
"resolved": "https://registry.npmjs.org/reselect/-/reselect-5.1.1.tgz",
|
||||
"integrity": "sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/resize-observer-polyfill": {
|
||||
"version": "1.5.1",
|
||||
"resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
|
||||
@ -3579,6 +3733,12 @@
|
||||
"semver": "bin/semver.js"
|
||||
}
|
||||
},
|
||||
"node_modules/set-cookie-parser": {
|
||||
"version": "2.7.2",
|
||||
"resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.2.tgz",
|
||||
"integrity": "sha512-oeM1lpU/UvhTxw+g3cIfxXHyJRc/uidd3yK1P242gzHds0udQBYzs3y8j4gCCW+ZJ7ad0yctld8RYO+bdurlvw==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/shebang-command": {
|
||||
"version": "2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
|
||||
@ -3730,6 +3890,15 @@
|
||||
"punycode": "^2.1.0"
|
||||
}
|
||||
},
|
||||
"node_modules/use-sync-external-store": {
|
||||
"version": "1.6.0",
|
||||
"resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.6.0.tgz",
|
||||
"integrity": "sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==",
|
||||
"license": "MIT",
|
||||
"peerDependencies": {
|
||||
"react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/vite": {
|
||||
"version": "7.2.4",
|
||||
"resolved": "https://registry.npmjs.org/vite/-/vite-7.2.4.tgz",
|
||||
|
||||
@ -10,9 +10,14 @@
|
||||
"preview": "vite preview"
|
||||
},
|
||||
"dependencies": {
|
||||
"@ant-design/icons": "^6.1.0",
|
||||
"@reduxjs/toolkit": "^2.11.0",
|
||||
"antd": "^6.0.0",
|
||||
"dayjs": "^1.11.19",
|
||||
"react": "^19.2.0",
|
||||
"react-dom": "^19.2.0"
|
||||
"react-dom": "^19.2.0",
|
||||
"react-redux": "^9.2.0",
|
||||
"react-router-dom": "^7.9.6"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@eslint/js": "^9.39.1",
|
||||
|
||||
BIN
web/public/logo.png
Normal file
BIN
web/public/logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 387 KiB |
BIN
web/public/rounded_logo.png
Normal file
BIN
web/public/rounded_logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 543 KiB |
@ -1 +0,0 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
|
||||
|
Before Width: | Height: | Size: 1.5 KiB |
19
web/src/Api/authApi.js
Normal file
19
web/src/Api/authApi.js
Normal file
@ -0,0 +1,19 @@
|
||||
import {createApi} from "@reduxjs/toolkit/query/react";
|
||||
import {baseQueryWithAuth} from "./baseQuery.js";
|
||||
|
||||
|
||||
export const authApi = createApi({
|
||||
reducerPath: "authApi",
|
||||
baseQuery: baseQueryWithAuth,
|
||||
endpoints: (builder) => ({
|
||||
login: builder.mutation({
|
||||
query: (credentials) => ({
|
||||
url: "/auth/login/",
|
||||
method: "POST",
|
||||
body: credentials,
|
||||
}),
|
||||
}),
|
||||
}),
|
||||
});
|
||||
|
||||
export const {useLoginMutation} = authApi;
|
||||
33
web/src/Api/baseQuery.js
Normal file
33
web/src/Api/baseQuery.js
Normal file
@ -0,0 +1,33 @@
|
||||
import {fetchBaseQuery} from '@reduxjs/toolkit/query/react';
|
||||
import {logout} from '../Redux/Slices/authSlice.js';
|
||||
import CONFIG from "../Core/сonfig.js";
|
||||
|
||||
export const baseQuery = fetchBaseQuery({
|
||||
baseUrl: CONFIG.BASE_URL,
|
||||
prepareHeaders: (headers, {getState, endpoint}) => {
|
||||
const token = localStorage.getItem('access_token');
|
||||
if (token) {
|
||||
headers.set('Authorization', `Bearer ${token}`);
|
||||
}
|
||||
if (endpoint === 'uploadAppointmentFile' || endpoint === 'uploadBackup') {
|
||||
const mutation = getState()?.api?.mutations?.[Object.keys(getState()?.api?.mutations || {})[0]];
|
||||
if (mutation?.body instanceof FormData) {
|
||||
headers.delete('Content-Type');
|
||||
}
|
||||
} else {
|
||||
headers.set('Content-Type', 'application/json');
|
||||
}
|
||||
|
||||
return headers;
|
||||
},
|
||||
});
|
||||
|
||||
export const baseQueryWithAuth = async (args, api, extraOptions) => {
|
||||
const result = await baseQuery(args, api, extraOptions);
|
||||
if (result.error && [401, 403].includes(result.error.status)) {
|
||||
localStorage.removeItem('access_token');
|
||||
api.dispatch(logout());
|
||||
window.location.href = '/login';
|
||||
}
|
||||
return result;
|
||||
};
|
||||
16
web/src/Api/usersApi.js
Normal file
16
web/src/Api/usersApi.js
Normal file
@ -0,0 +1,16 @@
|
||||
import {baseQueryWithAuth} from "./baseQuery.js";
|
||||
import {createApi} from "@reduxjs/toolkit/query/react";
|
||||
|
||||
|
||||
export const usersApi = createApi({
|
||||
reducerPath: "usersApi",
|
||||
baseQuery: baseQueryWithAuth,
|
||||
tagTypes: ["user"],
|
||||
endpoints: (builder) => ({
|
||||
getAuthenticatedUserData: builder.query({
|
||||
query: () => "/users/me/",
|
||||
}),
|
||||
}),
|
||||
});
|
||||
|
||||
export const {useGetAuthenticatedUserDataQuery} = usersApi;
|
||||
@ -1,42 +0,0 @@
|
||||
#root {
|
||||
max-width: 1280px;
|
||||
margin: 0 auto;
|
||||
padding: 2rem;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.logo {
|
||||
height: 6em;
|
||||
padding: 1.5em;
|
||||
will-change: filter;
|
||||
transition: filter 300ms;
|
||||
}
|
||||
.logo:hover {
|
||||
filter: drop-shadow(0 0 2em #646cffaa);
|
||||
}
|
||||
.logo.react:hover {
|
||||
filter: drop-shadow(0 0 2em #61dafbaa);
|
||||
}
|
||||
|
||||
@keyframes logo-spin {
|
||||
from {
|
||||
transform: rotate(0deg);
|
||||
}
|
||||
to {
|
||||
transform: rotate(360deg);
|
||||
}
|
||||
}
|
||||
|
||||
@media (prefers-reduced-motion: no-preference) {
|
||||
a:nth-of-type(2) .logo {
|
||||
animation: logo-spin infinite 20s linear;
|
||||
}
|
||||
}
|
||||
|
||||
.card {
|
||||
padding: 2em;
|
||||
}
|
||||
|
||||
.read-the-docs {
|
||||
color: #888;
|
||||
}
|
||||
@ -1,35 +0,0 @@
|
||||
import { useState } from 'react'
|
||||
import reactLogo from './assets/react.svg'
|
||||
import viteLogo from '/vite.svg'
|
||||
import './App.css'
|
||||
|
||||
function App() {
|
||||
const [count, setCount] = useState(0)
|
||||
|
||||
return (
|
||||
<>
|
||||
<div>
|
||||
<a href="https://vite.dev" target="_blank">
|
||||
<img src={viteLogo} className="logo" alt="Vite logo" />
|
||||
</a>
|
||||
<a href="https://react.dev" target="_blank">
|
||||
<img src={reactLogo} className="logo react" alt="React logo" />
|
||||
</a>
|
||||
</div>
|
||||
<h1>Vite + React</h1>
|
||||
<div className="card">
|
||||
<button onClick={() => setCount((count) => count + 1)}>
|
||||
count is {count}
|
||||
</button>
|
||||
<p>
|
||||
Edit <code>src/App.jsx</code> and save to test HMR
|
||||
</p>
|
||||
</div>
|
||||
<p className="read-the-docs">
|
||||
Click on the Vite and React logos to learn more
|
||||
</p>
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
export default App
|
||||
34
web/src/App/AdminRoute.jsx
Normal file
34
web/src/App/AdminRoute.jsx
Normal file
@ -0,0 +1,34 @@
|
||||
import {Navigate, Outlet} from "react-router-dom";
|
||||
import {useGetAuthenticatedUserDataQuery} from "../Api/usersApi.js";
|
||||
import LoadingIndicator from "../Components/Widgets/LoadingIndicator/LoadingIndicator.jsx";
|
||||
import {Result} from "antd";
|
||||
|
||||
const AdminRoute = () => {
|
||||
const {
|
||||
data: user,
|
||||
isLoading: isUserLoading,
|
||||
isError: isUserError,
|
||||
} = useGetAuthenticatedUserDataQuery(undefined, {
|
||||
pollingInterval: 20000,
|
||||
});
|
||||
|
||||
if (isUserLoading) {
|
||||
return <LoadingIndicator/>;
|
||||
}
|
||||
|
||||
if (isUserError) {
|
||||
return <Result status="500" title="500" subTitle="Произошла ошибка при загрузке данных пользователя"/>;
|
||||
}
|
||||
|
||||
if (!user) {
|
||||
return <Navigate to="/login"/>;
|
||||
}
|
||||
|
||||
if (!user.role || user.role.title !== "Администратор") {
|
||||
return <Navigate to="/"/>;
|
||||
}
|
||||
|
||||
return <Outlet/>;
|
||||
};
|
||||
|
||||
export default AdminRoute;
|
||||
41
web/src/App/App.jsx
Normal file
41
web/src/App/App.jsx
Normal file
@ -0,0 +1,41 @@
|
||||
import {useEffect} from 'react'
|
||||
import '../Styles/App.css'
|
||||
import dayjs from "dayjs";
|
||||
import {useDispatch, useSelector} from "react-redux";
|
||||
import LoadingIndicator from "../Components/Widgets/LoadingIndicator/LoadingIndicator.jsx";
|
||||
import {checkAuth} from "../Redux/Slices/authSlice.js";
|
||||
import {ConfigProvider} from "antd";
|
||||
import locale from 'antd/locale/ru_RU';
|
||||
import ErrorBoundary from "./ErrorBoundary.jsx";
|
||||
import AppRouter from "./AppRouter.jsx";
|
||||
import {BrowserRouter as Router} from "react-router-dom";
|
||||
|
||||
dayjs.locale('ru');
|
||||
|
||||
function App() {
|
||||
const dispatch = useDispatch();
|
||||
const {isLoading} = useSelector((state) => state.auth);
|
||||
|
||||
|
||||
useEffect(() => {
|
||||
dispatch(checkAuth());
|
||||
}, [dispatch]);
|
||||
|
||||
if (isLoading) {
|
||||
return <LoadingIndicator/>;
|
||||
}
|
||||
|
||||
return (
|
||||
<Router>
|
||||
<ConfigProvider
|
||||
locale={locale}
|
||||
>
|
||||
<ErrorBoundary>
|
||||
<AppRouter/>
|
||||
</ErrorBoundary>
|
||||
</ConfigProvider>
|
||||
</Router>
|
||||
)
|
||||
}
|
||||
|
||||
export default App
|
||||
29
web/src/App/AppRouter.jsx
Normal file
29
web/src/App/AppRouter.jsx
Normal file
@ -0,0 +1,29 @@
|
||||
import {Routes, Route, Navigate} from "react-router-dom";
|
||||
import PrivateRoute from "./PrivateRoute.jsx";
|
||||
import AdminRoute from "./AdminRoute.jsx";
|
||||
import LoginPage from "../Components/Pages/LoginPage/LoginPage.jsx";
|
||||
import CoursesPage from "../Components/Pages/Courses/CoursesPage.jsx";
|
||||
import MainLayout from "../Components/Layouts/MainLayout.jsx";
|
||||
|
||||
|
||||
const AppRouter = () => (
|
||||
<Routes>
|
||||
<Route path="/login" element={<LoginPage/>}/>
|
||||
|
||||
<Route element={<PrivateRoute/>}>
|
||||
<Route element={<MainLayout/>}>
|
||||
<Route path={"/"} element={<CoursesPage/>}/>
|
||||
</Route>
|
||||
</Route>
|
||||
|
||||
<Route element={<AdminRoute/>}>
|
||||
{/*<Route element={<MainLayout />}>*/}
|
||||
{/* <Route path="/admin" element={<AdminPage />} />*/}
|
||||
{/*</Route>*/}
|
||||
</Route>
|
||||
|
||||
<Route path={"*"} element={<Navigate to={"/"}/>}/>
|
||||
</Routes>
|
||||
);
|
||||
|
||||
export default AppRouter;
|
||||
28
web/src/App/ErrorBoundary.jsx
Normal file
28
web/src/App/ErrorBoundary.jsx
Normal file
@ -0,0 +1,28 @@
|
||||
import { Component } from "react";
|
||||
import {Alert, Result} from "antd";
|
||||
|
||||
class ErrorBoundary extends Component {
|
||||
state = { hasError: false };
|
||||
|
||||
static getDerivedStateFromError() {
|
||||
return { hasError: true };
|
||||
}
|
||||
|
||||
componentDidCatch(error, info) {
|
||||
console.error("ErrorBoundary caught:", error, info);
|
||||
}
|
||||
|
||||
render() {
|
||||
if (this.state.hasError) {
|
||||
return (
|
||||
<>
|
||||
<Result status="500" title="500" subTitle="Произошла ошибка в работе приложения."/>
|
||||
</>
|
||||
|
||||
);
|
||||
}
|
||||
return this.props.children;
|
||||
}
|
||||
}
|
||||
|
||||
export default ErrorBoundary;
|
||||
19
web/src/App/PrivateRoute.jsx
Normal file
19
web/src/App/PrivateRoute.jsx
Normal file
@ -0,0 +1,19 @@
|
||||
import {Navigate, Outlet} from "react-router-dom";
|
||||
import {useSelector} from "react-redux";
|
||||
import LoadingIndicator from "../Components/Widgets/LoadingIndicator/LoadingIndicator.jsx";
|
||||
|
||||
const PrivateRoute = () => {
|
||||
const {user, userData, isLoading} = useSelector((state) => state.auth);
|
||||
|
||||
if (isLoading) {
|
||||
return <LoadingIndicator/>;
|
||||
}
|
||||
|
||||
if (!user || !userData || userData.status.title !== "active") {
|
||||
return <Navigate to="/login"/>;
|
||||
}
|
||||
|
||||
return <Outlet/>;
|
||||
};
|
||||
|
||||
export default PrivateRoute;
|
||||
13
web/src/App/main.jsx
Normal file
13
web/src/App/main.jsx
Normal file
@ -0,0 +1,13 @@
|
||||
import {StrictMode} from 'react'
|
||||
import {createRoot} from 'react-dom/client'
|
||||
import App from './App.jsx'
|
||||
import {Provider} from "react-redux";
|
||||
import store from "../Redux/store.js";
|
||||
|
||||
createRoot(document.getElementById('root')).render(
|
||||
<StrictMode>
|
||||
<Provider store={store}>
|
||||
<App/>
|
||||
</Provider>
|
||||
</StrictMode>,
|
||||
)
|
||||
80
web/src/Components/Layouts/MainLayout.jsx
Normal file
80
web/src/Components/Layouts/MainLayout.jsx
Normal file
@ -0,0 +1,80 @@
|
||||
import useMainLayout from "./useMainLayout.js";
|
||||
import {Layout, Menu} from "antd";
|
||||
import CoursesPage from "../Pages/Courses/CoursesPage.jsx";
|
||||
import LoadingIndicator from "../Widgets/LoadingIndicator/LoadingIndicator.jsx";
|
||||
import {Outlet} from "react-router-dom";
|
||||
import {BookOutlined, LogoutOutlined, UserOutlined} from "@ant-design/icons";
|
||||
|
||||
const {Content, Footer, Sider} = Layout;
|
||||
|
||||
const MainLayout = () => {
|
||||
const {
|
||||
screens,
|
||||
collapsed,
|
||||
setCollapsed,
|
||||
location,
|
||||
user,
|
||||
isUserLoading,
|
||||
isUserError,
|
||||
handleMenuClick,
|
||||
getItem
|
||||
} = useMainLayout();
|
||||
|
||||
const menuItems = [
|
||||
getItem("Мои курсы", "/", <BookOutlined/>),
|
||||
getItem("Профиль", "/profile", <UserOutlined/>),
|
||||
getItem("Выйти", "logout", <LogoutOutlined/>),
|
||||
{type: "divider"}
|
||||
];
|
||||
|
||||
|
||||
return (
|
||||
<Layout style={{minHeight: "100vh", margin: "-0.4vw"}}>
|
||||
<Sider
|
||||
collapsible={!screens.xs}
|
||||
collapsed={collapsed}
|
||||
onCollapse={setCollapsed}
|
||||
style={{height: "100vh", position: "fixed", left: 0, overflow: "auto"}}
|
||||
>
|
||||
<div style={{display: "flex", justifyContent: "center", padding: 16}}>
|
||||
<img
|
||||
src="/rounded_logo.png"
|
||||
alt="Логотип"
|
||||
style={{width: collapsed ? 40 : 80, transition: "width 0.2s"}}
|
||||
/>
|
||||
</div>
|
||||
<Menu
|
||||
theme="dark"
|
||||
selectedKeys={[location.pathname]}
|
||||
mode="inline"
|
||||
items={menuItems}
|
||||
onClick={handleMenuClick}
|
||||
/>
|
||||
</Sider>
|
||||
|
||||
<Layout
|
||||
style={{marginLeft: collapsed ? 80 : 200, transition: "margin-left 0.2s"}}
|
||||
>
|
||||
<Content style={{
|
||||
margin: "0 16px",
|
||||
padding: 24,
|
||||
minHeight: "100vh",
|
||||
overflow: "auto",
|
||||
background: "#fff",
|
||||
borderRadius: 8,
|
||||
marginTop: "15px"
|
||||
}}>
|
||||
{isUserLoading ? (
|
||||
<LoadingIndicator/>
|
||||
) : (
|
||||
<Outlet/>
|
||||
)}
|
||||
</Content>
|
||||
<Footer style={{textAlign: "center"}}>{new Date().getFullYear()}</Footer>
|
||||
</Layout>
|
||||
</Layout>
|
||||
)
|
||||
|
||||
};
|
||||
|
||||
export default MainLayout;
|
||||
41
web/src/Components/Layouts/useMainLayout.js
Normal file
41
web/src/Components/Layouts/useMainLayout.js
Normal file
@ -0,0 +1,41 @@
|
||||
import {useState} from "react";
|
||||
import {useLocation, useNavigate} from "react-router-dom";
|
||||
import {useSelector} from "react-redux";
|
||||
import useAuthUtils from "../../Hooks/useAuthUtils.js";
|
||||
import {Grid} from "antd";
|
||||
|
||||
const {useBreakpoint} = Grid;
|
||||
|
||||
|
||||
const useMainLayout = () => {
|
||||
const [collapsed, setCollapsed] = useState(true);
|
||||
const navigate = useNavigate();
|
||||
const location = useLocation();
|
||||
const {logoutAndRedirect} = useAuthUtils();
|
||||
const screens = useBreakpoint();
|
||||
|
||||
const {userData: user, isLoading: isUserLoading, error: isUserError} = useSelector((state) => state.auth);
|
||||
|
||||
const handleMenuClick = ({key}) => {
|
||||
if (key === "logout") {
|
||||
logoutAndRedirect();
|
||||
return;
|
||||
}
|
||||
navigate(key);
|
||||
};
|
||||
const getItem = (label, key, icon, children) => ({key, icon, children, label});
|
||||
|
||||
return {
|
||||
screens,
|
||||
collapsed,
|
||||
setCollapsed,
|
||||
location,
|
||||
user,
|
||||
isUserLoading,
|
||||
isUserError,
|
||||
handleMenuClick,
|
||||
getItem
|
||||
};
|
||||
};
|
||||
|
||||
export default useMainLayout;
|
||||
12
web/src/Components/Pages/Courses/CoursesPage.jsx
Normal file
12
web/src/Components/Pages/Courses/CoursesPage.jsx
Normal file
@ -0,0 +1,12 @@
|
||||
|
||||
|
||||
|
||||
const CoursesPage = () => {
|
||||
return (
|
||||
<div>
|
||||
CoursesPage
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
export default CoursesPage;
|
||||
0
web/src/Components/Pages/Courses/useCoursesPage.js
Normal file
0
web/src/Components/Pages/Courses/useCoursesPage.js
Normal file
42
web/src/Components/Pages/LoginPage/LoginPage.jsx
Normal file
42
web/src/Components/Pages/LoginPage/LoginPage.jsx
Normal file
@ -0,0 +1,42 @@
|
||||
import {Button, Col, Flex, Form, Input, Typography} from "antd";
|
||||
import useLoginPage from "./useLoginPage.js";
|
||||
|
||||
const {Title} = Typography;
|
||||
|
||||
const LoginPage = () => {
|
||||
const {
|
||||
pageContainerStyle,
|
||||
onFinish
|
||||
} = useLoginPage();
|
||||
|
||||
return (
|
||||
<Flex vertical align={"center"} justify={"center"}>
|
||||
<Col style={pageContainerStyle}>
|
||||
<Title>Аутентификация</Title>
|
||||
<Form name={"login"} onFinish={onFinish}>
|
||||
<Form.Item
|
||||
name="login"
|
||||
rules={[{required: true, message: "Введите логин"}]}
|
||||
>
|
||||
<Input
|
||||
placeholder={"Логин"}
|
||||
/>
|
||||
</Form.Item>
|
||||
<Form.Item
|
||||
name="password"
|
||||
>
|
||||
<Input.Password placeholder={"Пароль"}/>
|
||||
</Form.Item>
|
||||
<Form.Item>
|
||||
<Button type="primary" htmlType="submit" block>
|
||||
Войти
|
||||
</Button>
|
||||
</Form.Item>
|
||||
</Form>
|
||||
</Col>
|
||||
|
||||
</Flex>
|
||||
)
|
||||
};
|
||||
|
||||
export default LoginPage;
|
||||
57
web/src/Components/Pages/LoginPage/useLoginPage.js
Normal file
57
web/src/Components/Pages/LoginPage/useLoginPage.js
Normal file
@ -0,0 +1,57 @@
|
||||
import {useNavigate} from "react-router-dom";
|
||||
import {useDispatch, useSelector} from "react-redux";
|
||||
import {useLoginMutation} from "../../../Api/authApi.js";
|
||||
import {useEffect, useRef} from "react";
|
||||
import {notification} from "antd";
|
||||
import {checkAuth, setError, setUser} from "../../../Redux/Slices/authSlice.js";
|
||||
|
||||
|
||||
const useLoginPage = () => {
|
||||
const navigate = useNavigate();
|
||||
const dispatch = useDispatch();
|
||||
const [loginUser, { isLoading }] = useLoginMutation();
|
||||
const { user, userData } = useSelector((state) => state.auth);
|
||||
const hasRedirected = useRef(false);
|
||||
|
||||
const pageContainerStyle = {
|
||||
paddingTop: screen.xs ? "100px" : "200px"
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
if (user && userData && !isLoading && !hasRedirected.current) {
|
||||
hasRedirected.current = true;
|
||||
navigate("/");
|
||||
}
|
||||
document.title = "Аутентификация";
|
||||
}, [user, userData, isLoading, navigate]);
|
||||
|
||||
const onFinish = async (loginData) => {
|
||||
try {
|
||||
const response = await loginUser(loginData).unwrap();
|
||||
const token = response.access_token || response.token;
|
||||
if (!token) {
|
||||
throw new Error("Сервер не вернул токен авторизации");
|
||||
}
|
||||
localStorage.setItem("access_token", token);
|
||||
dispatch(setUser({ token }));
|
||||
|
||||
await dispatch(checkAuth()).unwrap();
|
||||
} catch (error) {
|
||||
const errorMessage = error?.data?.detail || "Не удалось войти. Проверьте логин и пароль.";
|
||||
console.error(error);
|
||||
dispatch(setError(errorMessage));
|
||||
notification.error({
|
||||
title: "Ошибка при входе",
|
||||
description: errorMessage,
|
||||
placement: "topRight",
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
return {
|
||||
pageContainerStyle,
|
||||
onFinish
|
||||
};
|
||||
};
|
||||
|
||||
export default useLoginPage;
|
||||
@ -0,0 +1,15 @@
|
||||
import {Spin} from "antd";
|
||||
import {LoadingOutlined} from "@ant-design/icons";
|
||||
import useLoadingIndicatorUI from "./useLoadingIndicator.js";
|
||||
|
||||
const LoadingIndicator = () => {
|
||||
const {containerStyle, iconStyle} = useLoadingIndicatorUI();
|
||||
|
||||
return (
|
||||
<div style={containerStyle}>
|
||||
<Spin indicator={<LoadingOutlined style={iconStyle} spin/>}/>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
export default LoadingIndicator;
|
||||
@ -0,0 +1,20 @@
|
||||
const useLoadingIndicatorUI = () => {
|
||||
const containerStyle = {
|
||||
display: "flex",
|
||||
justifyContent: "center",
|
||||
alignItems: "center",
|
||||
height: "100vh",
|
||||
};
|
||||
|
||||
const iconStyle = {
|
||||
fontSize: 64,
|
||||
color: "#1890ff",
|
||||
};
|
||||
|
||||
return {
|
||||
containerStyle,
|
||||
iconStyle,
|
||||
};
|
||||
};
|
||||
|
||||
export default useLoadingIndicatorUI;
|
||||
5
web/src/Core/сonfig.js
Normal file
5
web/src/Core/сonfig.js
Normal file
@ -0,0 +1,5 @@
|
||||
const CONFIG = {
|
||||
BASE_URL: import.meta.env.VITE_BASE_URL,
|
||||
};
|
||||
|
||||
export default CONFIG;
|
||||
18
web/src/Hooks/useAuthUtils.js
Normal file
18
web/src/Hooks/useAuthUtils.js
Normal file
@ -0,0 +1,18 @@
|
||||
import { useDispatch } from "react-redux";
|
||||
import { useNavigate } from "react-router-dom";
|
||||
import { logout } from "../Redux/Slices/authSlice.js";
|
||||
|
||||
const useAuthUtils = () => {
|
||||
const dispatch = useDispatch();
|
||||
const navigate = useNavigate();
|
||||
|
||||
const logoutAndRedirect = () => {
|
||||
localStorage.removeItem("access_token");
|
||||
dispatch(logout());
|
||||
navigate("/login");
|
||||
};
|
||||
|
||||
return { logoutAndRedirect };
|
||||
};
|
||||
|
||||
export default useAuthUtils;
|
||||
74
web/src/Redux/Slices/authSlice.js
Normal file
74
web/src/Redux/Slices/authSlice.js
Normal file
@ -0,0 +1,74 @@
|
||||
import { createSlice, createAsyncThunk } from "@reduxjs/toolkit";
|
||||
import {usersApi} from "../../Api/usersApi.js";
|
||||
|
||||
export const checkAuth = createAsyncThunk("auth/checkAuth", async (_, { dispatch, rejectWithValue }) => {
|
||||
try {
|
||||
const token = localStorage.getItem("access_token");
|
||||
if (!token) {
|
||||
return rejectWithValue("No token found");
|
||||
}
|
||||
|
||||
const userData = await dispatch(
|
||||
usersApi.endpoints.getAuthenticatedUserData.initiate(undefined, { forceRefetch: true })
|
||||
).unwrap();
|
||||
|
||||
return { token, userData };
|
||||
} catch (error) {
|
||||
localStorage.removeItem("access_token");
|
||||
return rejectWithValue(error?.data?.detail || "Failed to authenticate");
|
||||
}
|
||||
});
|
||||
|
||||
const initialState = {
|
||||
user: null,
|
||||
userData: null,
|
||||
isLoading: true,
|
||||
error: null,
|
||||
};
|
||||
|
||||
const authSlice = createSlice({
|
||||
name: "auth",
|
||||
initialState,
|
||||
reducers: {
|
||||
setUser(state, action) {
|
||||
state.user = action.payload;
|
||||
state.isLoading = false;
|
||||
state.error = null;
|
||||
},
|
||||
setError(state, action) {
|
||||
state.error = action.payload;
|
||||
state.isLoading = false;
|
||||
},
|
||||
logout(state) {
|
||||
state.user = null;
|
||||
state.userData = null;
|
||||
state.error = null;
|
||||
state.isLoading = false;
|
||||
localStorage.removeItem("access_token");
|
||||
},
|
||||
setUserData(state, action) {
|
||||
state.userData = action.payload;
|
||||
},
|
||||
},
|
||||
extraReducers: (builder) => {
|
||||
builder
|
||||
.addCase(checkAuth.pending, (state) => {
|
||||
state.isLoading = true;
|
||||
state.error = null;
|
||||
})
|
||||
.addCase(checkAuth.fulfilled, (state, action) => {
|
||||
state.user = { token: action.payload.token };
|
||||
state.userData = action.payload.userData;
|
||||
state.isLoading = false;
|
||||
})
|
||||
.addCase(checkAuth.rejected, (state, action) => {
|
||||
state.user = null;
|
||||
state.userData = null;
|
||||
state.isLoading = false;
|
||||
state.error = action.payload;
|
||||
});
|
||||
},
|
||||
});
|
||||
|
||||
export const { setUser, setError, logout, setUserData } = authSlice.actions;
|
||||
export default authSlice.reducer;
|
||||
21
web/src/Redux/store.js
Normal file
21
web/src/Redux/store.js
Normal file
@ -0,0 +1,21 @@
|
||||
import {configureStore} from "@reduxjs/toolkit";
|
||||
import authReducer from "./Slices/authSlice.js";
|
||||
import {authApi} from "../Api/authApi.js";
|
||||
import {usersApi} from "../Api/usersApi.js";
|
||||
|
||||
export const store = configureStore({
|
||||
reducer: {
|
||||
auth: authReducer,
|
||||
[authApi.reducerPath]: authApi.reducer,
|
||||
|
||||
[usersApi.reducerPath]: usersApi.reducer
|
||||
},
|
||||
middleware: (getDefaultMiddleware) => (
|
||||
getDefaultMiddleware().concat(
|
||||
authApi.middleware,
|
||||
usersApi.middleware,
|
||||
)
|
||||
),
|
||||
});
|
||||
|
||||
export default store;
|
||||
0
web/src/Styles/App.css
Normal file
0
web/src/Styles/App.css
Normal file
@ -1 +0,0 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>
|
||||
|
Before Width: | Height: | Size: 4.0 KiB |
@ -1,68 +0,0 @@
|
||||
:root {
|
||||
font-family: system-ui, Avenir, Helvetica, Arial, sans-serif;
|
||||
line-height: 1.5;
|
||||
font-weight: 400;
|
||||
|
||||
color-scheme: light dark;
|
||||
color: rgba(255, 255, 255, 0.87);
|
||||
background-color: #242424;
|
||||
|
||||
font-synthesis: none;
|
||||
text-rendering: optimizeLegibility;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
}
|
||||
|
||||
a {
|
||||
font-weight: 500;
|
||||
color: #646cff;
|
||||
text-decoration: inherit;
|
||||
}
|
||||
a:hover {
|
||||
color: #535bf2;
|
||||
}
|
||||
|
||||
body {
|
||||
margin: 0;
|
||||
display: flex;
|
||||
place-items: center;
|
||||
min-width: 320px;
|
||||
min-height: 100vh;
|
||||
}
|
||||
|
||||
h1 {
|
||||
font-size: 3.2em;
|
||||
line-height: 1.1;
|
||||
}
|
||||
|
||||
button {
|
||||
border-radius: 8px;
|
||||
border: 1px solid transparent;
|
||||
padding: 0.6em 1.2em;
|
||||
font-size: 1em;
|
||||
font-weight: 500;
|
||||
font-family: inherit;
|
||||
background-color: #1a1a1a;
|
||||
cursor: pointer;
|
||||
transition: border-color 0.25s;
|
||||
}
|
||||
button:hover {
|
||||
border-color: #646cff;
|
||||
}
|
||||
button:focus,
|
||||
button:focus-visible {
|
||||
outline: 4px auto -webkit-focus-ring-color;
|
||||
}
|
||||
|
||||
@media (prefers-color-scheme: light) {
|
||||
:root {
|
||||
color: #213547;
|
||||
background-color: #ffffff;
|
||||
}
|
||||
a:hover {
|
||||
color: #747bff;
|
||||
}
|
||||
button {
|
||||
background-color: #f9f9f9;
|
||||
}
|
||||
}
|
||||
@ -1,10 +0,0 @@
|
||||
import { StrictMode } from 'react'
|
||||
import { createRoot } from 'react-dom/client'
|
||||
import './index.css'
|
||||
import App from './App.jsx'
|
||||
|
||||
createRoot(document.getElementById('root')).render(
|
||||
<StrictMode>
|
||||
<App />
|
||||
</StrictMode>,
|
||||
)
|
||||
Loading…
x
Reference in New Issue
Block a user