diff --git a/pyproject.toml b/pyproject.toml index 7d89aca..651402e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,6 +29,9 @@ dependencies = [ requires = ["poetry-core>=2.0.0,<3.0.0"] build-backend = "poetry.core.masonry.api" +[tool.poetry] +packages = [{include = "lkeep", from = "src"}] + [project.scripts] app = "lkeep.main:start" diff --git a/lkeep/apps/__init__.py b/src/lkeep/apps/__init__.py similarity index 100% rename from lkeep/apps/__init__.py rename to src/lkeep/apps/__init__.py diff --git a/lkeep/apps/auth/depends.py b/src/lkeep/apps/auth/depends.py similarity index 100% rename from lkeep/apps/auth/depends.py rename to src/lkeep/apps/auth/depends.py diff --git a/lkeep/apps/auth/handlers.py b/src/lkeep/apps/auth/handlers.py similarity index 100% rename from lkeep/apps/auth/handlers.py rename to src/lkeep/apps/auth/handlers.py diff --git a/lkeep/apps/auth/managers.py b/src/lkeep/apps/auth/managers.py similarity index 100% rename from lkeep/apps/auth/managers.py rename to src/lkeep/apps/auth/managers.py diff --git a/lkeep/apps/auth/named_tuples.py b/src/lkeep/apps/auth/named_tuples.py similarity index 100% rename from lkeep/apps/auth/named_tuples.py rename to src/lkeep/apps/auth/named_tuples.py diff --git a/lkeep/apps/auth/routes.py b/src/lkeep/apps/auth/routes.py similarity index 100% rename from lkeep/apps/auth/routes.py rename to src/lkeep/apps/auth/routes.py diff --git a/lkeep/apps/auth/schemas.py b/src/lkeep/apps/auth/schemas.py similarity index 100% rename from lkeep/apps/auth/schemas.py rename to src/lkeep/apps/auth/schemas.py diff --git a/lkeep/apps/auth/services.py b/src/lkeep/apps/auth/services.py similarity index 100% rename from lkeep/apps/auth/services.py rename to src/lkeep/apps/auth/services.py diff --git a/lkeep/apps/auth/tasks.py b/src/lkeep/apps/auth/tasks.py similarity index 100% rename from lkeep/apps/auth/tasks.py rename to src/lkeep/apps/auth/tasks.py diff --git a/lkeep/apps/auth/utils.py b/src/lkeep/apps/auth/utils.py similarity index 100% rename from lkeep/apps/auth/utils.py rename to src/lkeep/apps/auth/utils.py diff --git a/lkeep/core/__init__.py b/src/lkeep/core/__init__.py similarity index 100% rename from lkeep/core/__init__.py rename to src/lkeep/core/__init__.py diff --git a/lkeep/core/celery_config.py b/src/lkeep/core/celery_config.py similarity index 100% rename from lkeep/core/celery_config.py rename to src/lkeep/core/celery_config.py diff --git a/lkeep/core/core_dependency/db_dependency.py b/src/lkeep/core/core_dependency/db_dependency.py similarity index 100% rename from lkeep/core/core_dependency/db_dependency.py rename to src/lkeep/core/core_dependency/db_dependency.py diff --git a/lkeep/core/core_dependency/redis_dependency.py b/src/lkeep/core/core_dependency/redis_dependency.py similarity index 100% rename from lkeep/core/core_dependency/redis_dependency.py rename to src/lkeep/core/core_dependency/redis_dependency.py diff --git a/lkeep/core/settings.py b/src/lkeep/core/settings.py similarity index 99% rename from lkeep/core/settings.py rename to src/lkeep/core/settings.py index 543f43e..93be1df 100644 --- a/lkeep/core/settings.py +++ b/src/lkeep/core/settings.py @@ -128,6 +128,7 @@ class Settings(BaseSettings): templates_dir: str = "templates" frontend_url: str access_token_expire: int + domain: str model_config = SettingsConfigDict(env_file=".env", env_file_encoding="utf8", extra="ignore") diff --git a/lkeep/database/alembic/README b/src/lkeep/database/alembic/README similarity index 100% rename from lkeep/database/alembic/README rename to src/lkeep/database/alembic/README diff --git a/src/lkeep/database/alembic/__init__.py b/src/lkeep/database/alembic/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/lkeep/database/alembic/env.py b/src/lkeep/database/alembic/env.py similarity index 100% rename from lkeep/database/alembic/env.py rename to src/lkeep/database/alembic/env.py diff --git a/lkeep/database/alembic/script.py.mako b/src/lkeep/database/alembic/script.py.mako similarity index 100% rename from lkeep/database/alembic/script.py.mako rename to src/lkeep/database/alembic/script.py.mako diff --git a/lkeep/database/alembic/versions/2025_01_10_1706-ccf7560dd457_create_user_table.py b/src/lkeep/database/alembic/versions/2025_01_10_1706-ccf7560dd457_create_user_table.py similarity index 100% rename from lkeep/database/alembic/versions/2025_01_10_1706-ccf7560dd457_create_user_table.py rename to src/lkeep/database/alembic/versions/2025_01_10_1706-ccf7560dd457_create_user_table.py diff --git a/src/lkeep/database/alembic/versions/__init__.py b/src/lkeep/database/alembic/versions/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/lkeep/database/mixins/id_mixins.py b/src/lkeep/database/mixins/id_mixins.py similarity index 100% rename from lkeep/database/mixins/id_mixins.py rename to src/lkeep/database/mixins/id_mixins.py diff --git a/lkeep/database/mixins/timestamp_mixins.py b/src/lkeep/database/mixins/timestamp_mixins.py similarity index 100% rename from lkeep/database/mixins/timestamp_mixins.py rename to src/lkeep/database/mixins/timestamp_mixins.py diff --git a/lkeep/database/models/__init__.py b/src/lkeep/database/models/__init__.py similarity index 100% rename from lkeep/database/models/__init__.py rename to src/lkeep/database/models/__init__.py diff --git a/lkeep/database/models/base.py b/src/lkeep/database/models/base.py similarity index 100% rename from lkeep/database/models/base.py rename to src/lkeep/database/models/base.py diff --git a/lkeep/database/models/user.py b/src/lkeep/database/models/user.py similarity index 100% rename from lkeep/database/models/user.py rename to src/lkeep/database/models/user.py diff --git a/lkeep/main.py b/src/lkeep/main.py similarity index 60% rename from lkeep/main.py rename to src/lkeep/main.py index 1aeec25..f2a1fd4 100644 --- a/lkeep/main.py +++ b/src/lkeep/main.py @@ -8,6 +8,7 @@ https://pressanybutton.ru/category/servis-na-fastapi/ import uvicorn from fastapi import FastAPI +from starlette.middleware.cors import CORSMiddleware from lkeep.apps import apps_router @@ -15,6 +16,14 @@ app = FastAPI() app.include_router(router=apps_router) +app.add_middleware( + CORSMiddleware, + allow_origins=["http://127.0.0.1:3000"], # TODO: ЗАМЕНИТЬ ПОТОМ НА ДОМЕН + allow_credentials=True, + allow_methods=["*"], + allow_headers=["*"], +) + def start(): uvicorn.run(app="lkeep.main:app", reload=True)