From 450df46fc710b338624d572d6b1acf3b2bcc2587 Mon Sep 17 00:00:00 2001 From: R-Murod Date: Wed, 17 Jan 2024 17:54:38 +0600 Subject: [PATCH] changed templates --- .gitignore | 1 + shop/urls.py | 2 +- templates/base.html | 44 +++++++++--------------- templates/shop/shop/product_details.html | 1 + templates/shop/shop/shop.html | 44 ++++++++++++++++-------- 5 files changed, 48 insertions(+), 44 deletions(-) diff --git a/.gitignore b/.gitignore index b5b2b71..29b7d16 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ db.sqlite3 db.sqlite3-journal media /static/ +.vscode # ## # If your build process includes running collectstatic, then you probably don't need or want to include staticfiles/ diff --git a/shop/urls.py b/shop/urls.py index ef387f2..6a65c1b 100644 --- a/shop/urls.py +++ b/shop/urls.py @@ -5,7 +5,7 @@ from . import views app_name = 'shop' urlpatterns = [ - path('', views.home, name='home'), + path('', views.shop, name='shop'), path('shop/', views.shop, name='shop'), path('shop//', views.shop, name='categries'), path('shop///', views.product_details, name='product_details'), diff --git a/templates/base.html b/templates/base.html index 2ce00fb..28f55cd 100644 --- a/templates/base.html +++ b/templates/base.html @@ -63,6 +63,7 @@ #searchh input[type=text]:focus { width: 80%; + background: linear-gradient(0deg,rgba(36,36,36,.05) 0,rgba(36,36,36,.05) 100%),linear-gradient(97deg,#ed3cca .49%,#df34d2 14.88%,#d02bd9 29.27%,#bf22e1 43.14%,#ae1ae8 57.02%,#9a10f0 70.89%,#8306f7 84.76%,#7c1af8 99.15%); } @@ -77,8 +78,8 @@ -
-
+
+
@@ -133,20 +134,7 @@
-
-
-
-
-
- - -
-
-
-
-
+
@@ -171,8 +159,8 @@ {% endcomment %} {% comment %}
  • Blog
    • {% endcomment %} -
  • О Нас
    • -
  • Контакты
    • + {% comment %}
  • О Нас
    • +
  • Контакты
    • {% endcomment %}
    @@ -192,8 +180,8 @@ {% endcomment %} {% comment %}
  • Blog
    • {% endcomment %} -
  • О Нас
    • -
  • ConКонтактыtact
    • + {% comment %}
  • О Нас
    • +
  • ConКонтактыtact
    • {% endcomment %}
    @@ -205,16 +193,16 @@ - {{quantityyy}} штук : ${{totalll}} + {{totalll}} тг -
    +
    {% for x in cart_itemsss %}
    -
    {{x.product.name}}
    +
    {{x.product.name}}
     {% if x.variation.all %} @@ -222,16 +210,16 @@ {{item.variation_category | capfirst}} : {{item.variation_value | capfirst}} {% endfor %} {% endif %} - Цена за каждый : ${{x.product.price}} - Количество : {{x.quantity}} - ${{x.sub_total}} + Цена за каждый : {{x.product.price}}тг + Количество : {{x.quantity}} +
    {% endfor %} -
    - Общий = ${{totalll}} +
    + Общий = {{totalll}} тг

    {% if '/cart/' not in request.path %} Перейти в корзину diff --git a/templates/shop/shop/product_details.html b/templates/shop/shop/product_details.html index 72281b6..5615f94 100644 --- a/templates/shop/shop/product_details.html +++ b/templates/shop/shop/product_details.html @@ -4,6 +4,7 @@ {% block content %}
    diff --git a/templates/shop/shop/shop.html b/templates/shop/shop/shop.html index f2e674d..77ec156 100644 --- a/templates/shop/shop/shop.html +++ b/templates/shop/shop/shop.html @@ -7,7 +7,7 @@ -
    + {% comment %}
    @@ -21,18 +21,32 @@
    -
    +
    {% endcomment %} +
    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    -
    +

    -
    +

    Категории

    @@ -53,15 +67,15 @@
    -
    +
      • -
    • +
    • {{products_count}} Результаты
    @@ -73,7 +87,7 @@
    {% for product in products %}
    -
    +
    {% if product.discount != 0.00 %}
    @@ -94,7 +108,7 @@

    {{product.name}}

    - ${{product.price}}

    + {{product.price}} тг

    @@ -142,7 +156,7 @@

    {{product.name}}

    -
    {% if product.discount != 0.00 %}${{product.discount}}{% endif %} ${{product.price}}
    +
    {% if product.discount != 0.00 %}{{product.discount}}тг{% endif %} {{product.price}}тг

    {{product.description}}.

    @@ -162,11 +176,11 @@
    -
    +
    {% if products.has_other_pages %}
      {% if products.has_previous %} -
      • +
      • {% else %}
      • {% endif %} @@ -175,12 +189,12 @@ {% if products.number == x %}
    • {{x}}
      • {% else %} -
    • {{x}}
      • +
    • {{x}}
      • {% endif %} {% endfor %} {% if products.has_next %} -
      • +
      • {% else %}
      • {% endif %}