From 9e229dff489a1a6b33b2ed96ff48d281b9cef6a5 Mon Sep 17 00:00:00 2001
From: Lowlights <125327040+Lowlightsas@users.noreply.github.com>
Date: Fri, 26 Jan 2024 14:22:38 +0600
Subject: [PATCH] delete index html change base.html , detail.html,list.html

---
 .gitignore                                    |   4 +-
 .../__pycache__/settings.cpython-311.pyc      | Bin 2708 -> 2770 bytes
 NITAKUSHOP/__pycache__/urls.cpython-311.pyc   | Bin 1674 -> 1682 bytes
 NITAKUSHOP/settings.py                        |   2 +-
 NITAKUSHOP/urls.py                            |   2 +-
 db.sqlite3                                    | Bin 258048 -> 258048 bytes
 main/__pycache__/urls.cpython-311.pyc         | Bin 778 -> 703 bytes
 main/__pycache__/views.cpython-311.pyc        | Bin 4147 -> 3470 bytes
 main/static/deps/css/my_css.css               |   1 +
 main/templates/main/base.html                 | 139 ++++++++++++++--
 main/templates/main/index.html                | 156 ------------------
 main/templates/main/product/detail.html       |   6 +-
 main/templates/main/product/list.html         |  80 +++++----
 main/urls.py                                  |   2 +-
 main/views.py                                 |  14 --
 15 files changed, 179 insertions(+), 227 deletions(-)
 delete mode 100644 main/templates/main/index.html

diff --git a/.gitignore b/.gitignore
index 7bfadbc..1e28d7d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,4 +28,6 @@ build/
 
 # OS generated files
 .DS_Store
