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 d5eadef..26a0c2f 100644 Binary files a/NITAKUSHOP/__pycache__/settings.cpython-311.pyc and b/NITAKUSHOP/__pycache__/settings.cpython-311.pyc differ diff --git a/NITAKUSHOP/__pycache__/urls.cpython-311.pyc b/NITAKUSHOP/__pycache__/urls.cpython-311.pyc index 01d5f8e..9631f94 100644 Binary files a/NITAKUSHOP/__pycache__/urls.cpython-311.pyc and b/NITAKUSHOP/__pycache__/urls.cpython-311.pyc differ 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 b53e703..8b42959 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/main/__pycache__/urls.cpython-311.pyc b/main/__pycache__/urls.cpython-311.pyc index 087d949..6bffd70 100644 Binary files a/main/__pycache__/urls.cpython-311.pyc and b/main/__pycache__/urls.cpython-311.pyc differ diff --git a/main/__pycache__/views.cpython-311.pyc b/main/__pycache__/views.cpython-311.pyc index 8927139..037d13d 100644 Binary files a/main/__pycache__/views.cpython-311.pyc and b/main/__pycache__/views.cpython-311.pyc differ 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 %} - - - - {% block title %}My shop{% endblock %} - - - - -
+ -
-
- {% block content %} - {% endblock %} -
- - \ No newline at end of file + + + + + + + + + + + + + + + Главная + + + +
+ +
+ +
+
+
+ +
+ +
+ + + {% block content %} +
+
+
+ +
+
+
+ {% endblock %} +{#
#} +{# {% for product in products %}#} +{#
#} +{#
#} +{# {% if product.image %}#} +{#
#} +{# {{ product.name }}#} +{#
#} +{# #} +{# {% else %}#} +{#
#} +{# {{ product.name }}#} +{#
#} +{# {% endif %}#} +{#
#} +{# #} +{#

{{ product.name }}

#} +{# #} +{#

{{ product.description }}

#} +{#
#} +{#

{{ product.price }}₸

#} +{#
#} +{#
#} +{#
#} +{#
#} +{# {% endfor %}#} +{#
#} +
+ + + + + + + + + + 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 %} - - - - - - - - - - - - - - - - - - Home - - - -
- -
-
-
-
- -
- - -
-
- {% for product in products %} -
-
- {% if product.image %} -
- {{ product.name }} -
- - {% else %} - -
- {{ product.name }} -
- {% endif %} -
- -

{{ product.name }}

- -

{{ product.description }}

-
-

{{ product.price }}₸

-
-
-
-
- {% endfor %} -
- -
-
-{#
#} -{# #} -{##} -{# #} -{#
#} -{#
#} -{# ...#} -{#
#} -{# #} -{#

Anime girl/p>#} -{# #} -{#

Re Zero

#} -{##} -{#
#} -{##} -{#

90.00 $

#} -{##} -{# #} -{##} -{#
#} -{#
#} -{#
#} -{#
#} -{##} -{#
#} -{# #} -{# #} -{# #} -{# #} -{# #} - - -
- - - - - - - - - - \ 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 @@