mitri4
/
SoftwareShop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

delete unused template

Browse Source
remotes/origin/ESHOP_refactor_products_app
FUNNYDMAN 7 years ago
parent b315ef3fe8
commit 3624239a4b
6 changed files with 64 additions and 246 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      products/models.py
  2. 6
      products/templatetags/products_filters.py
  3. 2
      products/utils.py
  4. 4
      products/views.py
  5. 33
      templates/products/categorieslist.html
  6. 200
      templates/products/list.html

1
products/models.py
Unescape View File

@ -7,7 +7,6 @@ from mptt.models import TreeForeignKey
from core.models import AbstractStatusModel, AbstractDateTimeModel, AbstractStatusMPTTModel from core.models import AbstractStatusModel, AbstractDateTimeModel, AbstractStatusMPTTModel
# ---------------------------------- COMMON PRODUCT STATUS ---------------------------------------# # ---------------------------------- COMMON PRODUCT STATUS ---------------------------------------#
# Create your models here.
STATUS_INACTIVE = 0 STATUS_INACTIVE = 0
STATUS_ACTIVE = 25 STATUS_ACTIVE = 25
STATUS_DELETED = 50 STATUS_DELETED = 50

6
products/templatetags/products_filters.py
Unescape View File

@ -15,12 +15,6 @@ def apply_nds_status(doesNdsInclude):
@register.filter @register.filter
def apply_query_params(params, doAppend=False): def apply_query_params(params, doAppend=False):
"""
:param params dict:
:param arg return as additional query params or initial:
:return string:
"""
formated_params = "" formated_params = ""
if not params: if not params:
return formated_params return formated_params

2
products/utils.py
Unescape View File

@ -2,7 +2,9 @@ from django.utils.html_parser import HTMLParser
from .models import Product from .models import Product
# @TODO: MAKE DESCTIPTION PREVIEW # @TODO: MAKE DESCTIPTION PREVIEW
class ProductDesctipionHtmlParser(HTMLParser): class ProductDesctipionHtmlParser(HTMLParser):
def __init__(self, convert_charrefs=False, **kwargs): def __init__(self, convert_charrefs=False, **kwargs):

4
products/views.py
Unescape View File

@ -1,7 +1,4 @@
from functools import reduce
from django.conf import settings from django.conf import settings
from django.urls import reverse_lazy
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.views.generic import ListView, DetailView from django.views.generic import ListView, DetailView
@ -75,7 +72,6 @@ class ProductListView(ListView):
def get_cart_add_formset(self, products): def get_cart_add_formset(self, products):
return {product.id: CartAddInlineForm(initial={'offer': product.id, 'amount': 1}) for product in products} return {product.id: CartAddInlineForm(initial={'offer': product.id, 'amount': 1}) for product in products}
def get_product_sorting_form(self): def get_product_sorting_form(self):
if not "products" in self.request.resolver_match.view_name: if not "products" in self.request.resolver_match.view_name:
product_form_action = {'viewname': 'products:product_list', 'kwarg': {}} product_form_action = {'viewname': 'products:product_list', 'kwarg': {}}

33
templates/products/categorieslist.html
Unescape View File

@ -10,7 +10,8 @@
<form class="search-form-container" action="/find/" method="get"> <form class="search-form-container" action="/find/" method="get">
<div class="form-group"> <div class="form-group">
<div class="icon-addon addon-lg"> <div class="icon-addon addon-lg">
<input type="text" placeholder="what are you looking for ?" class="form-control" name="q" id="q" autocomplete="on"> <input type="text" placeholder="what are you looking for ?" class="form-control" name="q" id="q"
autocomplete="on">
<div id="selction-ajax"></div> <div id="selction-ajax"></div>
</div> </div>
</div> </div>
@ -19,7 +20,20 @@
{% for category in categories %} {% for category in categories %}
<div class="item col-sm-4"> <div class="item col-sm-4">
<a href="{{ category.get_absolute_url }}"> <a href="{{ category.get_absolute_url }}">
<img src="{% if category.image %}{{ category.image.url }}{% else %}{% static 'img/no-image.jpg' %} {% endif %}" class="img-responsive"> <img src="
{% if category.image %}{{ category.image.url }}{% else %}{% static 'img/no-image.jpg' %} {% endif %}"
class="img-responsive">
</a> </a>
<a href="{{ category.get_absolute_url }}">{{ category.name }}</a><br> <a href="{{ category.get_absolute_url }}">{{ category.name }}</a><br>
</div> </div>
@ -27,7 +41,20 @@
{% for product in products %} {% for product in products %}
<div class="item col-sm-4"> <div class="item col-sm-4">
<a href="{{ product.get_absolute_url }}"> <a href="{{ product.get_absolute_url }}">
<img src="{% if product.image %}{{ product.image.url }}{% else %}{% static 'img/no-image.jpg' %} {% endif %}" class="img-responsive"> <img src="
{% if product.image %}{{ product.image.url }}{% else %}{% static 'img/no-image.jpg' %} {% endif %}"
class="img-responsive">
</a> </a>
<a href="{{ product.get_absolute_url }}">{{ product.name }}</a><br> <a href="{{ product.get_absolute_url }}">{{ product.name }}</a><br>
<h4 class="product-price"> <h4 class="product-price">

