Skip to content

Commit

Permalink
stash commit
Browse files Browse the repository at this point in the history
  • Loading branch information
Reagent992 committed Jan 29, 2024
1 parent 56c1ff5 commit 13ade68
Show file tree
Hide file tree
Showing 8 changed files with 107 additions and 76 deletions.
11 changes: 8 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ TO-DO: Описание проекта.

## [Репозиторий Frontend](https://github.com/NataliyaNikulshina/ipr-hackathon-yandex-alfa)

## Документация
## Документация API

Пример адреса на запущенном сервере:

Expand All @@ -35,7 +35,7 @@ TO-DO: Описание проекта.
| [django-cors-headers](https://pypi.org/project/django-cors-headers/) | Что-то делает с headers |
| [Flake8](https://pypi.org/project/flake8/), [black](https://pypi.org/project/black/), [isort](https://pypi.org/project/isort/), [Pre-commit](https://pypi.org/project/pre-commit/) | Инструменты для поддержания Code-Style в проекте. |

## Code-Style
## Code-Style при разработке

### Локальный запуск pre-commit

Expand All @@ -46,6 +46,11 @@ TO-DO: Описание проекта.

### 1. Требуется заполнить `.env` файл, пример заполнения находится в `.envexample`

### 2. [Загрузка фикстур в БД](docs/authorization.md) - _Опционально_

## Авторы

TO-DO
- [Miron Sadykov](https://github.com/Reagent992)
- [Mikhail Volkov](https://github.com/greenpandorik)
- [Артур Галиаскаров](https://github.com/Arti1946)
- [Ilya Kotenko](https://github.com/IlyaKotenko)
4 changes: 1 addition & 3 deletions config/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,6 @@
],
"PAGE_SIZE": 10,
"DEFAULT_AUTHENTICATION_CLASSES": [
"rest_framework.authentication.BasicAuthentication",
"rest_framework.authentication.BasicAuthentication",
"rest_framework_simplejwt.authentication.JWTAuthentication",
],
"DEFAULT_SCHEMA_CLASS": "drf_spectacular.openapi.AutoSchema",
Expand All @@ -171,7 +169,7 @@
SPECTACULAR_SETTINGS = {
"TITLE": "IPR API",
"DESCRIPTION": (
"API-Документация для SPA-приложения ИПР.<br>"
"API-Документация для SPA ИПР.<br>"
"Хакатон Яндекс-Практикум/Альфа-Банк 2024. Команда № 8."
),
"VERSION": "0.1.0",
Expand Down
6 changes: 6 additions & 0 deletions docs/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
load_fixtures:
python ..\manage.py loaddata .\fixture\users_position_dump.json --app=users
python ..\manage.py loaddata .\fixture\tasks_skill_dump.json --app=tasks
python ..\manage.py loaddata .\fixture\users_user_dump.json --app=users
python ..\manage.py loaddata .\fixture\ipr_ipr_dump.json --app=ipr
python ..\manage.py loaddata .\fixture\tasks_task_dump.json --app=tasks
41 changes: 41 additions & 0 deletions docs/authorization.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# Загрузка данных в БД(фикстуры)

## [Основной REAMDE.MD файл](../README.md)

## Для загрузки фикстур в БД выполните команды

```bash
cd docs # Переход в папку docs
load_fixtures.bat # Для загрузки фикстур в бд на Windows
make Makefile # Для загрузки фикстур в бд на Linux
```

### Superadmin

> Используйте логин и пароль от Superadmin для входа в панель администратора
- Login: <[email protected]>
- Pass: Password

### Пользователи

- Пароль для всех: fd3fvcv33df

### Директор

- <[email protected]>

### Руководители команд

- <[email protected]>
- <[email protected]>
- <[email protected]>

### Сотрудники

- <[email protected]>
- <[email protected]>
- <[email protected]>
- <[email protected]>
- <[email protected]>
- <[email protected]>
22 changes: 0 additions & 22 deletions docs/fixture/authorization.md

This file was deleted.

38 changes: 0 additions & 38 deletions docs/fixture/users_team_dump.json

This file was deleted.

56 changes: 46 additions & 10 deletions docs/fixture/users_user_dump.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"model": "users.user",
"pk": 2,
"fields": {
"password": "upass",
"password": "uppbkdf2_sha256$720000$v0WwfyVPVxZWkubZ9Wv4pV$lqIeAcBPvbTKzdrgZTATXhuaCb+Rdbjn8gvzMQ0ymJw=ass",
"last_login": null,
"is_superuser": false,
"is_staff": false,
Expand All @@ -47,7 +47,7 @@
"model": "users.user",
"pk": 3,
"fields": {
"password": "upass",
"password": "pbkdf2_sha256$720000$v0WwfyVPVxZWkubZ9Wv4pV$lqIeAcBPvbTKzdrgZTATXhuaCb+Rdbjn8gvzMQ0ymJw=",
"last_login": null,
"is_superuser": false,
"is_staff": false,
Expand All @@ -69,7 +69,7 @@
"model": "users.user",
"pk": 4,
"fields": {
"password": "upass",
"password": "pbkdf2_sha256$720000$v0WwfyVPVxZWkubZ9Wv4pV$lqIeAcBPvbTKzdrgZTATXhuaCb+Rdbjn8gvzMQ0ymJw=",
"last_login": null,
"is_superuser": false,
"is_staff": false,
Expand All @@ -91,7 +91,7 @@
"model": "users.user",
"pk": 5,
"fields": {
"password": "upass",
"password": "pbkdf2_sha256$720000$v0WwfyVPVxZWkubZ9Wv4pV$lqIeAcBPvbTKzdrgZTATXhuaCb+Rdbjn8gvzMQ0ymJw=",
"last_login": null,
"is_superuser": false,
"is_staff": false,
Expand All @@ -113,7 +113,7 @@
"model": "users.user",
"pk": 6,
"fields": {
"password": "upass",
"password": "pbkdf2_sha256$720000$v0WwfyVPVxZWkubZ9Wv4pV$lqIeAcBPvbTKzdrgZTATXhuaCb+Rdbjn8gvzMQ0ymJw=",
"last_login": null,
"is_superuser": false,
"is_staff": false,
Expand All @@ -135,7 +135,7 @@
"model": "users.user",
"pk": 7,
"fields": {
"password": "upass",
"password": "pbkdf2_sha256$720000$v0WwfyVPVxZWkubZ9Wv4pV$lqIeAcBPvbTKzdrgZTATXhuaCb+Rdbjn8gvzMQ0ymJw=",
"last_login": null,
"is_superuser": false,
"is_staff": false,
Expand All @@ -157,7 +157,7 @@
"model": "users.user",
"pk": 8,
"fields": {
"password": "upass",
"password": "pbkdf2_sha256$720000$v0WwfyVPVxZWkubZ9Wv4pV$lqIeAcBPvbTKzdrgZTATXhuaCb+Rdbjn8gvzMQ0ymJw=",
"last_login": null,
"is_superuser": false,
"is_staff": false,
Expand All @@ -179,7 +179,7 @@
"model": "users.user",
"pk": 9,
"fields": {
"password": "upass",
"password": "pbkdf2_sha256$720000$v0WwfyVPVxZWkubZ9Wv4pV$lqIeAcBPvbTKzdrgZTATXhuaCb+Rdbjn8gvzMQ0ymJw=",
"last_login": null,
"is_superuser": false,
"is_staff": false,
Expand All @@ -201,7 +201,7 @@
"model": "users.user",
"pk": 10,
"fields": {
"password": "upass",
"password": "pbkdf2_sha256$720000$v0WwfyVPVxZWkubZ9Wv4pV$lqIeAcBPvbTKzdrgZTATXhuaCb+Rdbjn8gvzMQ0ymJw=",
"last_login": null,
"is_superuser": false,
"is_staff": false,
Expand All @@ -223,7 +223,7 @@
"model": "users.user",
"pk": 11,
"fields": {
"password": "upass",
"password": "pbkdf2_sha256$720000$v0WwfyVPVxZWkubZ9Wv4pV$lqIeAcBPvbTKzdrgZTATXhuaCb+Rdbjn8gvzMQ0ymJw=",
"last_login": null,
"is_superuser": false,
"is_staff": false,
Expand All @@ -240,5 +240,41 @@
"groups": [],
"user_permissions": []
}
},
{
"model": "users.team",
"pk": 1,
"fields": {
"name": "Front-end разработка",
"boss": 2,
"created_at": "2024-01-29T15:56:26.086Z"
}
},
{
"model": "users.team",
"pk": 2,
"fields": {
"name": "Аналитика",
"boss": 5,
"created_at": "2024-01-29T15:58:53.959Z"
}
},
{
"model": "users.team",
"pk": 3,
"fields": {
"name": "Дизайн",
"boss": 8,
"created_at": "2024-01-29T16:01:22.524Z"
}
},
{
"model": "users.team",
"pk": 4,
"fields": {
"name": "Менеджмент",
"boss": 11,
"created_at": "2024-01-29T17:01:57.507Z"
}
}
]
5 changes: 5 additions & 0 deletions docs/load_fixtures.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
python ..\manage.py loaddata .\fixture\users_position_dump.json --app=users
python ..\manage.py loaddata .\fixture\tasks_skill_dump.json --app=tasks
python ..\manage.py loaddata .\fixture\users_user_dump.json --app=users
python ..\manage.py loaddata .\fixture\ipr_ipr_dump.json --app=ipr
python ..\manage.py loaddata .\fixture\tasks_task_dump.json --app=tasks

0 comments on commit 13ade68

Please sign in to comment.