diff --git a/back/back/settings.py b/back/back/settings.py index 3dcd430..afa0c4f 100644 --- a/back/back/settings.py +++ b/back/back/settings.py @@ -11,6 +11,9 @@ https://docs.djangoproject.com/en/5.0/ref/settings/ """ from pathlib import Path +import os +from dotenv import load_dotenv +load_dotenv() # Build paths inside the project like this: BASE_DIR / 'subdir'. BASE_DIR = Path(__file__).resolve().parent.parent @@ -107,8 +110,14 @@ WSGI_APPLICATION = "back.wsgi.application" DATABASES = { "default": { - "ENGINE": "django.db.backends.sqlite3", - "NAME": BASE_DIR / "db.sqlite3", + "ENGINE": "django.db.backends.postgresql_psycopg2", # change engine to this + "NAME": "interactive_table", # db name you created above + "HOST": os.getenv("DB_HOST"), # usually localhost + "USER": os.getenv("DB_USER"), # db user you created above or postgres default + "PASSWORD": os.getenv( + "DB_PASSWORD" + ), # db password you created above or postgres + "PORT": os.getenv("DB_PORT"), # usually 5432 } } diff --git a/back/docker.db.sqlite3 b/back/docker.db.sqlite3 index 0eff615..19b568b 100644 Binary files a/back/docker.db.sqlite3 and b/back/docker.db.sqlite3 differ diff --git a/front/src/App.vue b/front/src/App.vue index 6bb766d..f33bc48 100644 --- a/front/src/App.vue +++ b/front/src/App.vue @@ -36,12 +36,13 @@ onMounted(async () => {
Проекты Кустарщины
-
+
- -

+ +

{{ state.active_product.description }} -

+
diff --git a/poetry.lock b/poetry.lock index 9f475e0..36b54cd 100644 --- a/poetry.lock +++ b/poetry.lock @@ -202,6 +202,42 @@ files = [ [package.extras] test = ["enum34", "ipaddress", "mock", "pywin32", "wmi"] +[[package]] +name = "psycopg2" +version = "2.9.9" +description = "psycopg2 - Python-PostgreSQL Database Adapter" +optional = false +python-versions = ">=3.7" +files = [ + {file = "psycopg2-2.9.9-cp310-cp310-win32.whl", hash = "sha256:38a8dcc6856f569068b47de286b472b7c473ac7977243593a288ebce0dc89516"}, + {file = "psycopg2-2.9.9-cp310-cp310-win_amd64.whl", hash = "sha256:426f9f29bde126913a20a96ff8ce7d73fd8a216cfb323b1f04da402d452853c3"}, + {file = "psycopg2-2.9.9-cp311-cp311-win32.whl", hash = "sha256:ade01303ccf7ae12c356a5e10911c9e1c51136003a9a1d92f7aa9d010fb98372"}, + {file = "psycopg2-2.9.9-cp311-cp311-win_amd64.whl", hash = "sha256:121081ea2e76729acfb0673ff33755e8703d45e926e416cb59bae3a86c6a4981"}, + {file = "psycopg2-2.9.9-cp312-cp312-win32.whl", hash = "sha256:d735786acc7dd25815e89cc4ad529a43af779db2e25aa7c626de864127e5a024"}, + {file = "psycopg2-2.9.9-cp312-cp312-win_amd64.whl", hash = "sha256:a7653d00b732afb6fc597e29c50ad28087dcb4fbfb28e86092277a559ae4e693"}, + {file = "psycopg2-2.9.9-cp37-cp37m-win32.whl", hash = "sha256:5e0d98cade4f0e0304d7d6f25bbfbc5bd186e07b38eac65379309c4ca3193efa"}, + {file = "psycopg2-2.9.9-cp37-cp37m-win_amd64.whl", hash = "sha256:7e2dacf8b009a1c1e843b5213a87f7c544b2b042476ed7755be813eaf4e8347a"}, + {file = "psycopg2-2.9.9-cp38-cp38-win32.whl", hash = "sha256:ff432630e510709564c01dafdbe996cb552e0b9f3f065eb89bdce5bd31fabf4c"}, + {file = "psycopg2-2.9.9-cp38-cp38-win_amd64.whl", hash = "sha256:bac58c024c9922c23550af2a581998624d6e02350f4ae9c5f0bc642c633a2d5e"}, + {file = "psycopg2-2.9.9-cp39-cp39-win32.whl", hash = "sha256:c92811b2d4c9b6ea0285942b2e7cac98a59e166d59c588fe5cfe1eda58e72d59"}, + {file = "psycopg2-2.9.9-cp39-cp39-win_amd64.whl", hash = "sha256:de80739447af31525feddeb8effd640782cf5998e1a4e9192ebdf829717e3913"}, + {file = "psycopg2-2.9.9.tar.gz", hash = "sha256:d1454bde93fb1e224166811694d600e746430c006fbb031ea06ecc2ea41bf156"}, +] + +[[package]] +name = "python-dotenv" +version = "1.0.1" +description = "Read key-value pairs from a .env file and set them as environment variables" +optional = false +python-versions = ">=3.8" +files = [ + {file = "python-dotenv-1.0.1.tar.gz", hash = "sha256:e324ee90a023d808f1959c46bcbc04446a10ced277783dc6ee09987c37ec10ca"}, + {file = "python_dotenv-1.0.1-py3-none-any.whl", hash = "sha256:f7b63ef50f1b690dddf550d03497b66d609393b40b564ed0d674909a68ebf16a"}, +] + +[package.extras] +cli = ["click (>=5.0)"] + [[package]] name = "sqlparse" version = "0.5.0" @@ -270,4 +306,4 @@ files = [ [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "a05745734d8097efd1df19bf5f78e2c5c18ee84a1404a705dbb06aa293de8989" +content-hash = "6c47288dfd6813b1437ec1e65708444b3d059e7890a0907b80803130465efa06" diff --git a/pyproject.toml b/pyproject.toml index 2edb099..2c78305 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,6 +12,8 @@ djangorestframework = "^3.15.1" taskipy = "^1.12.2" django-cors-headers = "^4.3.1" pillow = "^10.3.0" +python-dotenv = "^1.0.1" +psycopg2 = "^2.9.9" [build-system]