200
templates/products/list.html
Unescape View File

@ -1,200 +0,0 @@
{% extends 'base.html' %}
{% load static %}
{% block title %}
Producers Page
{% endblock %}
{% block content %}
<!--<div id="sidebar" class="col-sm-3">-->
<!--<h3>Categories</h3>-->
<!--<ul>-->
<!--<li {% if not category %} class="selected" {% endif %}>-->
<!--<a href="{% url 'products:ProductList' %}">All</a>-->
<!--</li>-->
<!--{% for cat in categories %}-->
<!--<li {% if category.slug == cat.slug %} class="selected" {% endif %}>-->
<!--<a href="{{ cat.get_absolute_url }}">{{ cat.name }}</a>-->
<!--{% for child in cat.get_children %}-->
<!--<a href="{{ child.get_absolute_url }}">{{ child.name }}</a>-->
<!--{% endfor %}-->
<!--</li>-->
<!--{% endfor %}-->
<!--</ul>-->
<!--</div>-->
<div class="banner">
<div class="container">
<div class="banner__content">
<img src="http://via.placeholder.com/1190x360" alt="Банер" class="img-responsive">
</div>
</div>
</div>
<div class="row">
<div class="col-4 left-menu">
<div class="">
<div class="left-menu__search">
<form action="">
<input type="text" placeholder="Поиск программы...">
<button class="left-menu__search-btn"><img src="{% static './img/search.svg' %}" alt="Поиск"></button>
</form>
</div>
<div class="left-menu__category">
<a class="left-menu__category-item" href="#">
<span class="category-item__image"><img src="{% static './img/menu/windows.svg' %}" alt=""></span>
<span class="category-item__name">Microsoft</span>
</a>
<a class="left-menu__category-item" href="#">
<span class="category-item__image"><img src="{% static './img/menu/antivirus.svg' %}" alt=""></span>
<span class="category-item__name">Антивирусы</span>
</a>
<a class="left-menu__category-item" href="#">
<span class="category-item__image"><img src="{% static './img/menu/1c.svg' %}" alt=""></span>
<span class="category-item__name">1C</span>
</a>
<a class="left-menu__category-item" href="#">
<span class="category-item__image"><img src="{% static './img/menu/graphic.svg' %}" alt=""></span>
<span class="category-item__name">Графика и видео</span>
</a>
<a class="left-menu__category-item" href="#">
<span class="category-item__image"><img src="{% static './img/menu/planning.svg' %}" alt=""></span>
<span class="category-item__name">Проектирование</span>
</a>
<a class="left-menu__category-item" href="#">
<span class="category-item__image"><img src="{% static './img/menu/office.svg' %}" alt=""></span>
<span class="category-item__name">Офисный программы</span>
</a>
<a class="left-menu__category-item" href="#">
<span class="category-item__image"><img src="{% static './img/menu/save.svg' %}" alt=""></span>
<span class="category-item__name">Резервное копирование</span>
</a>
<a class="left-menu__category-item" href="#">
<span class="category-item__image"><img src="{% static './img/menu/virtualization.svg' %}" alt=""></span>
<span class="category-item__name">Виртуализация</span>
</a>
</div>
<div class="left-menu__contact">
<form action="">
<div class="left-menu__title">Не нашли нужную программу
или разработчика?
Заполните форму и с Вами
свяжется наш специалист.
</div>
<input class="left-menu__text" type="text" placeholder="Имя">
<input class="left-menu__text" type="text" placeholder="Название продукта">
<input class="left-menu__text" type="text" placeholder="E-mail">
<input class="left-menu__text" type="text" placeholder="Номер телефона">
<button class="left-menu__btn">Отправить</button>
</form>
</div>
</div>
</div>
<div class="col-lg-8 col-md-12">
<div class="content">
<div class="content__menu">
<div class="row">
<div class="col-5 d-flex justify-content-start align-items-center">
<button id="content__category-btn" class="content__menu-btn">Разделы сайта</button>
</div>
<div class="col-7 justify-content-center">
<div class="content__search">
<form action="">
<input type="text" placeholder="Поиск программы...">
<button class="content__search-btn"><img src="{% static './img/search.svg' %}" alt="Поиск">
</button>
</form>
</div>
</div>
</div>
</div>
<div class="content__category">
<ul class="content__category-list">
<li><a href="#">Microsoft</a></li>
<li><a href="#">Антивирусы</a></li>
<li><a href="#">1C</a></li>
<li><a href="#">Графика и видео</a></li>
<li><a href="#">Проектирование</a></li>
<li><a href="#">Офисные программы</a></li>
<li><a href="#">Резервное копирование</a></li>
<li><a href="#">Виртуализация</a></li>
</ul>
</div>
<div class="content__banner align-items-center">
<div class="banner__close">
<button><img src="{% static './img/close.svg' %}" alt=""></button>
</div>
<div class="banner__info">
<div class="banner__title">Узнать подробнее о бонусных баллах
и заработке на приглашенных друзьях.
</div>
<div class="banner__btn">
<a href="#" class="banner__link">Узнать подробнее</a>
</div>
</div>
<div class="banner__image"><img src="{%static './img/coins.png' %}" alt=""></div>
</div>
<div class="content__title">Выбор ПО по разработчику</div>
<div class="selectPO">
<div class="selectPO__list">
<div class="selectPO__item">
<a href="#"><img src="{% static 'img/po_create/1c.png' %}" alt=""></a>
</div>
<div class="selectPO__item">
<a href="#"><img src="{% static 'img/po_create/avast.png' %}" alt=""></a>
</div>
<div class="selectPO__item">
<a href="#"><img src="{% static 'img/po_create/corel.png' %}" alt=""></a>
</div>
<div class="selectPO__item">
<a href="#"><img src="{% static 'img/po_create/roadmin.png' %}" alt=""></a>
</div>
<div class="selectPO__item">
<a href="#"><img src="{% static 'img/po_create/mcAfee.png' %}" alt=""></a>
</div>
<div class="selectPO__item">
<a href="#"><img src="{% static 'img/po_create/veeam.png' %}" alt=""></a>
</div>
</div>
</div>
<div class="content__title">Наши клиенты</div>
<div class="clients">
<ul class="clients__list">
<li><a href="#"><img src="{% static 'img/po_create/kerio.png' %}" alt=""></a></li>
<li><a href="#"><img src="{% static 'img/po_create/roadmin.png' %}" alt=""></a></li>
<li><a href="#"><img src="{% static 'img/po_create/eset.png' %}" alt=""></a></li>
</ul>
</div>
<div class="content__title">Наши сертефикаты</div>
<div class="certificate__list">
<a href="{% static './img/license/1.jpg' %}" class="certificate__item"><img src="{% static './img/lin_test.png' %}" alt=""></a>
<a href="{% static './img/license/2.jpg' %}" class="certificate__item"><img src="{% static './img/lin_test.png' %}" alt=""></a>
</div>
</div>
</div>
</div>
<!--
<div id="main" class="product_list col-sm-9">
<form class="search-form-container" action="/find/" method="get" >
<div class="form-group">
<div class="icon-addon addon-lg">
<input type="text" placeholder="what are you looking for ?" class="form-control" name="q" id="q" autocomplete="on">
<div id="selction-ajax"></div>
</div>
</div>
</form>
<table class="ItemsRow">
<tbody>
{% for producer in producers %}
{% cycle '<tr>' '' '' '' %}
<td>
<a href="{{ producer.get_absolute_url }}">
<img src="{% if producer.image %}{{ producer.image.url }}{% else %}{% static 'img/no-image.jpg' %} {% endif %}" class="img-responsive">
</a>
</td>
{% cycle '' '' '' '</tr>' %}
{% endfor %}
</tbody>
</table>
</div>-->
{% endblock %}
Write Preview
Loading…
Cancel
Save