From 31423d168d8152b7e754f04820cbbab3ec447bf0 Mon Sep 17 00:00:00 2001
From: ack <ack77@mail.ru>
Date: Wed, 21 Jan 2026 05:02:13 +0300
Subject: [PATCH] Fix os import and add media settings 6

---
 core/__pycache__/settings.cpython-311.pyc     | Bin 2529 -> 2906 bytes
 core/settings.py                              |  19 ++++----
 entrypoint.sh                                 |   4 ++
 products/__pycache__/admin.cpython-311.pyc    | Bin 639 -> 671 bytes
 products/__pycache__/models.cpython-311.pyc   | Bin 974 -> 1139 bytes
 products/admin.py                             |   4 +-
 ...uct_weight_product_description_and_more.py |  33 ++++++++++++++
 products/models.py                            |   5 ++-
 products/templates/products/list.html         |  41 ++++++++++++++----
 requirements.txt                              | Bin 150 -> 236 bytes
 10 files changed, 87 insertions(+), 19 deletions(-)
 create mode 100644 products/migrations/0002_remove_product_weight_product_description_and_more.py

diff --git a/core/__pycache__/settings.cpython-311.pyc b/core/__pycache__/settings.cpython-311.pyc
index f485ab427931869812ed8579cc07a2034d4eff99..f9edf40c20d5cc91953869ee3d0028cc9b15cf3a 100644
GIT binary patch
delta 790
zcma)4%}*LZ6rb4-J{EQnSP>Pm9~U(iv}%i<N(3#5O2S8*PHZ-Wx5Xt`HtdonT->uU
zv4%AD;DLCs2ao;@y=&sZ?8*KCO}N%m2PjRCeKYU(d-Fc#%}nM;&<;u8L{UIgqH$d_
zr4uQ<T*U}|MSutb3``9ZOqs1Q`z&EGVvx$J+y%|Kq&koef0BE8;218ee=Xt!j<|p)
zZg5mE5h@6r=a_gXyC{3XO+@H<dFc7P=UBrao^do+0*Uy*2P3Kz{4Ebc5IAErOhzCG
zGR+FYXdgp;9MkYYg(H3llK_m9AZ;mA9fb)JQgL-`c(hJ<X#LBy#pDG;Z$xz<WE>)7
z;=d}V{!~s5OD7>pA}|e)Dh!zdCXZ$xU&(kG<DK?vW}CI~+|?JR%wqBC7azc@jpnmP
zvn8gRjk>PJx9di^{;B0O%#x{<<F;pDe9&sD(Q@popq1h_-{*GJIlb8m@0q5)7LPBk
zK94QFNW>OnD=*g)3yFnRq!%%0$k?mvF;i`rYE5ezF+(qv)!C@+R1~O}6~$)iMmytt
zc*p4_bI<0gb?u|=$rqA^%({}xW(&4^JDtiTm11to76xYD9Z01&lEtlpk}MXo%0?!=
zm9pjad~QQ2<cj%1I;CWDna#{jzWv6vJhwpKr}txw6N+6HW87r~%ym%@LI?|%yEpDo
zxP9q*#rfsWeEX;CyFP>bVN2{fkQlMt_a2|+x_66~qw7V|m?hjvBS)3v+F|W9(RqI(
zE!|2>mgn9p(~U&m(c9zQ!`;)F&gP9ce=E*g0<8+IT%$l&K>YL__oU0SVdfgigV~7D
G^Zf?;2EStf

