Skip to content

Commit e2c1090

Browse files
Merge pull request #23 from intervisionlord/feature/deck_show_cards
Feature/deck show cards
2 parents e3d04c3 + b48cd77 commit e2c1090

22 files changed

+870
-497
lines changed

.env.example

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ SSL_ENABLED=True
1313
SSL_KEY_PATH=""
1414
SSL_CERT_PATH=""
1515

16-
# Параметры для Nextcloud
16+
# Параметры для Nextcloud Deck
1717
NC_URL="https://yourdomain"
1818
NC_LOGIN=""
19-
NC_PASSWORD=""
19+
NC_PASSWORD=""
20+
21+
# ID доски и стека для списка покупок
22+
DECK_BOARD_ID=1
23+
DECK_STACK_ID=1

.pre-commit-config.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,3 @@ repos:
2020
# hooks:
2121
# - id: isort
2222
# # сортирует импорты в Python
23-
24-
- repo: https://github.com/pycqa/flake8
25-
rev: 6.0.0
26-
hooks:
27-
- id: flake8
28-
args: [--max-line-length=88]

.scripts/project_tree.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,10 @@ def print_tree(directory: Path, ignore_dirs: list[str] = None, prefix: str = "")
3737
yield from print_tree(path, ignore_dirs, prefix=prefix + extension)
3838

3939

40-
def main():
40+
def main() -> None:
41+
"""
42+
Основная функция запуска отрисовки дерева файлов
43+
"""
4144
parser = argparse.ArgumentParser(
4245
description="Отображение древовидной структуры проекта"
4346
)

config/settings.py

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,43 @@
11
"""Файл настроек приложения"""
22

33
from typing import Optional
4-
54
from pydantic import Field
65
from pydantic_settings import BaseSettings
76

87

98
class Settings(BaseSettings):
109
"""Конфигурация приложения"""
1110

12-
VERSION: str = Field("0.0.2.2")
11+
VERSION: str = "0.0.3.0"
1312

1413
# Токен бота Telegram
1514
BOT_TOKEN: Optional[str] = Field(None, description="Токен бота от @BotFather")
1615

1716
# Настройки сервера
18-
HOST: str = Field("0.0.0.0", description="Хост для запуска сервера")
19-
PORT: int = Field(8443, description="Порт для запуска сервера")
17+
HOST: str = "0.0.0.0"
18+
PORT: int = 8443
2019

2120
# SSL
22-
SSL_ENABLED: bool = Field(False, description="Использование локального SSL")
23-
SSL_KEY_PATH: Optional[str] = Field(None, description="Ключ сертификата")
24-
SSL_CERT_PATH: Optional[str] = Field(None, description="Сертификат")
21+
SSL_ENABLED: bool = False
22+
SSL_KEY_PATH: Optional[str] = None
23+
SSL_CERT_PATH: Optional[str] = None
2524

26-
# Настройки вебхука (опционально для продакшена)
27-
WEBHOOK_HOST: Optional[str] = Field(None, description="Публичный URL для вебхука")
25+
# Настройки вебхука
26+
WEBHOOK_HOST: Optional[str] = None
2827

29-
# Настройки NextCloud
28+
# Настройки NextCloud Deck
3029
NC_URL: Optional[str] = Field(None, description="Адрес Nextcloud")
3130
NC_LOGIN: Optional[str] = Field(None, description="Логин Nextcloud")
3231
NC_PASSWORD: Optional[str] = Field(None, description="Пароль Nextcloud")
3332

33+
# ID доски и стека для списка покупок
34+
DECK_BOARD_ID: int = 1
35+
DECK_STACK_ID: int = 1
36+
3437
# Настройки логирования
35-
LOG_LEVEL: str = Field("INFO", description="Уровень логирования")
38+
LOG_LEVEL: str = "INFO"
3639

37-
class Config: # pylint: disable=R0903
40+
class Config:
3841
"""Конфигурация Pydantic"""
3942

4043
env_file = ".env"

handlers/bot_routes/route_deck_boards.py

Lines changed: 0 additions & 51 deletions
This file was deleted.

handlers/bot_routes/route_deck_cards.py

Lines changed: 0 additions & 32 deletions
This file was deleted.

handlers/bot_routes/route_deck_stacks.py

Lines changed: 0 additions & 73 deletions
This file was deleted.

0 commit comments

Comments
 (0)