Arduinum
11
.env.example
11
.env.example
@@ -1,11 +0,0 @@
|
|||||||
# настройки для бд
|
|
||||||
NAME_DB = "название бд"
|
|
||||||
ECHO_DB = "булево значение для дебага бд"
|
|
||||||
|
|
||||||
# настройки бекенда
|
|
||||||
HOST_APP=ip или доменное имя для app
|
|
||||||
PORT_APP=порт для app
|
|
||||||
IS_RELOAD=True для разработки, False для обычного использования
|
|
||||||
|
|
||||||
#настройки фронтенда
|
|
||||||
FRONTEND_ORIGINS=url для cors1,url для cors2
|
|
||||||
236
.gitignore
vendored
236
.gitignore
vendored
@@ -1,208 +1,52 @@
|
|||||||
# Byte-compiled / optimized / DLL files
|
# Node / Frontend
|
||||||
__pycache__/
|
node_modules/
|
||||||
*.py[codz]
|
|
||||||
*$py.class
|
|
||||||
|
|
||||||
# C extensions
|
|
||||||
*.so
|
|
||||||
|
|
||||||
# Distribution / packaging
|
|
||||||
.Python
|
|
||||||
build/
|
|
||||||
develop-eggs/
|
|
||||||
dist/
|
dist/
|
||||||
downloads/
|
coverage/
|
||||||
eggs/
|
npm-debug.log*
|
||||||
.eggs/
|
.yarn/*
|
||||||
lib/
|
.pnpm-debug.log*
|
||||||
lib64/
|
.vite/
|
||||||
parts/
|
.sass-cache/
|
||||||
sdist/
|
.sourcemaps/
|
||||||
var/
|
.versions/
|
||||||
wheels/
|
|
||||||
share/python-wheels/
|
|
||||||
*.egg-info/
|
|
||||||
.installed.cfg
|
|
||||||
*.egg
|
|
||||||
MANIFEST
|
|
||||||
|
|
||||||
# PyInstaller
|
# Ionic / Cordova / Capacitor
|
||||||
# Usually these files are written by a python script from a template
|
/platforms/
|
||||||
# before PyInstaller builds the exe, so as to inject date/other infos into it.
|
/plugins/
|
||||||
*.manifest
|
/www/
|
||||||
*.spec
|
/.ionic/
|
||||||
|
|
||||||
# Installer logs
|
# Tauri
|
||||||
pip-log.txt
|
target/
|
||||||
pip-delete-this-directory.txt
|
gen/
|
||||||
|
|
||||||
# Unit test / coverage reports
|
# Database
|
||||||
htmlcov/
|
*.db
|
||||||
.tox/
|
*.sqlite
|
||||||
.nox/
|
|
||||||
.coverage
|
|
||||||
.coverage.*
|
|
||||||
.cache
|
|
||||||
nosetests.xml
|
|
||||||
coverage.xml
|
|
||||||
*.cover
|
|
||||||
*.py.cover
|
|
||||||
.hypothesis/
|
|
||||||
.pytest_cache/
|
|
||||||
cover/
|
|
||||||
|
|
||||||
# Translations
|
|
||||||
*.mo
|
|
||||||
*.pot
|
|
||||||
|
|
||||||
# Django stuff:
|
|
||||||
*.log
|
|
||||||
local_settings.py
|
|
||||||
db.sqlite3
|
|
||||||
db.sqlite3-journal
|
|
||||||
*.sqlite3
|
*.sqlite3
|
||||||
|
|
||||||
# Flask stuff:
|
# Environment files
|
||||||
instance/
|
|
||||||
.webassets-cache
|
|
||||||
|
|
||||||
# Scrapy stuff:
|
|
||||||
.scrapy
|
|
||||||
|
|
||||||
# Sphinx documentation
|
|
||||||
docs/_build/
|
|
||||||
|
|
||||||
# PyBuilder
|
|
||||||
.pybuilder/
|
|
||||||
target/
|
|
||||||
|
|
||||||
# Jupyter Notebook
|
|
||||||
.ipynb_checkpoints
|
|
||||||
|
|
||||||
# IPython
|
|
||||||
profile_default/
|
|
||||||
ipython_config.py
|
|
||||||
|
|
||||||
# pyenv
|
|
||||||
# For a library or package, you might want to ignore these files since the code is
|
|
||||||
# intended to run in multiple environments; otherwise, check them in:
|
|
||||||
# .python-version
|
|
||||||
|
|
||||||
# pipenv
|
|
||||||
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
|
|
||||||
# However, in case of collaboration, if having platform-specific dependencies or dependencies
|
|
||||||
# having no cross-platform support, pipenv may install dependencies that don't work, or not
|
|
||||||
# install all needed dependencies.
|
|
||||||
#Pipfile.lock
|
|
||||||
|
|
||||||
# UV
|
|
||||||
# Similar to Pipfile.lock, it is generally recommended to include uv.lock in version control.
|
|
||||||
# This is especially recommended for binary packages to ensure reproducibility, and is more
|
|
||||||
# commonly ignored for libraries.
|
|
||||||
#uv.lock
|
|
||||||
|
|
||||||
# poetry
|
|
||||||
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
|
|
||||||
# This is especially recommended for binary packages to ensure reproducibility, and is more
|
|
||||||
# commonly ignored for libraries.
|
|
||||||
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
|
|
||||||
#poetry.lock
|
|
||||||
#poetry.toml
|
|
||||||
|
|
||||||
# pdm
|
|
||||||
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
|
|
||||||
# pdm recommends including project-wide configuration in pdm.toml, but excluding .pdm-python.
|
|
||||||
# https://pdm-project.org/en/latest/usage/project/#working-with-version-control
|
|
||||||
#pdm.lock
|
|
||||||
#pdm.toml
|
|
||||||
.pdm-python
|
|
||||||
.pdm-build/
|
|
||||||
|
|
||||||
# pixi
|
|
||||||
# Similar to Pipfile.lock, it is generally recommended to include pixi.lock in version control.
|
|
||||||
#pixi.lock
|
|
||||||
# Pixi creates a virtual environment in the .pixi directory, just like venv module creates one
|
|
||||||
# in the .venv directory. It is recommended not to include this directory in version control.
|
|
||||||
.pixi
|
|
||||||
|
|
||||||
# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
|
|
||||||
__pypackages__/
|
|
||||||
|
|
||||||
# Celery stuff
|
|
||||||
celerybeat-schedule
|
|
||||||
celerybeat.pid
|
|
||||||
|
|
||||||
# SageMath parsed files
|
|
||||||
*.sage.py
|
|
||||||
|
|
||||||
# Environments
|
|
||||||
.env
|
.env
|
||||||
.envrc
|
|
||||||
.venv
|
|
||||||
env/
|
|
||||||
venv/
|
|
||||||
ENV/
|
|
||||||
env.bak/
|
|
||||||
venv.bak/
|
|
||||||
|
|
||||||
# Spyder project settings
|
# IDEs
|
||||||
.spyderproject
|
|
||||||
.spyproject
|
|
||||||
|
|
||||||
# Rope project settings
|
|
||||||
.ropeproject
|
|
||||||
|
|
||||||
# mkdocs documentation
|
|
||||||
/site
|
|
||||||
|
|
||||||
# mypy
|
|
||||||
.mypy_cache/
|
|
||||||
.dmypy.json
|
|
||||||
dmypy.json
|
|
||||||
|
|
||||||
# Pyre type checker
|
|
||||||
.pyre/
|
|
||||||
|
|
||||||
# pytype static type analyzer
|
|
||||||
.pytype/
|
|
||||||
|
|
||||||
# Cython debug symbols
|
|
||||||
cython_debug/
|
|
||||||
|
|
||||||
# PyCharm
|
|
||||||
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
|
|
||||||
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
|
|
||||||
# and can be added to the global gitignore or merged into this file. For a more nuclear
|
|
||||||
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
|
|
||||||
#.idea/
|
|
||||||
|
|
||||||
# Abstra
|
|
||||||
# Abstra is an AI-powered process automation framework.
|
|
||||||
# Ignore directories containing user credentials, local state, and settings.
|
|
||||||
# Learn more at https://abstra.io/docs
|
|
||||||
.abstra/
|
|
||||||
|
|
||||||
# Visual Studio Code
|
|
||||||
# Visual Studio Code specific template is maintained in a separate VisualStudioCode.gitignore
|
|
||||||
# that can be found at https://github.com/github/gitignore/blob/main/Global/VisualStudioCode.gitignore
|
|
||||||
# and can be added to the global gitignore or merged into this file. However, if you prefer,
|
|
||||||
# you could uncomment the following to ignore the entire vscode folder
|
|
||||||
.vscode/
|
.vscode/
|
||||||
|
.idea/
|
||||||
|
*.sublime-project
|
||||||
|
*.sublime-workspace
|
||||||
|
|
||||||
# Ruff stuff:
|
# OS / System
|
||||||
.ruff_cache/
|
.DS_Store
|
||||||
|
Thumbs.db
|
||||||
|
$RECYCLE.BIN/
|
||||||
|
UserInterfaceState.xcuserstate
|
||||||
|
|
||||||
# PyPI configuration file
|
# Logs
|
||||||
.pypirc
|
*.log
|
||||||
|
log.txt
|
||||||
|
|
||||||
# Cursor
|
# Temporary files
|
||||||
# Cursor is an AI-powered code editor. `.cursorignore` specifies files/directories to
|
*~
|
||||||
# exclude from AI features like autocomplete and code analysis. Recommended for sensitive data
|
*.sw[mnpcod]
|
||||||
# refer to https://docs.cursor.com/context/ignore-files
|
.tmp
|
||||||
.cursorignore
|
*.tmp
|
||||||
.cursorindexingignore
|
*.tmp.*
|
||||||
|
|
||||||
# Marimo
|
|
||||||
marimo/_static/
|
|
||||||
marimo/_lsp/
|
|
||||||
__marimo__/
|
|
||||||
|
|||||||
@@ -7,26 +7,3 @@ repos:
|
|||||||
- id: check-case-conflict
|
- id: check-case-conflict
|
||||||
- id: check-merge-conflict
|
- id: check-merge-conflict
|
||||||
- id: end-of-file-fixer
|
- id: end-of-file-fixer
|
||||||
|
|
||||||
- repo: https://github.com/asottile/pyupgrade
|
|
||||||
rev: v3.21.2
|
|
||||||
hooks:
|
|
||||||
- id: pyupgrade
|
|
||||||
args: [ --py313-plus ]
|
|
||||||
|
|
||||||
- repo: https://github.com/astral-sh/ruff-pre-commit
|
|
||||||
rev: v0.13.0
|
|
||||||
hooks:
|
|
||||||
- id: ruff-check
|
|
||||||
args: [ "--fix", "--line-length=120" ]
|
|
||||||
|
|
||||||
- repo: https://foundry.fsky.io/vel/ty-pre-commit
|
|
||||||
rev: 0.0.3
|
|
||||||
hooks:
|
|
||||||
- id: ty-check
|
|
||||||
additional_dependencies:
|
|
||||||
- sqlalchemy
|
|
||||||
- alembic
|
|
||||||
- pydantic-settings
|
|
||||||
- fastapi
|
|
||||||
- uvicorn
|
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
3.13.2
|
|
||||||
147
alembic.ini
147
alembic.ini
@@ -1,147 +0,0 @@
|
|||||||
# A generic, single database configuration.
|
|
||||||
|
|
||||||
[alembic]
|
|
||||||
# path to migration scripts.
|
|
||||||
# this is typically a path given in POSIX (e.g. forward slashes)
|
|
||||||
# format, relative to the token %(here)s which refers to the location of this
|
|
||||||
# ini file
|
|
||||||
script_location = %(here)s/src/kawai_focus_v2/database/alembic
|
|
||||||
|
|
||||||
# template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
|
|
||||||
# Uncomment the line below if you want the files to be prepended with date and time
|
|
||||||
# see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file
|
|
||||||
# for all available tokens
|
|
||||||
file_template = %%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s
|
|
||||||
|
|
||||||
# sys.path path, will be prepended to sys.path if present.
|
|
||||||
# defaults to the current working directory. for multiple paths, the path separator
|
|
||||||
# is defined by "path_separator" below.
|
|
||||||
prepend_sys_path = .
|
|
||||||
|
|
||||||
|
|
||||||
# timezone to use when rendering the date within the migration file
|
|
||||||
# as well as the filename.
|
|
||||||
# If specified, requires the tzdata library which can be installed by adding
|
|
||||||
# `alembic[tz]` to the pip requirements.
|
|
||||||
# string value is passed to ZoneInfo()
|
|
||||||
# leave blank for localtime
|
|
||||||
# timezone =
|
|
||||||
|
|
||||||
# max length of characters to apply to the "slug" field
|
|
||||||
# truncate_slug_length = 40
|
|
||||||
|
|
||||||
# set to 'true' to run the environment during
|
|
||||||
# the 'revision' command, regardless of autogenerate
|
|
||||||
# revision_environment = false
|
|
||||||
|
|
||||||
# set to 'true' to allow .pyc and .pyo files without
|
|
||||||
# a source .py file to be detected as revisions in the
|
|
||||||
# versions/ directory
|
|
||||||
# sourceless = false
|
|
||||||
|
|
||||||
# version location specification; This defaults
|
|
||||||
# to <script_location>/versions. When using multiple version
|
|
||||||
# directories, initial revisions must be specified with --version-path.
|
|
||||||
# The path separator used here should be the separator specified by "path_separator"
|
|
||||||
# below.
|
|
||||||
# version_locations = %(here)s/bar:%(here)s/bat:%(here)s/alembic/versions
|
|
||||||
|
|
||||||
# path_separator; This indicates what character is used to split lists of file
|
|
||||||
# paths, including version_locations and prepend_sys_path within configparser
|
|
||||||
# files such as alembic.ini.
|
|
||||||
# The default rendered in new alembic.ini files is "os", which uses os.pathsep
|
|
||||||
# to provide os-dependent path splitting.
|
|
||||||
#
|
|
||||||
# Note that in order to support legacy alembic.ini files, this default does NOT
|
|
||||||
# take place if path_separator is not present in alembic.ini. If this
|
|
||||||
# option is omitted entirely, fallback logic is as follows:
|
|
||||||
#
|
|
||||||
# 1. Parsing of the version_locations option falls back to using the legacy
|
|
||||||
# "version_path_separator" key, which if absent then falls back to the legacy
|
|
||||||
# behavior of splitting on spaces and/or commas.
|
|
||||||
# 2. Parsing of the prepend_sys_path option falls back to the legacy
|
|
||||||
# behavior of splitting on spaces, commas, or colons.
|
|
||||||
#
|
|
||||||
# Valid values for path_separator are:
|
|
||||||
#
|
|
||||||
# path_separator = :
|
|
||||||
# path_separator = ;
|
|
||||||
# path_separator = space
|
|
||||||
# path_separator = newline
|
|
||||||
#
|
|
||||||
# Use os.pathsep. Default configuration used for new projects.
|
|
||||||
path_separator = os
|
|
||||||
|
|
||||||
# set to 'true' to search source files recursively
|
|
||||||
# in each "version_locations" directory
|
|
||||||
# new in Alembic version 1.10
|
|
||||||
# recursive_version_locations = false
|
|
||||||
|
|
||||||
# the output encoding used when revision files
|
|
||||||
# are written from script.py.mako
|
|
||||||
# output_encoding = utf-8
|
|
||||||
|
|
||||||
# database URL. This is consumed by the user-maintained env.py script only.
|
|
||||||
# other means of configuring database URLs may be customized within the env.py
|
|
||||||
# file.
|
|
||||||
#sqlalchemy.url = driver://user:pass@localhost/dbname
|
|
||||||
|
|
||||||
|
|
||||||
[post_write_hooks]
|
|
||||||
# post_write_hooks defines scripts or Python functions that are run
|
|
||||||
# on newly generated revision scripts. See the documentation for further
|
|
||||||
# detail and examples
|
|
||||||
|
|
||||||
# format using "black" - use the console_scripts runner, against the "black" entrypoint
|
|
||||||
# hooks = black
|
|
||||||
# black.type = console_scripts
|
|
||||||
# black.entrypoint = black
|
|
||||||
# black.options = -l 79 REVISION_SCRIPT_FILENAME
|
|
||||||
|
|
||||||
# lint with attempts to fix using "ruff" - use the module runner, against the "ruff" module
|
|
||||||
# hooks = ruff
|
|
||||||
# ruff.type = module
|
|
||||||
# ruff.module = ruff
|
|
||||||
# ruff.options = check --fix REVISION_SCRIPT_FILENAME
|
|
||||||
|
|
||||||
# Alternatively, use the exec runner to execute a binary found on your PATH
|
|
||||||
hooks = ruff
|
|
||||||
ruff.type = exec
|
|
||||||
ruff.executable = uv
|
|
||||||
ruff.options = run ruff format REVISION_SCRIPT_FILENAME
|
|
||||||
|
|
||||||
# Logging configuration. This is also consumed by the user-maintained
|
|
||||||
# env.py script only.
|
|
||||||
[loggers]
|
|
||||||
keys = root,sqlalchemy,alembic
|
|
||||||
|
|
||||||
[handlers]
|
|
||||||
keys = console
|
|
||||||
|
|
||||||
[formatters]
|
|
||||||
keys = generic
|
|
||||||
|
|
||||||
[logger_root]
|
|
||||||
level = WARNING
|
|
||||||
handlers = console
|
|
||||||
qualname =
|
|
||||||
|
|
||||||
[logger_sqlalchemy]
|
|
||||||
level = WARNING
|
|
||||||
handlers =
|
|
||||||
qualname = sqlalchemy.engine
|
|
||||||
|
|
||||||
[logger_alembic]
|
|
||||||
level = INFO
|
|
||||||
handlers =
|
|
||||||
qualname = alembic
|
|
||||||
|
|
||||||
[handler_console]
|
|
||||||
class = StreamHandler
|
|
||||||
args = (sys.stderr,)
|
|
||||||
level = NOTSET
|
|
||||||
formatter = generic
|
|
||||||
|
|
||||||
[formatter_generic]
|
|
||||||
format = %(levelname)-5.5s [%(name)s] %(message)s
|
|
||||||
datefmt = %H:%M:%S
|
|
||||||
32
client/.gitignore
vendored
32
client/.gitignore
vendored
@@ -1,32 +0,0 @@
|
|||||||
# Specifies intentionally untracked files to ignore when using Git
|
|
||||||
# http://git-scm.com/docs/gitignore
|
|
||||||
|
|
||||||
*~
|
|
||||||
*.sw[mnpcod]
|
|
||||||
.tmp
|
|
||||||
*.tmp
|
|
||||||
*.tmp.*
|
|
||||||
*.sublime-project
|
|
||||||
*.sublime-workspace
|
|
||||||
.DS_Store
|
|
||||||
Thumbs.db
|
|
||||||
UserInterfaceState.xcuserstate
|
|
||||||
$RECYCLE.BIN/
|
|
||||||
|
|
||||||
*.log
|
|
||||||
log.txt
|
|
||||||
npm-debug.log*
|
|
||||||
|
|
||||||
/.idea
|
|
||||||
/.ionic
|
|
||||||
/.sass-cache
|
|
||||||
/.sourcemaps
|
|
||||||
/.versions
|
|
||||||
/.vscode/*
|
|
||||||
!/.vscode/extensions.json
|
|
||||||
/coverage
|
|
||||||
/dist
|
|
||||||
/node_modules
|
|
||||||
/platforms
|
|
||||||
/plugins
|
|
||||||
/www
|
|
||||||
25
client/package-lock.json
generated
25
client/package-lock.json
generated
@@ -1,11 +1,11 @@
|
|||||||
{
|
{
|
||||||
"name": "client",
|
"name": "kawai-focus",
|
||||||
"version": "0.0.1",
|
"version": "0.0.1",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "client",
|
"name": "kawai-focus",
|
||||||
"version": "0.0.1",
|
"version": "0.0.1",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@capacitor/app": "8.0.0",
|
"@capacitor/app": "8.0.0",
|
||||||
@@ -15,6 +15,8 @@
|
|||||||
"@capacitor/status-bar": "8.0.0",
|
"@capacitor/status-bar": "8.0.0",
|
||||||
"@ionic/vue": "^8.0.0",
|
"@ionic/vue": "^8.0.0",
|
||||||
"@ionic/vue-router": "^8.0.0",
|
"@ionic/vue-router": "^8.0.0",
|
||||||
|
"@tauri-apps/api": "^2.9.1",
|
||||||
|
"@tauri-apps/plugin-sql": "^2.3.1",
|
||||||
"ionicons": "^7.0.0",
|
"ionicons": "^7.0.0",
|
||||||
"vue": "^3.3.0",
|
"vue": "^3.3.0",
|
||||||
"vue-router": "^4.2.0"
|
"vue-router": "^4.2.0"
|
||||||
@@ -3143,6 +3145,25 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@tauri-apps/api": {
|
||||||
|
"version": "2.9.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.9.1.tgz",
|
||||||
|
"integrity": "sha512-IGlhP6EivjXHepbBic618GOmiWe4URJiIeZFlB7x3czM0yDHHYviH1Xvoiv4FefdkQtn6v7TuwWCRfOGdnVUGw==",
|
||||||
|
"license": "Apache-2.0 OR MIT",
|
||||||
|
"funding": {
|
||||||
|
"type": "opencollective",
|
||||||
|
"url": "https://opencollective.com/tauri"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@tauri-apps/plugin-sql": {
|
||||||
|
"version": "2.3.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@tauri-apps/plugin-sql/-/plugin-sql-2.3.1.tgz",
|
||||||
|
"integrity": "sha512-iNgHnFIR+jRkx9INKVKepzMlxXtNkJUaWuhagFjT4dOttPaNyRnVHgwTjpqZhyVjiklDh2UdEPAJkQKiCPAekw==",
|
||||||
|
"license": "MIT OR Apache-2.0",
|
||||||
|
"dependencies": {
|
||||||
|
"@tauri-apps/api": "^2.8.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@tootallnate/once": {
|
"node_modules/@tootallnate/once": {
|
||||||
"version": "2.0.0",
|
"version": "2.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
"build": "vue-tsc && vite build",
|
"build": "vite build",
|
||||||
"preview": "vite preview",
|
"preview": "vite preview",
|
||||||
"test:e2e": "cypress run",
|
"test:e2e": "cypress run",
|
||||||
"test:unit": "vitest",
|
"test:unit": "vitest",
|
||||||
@@ -19,6 +19,8 @@
|
|||||||
"@capacitor/status-bar": "8.0.0",
|
"@capacitor/status-bar": "8.0.0",
|
||||||
"@ionic/vue": "^8.0.0",
|
"@ionic/vue": "^8.0.0",
|
||||||
"@ionic/vue-router": "^8.0.0",
|
"@ionic/vue-router": "^8.0.0",
|
||||||
|
"@tauri-apps/api": "^2.9.1",
|
||||||
|
"@tauri-apps/plugin-sql": "^2.3.1",
|
||||||
"ionicons": "^7.0.0",
|
"ionicons": "^7.0.0",
|
||||||
"vue": "^3.3.0",
|
"vue": "^3.3.0",
|
||||||
"vue-router": "^4.2.0"
|
"vue-router": "^4.2.0"
|
||||||
|
|||||||
@@ -4,14 +4,6 @@
|
|||||||
</ion-app>
|
</ion-app>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script setup>
|
||||||
import { IonApp, IonRouterOutlet } from '@ionic/vue';
|
import { IonApp, IonRouterOutlet } from '@ionic/vue'
|
||||||
|
|
||||||
export default {
|
|
||||||
name: 'App',
|
|
||||||
components: {
|
|
||||||
IonApp,
|
|
||||||
IonRouterOutlet
|
|
||||||
}
|
|
||||||
};
|
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
8
client/src/config.js
Normal file
8
client/src/config.js
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
import { appLocalDataDir } from '@tauri-apps/api/path';
|
||||||
|
|
||||||
|
export async function getDB_URL() {
|
||||||
|
// Функция верёнт путь до бд
|
||||||
|
|
||||||
|
const appDir = await appLocalDataDir();
|
||||||
|
return `sqlite:${appDir}/timer.db`;
|
||||||
|
}
|
||||||
10
client/src/db/crud/timerCrud.js
Normal file
10
client/src/db/crud/timerCrud.js
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
import { getDb } from "../initDb";
|
||||||
|
import { SELECT_TIMERS } from "../dml/timerDML";
|
||||||
|
|
||||||
|
|
||||||
|
export async function getTimers() {
|
||||||
|
// Функция для получения списка таймеров
|
||||||
|
|
||||||
|
const db = await getDb();
|
||||||
|
return await db.select(SELECT_TIMERS);
|
||||||
|
}
|
||||||
11
client/src/db/ddl/timerDDL.js
Normal file
11
client/src/db/ddl/timerDDL.js
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
export const CREATE_TIMER = `
|
||||||
|
PRAGMA foreign_keys=ON;
|
||||||
|
CREATE TABLE IF NOT EXISTS timer (
|
||||||
|
title VARCHAR(200) NOT NULL,
|
||||||
|
pomodoro_time INTEGER NOT NULL,
|
||||||
|
break_time INTEGER NOT NULL,
|
||||||
|
break_long_time INTEGER NOT NULL,
|
||||||
|
count_pomodoro INTEGER NOT NULL,
|
||||||
|
id INTEGER NOT NULL,
|
||||||
|
PRIMARY KEY (id)
|
||||||
|
);`
|
||||||
6
client/src/db/dml/timerDML.js
Normal file
6
client/src/db/dml/timerDML.js
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
export const SELECT_TIMERS = 'SELECT id, title, pomodoro_time, count_pomodoro FROM timer ORDER BY id DESC'
|
||||||
|
export const COUNT_TIMERS = 'SELECT COUNT(*) as cnt FROM timer'
|
||||||
|
export const INSERT_SEED_DB = `
|
||||||
|
INSERT INTO timer (title, pomodoro_time, break_time, break_long_time, count_pomodoro) VALUES
|
||||||
|
('Timer mini example', 10, 3, 15, 2), ('Timer max example', 90, 10, 40, 8)
|
||||||
|
`
|
||||||
26
client/src/db/initDb.js
Normal file
26
client/src/db/initDb.js
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
import Database from '@tauri-apps/plugin-sql';
|
||||||
|
import { CREATE_TIMER } from './ddl/timerDDL';
|
||||||
|
import { getDB_URL } from '../config';
|
||||||
|
import { seedDb } from './seed';
|
||||||
|
|
||||||
|
let dbPromise = null;
|
||||||
|
|
||||||
|
export async function getDb() {
|
||||||
|
// Функция для получения подключения к базе данных
|
||||||
|
|
||||||
|
if (!dbPromise) {
|
||||||
|
dbPromise = (async () => {
|
||||||
|
try {
|
||||||
|
const dbUrl = await getDB_URL();
|
||||||
|
const db = await Database.load(dbUrl);
|
||||||
|
await db.execute(CREATE_TIMER);
|
||||||
|
await seedDb(db);
|
||||||
|
return db;
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Ошибка инициализации базы данных', error);
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
})();
|
||||||
|
}
|
||||||
|
return await dbPromise; // await для консистентности
|
||||||
|
}
|
||||||
11
client/src/db/seed.js
Normal file
11
client/src/db/seed.js
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
import { INSERT_SEED_DB, COUNT_TIMERS } from './dml/timerDML'
|
||||||
|
|
||||||
|
|
||||||
|
export async function seedDb(db) {
|
||||||
|
// Функция для заполнения бд данными
|
||||||
|
|
||||||
|
const count = await db.select(COUNT_TIMERS);
|
||||||
|
if (count[0].cnt === 0) {
|
||||||
|
await db.execute(INSERT_SEED_DB);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -8,14 +8,53 @@ import {
|
|||||||
trashOutline
|
trashOutline
|
||||||
} from 'ionicons/icons';
|
} from 'ionicons/icons';
|
||||||
|
|
||||||
|
import { ref, onMounted } from 'vue';
|
||||||
|
import { getTimers } from '../../db/crud/timerCrud';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'TimersList',
|
name: 'TimersList',
|
||||||
components: {
|
components: {
|
||||||
IonIcon,
|
IonIcon,
|
||||||
},
|
},
|
||||||
setup() {
|
setup() {
|
||||||
// Возвращаем иконки, чтобы они были доступны в шаблоне
|
const timers = ref([]);
|
||||||
|
const loading = ref(true);
|
||||||
|
const error = ref(null);
|
||||||
|
const expandedId = ref(null);
|
||||||
|
|
||||||
|
const loadTimers = async () => {
|
||||||
|
loading.value = true;
|
||||||
|
error.value = null;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const result = await getTimers();
|
||||||
|
timers.value = result;
|
||||||
|
} catch (err) {
|
||||||
|
error.value = err.message || 'Ошибка загрузки таймеров';
|
||||||
|
} finally {
|
||||||
|
loading.value = false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const toggleExpand = (id) => {
|
||||||
|
expandedId.value = expandedId.value === id ? null : id;
|
||||||
|
};
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
loadTimers();
|
||||||
|
});
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
// состояние
|
||||||
|
timers,
|
||||||
|
loading,
|
||||||
|
error,
|
||||||
|
expandedId,
|
||||||
|
|
||||||
|
// методы
|
||||||
|
toggleExpand,
|
||||||
|
|
||||||
|
// иконки
|
||||||
timerOutline,
|
timerOutline,
|
||||||
chevronUp,
|
chevronUp,
|
||||||
chevronDown,
|
chevronDown,
|
||||||
@@ -24,44 +63,4 @@ export default {
|
|||||||
trashOutline,
|
trashOutline,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
data() {
|
|
||||||
return {
|
|
||||||
timers: [],
|
|
||||||
expandedId: null,
|
|
||||||
loading: true,
|
|
||||||
error: null,
|
|
||||||
apiUrl: 'http://127.0.0.1:8090/api/timers'
|
|
||||||
};
|
|
||||||
},
|
|
||||||
mounted() {
|
|
||||||
this.fetchTimers();
|
|
||||||
},
|
|
||||||
methods: {
|
|
||||||
async fetchTimers() {
|
|
||||||
try {
|
|
||||||
this.loading = true;
|
|
||||||
this.error = null;
|
|
||||||
|
|
||||||
// Для Tauri invoke (раскомментировать при необходимости)
|
|
||||||
// const { invoke } = window.__TAURI__.tauri;
|
|
||||||
// this.timers = await invoke('list_timers');
|
|
||||||
|
|
||||||
const response = await fetch(`${this.apiUrl}/`);
|
|
||||||
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error(`HTTP error! status: ${response.status}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
this.timers = await response.json();
|
|
||||||
this.loading = false;
|
|
||||||
} catch (err) {
|
|
||||||
this.error = `Ошибка загрузки таймеров: ${err.message}`;
|
|
||||||
this.loading = false;
|
|
||||||
console.error('Fetch error:', err);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
toggleExpand(timerId) {
|
|
||||||
this.expandedId = this.expandedId === timerId ? null : timerId;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
|
|||||||
4
desktop/src-tauri/.gitignore
vendored
4
desktop/src-tauri/.gitignore
vendored
@@ -1,4 +0,0 @@
|
|||||||
# Generated by Cargo
|
|
||||||
# will have compiled files and executables
|
|
||||||
/target/
|
|
||||||
/gen/schemas
|
|
||||||
734
desktop/src-tauri/Cargo.lock
generated
734
desktop/src-tauri/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -1,9 +1,9 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "app"
|
name = "app"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
description = "A Tauri App"
|
description = "Kawai-Focus - приложение для фокусировки внимания на основе таймера Pomodoro."
|
||||||
authors = ["you"]
|
authors = ["Arduinum"]
|
||||||
license = ""
|
license = "MIT"
|
||||||
repository = ""
|
repository = ""
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
rust-version = "1.77.2"
|
rust-version = "1.77.2"
|
||||||
@@ -23,3 +23,4 @@ serde = { version = "1.0", features = ["derive"] }
|
|||||||
log = "0.4"
|
log = "0.4"
|
||||||
tauri = { version = "2.9.5", features = [] }
|
tauri = { version = "2.9.5", features = [] }
|
||||||
tauri-plugin-log = "2"
|
tauri-plugin-log = "2"
|
||||||
|
tauri-plugin-sql = { version = "2.3.1", features = ["sqlite"] }
|
||||||
|
|||||||
@@ -1,11 +1,10 @@
|
|||||||
{
|
{
|
||||||
"$schema": "../gen/schemas/desktop-schema.json",
|
"$schema": "../gen/schemas/desktop-schema.json",
|
||||||
"identifier": "default",
|
"identifier": "default",
|
||||||
"description": "enables the default permissions",
|
"windows": ["main"],
|
||||||
"windows": [
|
|
||||||
"main"
|
|
||||||
],
|
|
||||||
"permissions": [
|
"permissions": [
|
||||||
"core:default"
|
"core:default",
|
||||||
|
"sql:default",
|
||||||
|
"sql:allow-execute"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,16 +1,7 @@
|
|||||||
#[cfg_attr(mobile, tauri::mobile_entry_point)]
|
#[cfg_attr(mobile, tauri::mobile_entry_point)]
|
||||||
pub fn run() {
|
pub fn run() {
|
||||||
tauri::Builder::default()
|
tauri::Builder::default()
|
||||||
.setup(|app| {
|
.plugin(tauri_plugin_sql::Builder::default().build())
|
||||||
if cfg!(debug_assertions) {
|
.run(tauri::generate_context!())
|
||||||
app.handle().plugin(
|
.expect("Ошибка при запуске приложения Tauri.");
|
||||||
tauri_plugin_log::Builder::default()
|
|
||||||
.level(log::LevelFilter::Info)
|
|
||||||
.build(),
|
|
||||||
)?;
|
|
||||||
}
|
|
||||||
Ok(())
|
|
||||||
})
|
|
||||||
.run(tauri::generate_context!())
|
|
||||||
.expect("error while running tauri application");
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,5 +2,6 @@
|
|||||||
#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
|
#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
|
println!("Запуск приложения Tauri...");
|
||||||
app_lib::run();
|
app_lib::run();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,17 +10,21 @@
|
|||||||
"beforeBuildCommand": "cd ../client && npm run build"
|
"beforeBuildCommand": "cd ../client && npm run build"
|
||||||
},
|
},
|
||||||
"app": {
|
"app": {
|
||||||
|
"withGlobalTauri": true,
|
||||||
"windows": [
|
"windows": [
|
||||||
{
|
{
|
||||||
|
"label": "main",
|
||||||
"title": "Kawai-Focus",
|
"title": "Kawai-Focus",
|
||||||
"width": 800,
|
"width": 800,
|
||||||
"height": 600,
|
"height": 600,
|
||||||
"resizable": true,
|
"resizable": true,
|
||||||
"fullscreen": false
|
"fullscreen": false,
|
||||||
|
"devtools": true
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"security": {
|
"security": {
|
||||||
"csp": null
|
"csp": null,
|
||||||
|
"capabilities": ["default"]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"bundle": {
|
"bundle": {
|
||||||
|
|||||||
@@ -1,2 +0,0 @@
|
|||||||
def main() -> None:
|
|
||||||
print("Hello from kawai-focus-v2!")
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
from fastapi import APIRouter, Depends, status
|
|
||||||
|
|
||||||
from kawai_focus_v2.database.cruds import get_timers, get_timer, new_timer, update_timer, del_timer
|
|
||||||
from kawai_focus_v2.schemas.timer import TimerModel, TimerListModel, NewTimerModel, UpdateTimerModel
|
|
||||||
from kawai_focus_v2.database.db import get_db_instance, SessionDB
|
|
||||||
|
|
||||||
|
|
||||||
router = APIRouter(prefix='/timers', tags=['timers'])
|
|
||||||
|
|
||||||
|
|
||||||
@router.get('/', response_model=list[TimerListModel], status_code=status.HTTP_200_OK)
|
|
||||||
def list_timers(db: SessionDB = Depends(get_db_instance)) -> list[TimerListModel]:
|
|
||||||
"""Ручка для получения списка таймеров"""
|
|
||||||
|
|
||||||
return get_timers(db=db)
|
|
||||||
|
|
||||||
|
|
||||||
@router.get('/{id}', response_model=TimerModel, status_code=status.HTTP_200_OK)
|
|
||||||
def timer(id: int, db: SessionDB = Depends(get_db_instance)) -> TimerModel:
|
|
||||||
"""Ручка для получения таймера"""
|
|
||||||
|
|
||||||
return get_timer(timer_id=id, db=db)
|
|
||||||
|
|
||||||
|
|
||||||
@router.post('/new', response_model=TimerModel, status_code=status.HTTP_201_CREATED)
|
|
||||||
def add_timer(data: NewTimerModel, db: SessionDB = Depends(get_db_instance)) -> TimerModel:
|
|
||||||
"""Ручка для создания нового таймера"""
|
|
||||||
|
|
||||||
return new_timer(data=data, db=db)
|
|
||||||
|
|
||||||
|
|
||||||
@router.patch('/{id}', response_model=TimerModel, status_code=status.HTTP_200_OK)
|
|
||||||
def update_data_timer(id: int, data: UpdateTimerModel, db: SessionDB = Depends(get_db_instance)) -> TimerModel:
|
|
||||||
"""Ручка для обновления таймера"""
|
|
||||||
|
|
||||||
return update_timer(timer_id=id, data=data, db=db)
|
|
||||||
|
|
||||||
|
|
||||||
@router.delete('/{id}', status_code=status.HTTP_204_NO_CONTENT)
|
|
||||||
def delete_timer(id: int, db: SessionDB = Depends(get_db_instance)) -> None:
|
|
||||||
"""Ручка для удаления таймера"""
|
|
||||||
|
|
||||||
del_timer(timer_id=id, db=db)
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
from enum import Enum
|
|
||||||
|
|
||||||
|
|
||||||
class ErrorMessage(Enum):
|
|
||||||
"""Сообщения об ошибках"""
|
|
||||||
|
|
||||||
NO_TIME = 'Не указано время таймера!'
|
|
||||||
NEGATIVE_TIME = 'Время таймера не может быть отрицательным!'
|
|
||||||
SS_MM_BIG = 'Секунды и минуты не могут быть больше 59!'
|
|
||||||
HH_BIG = 'Часы не могут быть больше 23!'
|
|
||||||
FOLDER_NOT_FOUND = 'Папка не найдена!'
|
|
||||||
JSON_NOT_FOUND = 'Файл json не найден!'
|
|
||||||
TYPE_DICT = 'Тип данных не является словарем!'
|
|
||||||
NOT_INT_TYPE = 'Тип данных не является целым числом!'
|
|
||||||
KEY_ERROR = 'Ключ не найден!'
|
|
||||||
CONNECTION_ERROR = 'Подключение к базе данных не удалось!'
|
|
||||||
INTEGRITY_ERROR = 'Ошибка целостности данных (нарушение уникальности или связей)!'
|
|
||||||
OPERATIONAL_ERROR = 'Ошибка выполнения SQL-запроса (возможная блокировка или повреждение БД)!'
|
|
||||||
VALIDATION_ERROR = 'Ошибка валидации данных (несоответствие ожидаемой схеме)!'
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
from pydantic_settings import BaseSettings, SettingsConfigDict
|
|
||||||
from pydantic import Field
|
|
||||||
|
|
||||||
|
|
||||||
class ModelConfig(BaseSettings):
|
|
||||||
"""Модель конфигурации"""
|
|
||||||
|
|
||||||
model_config = SettingsConfigDict(
|
|
||||||
env_file='.env',
|
|
||||||
env_file_encoding='utf-8',
|
|
||||||
extra='ignore'
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class SettingsDB(ModelConfig):
|
|
||||||
"""Класс для данных БД"""
|
|
||||||
|
|
||||||
name_db: str
|
|
||||||
echo_db: bool
|
|
||||||
|
|
||||||
@property
|
|
||||||
def get_url_db(self) -> str:
|
|
||||||
"""Метод вернёт URL для подключения к БД"""
|
|
||||||
|
|
||||||
return f'sqlite:///{self.name_db}'
|
|
||||||
|
|
||||||
|
|
||||||
class SettingsApp(ModelConfig):
|
|
||||||
"""Настройки для приложения"""
|
|
||||||
|
|
||||||
port_app: int
|
|
||||||
host_app: str
|
|
||||||
is_reload: bool
|
|
||||||
frontend_origins: str
|
|
||||||
|
|
||||||
|
|
||||||
class Settings(ModelConfig):
|
|
||||||
"""Класс для данных конфига"""
|
|
||||||
|
|
||||||
app_settings: SettingsApp = Field(default_factory=SettingsApp)
|
|
||||||
db_settings: SettingsDB = Field(default_factory=SettingsDB)
|
|
||||||
|
|
||||||
|
|
||||||
settings = Settings()
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
Generic single-database configuration.
|
|
||||||
@@ -1,82 +0,0 @@
|
|||||||
from logging.config import fileConfig
|
|
||||||
|
|
||||||
from sqlalchemy import engine_from_config
|
|
||||||
from sqlalchemy import pool
|
|
||||||
|
|
||||||
from alembic import context
|
|
||||||
|
|
||||||
from kawai_focus_v2.core.settings import settings
|
|
||||||
from kawai_focus_v2.database.models import Base
|
|
||||||
|
|
||||||
# this is the Alembic Config object, which provides
|
|
||||||
# access to the values within the .ini file in use.
|
|
||||||
config = context.config
|
|
||||||
config.set_main_option("sqlalchemy.url", settings.db_settings.get_url_db)
|
|
||||||
|
|
||||||
# Interpret the config file for Python logging.
|
|
||||||
# This line sets up loggers basically.
|
|
||||||
if config.config_file_name is not None:
|
|
||||||
fileConfig(config.config_file_name)
|
|
||||||
|
|
||||||
# add your model's MetaData object here
|
|
||||||
# for 'autogenerate' support
|
|
||||||
# from myapp import mymodel
|
|
||||||
# target_metadata = mymodel.Base.metadata
|
|
||||||
target_metadata = Base.metadata
|
|
||||||
|
|
||||||
# other values from the config, defined by the needs of env.py,
|
|
||||||
# can be acquired:
|
|
||||||
# my_important_option = config.get_main_option("my_important_option")
|
|
||||||
# ... etc.
|
|
||||||
|
|
||||||
|
|
||||||
def run_migrations_offline() -> None:
|
|
||||||
"""Run migrations in 'offline' mode.
|
|
||||||
|
|
||||||
This configures the context with just a URL
|
|
||||||
and not an Engine, though an Engine is acceptable
|
|
||||||
here as well. By skipping the Engine creation
|
|
||||||
we don't even need a DBAPI to be available.
|
|
||||||
|
|
||||||
Calls to context.execute() here emit the given string to the
|
|
||||||
script output.
|
|
||||||
|
|
||||||
"""
|
|
||||||
url = config.get_main_option("sqlalchemy.url")
|
|
||||||
context.configure(
|
|
||||||
url=url,
|
|
||||||
target_metadata=target_metadata,
|
|
||||||
literal_binds=True,
|
|
||||||
dialect_opts={"paramstyle": "named"},
|
|
||||||
)
|
|
||||||
|
|
||||||
with context.begin_transaction():
|
|
||||||
context.run_migrations()
|
|
||||||
|
|
||||||
|
|
||||||
def run_migrations_online() -> None:
|
|
||||||
"""Run migrations in 'online' mode.
|
|
||||||
|
|
||||||
In this scenario we need to create an Engine
|
|
||||||
and associate a connection with the context.
|
|
||||||
|
|
||||||
"""
|
|
||||||
connectable = engine_from_config(
|
|
||||||
config.get_section(config.config_ini_section, {}),
|
|
||||||
prefix="sqlalchemy.",
|
|
||||||
poolclass=pool.NullPool,
|
|
||||||
)
|
|
||||||
|
|
||||||
with connectable.connect() as connection:
|
|
||||||
context.configure(
|
|
||||||
connection=connection, target_metadata=target_metadata
|
|
||||||
)
|
|
||||||
|
|
||||||
with context.begin_transaction():
|
|
||||||
context.run_migrations()
|
|
||||||
|
|
||||||
|
|
||||||
if context.is_offline_mode():
|
|
||||||
run_migrations_offline()
|
|
||||||
else:
|
|
||||||
run_migrations_online()
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
"""${message}
|
|
||||||
|
|
||||||
Revision ID: ${up_revision}
|
|
||||||
Revises: ${down_revision | comma,n}
|
|
||||||
Create Date: ${create_date}
|
|
||||||
|
|
||||||
"""
|
|
||||||
from typing import Sequence, Union
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
import sqlalchemy as sa
|
|
||||||
${imports if imports else ""}
|
|
||||||
|
|
||||||
# revision identifiers, used by Alembic.
|
|
||||||
revision: str = ${repr(up_revision)}
|
|
||||||
down_revision: Union[str, Sequence[str], None] = ${repr(down_revision)}
|
|
||||||
branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)}
|
|
||||||
depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)}
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
"""Upgrade schema."""
|
|
||||||
${upgrades if upgrades else "pass"}
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
"""Downgrade schema."""
|
|
||||||
${downgrades if downgrades else "pass"}
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
"""Create Timer
|
|
||||||
|
|
||||||
Revision ID: 503b50886979
|
|
||||||
Revises:
|
|
||||||
Create Date: 2025-12-25 15:04:03.485293
|
|
||||||
|
|
||||||
"""
|
|
||||||
|
|
||||||
from collections.abc import Sequence
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
|
|
||||||
# revision identifiers, used by Alembic.
|
|
||||||
revision: str = "503b50886979"
|
|
||||||
down_revision: str | Sequence[str] | None = None
|
|
||||||
branch_labels: str | Sequence[str] | None = None
|
|
||||||
depends_on: str | Sequence[str] | None = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
"""Upgrade schema."""
|
|
||||||
# ### commands auto generated by Alembic - please adjust! ###
|
|
||||||
op.create_table(
|
|
||||||
"timer",
|
|
||||||
sa.Column("название", sa.String(length=200), nullable=False),
|
|
||||||
sa.Column("время помидора", sa.Integer(), nullable=False),
|
|
||||||
sa.Column("время перерыва", sa.Integer(), nullable=False),
|
|
||||||
sa.Column("время долгого перерыва", sa.Integer(), nullable=False),
|
|
||||||
sa.Column("количество помидоров", sa.Integer(), nullable=False),
|
|
||||||
sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
|
|
||||||
sa.PrimaryKeyConstraint("id"),
|
|
||||||
)
|
|
||||||
# ### end Alembic commands ###
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
"""Downgrade schema."""
|
|
||||||
# ### commands auto generated by Alembic - please adjust! ###
|
|
||||||
op.drop_table("timer")
|
|
||||||
# ### end Alembic commands ###
|
|
||||||
@@ -1,61 +0,0 @@
|
|||||||
from sqlalchemy import select
|
|
||||||
|
|
||||||
from kawai_focus_v2.database.models import Timer
|
|
||||||
from kawai_focus_v2.schemas.timer import TimerModel, TimerListModel, UpdateTimerModel, NewTimerModel
|
|
||||||
from kawai_focus_v2.database.db import get_db_instance, SessionDB
|
|
||||||
|
|
||||||
|
|
||||||
def get_timer(timer_id: int, db: SessionDB) -> TimerModel:
|
|
||||||
"""Функция для получения данных таймера"""
|
|
||||||
|
|
||||||
db = get_db_instance()
|
|
||||||
with db.get_session() as session:
|
|
||||||
timer = session.get(Timer, timer_id)
|
|
||||||
return TimerModel.model_validate(timer, from_attributes=True)
|
|
||||||
|
|
||||||
|
|
||||||
def get_timers(db: SessionDB) -> list[TimerListModel]:
|
|
||||||
"""Функция для получения списка таймеров"""
|
|
||||||
|
|
||||||
with db.get_session() as session:
|
|
||||||
timers = session.execute(
|
|
||||||
select(Timer.id, Timer.title, Timer.pomodoro_time, Timer.count_pomodoro)
|
|
||||||
).all()
|
|
||||||
|
|
||||||
return [TimerListModel.model_validate(timer, from_attributes=True) for timer in timers]
|
|
||||||
|
|
||||||
|
|
||||||
def new_timer(data: NewTimerModel, db: SessionDB) -> TimerModel:
|
|
||||||
"""Функция для создания нового таймера"""
|
|
||||||
|
|
||||||
with db.get_session() as session:
|
|
||||||
timer = Timer(**data.model_dump())
|
|
||||||
session.add(timer)
|
|
||||||
session.commit()
|
|
||||||
session.refresh(timer)
|
|
||||||
|
|
||||||
return TimerModel.model_validate(timer, from_attributes=True)
|
|
||||||
|
|
||||||
|
|
||||||
def update_timer(timer_id: int, data: UpdateTimerModel, db: SessionDB) -> TimerModel:
|
|
||||||
"""Функция для обновления таймера"""
|
|
||||||
|
|
||||||
with db.get_session() as session:
|
|
||||||
timer = session.get(Timer, timer_id)
|
|
||||||
|
|
||||||
for field, value in data.model_dump(exclude_unset=True).items():
|
|
||||||
setattr(timer, field, value)
|
|
||||||
|
|
||||||
session.commit()
|
|
||||||
session.refresh(timer)
|
|
||||||
|
|
||||||
return TimerModel.model_validate(timer, from_attributes=True)
|
|
||||||
|
|
||||||
|
|
||||||
def del_timer(timer_id: int, db: SessionDB) -> None:
|
|
||||||
"""Функция для удаления таймера"""
|
|
||||||
|
|
||||||
with db.get_session() as session:
|
|
||||||
timer = session.get(Timer, timer_id)
|
|
||||||
session.delete(timer)
|
|
||||||
session.commit()
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
from kawai_focus_v2.schemas.timer import NewTimerModel
|
|
||||||
|
|
||||||
|
|
||||||
data_timers = [
|
|
||||||
NewTimerModel(
|
|
||||||
title='Timer mini example',
|
|
||||||
pomodoro_time=10,
|
|
||||||
break_time=3,
|
|
||||||
break_long_time=15,
|
|
||||||
count_pomodoro=2
|
|
||||||
),
|
|
||||||
NewTimerModel(
|
|
||||||
title='Timer max example',
|
|
||||||
pomodoro_time=90,
|
|
||||||
break_time=10,
|
|
||||||
break_long_time=40,
|
|
||||||
count_pomodoro=8
|
|
||||||
),
|
|
||||||
]
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
from sqlalchemy import create_engine
|
|
||||||
from sqlalchemy.orm import sessionmaker, Session
|
|
||||||
from functools import lru_cache
|
|
||||||
|
|
||||||
from kawai_focus_v2.core.settings import settings
|
|
||||||
|
|
||||||
|
|
||||||
class SessionDB:
|
|
||||||
"""Класс для управления подключением к базе данных."""
|
|
||||||
|
|
||||||
def __init__(self) -> None:
|
|
||||||
self._engine = create_engine(
|
|
||||||
url=settings.db_settings.get_url_db,
|
|
||||||
echo=settings.db_settings.echo_db
|
|
||||||
)
|
|
||||||
self._session_factory = sessionmaker(
|
|
||||||
bind=self._engine,
|
|
||||||
expire_on_commit=False,
|
|
||||||
autocommit=False
|
|
||||||
)
|
|
||||||
|
|
||||||
@property
|
|
||||||
def get_session(self) -> sessionmaker[Session]:
|
|
||||||
"""Метод для получения сессии"""
|
|
||||||
|
|
||||||
return self._session_factory
|
|
||||||
|
|
||||||
|
|
||||||
@lru_cache(maxsize=1)
|
|
||||||
def get_db_instance() -> SessionDB:
|
|
||||||
"""Возвращает один и тот же объект SeesionDB"""
|
|
||||||
|
|
||||||
return SessionDB()
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
from sqlalchemy.orm import Mapped, mapped_column
|
|
||||||
from sqlalchemy import Integer
|
|
||||||
|
|
||||||
|
|
||||||
class IDMixin:
|
|
||||||
"""Базовый класс для моделей с id"""
|
|
||||||
|
|
||||||
id: Mapped[int] = mapped_column(
|
|
||||||
Integer,
|
|
||||||
name='id',
|
|
||||||
primary_key=True,
|
|
||||||
autoincrement=True
|
|
||||||
)
|
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
from sqlalchemy.orm import DeclarativeBase, mapped_column, Mapped
|
|
||||||
from sqlalchemy import Integer, String
|
|
||||||
|
|
||||||
from kawai_focus_v2.database.mixins import IDMixin
|
|
||||||
|
|
||||||
|
|
||||||
class Base(DeclarativeBase):
|
|
||||||
"""Класс для корректной работы аннотаций"""
|
|
||||||
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
class Timer(IDMixin, Base):
|
|
||||||
"""Модель таймера"""
|
|
||||||
|
|
||||||
__tablename__ = 'timer'
|
|
||||||
|
|
||||||
title: Mapped[str] = mapped_column(
|
|
||||||
String(length=200),
|
|
||||||
name='название',
|
|
||||||
nullable=False
|
|
||||||
)
|
|
||||||
|
|
||||||
pomodoro_time: Mapped[int] = mapped_column(
|
|
||||||
Integer,
|
|
||||||
name='время помидора',
|
|
||||||
nullable=False
|
|
||||||
)
|
|
||||||
|
|
||||||
break_time: Mapped[int] = mapped_column(
|
|
||||||
Integer,
|
|
||||||
name='время перерыва',
|
|
||||||
nullable=False
|
|
||||||
)
|
|
||||||
|
|
||||||
break_long_time: Mapped[int] = mapped_column(
|
|
||||||
Integer,
|
|
||||||
name='время долгого перерыва',
|
|
||||||
nullable=False
|
|
||||||
)
|
|
||||||
|
|
||||||
count_pomodoro: Mapped[int] = mapped_column(
|
|
||||||
Integer,
|
|
||||||
name='количество помидоров',
|
|
||||||
nullable=False
|
|
||||||
)
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
from kawai_focus_v2.schemas.timer import NewTimerModel
|
|
||||||
from kawai_focus_v2.database.cruds import new_timer
|
|
||||||
from kawai_focus_v2.database.db import get_db_instance
|
|
||||||
from kawai_focus_v2.database.data import data_timers
|
|
||||||
|
|
||||||
|
|
||||||
def new_temers(data: list[NewTimerModel]) -> None:
|
|
||||||
"""Заполняет базу данных образцами таймеров"""
|
|
||||||
|
|
||||||
db = get_db_instance()
|
|
||||||
for timer in data:
|
|
||||||
new_timer(data=timer, db=db)
|
|
||||||
|
|
||||||
|
|
||||||
def start_filling_data() -> None:
|
|
||||||
"""Функция для заполнения бд данными"""
|
|
||||||
|
|
||||||
new_temers(data=data_timers)
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
from fastapi import FastAPI
|
|
||||||
from fastapi.middleware.cors import CORSMiddleware
|
|
||||||
|
|
||||||
from kawai_focus_v2.api.timers.router import router as timers_router
|
|
||||||
from kawai_focus_v2.core.settings import settings
|
|
||||||
|
|
||||||
app = FastAPI(title='Kawai-Focus')
|
|
||||||
|
|
||||||
# Настройка CORS
|
|
||||||
origins = settings.app_settings.frontend_origins.split(',')
|
|
||||||
|
|
||||||
app.add_middleware(
|
|
||||||
CORSMiddleware, # type: ignore[arg-type]
|
|
||||||
allow_origins=origins, # Разрешаем запросы с этих адресов
|
|
||||||
allow_credentials=True,
|
|
||||||
allow_methods=['*'], # Разрешаем все методы (GET, POST, etc.)
|
|
||||||
allow_headers=['*'], # Разрешаем все заголовки
|
|
||||||
)
|
|
||||||
|
|
||||||
app.include_router(timers_router, prefix='/api')
|
|
||||||
@@ -1,60 +0,0 @@
|
|||||||
from pydantic import BaseModel, field_validator, Field
|
|
||||||
from kawai_focus_v2.core.messages.errors import ErrorMessage
|
|
||||||
|
|
||||||
|
|
||||||
class TimerModel(BaseModel):
|
|
||||||
"""Модель схемы данных таймера"""
|
|
||||||
|
|
||||||
id: int
|
|
||||||
title: str
|
|
||||||
pomodoro_time: int
|
|
||||||
break_time: int
|
|
||||||
break_long_time: int
|
|
||||||
count_pomodoro: int
|
|
||||||
|
|
||||||
|
|
||||||
class NewTimerModel(BaseModel):
|
|
||||||
"""Модель схемы нового таймера"""
|
|
||||||
|
|
||||||
title: str
|
|
||||||
pomodoro_time: int
|
|
||||||
break_time: int
|
|
||||||
break_long_time: int
|
|
||||||
count_pomodoro: int
|
|
||||||
|
|
||||||
|
|
||||||
class UpdateTimerModel(BaseModel):
|
|
||||||
"""Модель схемы обновления данных таймера"""
|
|
||||||
|
|
||||||
title: str | None = None
|
|
||||||
pomodoro_time: int | None = None
|
|
||||||
break_time: int | None = None
|
|
||||||
break_long_time: int | None = None
|
|
||||||
count_pomodoro: int | None = None
|
|
||||||
|
|
||||||
|
|
||||||
class TimerListModel(BaseModel):
|
|
||||||
"""Модель схемы данных таймера для списка"""
|
|
||||||
|
|
||||||
id: int
|
|
||||||
title: str
|
|
||||||
pomodoro_time: int
|
|
||||||
count_pomodoro: int
|
|
||||||
|
|
||||||
|
|
||||||
class TimerTimeModel(BaseModel):
|
|
||||||
"""Модель схемы данных времени таймера"""
|
|
||||||
|
|
||||||
hh: int = Field(0, ge=0, le=23)
|
|
||||||
mm: int = Field(0, ge=0, le=59)
|
|
||||||
|
|
||||||
@field_validator('hh', 'mm')
|
|
||||||
@classmethod
|
|
||||||
def check_all_time_fields(cls, value: int) -> int:
|
|
||||||
"""Метод валидирует все поля времени"""
|
|
||||||
|
|
||||||
# гарантирует, что время не равно 00:00:00
|
|
||||||
if value == 0:
|
|
||||||
raise ValueError(ErrorMessage.NO_TIME.value)
|
|
||||||
|
|
||||||
return value
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
from kawai_focus_v2.core.settings import settings
|
|
||||||
|
|
||||||
import uvicorn
|
|
||||||
|
|
||||||
|
|
||||||
def run():
|
|
||||||
uvicorn.run(
|
|
||||||
'kawai_focus_v2.main:app',
|
|
||||||
host=settings.app_settings.host_app,
|
|
||||||
port=settings.app_settings.port_app,
|
|
||||||
reload=settings.app_settings.is_reload
|
|
||||||
)
|
|
||||||
Reference in New Issue
Block a user