delta 396
zcmX|7Jxjx25We?Knlztn5}QUlC`c7S(V^~&tsqn#Y?oVt^g@aF0ah0m1FkM5po@bz
z=-}92;NYT*a~JF8*i|QA6+P~`=Z@#N<F4<&dG?)U=^*U<;~;)DyLK@9E~-l)Kp;kZ
zm+f)n3^+tQl5QEmy}++s%Uzs2&HR-+{~0PIp-M7l+kjddD09P57pw?2NJW!`LNa}8
z`VEU28CP<fp+zRzWRV>ylshp1D1XIchB<P`6<rQ_KXK$I7Gl<xCooSwI#fhgEc66M
zD8K@ZqEBO6FjMMXunJ3``FgJ;wIpWtP8FAV(f-_Vr!O@dD<^8_X!|H`&8JW5xVbS?
z?5kl&2dywn7qXw8Tdl1wH|vdXx!KqZSJ!IwYI>$s^l5SS_a{2F^g;9F0N7~yrY-Tj
qo0j#*`6+OM#2T1Rq795(k{xJPq6|&2i-|te!C!m<_ty{0V#*gmQ(FcA

diff --git a/core/settings.py b/core/settings.py
index a68896d..cbce9fd 100644
--- a/core/settings.py
+++ b/core/settings.py
@@ -80,12 +80,6 @@ DATABASES = {
     }
 }
 
-# добавил от жемени из за нжинкса
-
-CSRF_TRUSTED_ORIGINS = [
-    "http://192.168.1.57:8080",
-    "https://shop.tertelius.space", # Сразу добавь на будущее
-]
 
 # Password validation
 # https://docs.djangoproject.com/en/5.2/ref/settings/#auth-password-validators
@@ -109,9 +103,11 @@ AUTH_PASSWORD_VALIDATORS = [
 # Internationalization
 # https://docs.djangoproject.com/en/5.2/topics/i18n/
 
-LANGUAGE_CODE = 'en-us'
+# LANGUAGE_CODE = 'en-us'
+LANGUAGE_CODE = 'ru-ru'
 
-TIME_ZONE = 'UTC'
+# TIME_ZONE = 'UTC'
+TIME_ZONE = 'Europe/Moscow'
 
 USE_I18N = True
 
@@ -132,3 +128,10 @@ MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
 # https://docs.djangoproject.com/en/5.2/ref/settings/#default-auto-field
 
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
+
+# добавил от жемени из за нжинкса
+
+CSRF_TRUSTED_ORIGINS = [
+    "http://192.168.1.57:8080",
+    "https://shop.tertelius.space", # Сразу добавь на будущее
+]
diff --git a/entrypoint.sh b/entrypoint.sh
index 3338e8b..ae18aca 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -4,6 +4,10 @@
 echo "Collecting static files..."
 python manage.py collectstatic --noinput
 
+# Применяем миграции базы данных
+echo "Applying database migrations..."
+python manage.py migrate --noinput
+
 # Запускаем основную команду (Gunicorn)
 echo "Starting Gunicorn..."
 exec "$@"
\ No newline at end of file
diff --git a/products/__pycache__/admin.cpython-311.pyc b/products/__pycache__/admin.cpython-311.pyc
index 7aa5d53af8088cfe0f9ced2449c151585d1b3e5a..79143ee456c772874b304d37df6628b6ed1a1435 100644
GIT binary patch
delta 215
zcmey*GM|-iIWI340}!Me6=ZTTPUJhpC^qq;Fh>+i3Ue@nCd<SZassTGxryninv6vp
zKy`katdj*8jrecz7N;f_C1=E^Wv1q&6i;?yv{aA+$~VB_2Q~%~y#}8fBC-v>AXp?g
zc?zSalmJjsksyc=0usMCY;yBcN^?@}io_>>XLNI7W|aHDfJsa+y&|mq5hU>iM0{js
QV3NGTDDi;_MJd=^03)e2H~;_u

delta 182
zcmbQw`k#ewIWI340}wp@ou9dZVItolMxlupg;|0bG?^#9k>g@3Pt8ovDDl%|nJmR<
zG&!2lQc@VGx&aO!2<tWYfMAip<SmSzQv5*KA^{K~2qb=S*yQG?l;)(`6^Tt2XL565
kWYqt_fJsa+y&|mq5hU>iM0{jsV3NGTDDi;_MJd=^0EKfc=>Px#

diff --git a/products/__pycache__/models.cpython-311.pyc b/products/__pycache__/models.cpython-311.pyc
index d62b39d8220ef306a53bea6ff9e51048a3f60d92..dcdb30c3d45d0ecc6b913951de1ce7a9bfe30af7 100644
GIT binary patch
delta 603
zcmX@d{+WY!IWI340}$xz7i3<V$Xm?C2I2w1=M@vX9P8JxE@Nb1SPjGw5XH{Kkjk9J
z0pq8zrLd=Ptl?b73{(ZgP*t2@RbYcbA}L%c+(5{)hIbhYP#q9MKooZhUkgJNPYQo9
zgQmbO_JE@Nl+xsqmnVSIr2;@=vJ#_?448Fc-i7@ac3f<{u;Ieq3p*}s)nqIJIbyOO
zqm^S7X8}ZGv3^LY7*O=Wj0@W@?7Oh>Vgpe5whLRKT3BvzmKNmXC#J-g<lkb+E6vHd
z#hR3pn3p|y4r7}%Cs1QC$jJ>1H~58nDlc$Id<OCu{4{wd+cKG^3If@;I73n^O58G2
zb5d?`r=%7q7iAWdWaj7H;&Dk$&dg2Bfk?3y6lEr--s1AiO-xUP3IS!)Q;S4^hOA^L
z5(QF4!XSbbMt}mZxNY(QCbd){r3q?Rgp@8AI9(8Oz9{5;Maa3q`v#AEhuak%`4vVx
z5>I4Z;EBA*6M2OvvcdHRk1R++b_Mqil>;dkA`36@6kX&gy24Y`;QE1ukyY{o113=<
yI$4idLrMW;JKQn9IBar(5s;H=SEM|-fLYa&oe`)Rljun6$@vHp|AIvlY#adN6RlhT

delta 405
zcmey&agLpLIWI340}v$q%+Cy;$Xh&7mXonzVwa<T3Tq168un$(3=FG*7y_c$nHW-;
zvp8V<6pl5V%NT(wfEcQRGli>#A&M)7JD5R}=N5ZFQGQBka>>j8lbsk%CQo9t5-H^c
zs=P4i!q$t83K|!7UD&Lt$vBypsZAPWYB9(y4GcH<g?lP5a7cUx8S1CWJ$W6IDGMKv
zJ^4SAxUpMKeqxDRW@=8#Ew=L1%=C<sB0-?sN`@jKAXOv)B3NMr$nC|MlRcQ#Jb2_g
z+^+D*uQ1w?cp~cpPvk|O$SXXN4X!tM<vPNy@XD?5zrbsAk=N!5uT6v72Np(F$qx*e
zM3K<s%gh>5(jW`q_Wk0p$pv~eC)KV<Zn7wgswEpEP%|dck=B#*5hVTvizL`M0BTfa
ATmS$7

diff --git a/products/admin.py b/products/admin.py
index ac78e51..38a79c7 100644
--- a/products/admin.py
+++ b/products/admin.py
@@ -3,4 +3,6 @@ from .models import Product
 
 @admin.register(Product)
 class ProductAdmin(admin.ModelAdmin):
-    list_display = ('name', 'price', 'weight')
\ No newline at end of file
+    # Убираем 'weight', добавляем 'image'
+    list_display = ('name', 'price', 'image') 
+    search_fields = ('name',)
\ No newline at end of file
diff --git a/products/migrations/0002_remove_product_weight_product_description_and_more.py b/products/migrations/0002_remove_product_weight_product_description_and_more.py
new file mode 100644
index 0000000..e7c0eb8
--- /dev/null
+++ b/products/migrations/0002_remove_product_weight_product_description_and_more.py
@@ -0,0 +1,33 @@
+# Generated by Django 5.2.10 on 2026-01-21 02:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('products', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='product',
+            name='weight',
+        ),
+        migrations.AddField(
+            model_name='product',
+            name='description',
+            field=models.TextField(default=1, verbose_name='Описание'),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='product',
+            name='image',
+            field=models.ImageField(blank=True, null=True, upload_to='products/', verbose_name='Изображение'),
+        ),
+        migrations.AlterField(
+            model_name='product',
+            name='name',
+            field=models.CharField(max_length=200, verbose_name='Название'),
+        ),
+    ]
diff --git a/products/models.py b/products/models.py
index b480265..354db2d 100644
--- a/products/models.py
+++ b/products/models.py
@@ -1,9 +1,10 @@
 from django.db import models
 
 class Product(models.Model):
-    name = models.CharField(max_length=255, verbose_name="Название")
+    name = models.CharField(max_length=200, verbose_name="Название")
+    description = models.TextField(verbose_name="Описание")
     price = models.DecimalField(max_digits=10, decimal_places=2, verbose_name="Цена")
-    weight = models.FloatField(verbose_name="Вес (кг)")
+    image = models.ImageField(upload_to='products/', null=True, blank=True, verbose_name="Изображение")
 
     def __str__(self):
         return self.name
\ No newline at end of file
diff --git a/products/templates/products/list.html b/products/templates/products/list.html
index 18387ba..60e7ed4 100644
--- a/products/templates/products/list.html
+++ b/products/templates/products/list.html
@@ -1,8 +1,33 @@
-<h1>Список товаров</h1>
-<ul>
-{% for p in products %}
-    <li>{{ p.name }} — Цена: {{ p.price }} руб. ({{ p.weight }} кг)</li>
-{% empty %}
-    <li>Товаров пока нет.</li>
-{% endfor %}
-</ul>
\ No newline at end of file
+<!DOCTYPE html>
+<html lang="ru">
+<head>
+    <meta charset="UTF-8">
+    <title>Мой Магазин</title>
+    <style>
+        body { font-family: sans-serif; margin: 40px; }
+        .product { border-bottom: 1px solid #ccc; padding: 10px; margin-bottom: 10px; }
+        .admin-link { background: #417690; color: white; padding: 10px; text-decoration: none; border-radius: 4px; }
+        img { max-width: 200px; height: auto; display: block; margin-top: 10px; }
+    </style>
+</head>
+<body>
+    <h1>Список товаров</h1>
+    <a href="/admin/" class="admin-link">Перейти в панель админа</a>
+    <hr>
+
+    {% for product in products %}
+        <div class="product">
+            <h2>{{ product.name }}</h2>
+            <p>{{ product.description }}</p>
+            <p><strong>Цена: {{ product.price }} руб.</strong></p>
+            {% if product.image %}
+                <img src="{{ product.image.url }}" alt="{{ product.name }}">
+            {% else %}
+                <p>Нет изображения</p>
+            {% endif %}
+        </div>
+    {% empty %}
+        <p>Товаров пока нет.</p>
+    {% endfor %}
+</body>
+</html>
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index 23975e2d2cb5c9ab75281def70371aae7237fe00..d32322a1111b648d90d8f7095b4579536bb62a7d 100644
GIT binary patch
delta 92
zcmbQn_=a(U%fvPTe_IAy1|tSz20aD?Fy>|8VklrpWJqSn29oIvnGAVA5~9i!Nkt|@
X4iM%ul!N6AfoAA27&7QhwDkl463h>j

delta 12
TcmaFEIE`_F%fwYq6I}!VA#((~