From d72ad149a5d7f264dd2794276a2f60d8bddb862c Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Sat, 27 Apr 2024 10:07:17 +0300
Subject: [PATCH] new db

---
 back/back/settings.py  |  13 +++++++++++--
 back/docker.db.sqlite3 | Bin 155648 -> 155648 bytes
 front/src/App.vue      |   9 +++++----
 poetry.lock            |  38 +++++++++++++++++++++++++++++++++++++-
 pyproject.toml         |   2 ++
 5 files changed, 55 insertions(+), 7 deletions(-)

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 0eff615055df41024159712ae4babed41fec0fd5..19b568b820c78f1206442e2fac2c13829de0f092 100644
GIT binary patch
delta 8417
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
G;{Fe6a57o|

delta 560
zcmZoTz}awsbAmLl9|Hq}8W1Z1G3!JPb5=hFy|S)_Df&W^{5;IcjEM!A@dZWsDW%CJ
z%$v*fV;ls{6by~5Of0PoE%gjc%*~7pHb2f+RN!IZ&SBuY&AW|fB6rTl#u)C+IkRW5
z@UZabGVpKb&*h)Qe`jN3EdS=*_0vBvOY&z=XJ5c*ys^=ce|q+M#+g8omg(#pKq6lJ
z+gtWCHV80Fvc8+negP!3g?0P8tBhh=K+{?o_#g2f=3m0!y0Nj8f4VzA6Yum%{7j{+
zEI{`wZ|4zU`oh0m-~i(X{)rO=CLQ2l;SOd{-B{qx&DE*J%*o(9AvHgKd%ikT2uoye
za#3n(UVLyyeo4HMfsu)>fr+l6QG8-ayrF@ffsvl6p<Y2=dQxI?wtiY>PHM6Kh5Z-y
yUD$H5@nX}34Hq_D*mYq;e1&g*MP|5@URqKGFVF#uK-;*3H#T|>xOM(i_8kBZ7rsjX

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 () => {
       </ul>
     </div>
     <div class="header">Проекты Кустарщины</div>
-    <div class="main">
+    <div class="product">
       <div v-if="state.active_product">
-        <model-fbx class="model" :src="`${SERVER_URL}/${state.active_product.model3d.replace('/back', '')}`"></model-fbx>
-        <p>
+        <model-fbx v-if="state.active_product.model3d" class="product-model"
+          :src="`${SERVER_URL}/${state.active_product.model3d.replace('/back', '')}`"></model-fbx>
+        <div class="product-description">
           {{ state.active_product.description }}
-        </p>
+        </div>
       </div>
     </div>
   </div>
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]