From 3bcadd5054dcdbf6ac89c185baeb763a8f3799d2 Mon Sep 17 00:00:00 2001 From: Denis1505 Date: Fri, 8 Jul 2022 18:55:53 +0300 Subject: [PATCH 1/5] [#H21].(start) --- .../Telegram/Telegram/Telegram/__init__.py | 0 .../Telegram/Telegram/Telegram/asgi.py | 16 +++ .../Telegram/Telegram/Telegram/settings.py | 128 ++++++++++++++++++ .../Telegram/Telegram/Telegram/urls.py | 22 +++ .../Telegram/Telegram/Telegram/wsgi.py | 16 +++ .../Telegram/Telegram/manage.py | 22 +++ .../Telegram/Telegram/products/__init__.py | 0 .../Telegram/Telegram/products/admin.py | 3 + .../Telegram/Telegram/products/apps.py | 6 + .../products/migrations/0001_initial.py | 41 ++++++ .../Telegram/products/migrations/__init__.py | 0 .../Telegram/Telegram/products/models.py | 18 +++ .../Telegram/products/templates/products.html | 10 ++ .../products/templates/products/product.html | 14 ++ .../templates/products/products_detail.html | 8 ++ .../Telegram/Telegram/products/tests.py | 3 + .../Telegram/Telegram/products/urls.py | 7 + .../Telegram/Telegram/products/views.py | 10 ++ 18 files changed, 324 insertions(+) create mode 100644 Shops/sport_atribute_shop/Telegram/Telegram/Telegram/__init__.py create mode 100644 Shops/sport_atribute_shop/Telegram/Telegram/Telegram/asgi.py create mode 100644 Shops/sport_atribute_shop/Telegram/Telegram/Telegram/settings.py create mode 100644 Shops/sport_atribute_shop/Telegram/Telegram/Telegram/urls.py create mode 100644 Shops/sport_atribute_shop/Telegram/Telegram/Telegram/wsgi.py create mode 100644 Shops/sport_atribute_shop/Telegram/Telegram/manage.py create mode 100644 Shops/sport_atribute_shop/Telegram/Telegram/products/__init__.py create mode 100644 Shops/sport_atribute_shop/Telegram/Telegram/products/admin.py create mode 100644 Shops/sport_atribute_shop/Telegram/Telegram/products/apps.py create mode 100644 Shops/sport_atribute_shop/Telegram/Telegram/products/migrations/0001_initial.py create mode 100644 Shops/sport_atribute_shop/Telegram/Telegram/products/migrations/__init__.py create mode 100644 Shops/sport_atribute_shop/Telegram/Telegram/products/models.py create mode 100644 Shops/sport_atribute_shop/Telegram/Telegram/products/templates/products.html create mode 100644 Shops/sport_atribute_shop/Telegram/Telegram/products/templates/products/product.html create mode 100644 Shops/sport_atribute_shop/Telegram/Telegram/products/templates/products/products_detail.html create mode 100644 Shops/sport_atribute_shop/Telegram/Telegram/products/tests.py create mode 100644 Shops/sport_atribute_shop/Telegram/Telegram/products/urls.py create mode 100644 Shops/sport_atribute_shop/Telegram/Telegram/products/views.py diff --git a/Shops/sport_atribute_shop/Telegram/Telegram/Telegram/__init__.py b/Shops/sport_atribute_shop/Telegram/Telegram/Telegram/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/Shops/sport_atribute_shop/Telegram/Telegram/Telegram/asgi.py b/Shops/sport_atribute_shop/Telegram/Telegram/Telegram/asgi.py new file mode 100644 index 0000000..a301099 --- /dev/null +++ b/Shops/sport_atribute_shop/Telegram/Telegram/Telegram/asgi.py @@ -0,0 +1,16 @@ +""" +ASGI config for Telegram project. + +It exposes the ASGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/4.0/howto/deployment/asgi/ +""" + +import os + +from django.core.asgi import get_asgi_application + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'Telegram.settings') + +application = get_asgi_application() diff --git a/Shops/sport_atribute_shop/Telegram/Telegram/Telegram/settings.py b/Shops/sport_atribute_shop/Telegram/Telegram/Telegram/settings.py new file mode 100644 index 0000000..a6fd789 --- /dev/null +++ b/Shops/sport_atribute_shop/Telegram/Telegram/Telegram/settings.py @@ -0,0 +1,128 @@ +""" +Django settings for Telegram project. + +Generated by 'django-admin startproject' using Django 4.0.6. + +For more information on this file, see +https://docs.djangoproject.com/en/4.0/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/4.0/ref/settings/ +""" + +from pathlib import Path + +# Build paths inside the project like this: BASE_DIR / 'subdir'. +BASE_DIR = Path(__file__).resolve().parent.parent + + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/4.0/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = 'django-insecure-@7vb_0!-#i$g2d_p)s5d4zb7gj856+%6%p1)=3yqcx0l^y^rak' + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = True + +ALLOWED_HOSTS = [] + + +# Application definition + +INSTALLED_APPS = [ + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', + 'products', +] + +MIDDLEWARE = [ + 'django.middleware.security.SecurityMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', +] + +ROOT_URLCONF = 'Telegram.urls' + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + }, + }, +] + +WSGI_APPLICATION = 'Telegram.wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/4.0/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.postgresql_psycopg2', + 'NAME': 'sport_atribute_shop', + 'USER': 'postgres', + 'PASSWORD': 'ghbdtn', + 'HOST': 'localhost', + 'PORT': '5432', + } +} + + +# Password validation +# https://docs.djangoproject.com/en/4.0/ref/settings/#auth-password-validators + +AUTH_PASSWORD_VALIDATORS = [ + { + 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', + }, +] + + +# Internationalization +# https://docs.djangoproject.com/en/4.0/topics/i18n/ + +LANGUAGE_CODE = 'en-us' + +TIME_ZONE = 'UTC' + +USE_I18N = True + +USE_TZ = True + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/4.0/howto/static-files/ + +STATIC_URL = 'static/' + +# Default primary key field type +# https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field + +DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' diff --git a/Shops/sport_atribute_shop/Telegram/Telegram/Telegram/urls.py b/Shops/sport_atribute_shop/Telegram/Telegram/Telegram/urls.py new file mode 100644 index 0000000..b789c5d --- /dev/null +++ b/Shops/sport_atribute_shop/Telegram/Telegram/Telegram/urls.py @@ -0,0 +1,22 @@ +"""Telegram URL Configuration + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/4.0/topics/http/urls/ +Examples: +Function views + 1. Add an import: from my_app import views + 2. Add a URL to urlpatterns: path('', views.home, name='home') +Class-based views + 1. Add an import: from other_app.views import Home + 2. Add a URL to urlpatterns: path('', Home.as_view(), name='home') +Including another URLconf + 1. Import the include() function: from django.urls import include, path + 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) +""" +from django.contrib import admin +from django.urls import path, include + +urlpatterns = [ + path('admin/', admin.site.urls), + path('', include('products.urls')) +] diff --git a/Shops/sport_atribute_shop/Telegram/Telegram/Telegram/wsgi.py b/Shops/sport_atribute_shop/Telegram/Telegram/Telegram/wsgi.py new file mode 100644 index 0000000..60ce55e --- /dev/null +++ b/Shops/sport_atribute_shop/Telegram/Telegram/Telegram/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for Telegram project. + +It exposes the WSGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/4.0/howto/deployment/wsgi/ +""" + +import os + +from django.core.wsgi import get_wsgi_application + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'Telegram.settings') + +application = get_wsgi_application() diff --git a/Shops/sport_atribute_shop/Telegram/Telegram/manage.py b/Shops/sport_atribute_shop/Telegram/Telegram/manage.py new file mode 100644 index 0000000..f726b55 --- /dev/null +++ b/Shops/sport_atribute_shop/Telegram/Telegram/manage.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +"""Django's command-line utility for administrative tasks.""" +import os +import sys + + +def main(): + """Run administrative tasks.""" + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'Telegram.settings') + try: + from django.core.management import execute_from_command_line + except ImportError as exc: + raise ImportError( + "Couldn't import Django. Are you sure it's installed and " + "available on your PYTHONPATH environment variable? Did you " + "forget to activate a virtual environment?" + ) from exc + execute_from_command_line(sys.argv) + + +if __name__ == '__main__': + main() diff --git a/Shops/sport_atribute_shop/Telegram/Telegram/products/__init__.py b/Shops/sport_atribute_shop/Telegram/Telegram/products/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/Shops/sport_atribute_shop/Telegram/Telegram/products/admin.py b/Shops/sport_atribute_shop/Telegram/Telegram/products/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/Shops/sport_atribute_shop/Telegram/Telegram/products/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/Shops/sport_atribute_shop/Telegram/Telegram/products/apps.py b/Shops/sport_atribute_shop/Telegram/Telegram/products/apps.py new file mode 100644 index 0000000..145a2ac --- /dev/null +++ b/Shops/sport_atribute_shop/Telegram/Telegram/products/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class ProductsConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'products' diff --git a/Shops/sport_atribute_shop/Telegram/Telegram/products/migrations/0001_initial.py b/Shops/sport_atribute_shop/Telegram/Telegram/products/migrations/0001_initial.py new file mode 100644 index 0000000..d13639f --- /dev/null +++ b/Shops/sport_atribute_shop/Telegram/Telegram/products/migrations/0001_initial.py @@ -0,0 +1,41 @@ +# Generated by Django 4.0.6 on 2022-07-05 14:39 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Manufacturer', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=50)), + ], + ), + migrations.CreateModel( + name='Teg', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=50)), + ], + ), + migrations.CreateModel( + name='Product', + fields=[ + ('name', models.CharField(max_length=50)), + ('description', models.CharField(max_length=200)), + ('amount', models.PositiveIntegerField(default=1)), + ('cost', models.PositiveIntegerField()), + ('id', models.UUIDField(primary_key=True, serialize=False)), + ('manufacturer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='products.manufacturer')), + ('teg', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='products.teg')), + ], + ), + ] diff --git a/Shops/sport_atribute_shop/Telegram/Telegram/products/migrations/__init__.py b/Shops/sport_atribute_shop/Telegram/Telegram/products/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/Shops/sport_atribute_shop/Telegram/Telegram/products/models.py b/Shops/sport_atribute_shop/Telegram/Telegram/products/models.py new file mode 100644 index 0000000..9b7ba06 --- /dev/null +++ b/Shops/sport_atribute_shop/Telegram/Telegram/products/models.py @@ -0,0 +1,18 @@ +from django.db import models + +# Create your models here. +class Manufacturer(models.Model): + name = models.CharField(max_length=50) + +class Teg(models.Model): + name = models.CharField(max_length=50) + +class Product(models.Model): + name = models.CharField(max_length=50, null=False) + description = models.CharField(max_length=200) + amount = models.PositiveIntegerField(default=1) + cost = models.PositiveIntegerField(null=False) + manufacturer = models.ForeignKey(Manufacturer, on_delete=models.CASCADE, null=False) + id = models.UUIDField(primary_key=True) + teg = models.ForeignKey(Teg, on_delete=models.CASCADE, null=False) + diff --git a/Shops/sport_atribute_shop/Telegram/Telegram/products/templates/products.html b/Shops/sport_atribute_shop/Telegram/Telegram/products/templates/products.html new file mode 100644 index 0000000..9224df8 --- /dev/null +++ b/Shops/sport_atribute_shop/Telegram/Telegram/products/templates/products.html @@ -0,0 +1,10 @@ + + + {% block title %} Default title {% endblock %} + + +
+ {% block content %} {% endblock %} +
+ + \ No newline at end of file diff --git a/Shops/sport_atribute_shop/Telegram/Telegram/products/templates/products/product.html b/Shops/sport_atribute_shop/Telegram/Telegram/products/templates/products/product.html new file mode 100644 index 0000000..485f726 --- /dev/null +++ b/Shops/sport_atribute_shop/Telegram/Telegram/products/templates/products/product.html @@ -0,0 +1,14 @@ +{% extends "base.html" %} + +{% block title %} Products {% endblock %} +{% block content %} + + + +{% endblock %} \ No newline at end of file diff --git a/Shops/sport_atribute_shop/Telegram/Telegram/products/templates/products/products_detail.html b/Shops/sport_atribute_shop/Telegram/Telegram/products/templates/products/products_detail.html new file mode 100644 index 0000000..6a90bb4 --- /dev/null +++ b/Shops/sport_atribute_shop/Telegram/Telegram/products/templates/products/products_detail.html @@ -0,0 +1,8 @@ +{% extends "base.html" %} +{% block title %} Overview {% endblock %} +{% block content %} + +

{{ title }}

+

{{ description }}

+ +{% endblock %} diff --git a/Shops/sport_atribute_shop/Telegram/Telegram/products/tests.py b/Shops/sport_atribute_shop/Telegram/Telegram/products/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/Shops/sport_atribute_shop/Telegram/Telegram/products/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/Shops/sport_atribute_shop/Telegram/Telegram/products/urls.py b/Shops/sport_atribute_shop/Telegram/Telegram/products/urls.py new file mode 100644 index 0000000..5928824 --- /dev/null +++ b/Shops/sport_atribute_shop/Telegram/Telegram/products/urls.py @@ -0,0 +1,7 @@ +from django.urls import path +from .views import add_product + + +urlpatterns = [ + path('', view=add_product) +] diff --git a/Shops/sport_atribute_shop/Telegram/Telegram/products/views.py b/Shops/sport_atribute_shop/Telegram/Telegram/products/views.py new file mode 100644 index 0000000..4a7b7b1 --- /dev/null +++ b/Shops/sport_atribute_shop/Telegram/Telegram/products/views.py @@ -0,0 +1,10 @@ +from django.shortcuts import render +from .models import Product +# Create your views here. + +def add_product(request): + products = Product.objects.all() + description = { + "products": products + } + return render(request, "products/products.html", description) From 8a791d0f2984f76651f3798699c04b5b2ed7a057 Mon Sep 17 00:00:00 2001 From: Denis1505 Date: Tue, 12 Jul 2022 18:57:31 +0300 Subject: [PATCH 2/5] [#H21].(start project) --- .../Telegram/Telegram/products/admin_bot.py | 16 ++++++++++++++++ .../migrations/0002_alter_product_id.py | 19 +++++++++++++++++++ .../Telegram/Telegram/templates/products.html | 12 ++++++++++++ .../templates/products/products_detail.html | 19 +++++++++++++++++++ 4 files changed, 66 insertions(+) create mode 100644 Shops/sport_atribute_shop/Telegram/Telegram/products/admin_bot.py create mode 100644 Shops/sport_atribute_shop/Telegram/Telegram/products/migrations/0002_alter_product_id.py create mode 100644 Shops/sport_atribute_shop/Telegram/Telegram/templates/products.html create mode 100644 Shops/sport_atribute_shop/Telegram/Telegram/templates/products/products_detail.html diff --git a/Shops/sport_atribute_shop/Telegram/Telegram/products/admin_bot.py b/Shops/sport_atribute_shop/Telegram/Telegram/products/admin_bot.py new file mode 100644 index 0000000..40ae72a --- /dev/null +++ b/Shops/sport_atribute_shop/Telegram/Telegram/products/admin_bot.py @@ -0,0 +1,16 @@ +import telebot + + +# Создаем экземпляр бота +bot = telebot.TeleBot('5534490508:AAFzDe0bzRBjE-PYZ1W1wdNqRp0XCwZxOEM') +# Функция, обрабатывающая команду /start +@bot.message_handler(commands=["start"]) +def start(massage): + bot.send_message(massage.chat.id, 'Привет, какие продукты ты хочешь добавить?') +# Получение сообщений от юзера +@bot.message_handler(content_types=["text"]) +def handle_text(message): + bot.send_message(message.chat.id, 'Вы написали: ' + message.text) + +# Запускаем бота +bot.polling(none_stop=True, interval=0) \ No newline at end of file diff --git a/Shops/sport_atribute_shop/Telegram/Telegram/products/migrations/0002_alter_product_id.py b/Shops/sport_atribute_shop/Telegram/Telegram/products/migrations/0002_alter_product_id.py new file mode 100644 index 0000000..1d0f485 --- /dev/null +++ b/Shops/sport_atribute_shop/Telegram/Telegram/products/migrations/0002_alter_product_id.py @@ -0,0 +1,19 @@ +# Generated by Django 4.0.6 on 2022-07-09 14:52 + +from django.db import migrations, models +import uuid + + +class Migration(migrations.Migration): + + dependencies = [ + ('products', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='product', + name='id', + field=models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False), + ), + ] diff --git a/Shops/sport_atribute_shop/Telegram/Telegram/templates/products.html b/Shops/sport_atribute_shop/Telegram/Telegram/templates/products.html new file mode 100644 index 0000000..47138a3 --- /dev/null +++ b/Shops/sport_atribute_shop/Telegram/Telegram/templates/products.html @@ -0,0 +1,12 @@ + + + + + {% block title %} Default title {% endblock %} + + +
+ {% block content %} {% endblock %} +
+ + \ No newline at end of file diff --git a/Shops/sport_atribute_shop/Telegram/Telegram/templates/products/products_detail.html b/Shops/sport_atribute_shop/Telegram/Telegram/templates/products/products_detail.html new file mode 100644 index 0000000..fd3b057 --- /dev/null +++ b/Shops/sport_atribute_shop/Telegram/Telegram/templates/products/products_detail.html @@ -0,0 +1,19 @@ +{% extends 'products.html' %} + +{% block title %} Продукты {% endblock %} + +{% block content %} + \ No newline at end of file From 42987a151631ce92d9cd305a4e8183eb40c9c209 Mon Sep 17 00:00:00 2001 From: Denis1505 Date: Tue, 12 Jul 2022 19:00:29 +0300 Subject: [PATCH 3/5] [#H21].(start project) --- .../Telegram/Telegram/Telegram/settings.py | 4 +++- .../Telegram/Telegram/Telegram/urls.py | 2 +- .../Telegram/Telegram/products/models.py | 4 ++-- .../Telegram/products/templates/products.html | 10 ---------- .../products/templates/products/product.html | 14 -------------- .../templates/products/products_detail.html | 8 -------- .../Telegram/Telegram/products/urls.py | 4 ++-- .../Telegram/Telegram/products/views.py | 11 ++++++----- 8 files changed, 14 insertions(+), 43 deletions(-) delete mode 100644 Shops/sport_atribute_shop/Telegram/Telegram/products/templates/products.html delete mode 100644 Shops/sport_atribute_shop/Telegram/Telegram/products/templates/products/product.html delete mode 100644 Shops/sport_atribute_shop/Telegram/Telegram/products/templates/products/products_detail.html diff --git a/Shops/sport_atribute_shop/Telegram/Telegram/Telegram/settings.py b/Shops/sport_atribute_shop/Telegram/Telegram/Telegram/settings.py index a6fd789..58ab864 100644 --- a/Shops/sport_atribute_shop/Telegram/Telegram/Telegram/settings.py +++ b/Shops/sport_atribute_shop/Telegram/Telegram/Telegram/settings.py @@ -52,10 +52,12 @@ ROOT_URLCONF = 'Telegram.urls' +TEMPLATES_PATH = BASE_DIR.joinpath('templates') + TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [], + 'DIRS': [TEMPLATES_PATH], 'APP_DIRS': True, 'OPTIONS': { 'context_processors': [ diff --git a/Shops/sport_atribute_shop/Telegram/Telegram/Telegram/urls.py b/Shops/sport_atribute_shop/Telegram/Telegram/Telegram/urls.py index b789c5d..b65f970 100644 --- a/Shops/sport_atribute_shop/Telegram/Telegram/Telegram/urls.py +++ b/Shops/sport_atribute_shop/Telegram/Telegram/Telegram/urls.py @@ -18,5 +18,5 @@ urlpatterns = [ path('admin/', admin.site.urls), - path('', include('products.urls')) + path('products/', include('products.urls')) ] diff --git a/Shops/sport_atribute_shop/Telegram/Telegram/products/models.py b/Shops/sport_atribute_shop/Telegram/Telegram/products/models.py index 9b7ba06..110cb6b 100644 --- a/Shops/sport_atribute_shop/Telegram/Telegram/products/models.py +++ b/Shops/sport_atribute_shop/Telegram/Telegram/products/models.py @@ -1,5 +1,5 @@ from django.db import models - +import uuid # Create your models here. class Manufacturer(models.Model): name = models.CharField(max_length=50) @@ -13,6 +13,6 @@ class Product(models.Model): amount = models.PositiveIntegerField(default=1) cost = models.PositiveIntegerField(null=False) manufacturer = models.ForeignKey(Manufacturer, on_delete=models.CASCADE, null=False) - id = models.UUIDField(primary_key=True) + id = models.UUIDField(primary_key=True, default=uuid.uuid4) teg = models.ForeignKey(Teg, on_delete=models.CASCADE, null=False) diff --git a/Shops/sport_atribute_shop/Telegram/Telegram/products/templates/products.html b/Shops/sport_atribute_shop/Telegram/Telegram/products/templates/products.html deleted file mode 100644 index 9224df8..0000000 --- a/Shops/sport_atribute_shop/Telegram/Telegram/products/templates/products.html +++ /dev/null @@ -1,10 +0,0 @@ - - - {% block title %} Default title {% endblock %} - - -
- {% block content %} {% endblock %} -
- - \ No newline at end of file diff --git a/Shops/sport_atribute_shop/Telegram/Telegram/products/templates/products/product.html b/Shops/sport_atribute_shop/Telegram/Telegram/products/templates/products/product.html deleted file mode 100644 index 485f726..0000000 --- a/Shops/sport_atribute_shop/Telegram/Telegram/products/templates/products/product.html +++ /dev/null @@ -1,14 +0,0 @@ -{% extends "base.html" %} - -{% block title %} Products {% endblock %} -{% block content %} - -
    - {% for product in products %} -
  • -

    {{product.product_name}} {{product.description}} - {{product.price}}

    -
    • - {% endfor %} -
- -{% endblock %} \ No newline at end of file diff --git a/Shops/sport_atribute_shop/Telegram/Telegram/products/templates/products/products_detail.html b/Shops/sport_atribute_shop/Telegram/Telegram/products/templates/products/products_detail.html deleted file mode 100644 index 6a90bb4..0000000 --- a/Shops/sport_atribute_shop/Telegram/Telegram/products/templates/products/products_detail.html +++ /dev/null @@ -1,8 +0,0 @@ -{% extends "base.html" %} -{% block title %} Overview {% endblock %} -{% block content %} - -

{{ title }}

-

{{ description }}

- -{% endblock %} diff --git a/Shops/sport_atribute_shop/Telegram/Telegram/products/urls.py b/Shops/sport_atribute_shop/Telegram/Telegram/products/urls.py index 5928824..ee3d8b9 100644 --- a/Shops/sport_atribute_shop/Telegram/Telegram/products/urls.py +++ b/Shops/sport_atribute_shop/Telegram/Telegram/products/urls.py @@ -1,7 +1,7 @@ from django.urls import path -from .views import add_product +from .views import get_products urlpatterns = [ - path('', view=add_product) + path('', view=get_products) ] diff --git a/Shops/sport_atribute_shop/Telegram/Telegram/products/views.py b/Shops/sport_atribute_shop/Telegram/Telegram/products/views.py index 4a7b7b1..d3e40e2 100644 --- a/Shops/sport_atribute_shop/Telegram/Telegram/products/views.py +++ b/Shops/sport_atribute_shop/Telegram/Telegram/products/views.py @@ -1,10 +1,11 @@ from django.shortcuts import render from .models import Product +from .models import Manufacturer +from .models import Teg # Create your views here. -def add_product(request): - products = Product.objects.all() - description = { +def get_products(request): + products = Product.objects.all() + return render(request, "products/products_detail.html", { "products": products - } - return render(request, "products/products.html", description) + }) From 835c70a3b2002aae664b8a6e00af048be4ac3242 Mon Sep 17 00:00:00 2001 From: Denis1505 Date: Wed, 13 Jul 2022 16:22:13 +0300 Subject: [PATCH 4/5] [#H21].(models many) --- Shops/sport_atribute_shop/Telegram/Telegram/products/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Shops/sport_atribute_shop/Telegram/Telegram/products/models.py b/Shops/sport_atribute_shop/Telegram/Telegram/products/models.py index 110cb6b..e90b930 100644 --- a/Shops/sport_atribute_shop/Telegram/Telegram/products/models.py +++ b/Shops/sport_atribute_shop/Telegram/Telegram/products/models.py @@ -14,5 +14,5 @@ class Product(models.Model): cost = models.PositiveIntegerField(null=False) manufacturer = models.ForeignKey(Manufacturer, on_delete=models.CASCADE, null=False) id = models.UUIDField(primary_key=True, default=uuid.uuid4) - teg = models.ForeignKey(Teg, on_delete=models.CASCADE, null=False) + teg = models.ManyToManyField(Teg) From 97d19d3d746f948368fe95e80ca244d9da0b9782 Mon Sep 17 00:00:00 2001 From: Denis1505 Date: Wed, 13 Jul 2022 19:49:42 +0300 Subject: [PATCH 5/5] [#H21].(Get manytomany) --- .../0003_remove_product_teg_product_teg.py | 22 ++++++++++++++++++ .../Telegram/Telegram/products/models.py | 7 ++++++ .../Telegram/Telegram/products/urls.py | 5 ++-- .../Telegram/Telegram/products/views.py | 23 +++++++++++++++++++ 4 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 Shops/sport_atribute_shop/Telegram/Telegram/products/migrations/0003_remove_product_teg_product_teg.py diff --git a/Shops/sport_atribute_shop/Telegram/Telegram/products/migrations/0003_remove_product_teg_product_teg.py b/Shops/sport_atribute_shop/Telegram/Telegram/products/migrations/0003_remove_product_teg_product_teg.py new file mode 100644 index 0000000..82b3035 --- /dev/null +++ b/Shops/sport_atribute_shop/Telegram/Telegram/products/migrations/0003_remove_product_teg_product_teg.py @@ -0,0 +1,22 @@ +# Generated by Django 4.0.6 on 2022-07-13 13:57 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('products', '0002_alter_product_id'), + ] + + operations = [ + migrations.RemoveField( + model_name='product', + name='teg', + ), + migrations.AddField( + model_name='product', + name='teg', + field=models.ManyToManyField(to='products.teg'), + ), + ] diff --git a/Shops/sport_atribute_shop/Telegram/Telegram/products/models.py b/Shops/sport_atribute_shop/Telegram/Telegram/products/models.py index e90b930..459bc04 100644 --- a/Shops/sport_atribute_shop/Telegram/Telegram/products/models.py +++ b/Shops/sport_atribute_shop/Telegram/Telegram/products/models.py @@ -4,9 +4,14 @@ class Manufacturer(models.Model): name = models.CharField(max_length=50) + def __str__(self): + return self.name + class Teg(models.Model): name = models.CharField(max_length=50) + def __str__(self): + return self.name class Product(models.Model): name = models.CharField(max_length=50, null=False) description = models.CharField(max_length=200) @@ -16,3 +21,5 @@ class Product(models.Model): id = models.UUIDField(primary_key=True, default=uuid.uuid4) teg = models.ManyToManyField(Teg) + def __str__(self): + return self.name \ No newline at end of file diff --git a/Shops/sport_atribute_shop/Telegram/Telegram/products/urls.py b/Shops/sport_atribute_shop/Telegram/Telegram/products/urls.py index ee3d8b9..94c90c9 100644 --- a/Shops/sport_atribute_shop/Telegram/Telegram/products/urls.py +++ b/Shops/sport_atribute_shop/Telegram/Telegram/products/urls.py @@ -1,7 +1,8 @@ from django.urls import path -from .views import get_products +from .views import get_products, filter_price urlpatterns = [ - path('', view=get_products) + path('', view=get_products), + path('filter/', view=filter_price) ] diff --git a/Shops/sport_atribute_shop/Telegram/Telegram/products/views.py b/Shops/sport_atribute_shop/Telegram/Telegram/products/views.py index d3e40e2..a3d9495 100644 --- a/Shops/sport_atribute_shop/Telegram/Telegram/products/views.py +++ b/Shops/sport_atribute_shop/Telegram/Telegram/products/views.py @@ -1,3 +1,4 @@ +from math import prod from django.shortcuts import render from .models import Product from .models import Manufacturer @@ -9,3 +10,25 @@ def get_products(request): return render(request, "products/products_detail.html", { "products": products }) + + +def get_teg(product): + product = list(Product.objects.all()) + for i in range(): + temp_product = [product.pop(0) for i in range(10)] + teg = Teg.objects.create(name=f"Teg{i+1}") + teg.product.set(temp_product) + teg.save() + +def get_teg(): + products = Product.objects.all() + tegs = list(Teg.objects.all()) + for product in products: + product.teg.set(tegs) + product.save() + +def filter_price(request): + all_price = Product.objects.filter(cost) + return render(request, "products/products_detail.html", { + "products": all_price + }) \ No newline at end of file