-Thumbs.db
\ No newline at end of file
+Thumbs.db
+.idea
+/media
\ No newline at end of file
diff --git a/NITAKUSHOP/__pycache__/settings.cpython-311.pyc b/NITAKUSHOP/__pycache__/settings.cpython-311.pyc
index d5eadef97a68bc979bfc59523c2bbb5de38e4c83..26a0c2f78f256e4f532b2fc938181be0b3191a7c 100644
GIT binary patch
delta 264
zcmbOtdP$UbIWI340}yO?-<*1IBCjM96XQgUoca{jMT}9L=?p1sK$;6kvjb`F6pkpK
z6wXw(6s{_628MLT6qXcjpd8O4#!SW(-Z?Dkj8VKPd{KNU{3!xJRe~T@DME9YG8v=z
zQ-o7QfU1O3M8TvOm=w=sOlOG_NRfyVOp%NdN@0l-24ayEX{jjD6zM3j6qzV-ph2=A
zgQ6r-<boMA<u_|Fwlf+tSMeHJ8tECDS?C$)8JZhaiRERMBxaWuXXF>?6=&vTSC%JM
n>Sb3|aT*$#1C;<3ZQj7t$i|p3*@!cO-Ti_92yO1><YWW@DGxyI

delta 202
zcmW-ZJr06E6omH?L|0ryU`71vOtkSbHs;l1HW*J}qn(MJ(aKQS*vlzwy@i)BE=)2r
z#eA8MzG?MTsx7SUv)AT)QJM1-m-+6%(g-vj#BJN2Z68hUptbQJ_r4H@;G)|62jzrL
z;TmEE#Q_3zEfrQ2dWDk{cM&1BRD`5XU1vWh<8p|Udl+y8mt*S$8Ed3N?qkHMJsMX>
bJiufn7SnP`Cn~?r(IdWY<(i`MEhYT{@{li3

diff --git a/NITAKUSHOP/__pycache__/urls.cpython-311.pyc b/NITAKUSHOP/__pycache__/urls.cpython-311.pyc
index 01d5f8ec9a39e1c32355981adc0ff8d4f34c009a..9631f94cd746eaba5f500baac5ddb5a7e6cc6974 100644
GIT binary patch
delta 66
zcmeC;oy5z#oR^o20SIoUZ%%FB$ScXh%TrL4pHiA!5}%V<T(Vh*#fgzoWO6?1B)%)W
V@(c1Vu$W$CF}=cKI+>5H1^|WA6fpn*

delta 58
zcmbQl+r`VfoR^o20SKNy+K^hgkynz1jWshbCADI+F^dx;qwwT1)=9iQ(KE^~u&7^T
NQNO~XK3R;d1_11R5orJb

diff --git a/NITAKUSHOP/settings.py b/NITAKUSHOP/settings.py
index 7ddb90f..ba84e69 100644
--- a/NITAKUSHOP/settings.py
+++ b/NITAKUSHOP/settings.py
@@ -25,7 +25,7 @@ SECRET_KEY = 'django-insecure-&b24xw3mg)lbuo4pdea^cxgkoc!yace&t^o9*o#n=-_jhwe+x!
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-ALLOWED_HOSTS = ['192.168.0.172', 'nitakushop.silkyway.kz']
+ALLOWED_HOSTS = ['192.168.0.172', 'nitakushop.silkyway.kz','127.0.0.1']
 
 
 # Application definition
diff --git a/NITAKUSHOP/urls.py b/NITAKUSHOP/urls.py
index 0342015..e9aa637 100644
--- a/NITAKUSHOP/urls.py
+++ b/NITAKUSHOP/urls.py
@@ -22,7 +22,7 @@ from django.conf.urls.static import static
 
 urlpatterns = [
     path('admin/', admin.site.urls),
-    path('', views.index, name='index'),
+    path('', views.product_list, name='product_list'),
     path('', include('main.urls', namespace='main')),
     path('about/', views.about, name='about'),
 
diff --git a/db.sqlite3 b/db.sqlite3
index b53e703e8d2ea25e1f1150a14e2b34235d0f862b..8b42959083786c873a42fdf64274a87393b1e9a3 100644
GIT binary patch
delta 570
zcmaKnJ!lhg7{>n}C;2dUPtqz#s^%Jyh>+y&l8ea=LbMKr=+Y&JpmB)kQtBXuf}}x8
ztT-f9xk1I$4_uVC9CAS=3ZhF9t`r;!VqGGoRMbVm#cL)9ad@BU_q^}#onFWEI+{bY
z*4lfF)|M(lnwoYseWwzGK|)f8poe8Rn8y{I!3i9MU-~7jNgZ2mMj;SF25%g>_a+95
zgis=wzz<ya$Td7c$!ksFJzk?{%k9ZN9kg#RT=*uN;wHgwY~UkS@Cr5_<1!{u#TX*e
zmiXO@x9LqLZra1LDu#A&O8w?``pVAFr&MIzltwJyB3%%qQE9}Zu8Bc`2dKFnW#?p<
z+Qk@VJST(TwC6PCxv%0b49wv?-eC!!p2@7*cM==3V9qS~)e2p91}69|fhDLl@8@yh
zlu$2NTN)p-&NX>r*L}C^+U}z4K5{$mOK+aLUFX0h{yFN`NifX55WUq(?3_twMN%)E
z9c?764UNb8<=y`($F16NcF1|#<Y5-c$x7bP6hl9p(v^HBr#QVizF*{f*tq3u^Q6EB
z*to5Ra}4!iGe{!!0v)4)qOMtAH6H!nm5UF(7gj&e!Q$UXR3($kq{;z;eN^-o<=vM1
h!tJayxKC5GY*JB^TAx=7hL%lbHPzE{jy~Ys(jP{_xRC$=

delta 360
zcmXAjO(=t50LP!_eV*D&-uJ&bP(EKJ`N(E9Y-_1aE*ckVH+ETZb0DRbNekuh&PT68
zCI=T9J?U{miHjuMl-h|Llw2qmPt^bP@Av=66p<;yuBPc+O)pI!C%KO%M9R07tS5vR
z<|)AoZXmIXd5mHJVKhTGzs)CM*;U{kos-p`oy$KOae@haVi}HNpKyS<%FW;w7sAR<
zgO{*MDmDw_A9V@ii{J-uc*Z@>A+V1$rjf!BJm$O8n5S!^!HOF4>yR26OPGU>>xdSV
zw_(V^Gb*D0i(!HhwK$`mJz`tETfrEvk;U<erKP~jSS?*xf+m;17L)WrmQS#Cu6e1m
ztFsn9%;(yiyGa&vLIq~ZrYTme(j%nQt-X>+F6VV+n*#<>OvGmWe~dHRr?tu}o4GYl
mr{(VmcPe#zL;hee&?R41Se?NtRG%x)+J)b3G8x-rXYpU!+G#=n

diff --git a/main/__pycache__/urls.cpython-311.pyc b/main/__pycache__/urls.cpython-311.pyc
index 087d949f3e5b0deee2ff14b2f2fe054a1f681968..6bffd70d4685bf647da5ac6554ab0efcf417cfec 100644
GIT binary patch
delta 177
zcmeBT+s~@LoR^o20SIoUZ%*xDWMFs<;=lk0l<|4nMD-#@wu!UsxYAjoI8yk688rDP
zvoR`)SFt4~<(HP|-(m&RnvAzt@)C1XC%ZEi8*tv@PRUBlOV8IUEy^h_Vg?#^i=l`W
zL~$e*6vTrR7O?}lMVugld-5knFD_vq6X*<v;$@TFn2cCB7+5(cPhu)z5d?|>0E)&b
AcmMzZ

delta 299
zcmdnb+Qp{6oR^o20SI)xH>Pf3WMFs<;=lkWl=1o2MD-#@_KCCXCQe|j=SyYI;(#eh
z;a|hPjG2L9H4sBUI%^bXia;=frr=AEfF|QDmV(5RjF&*eK^)ey%+&JYTP(SWnR&Mu
zZn0+OrKDDX6y+u6rdF{fCgqow=-*-m(^Z@WMfoYE$tA`5w|Jn;_{sW=aTZ*+xKpwc
z^V0M6N{e!ei$Inav4aR!AaRQ$v7jIxWL^=-okbuI7IA|J-pP9zy|_exOpt4e_e>UK
pGLm9rVC8IZ=@9A&?TMaIet|{(B8&PJ7WEq}9FyIdN?3$|DgpDWODzBZ

diff --git a/main/__pycache__/views.cpython-311.pyc b/main/__pycache__/views.cpython-311.pyc
index 8927139543cd612e6ef113faad732934946d857c..037d13d91d2047537657fa6dea29f82fa0e43bae 100644
GIT binary patch
delta 426
zcmYLFO-sW-5Ka2EX<`zK+6ENurAQ7UDkx|Xym+bf(u?#`(q>yD(dg_3^x_Bhs!;ak
z9}v&Edl0Ywf&2|UdC}QWaA6<w-VE=}Zc=|*v|db8SMVI4B=lFGSdMx)S>1BRN>}sC
zJ{hasvacc2{ZdD9^~udqa-VM!k`{TuLn_|&jao{8UdEL1lnkPCPOmu2p{01str=cF
ziaE?8C8BC<=f0GrZ4A}h1yoXf;Bh*NAfPPOE+F#b0cS1&BAX=YpHk#$-U~y}q*NLP
zA*TQZB#=jNi(txzIW@ZOu`nKiG>58$8UiaK)a3yit8@mFY#G%H1IA$qHAifk&uT?{
zns=pn<S-{X*6xn<hGhwvxPldv+5cYFbnBi^xfg^`$8JM>SgmpeD_3p1hH&hIb@>5V
lQa16bfNW>${AkTHe0WIrp@Eu;mpzC_yQOO4+uke4!9QjNX)FK$

delta 960
zcmZ8f-%Aux6rP!#nVsF)pZVKeXw=nZEVD2abSWY&%UYq{e35nUs1xI^-I)c8Emx6x
ziBjev35lMpkihcA2>TOaMiyKKq#o*BkY0T1+;I)+GV`5tzkBX?&OP@&k8Mezx51#F
zg3&edQ8@~%gc|8PE6JXO!cH=XUt-4u<Xxi1d`LvTC3?({{4f)daF>z;EBIE*;jv;A
za4t&|k?P>Vdf-3&3Gk9aG-8kku~P&&l}0@Bu5piOb6*(nFa~da7y6kZZFc+W=Zj3y
zgM>9^9rQN-YSNS;R<*$tDda2C>yTlCWN`=7<4-&6aDGN9bO2+S))#Bj`ef}`oAwLI
zUa%MK5)eDqw*AD~l)9wh(c41~H>qOXaClwG=5q-1^RV@r%sHH)8k*vGfi;w@;jo$t
zVJuR?kEr^1reI7fIYZ563<b%IBh2DFDr61a@e^t)k5xr~7@o<fxo$Owl(}=$#*8NO
zSbzkMH$QO?RCULb(KPHO6knJ{u(1=96UnUO#mfDH0y&RMm@{w<EZ|xIodu92^M=qh
z?`q>15FA-~3{aweMCvQGsY;|_Rj|S>l~YZtEz7Y=Oga$xdj5a{C|&;@q9P5?=J&#_
zyWv(loG6DArQ!W(Q#snQ7j55-w%gHUIhripJm4uV@HD-cej{xAt(vRw+3aAM9kkfN
zUkze(IcdetzMHbe-m=(hvAu^-0`>80%FE#pcqT1eXv2-*;U)l`0gxoz494Ly6ZwLH
zCGhLa1)-P0@vYCoBz-yojC)k~(6ZNU5w0U_J%E|^HxCg>Cs=LvgK=FeOyPg`>7*qR
z8OP}Y)jJv|cZrj**kOL~zoO&juvp^TV2)eOZ(@I+TdhpyF4+lQwdW^Np%W>j7#UT=
zXCS1<yc`(u#le&5v>Y(az?F;SV%+n&>D;jQ6ecllNk>9z2A++kT*BvpBhOubZF+(u
WaW+KvEo%o9nEydCM}q?_(f9*h!Tk~d

diff --git a/main/static/deps/css/my_css.css b/main/static/deps/css/my_css.css
index 42de60a..02fff0c 100644
--- a/main/static/deps/css/my_css.css
+++ b/main/static/deps/css/my_css.css
@@ -98,3 +98,4 @@ footer {
 .footer-text span {
     color: #ff6b6b; /* Цвет для части текста */
 }
+
diff --git a/main/templates/main/base.html b/main/templates/main/base.html
index e87c9ea..017893e 100644
--- a/main/templates/main/base.html
+++ b/main/templates/main/base.html
@@ -1,21 +1,124 @@
+
 {% load static %}
 <!DOCTYPE html>
-<html>
- <head>
- <meta charset="utf-8" />
- <title>{% block title %}My shop{% endblock %}</title>
- <link href="{% static "/deps/css/base.css" %}" rel="stylesheet">
- </head>
- <body>
- <div id="header">
- <a href="/" class="logo">Nitaku</a>
- </div>
- <div id="subheader">
+<html lang="ru">
 
- </div>
- <div id="content">
- {% block content %}
- {% endblock %}
- </div>
- </body>
-</html>
\ No newline at end of file
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="stylesheet" href="{% static "/deps/css/bootstrap/bootstrap.min.css"%}">
+    <link rel="stylesheet" href="{% static "/deps/css/my_css.css"%}">
+    <!-- Стиль footer-a для главной страницы -->
+    <link rel="stylesheet" href="{% static "/deps/css/my_footer_css.css"%}">
+    <link rel="stylesheet" href="{% static "/deps/css/catal.css"%}">
+    <!-- Favicons for different platforms -->
+    <link rel="apple-touch-icon" sizes="180x180" href="{% static "/deps/favicon/apple-touch-icon.png"%}">
+    <link rel="icon" type="image/png" sizes="32x32" href="{% static "/deps/favicon/favicon-32x32.png"%}">
+    <link rel="icon" type="image/png" sizes="16x16" href="{% static "/deps/favicon/favicon-16x16.png"%}">
+    <link rel="manifest" href="{% static "/deps/favicon/site.webmanifest"%}">
+    <title>Главная</title>
+</head>
+
+<body>
+    <header>
+        <nav class="navbar navbar-expand-lg bg-dark" data-bs-theme="dark">
+            <div class="container">
+                <a class="navbar-brand" href="{% url "product_list"%}">Nitaku</a>
+                <button class="navbar-toggler" type="button" data-bs-toggle="collapse"
+                    data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent"
+                    aria-expanded="false" aria-label="Toggle navigation">
+                    <span class="navbar-toggler-icon"></span>
+                </button>
+
+                <div class="collapse navbar-collapse" id="navbarSupportedContent">
+                    <ul class="navbar-nav me-auto mb-2 mb-lg-0">
+                        <li class="nav-item dropdown ">
+                            <a class="nav-link dropdown-toggle text-white" href="#" role="button"
+                                data-bs-toggle="dropdown" aria-expanded="false">
+                                Информация
+                            </a>
+                            <ul class="dropdown-menu">
+                                <li><a class="dropdown-item  text-white" href="https://t.me/silky_way_bot">Контактная информация</a></li>
+                                <li><a class="dropdown-item text-white" href="{% url 'about' %}">Про нас</a></li>
+                            </ul>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+        </nav>
+    </header>
+
+    <div class="container">
+        <div class="row mt-1">
+            <div class="col-lg-2">
+                <!-- Пустой блок на Ваше усмотрение -->
+            </div>
+            <div id="header">
+                <h1><img src="{% static "deps/favicon/favicon.ico.png"%}" alt="Логотип"> <a class="navbar-brand" href="{% url "product_list"%}">Nitaku Shop</a></h1>
+            </div>
+        </div>
+
+        <!-- Добавление кнопок категорий и формы для фильтрации -->
+        {% block content %}
+        <div class="row mb-3">
+            <div class="col-12">
+                <form method="get" action="{% url 'main:product_list' %}">
+                    <button type="submit" class="btn btn-primary">Искать по Категориям</button>
+                </form>
+            </div>
+        </div>
+    {% endblock %}
+{#        <div class="row">#}
+{#            {% for product in products %}#}
+{#                <div class="col-12 col-md-6 col-lg-4 p-4">#}
+{#                    <div class="card border-primary rounded custom-shadow">#}
+{#                        {% if product.image %}#}
+{#                            <a href="{{ product.get_absolute_url }}"><div class="aspect-ratio overflow-hidden" style="position: relative; padding-top: 100%;">#}
+{#                                <img src="{{ product.image.url }}" class="w-100 h-100 position-absolute" style="object-fit: cover; top: 0; left: 0;" alt="{{ product.name }}">#}
+{#                            </div>#}
+{#                            </a>#}
+{#                        {% else %}#}
+{#                            <div class="aspect-ratio overflow-hidden" style="position: relative; padding-top: 100%;">#}
+{#                                <img src="{% static 'deps/img/no_image.jpg' %}" class="w-100 h-100 position-absolute" style="object-fit: cover; top: 0; left: 0;" alt="{{ product.name }}">#}
+{#                            </div>#}
+{#                        {% endif %}#}
+{#                        <div class="card-body">#}
+{#                            <a href="{{ product.get_absolute_url }}">#}
+{#                                <p class="card-title">{{ product.name }}</p>#}
+{#                            </a>#}
+{#                            <p class="card-text text-truncate" style="color:wheat">{{ product.description }}</p>#}
+{#                            <div class="d-flex justify-content-between">#}
+{#                                <p><strong>{{ product.price }}₸</strong></p>#}
+{#                            </div>#}
+{#                        </div>#}
+{#                    </div>#}
+{#                </div>#}
+{#            {% endfor %}#}
+{#        </div>#}
+    </div>
+
+    <footer class="py-2 bg-dark">
+        <div class="container">
+            <div class="row">
+                <div class="col-lg-14">
+                    <p class="m-0 text-center text-white footer-text" style="font-size: 18px;">Nitaku shop <span>&</span> Silky Way 2024</p>
+                </div>
+                <div class="col-lg-14">
+                    <div class="text-center mt-3">
+                        <h5 class="text-white" style="font-size: 14px;">Посетите нашего телеграм бота!</h5>
+                        <p class="text-white" style="font-size: 14px;">Распознавайте товары в картинах и найдите их онлайн.</p>
+                        <a href="https://t.me/silky_way_bot" class="btn btn-warning" style="font-size: 14px;"> Silky Way </a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </footer>
+
+    <script src="{%  static "/deps/js/jquery/jquery-3.7.0.min.js"%}"></script>
+    <script src="{% static "/deps/js/jquery-events.js"%}"></script>
+    <script src="{% static "/deps/js/jquery-ajax.js"%}"></script>
+    <script src="{% static "/deps/js/bootstrap/bootstrap.bundle.min.js"%}"></script>
+</body>
+
+</html>
diff --git a/main/templates/main/index.html b/main/templates/main/index.html
deleted file mode 100644
index 82df397..0000000
--- a/main/templates/main/index.html
+++ /dev/null
@@ -1,156 +0,0 @@
-
-{% load static %}
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link rel="stylesheet" href="{% static "/deps/css/bootstrap/bootstrap.min.css"%}">
-    <link rel="stylesheet" href="{% static "/deps/css/my_css.css"%}">
-    <!-- Стиль footer-a для главной страницы -->
-    <link rel="stylesheet" href="{% static "/deps/css/my_footer_css.css"%}">
-    <link rel="stylesheet" href="{% static "/deps/css/catal.css"%}">
-    <!-- Favicons for different platforms -->
-    <link rel="apple-touch-icon" sizes="180x180" href="{% static "/deps/favicon/apple-touch-icon.png"%}">
-    <link rel="icon" type="image/png" sizes="32x32" href="{% static "/deps/favicon/favicon-32x32.png"%}">
-    <link rel="icon" type="image/png" sizes="16x16" href="{% static "/deps/favicon/favicon-16x16.png"%}">
-    <link rel="manifest" href="{% static "/deps/favicon/site.webmanifest"%}">
-    <title>Home</title>
-</head>
-
-<body>
-    <header>
-        <nav class="navbar navbar-expand-lg bg-dark" data-bs-theme="dark">
-            <div class="container">
-                <a class="navbar-brand" href="{% url "index"%}">Nitaku</a>
-                <button class="navbar-toggler" type="button" data-bs-toggle="collapse"
-                    data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent"
-                    aria-expanded="false" aria-label="Toggle navigation">
-                    <span class="navbar-toggler-icon"></span>
-                </button>
-                <div class="collapse navbar-collapse" id="navbarSupportedContent">
-                    <ul class="navbar-nav me-auto mb-2 mb-lg-0">
-                        <li class="nav-item dropdown ">
-                            <a class="nav-link dropdown-toggle text-white" href="#" role="button"
-                                data-bs-toggle="dropdown" aria-expanded="false">
-                                Информация
-                            </a>
-                            <ul class="dropdown-menu">
-
-                                <li><a class="dropdown-item  text-white" href="https://t.me/silky_way_bot">Контактная информация</a></li>
-                               <li><a class="dropdown-item text-white" href="{% url 'about' %}">Про нас</a></li>
-
-                            </ul>
-                        </li>
-
-
-
-                    </ul>
-                </div>
-            </div>
-        </nav>
-    </header>
-    <div class="container">
-        <div class="row mt-1">
-            <div class="col-lg-2">
-                <!-- Пустой блок на Ваше усмотрение -->
-            </div>
-    
-            <div id="header">
-                <h1><img src="{% static "deps/favicon/favicon.ico.png"%}" alt="Логотип"> <a class="navbar-brand" href="{% url "index"%}">Nitaku Shop</a></h1>
-            </div>
-        </div>
-        <div class="row">
-    {% for product in products %}
-        <div class="col-12 col-md-6 col-lg-4 p-4">
-            <div class="card border-primary rounded custom-shadow">
-                {% if product.image %}
-                    <a href="{{ product.get_absolute_url }}"><div class="aspect-ratio overflow-hidden" style="position: relative; padding-top: 100%;">
-                        <img src="{{ product.image.url }}" class="w-100 h-100 position-absolute" style="object-fit: cover; top: 0; left: 0;" alt="{{ product.name }}">
-                    </div>
-                    </a>
-                {% else %}
-                    <!-- Заглушка или альтернативное содержимое для товаров без изображений -->
-                    <div class="aspect-ratio overflow-hidden" style="position: relative; padding-top: 100%;">
-                        <img src="{% static 'deps/img/no_image.jpg' %}" class="w-100 h-100 position-absolute" style="object-fit: cover; top: 0; left: 0;" alt="{{ product.name }}">
-                    </div>
-                {% endif %}
-                <div class="card-body">
-                    <a href="{{ product.get_absolute_url }}">
-                        <p class="card-title">{{ product.name }}</p>
-                    </a>
-                    <p class="card-text text-truncate" style="color:wheat">{{ product.description }}</p>
-                    <div class="d-flex justify-content-between">
-                        <p><strong>{{ product.price }}₸</strong></p>
-                    </div>
-                </div>
-            </div>
-        </div>
-    {% endfor %}
-</div>
-
-    </div>
-    <section>
-{#        <div class="container">#}
-{#            <!-- Каталог и корзина с фиксированным расположением на странице -->#}
-{##}
-{#                 <!-- Карта товара -->#}
-{#                        <div class="col-lg-4 col-md-6 p-4">#}
-{#                            <div class="card border-primary rounded custom-shadow">#}
-{#                                <img src="{% static "/deps/images/goods/O1CN01xsBTy51MVZ2HM1sjf_!!4200721440-0-cib.jpg"%}" class="card-img-top" alt="...">#}
-{#                                <div class="card-body">#}
-{#                                    <a href="../goods/product.html">#}
-{#                                        <p class="card-title">Anime girl/p>#}
-{#                                    </a>#}
-{#                                    <p class="card-text text-truncate">Re Zero</p>#}
-{##}
-{#                                    <div class="d-flex justify-content-between">#}
-{##}
-{#                                        <p><strong>90.00 $</strong></p>#}
-{##}
-{#                                        <!-- <p><strong>100.00 $</strong></p> -->#}
-{##}
-{#                                    </div>#}
-{#                                </div>#}
-{#                            </div>#}
-{#                        </div>#}
-{##}
-{#                        </div>#}
-{#                    </div>#}
-{#                </div>#}
-{#                <!-- Закончилась разметка модального окна -->#}
-{#            </div>#}
-{#        </div>#}
-        <!-- Контент -->
-
-    </section>
-<footer class="py-2 bg-dark"> <!-- Уменьшаем высоту (padding) -->
-    <div class="container">
-        <div class="row">
-            <!-- Колонка для рекламного блока -->
-            <div class="col-lg-14">
-                <p class="m-0 text-center text-white footer-text" style="font-size: 18px;">Nitaku shop <span>&</span> Silky Way 2024</p> <!-- Изменяем размер шрифта -->
-            </div>
-            <!-- Колонка для рекламного блока -->
-            <div class="col-lg-14">
-    <div class="text-center mt-3">
-        <h5 class="text-white" style="font-size: 14px;">Посетите нашего телеграм бота!</h5>
-        <p class="text-white" style="font-size: 14px;">Распознавайте товары в картинах и найдите их онлайн.</p>
-        <a href="https://t.me/silky_way_bot" class="btn btn-warning" style="font-size: 14px;"> Silky Way </a>
-    </div>
-</div>
-
-        </div>
-    </div>
-</footer>
-
-
-    <script src="{%  static "/deps/js/jquery/jquery-3.7.0.min.js"%}"></script>
-    <script src="{% static "/deps/js/jquery-events.js"%}"></script>
-    <script src="{% static "/deps/js/jquery-ajax.js"%}"></script>
-    <script src="{% static "/deps/js/bootstrap/bootstrap.bundle.min.js"%}"></script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/main/templates/main/product/detail.html b/main/templates/main/product/detail.html
index d6fd9aa..663c06b 100644
--- a/main/templates/main/product/detail.html
+++ b/main/templates/main/product/detail.html
@@ -23,7 +23,7 @@
     <header>
         <nav class="navbar navbar-expand-lg bg-dark" data-bs-theme="dark">
             <div class="container">
-                <a class="navbar-brand" href="{% url "index" %}">Nitaku Shop</a>
+                <a class="navbar-brand" href="{% url "product_list" %}">Nitaku Shop</a>
                 <button class="navbar-toggler" type="button" data-bs-toggle="collapse"
                     data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent"
                     aria-expanded="false" aria-label="Toggle navigation">
@@ -50,7 +50,7 @@
     <div class="container">
         <div class="row mt-4">
             <div id="header">
-                <h1><img src="{% static "deps/favicon/favicon.ico.png"%}" alt="Логотип"> <a class="navbar-brand" href="{% url "index"%}">Nitaku Shop</a></h1>
+                <h1><img src="{% static "deps/favicon/favicon.ico.png"%}" alt="Логотип"> <a class="navbar-brand" href="{% url "product_list"%}">Nitaku Shop</a></h1>
             </div>
         </div>
         <div class="row">
@@ -97,7 +97,7 @@
 
                         <p class="text" style="color:wheat">{{ product.description }}</p>
                          <p class="price" style="font-size: 35px; font-weight: bold; color: rgba(255,128,0,0.73);">{{ product.price }}₸</p>
-                        <a href="{% url 'index' %}" class="btn btn-primary">Вернуться на главную</a>
+                        <a href="{% url 'product_list' %}" class="btn btn-primary">Вернуться на главную</a>
 
 
                     </div>
diff --git a/main/templates/main/product/list.html b/main/templates/main/product/list.html
index 8dab037..a57d323 100644
--- a/main/templates/main/product/list.html
+++ b/main/templates/main/product/list.html
@@ -1,35 +1,51 @@
 {% extends "main/base.html" %}
 {% load static %}
-{% block title %}
- {% if category %}{{ category.name }}{% else %}Products{% endif %}
-{% endblock %}
+
 {% block content %}
- <div id="sidebar">
- <h3>Categories</h3>
- <ul>
- <li {% if not category %}class="selected"{% endif %}>
- <a href="{% url "main:product_list" %}">All</a>
- </li>
- {% for c in categories %}
- <li {% if category.slug == c.slug %}class="selected"
- {% endif %}>
- <a href="{{ c.get_absolute_url }}">{{ c.name }}</a>
- </li>
- {% endfor %}
- </ul>
- </div>
- <div id="main" class="product-list">
- <h1>{% if category %}{{ category.name }}{% else %}Products
- {% endif %}</h1>
- {% for product in products %}
- <div class="item">
- <a href="{{ product.get_absolute_url }}">
- <img src="{% if product.image %}{{ product.image.url }}{% else %}{% static "deps/img/no_image.jpg" %}{% endif %}">
- </a>
- <a href="{{ product.get_absolute_url }}">{{ product.name }}</a>
- <br>
- ${{ product.price }}
- </div>
- {% endfor %}
- </div>
-{% endblock %}
\ No newline at end of file
+       <link rel="stylesheet" href="{% static "/deps/css/my_css.css"%}">
+<div id="sidebar" class="categories-sidebar">
+    <h3>Категории</h3>
+    <div class="btn-group" role="group" aria-label="Категории">
+        {% for c in categories %}
+            <a href="{{ c.get_absolute_url }}" class="btn btn-secondary {% if category.slug == c.slug %}active{% endif %}">
+                {{ c.name }}
+            </a>
+        {% endfor %}
+    </div>
+</div>
+
+
+  <div id="main" class="product-list">
+
+    <div class="row">
+      {% for product in products %}
+        {% if not category or product.category == category %}
+          <div class="col-12 col-md-6 col-lg-4 p-4">
+            <div class="card border-primary rounded custom-shadow">
+              {% if product.image %}
+                <a href="{{ product.get_absolute_url }}">
+                  <div class="aspect-ratio overflow-hidden" style="position: relative; padding-top: 100%;">
+                    <img src="{{ product.image.url }}" class="w-100 h-100 position-absolute" style="object-fit: cover; top: 0; left: 0;" alt="{{ product.name }}">
+                  </div>
+                </a>
+              {% else %}
+                <div class="aspect-ratio overflow-hidden" style="position: relative; padding-top: 100%;">
+                  <img src="{% static 'deps/img/no_image.jpg' %}" class="w-100 h-100 position-absolute" style="object-fit: cover; top: 0; left: 0;" alt="{{ product.name }}">
+                </div>
+              {% endif %}
+              <div class="card-body">
+                <a href="{{ product.get_absolute_url }}">
+                  <p class="card-title">{{ product.name }}</p>
+                </a>
+                <p class="card-text text-truncate" style="color: wheat">{{ product.description }}</p>
+                <div class="d-flex justify-content-between">
+                  <p><strong>{{ product.price }}₸</strong></p>
+                </div>
+              </div>
+            </div>
+          </div>
+        {% endif %}
+      {% endfor %}
+    </div>
+  </div>
+{% endblock %}
diff --git a/main/urls.py b/main/urls.py
index c2a12b0..cfd02c4 100644
--- a/main/urls.py
+++ b/main/urls.py
@@ -4,7 +4,7 @@ from . import views
 app_name = 'main'
 
 urlpatterns = [
-    path('', views.index, name='index'),
+
     path('about/', views.about, name='about'),
     path('products/', views.product_list, name='product_list'),
     path('<slug:category_slug>/', views.product_list,
diff --git a/main/views.py b/main/views.py
index 4222280..f452928 100644
--- a/main/views.py
+++ b/main/views.py
@@ -2,21 +2,7 @@ from django.shortcuts import render,get_object_or_404
 from django.http import HttpResponse
 from .models import Category, Product
 
-def index(request) -> HttpResponse:
-    context : dict = {
-        'title':'Home',
-        'contect' : 'Главная страница - HOME',
-        'list':['first','second'],
-        'dict' : {'first':1},
-        'is_authenticated':False
-    }
-    products = Product.objects.all()
-    categories = Category.objects.all()
 
-    # Merge the two dictionaries into one
-    context.update({'products': products, 'categories': categories})
-
-    return render(request, 'main/index.html', context)
 
 def about(request):
     context = {