Merge branch 'module-figma' of blezz-tech/sharix-open-landing into module-figma

admin.py

@@ -1,13 +1,16 @@
 from django.contrib import admin
+
 from landing.models import *
 from landing.utils import create_pages_clean_admin
 
+
 @admin.register(LandingPage)
 class LandingPageAdmin(admin.ModelAdmin):
     list_display = ('title', 'slug')
     actions = [create_pages_clean_admin]
 
+
 @admin.register(FAQmodel)
 class LandingPageAdmin(admin.ModelAdmin):
     list_display = ('question',)
-#admin.site.register(LandingPage)
+# admin.site.register(LandingPage)

forms.py

@@ -1,12 +1,18 @@
-from django import forms
 import datetime
 
+from django import forms
+
+
 class MyForm(forms.Form):
-    name = forms.CharField(label="", widget=forms.TextInput(attrs={'class':'form-control', 'placeholder':'Имя', 'id':'sendemailname'}))
-    email = forms.CharField(label="", widget=forms.TextInput(attrs={'class':'form-control', 'placeholder':'Email', 'type':'email', 'id':'sendemailemail'}))
-    message = forms.CharField(label="", widget=forms.Textarea(attrs={'class':'form-control', 'placeholder':'Сообщение', 'rows':'3', 'id':'sendemailmessage'}))
+    name = forms.CharField(label="", widget=forms.TextInput(
+        attrs={'class': 'form-control', 'placeholder': 'Имя', 'id': 'sendemailname'}))
+    email = forms.CharField(label="", widget=forms.TextInput(
+        attrs={'class': 'form-control', 'placeholder': 'Email', 'type': 'email', 'id': 'sendemailemail'}))
+    message = forms.CharField(label="", widget=forms.Textarea(
+        attrs={'class': 'form-control', 'placeholder': 'Сообщение', 'rows': '3', 'id': 'sendemailmessage'}))
 
-SERVICE_CHOICES =(
+
+SERVICE_CHOICES = (
     (0, "xxxxxxxxxxxxxxxxxxxxxxxxxxxx"),
     (1, "xxxxxxxxxxxxxxxxxxxxxxxx"),
     (2, "xxxxxxxxxxxxxxxxxx"),
@@ -23,10 +29,51 @@ service_errors = {
     'required': 'Выберите хотя бы одну услугу.',
     'invalid': 'Выберите хотя бы одну услугу.'
 }
+
+
 class OrderForm(forms.Form):
-    name = forms.CharField(label="", widget=forms.TextInput(attrs={'class':'form-control', 'placeholder':'Имя'}))
-    surname = forms.CharField(label="", widget=forms.TextInput(attrs={'class':'form-control', 'placeholder':'Фамилия'}))
-    service = forms.MultipleChoiceField( required=True, choices=SERVICE_CHOICES, widget=forms.CheckboxSelectMultiple(), error_messages=service_errors)
-    datetime = forms.DateTimeField(initial=datetime.date.today, widget=forms.DateTimeInput(attrs={'type':'datetime-local', 'class':'form-control', 'placeholder':'form-control'}) )
-    phone = forms.RegexField(regex=r'^\+?1?\d{9,15}$', error_messages=number_errors, widget=forms.TextInput(attrs={'class':'form-control', 'type':'tel', 'placeholder':'+79876543210'}))
-    comment = forms.CharField(label="", required=False, widget=forms.Textarea(attrs={'class':'form-control', 'placeholder':'Комментарий', 'rows':'5'}))
+    name = forms.CharField(
+        label="",
+        widget=forms.TextInput(attrs={
+            'class': 'form-control',
+            'placeholder': 'Имя'
+        })
+    )
+    surname = forms.CharField(
+        label="",
+        widget=forms.TextInput(attrs={
+            'class': 'form-control',
+            'placeholder': 'Фамилия'
+        })
+    )
+    service = forms.MultipleChoiceField(
+        required=True,
+        choices=SERVICE_CHOICES,
+        widget=forms.CheckboxSelectMultiple(),
+        error_messages=service_errors
+    )
+    datetime = forms.DateTimeField(
+        initial=datetime.date.today,
+        widget=forms.DateTimeInput(attrs={
+            'type': 'datetime-local',
+            'class': 'form-control',
+            'placeholder': 'form-control'
+        })
+    )
+    phone = forms.RegexField(
+        regex=r'^\+?1?\d{9,15}$',
+        error_messages=number_errors,
+        widget=forms.TextInput(attrs={
+            'class': 'form-control',
+            'type': 'tel',
+            'placeholder': '+79876543210'
+        })
+    )
+    comment = forms.CharField(
+        label="",
+        required=False, widget=forms.Textarea(attrs={
+            'class': 'form-control',
+            'placeholder': 'Комментарий',
+            'rows': '5'
+        })
+    )

models.py

@@ -1,6 +1,6 @@
-from django.db import models
-from django.urls import reverse
 from ckeditor.fields import RichTextField
+from django.db import models
+
 
 class LandingPage(models.Model):
     title = models.CharField(max_length=150)
@@ -9,17 +9,18 @@ class LandingPage(models.Model):
 
     def __str__(self) -> str:
         return self.title
-    
+
     class Meta:
         verbose_name = 'Простая страница'
         verbose_name_plural = 'Простые страницы'
-    
+
+
 class FAQmodel(models.Model):
     question = models.TextField(blank=True)
     answer = models.TextField(blank=True)
 
     def __str__(self) -> str:
         return self.question
-    
+
     class Meta:
-        verbose_name = 'FAQ'
+        verbose_name = 'FAQ'

tests.py

@@ -1,3 +1 @@
-from django.test import TestCase
-
 # Create your tests here.

urls.py

@@ -1,15 +1,16 @@
-from django.urls import path, include
+from django.urls import path
+
 from .views import *
 
 urlpatterns = [
-    
-    #path('', include('django.contrib.flatpages.urls')),
+
+    # path('', include('django.contrib.flatpages.urls')),
     path('', index_html, name='main'),
     path('order/', order_html, name='order'),
     path('faq/', faq_html, name='faq'),
     path('price/', price_html, name='price'),
     path('contact/', contact_html, name='contact'),
-    #pages
+    # pages
     path('clean-car/', page_html, name='clean-car'),
     path('clean-fit/', page_html, name='clean-fit'),
     path('clean-office/', page_html, name='clean-office'),
@@ -21,8 +22,7 @@ urlpatterns = [
     path('clean-out/', page_html, name='clean-out'),
     path('clean-renovation/', page_html, name='clean-renovation'),
 
-    #path('services/<str:page>/', services_html, name="services"),
-    #path('', views.flatpage, {'url': ''}, name='about'),
-    #path('test/', views.flatpage, {'url': '/test/'}, name='test'),
+    # path('services/<str:page>/', services_html, name="services"),
+    # path('', views.flatpage, {'url': ''}, name='about'),
+    # path('test/', views.flatpage, {'url': '/test/'}, name='test'),
 ]
-

utils.py

@@ -1,7 +1,6 @@
 from landing.models import LandingPage
 
 
-
 def create_pages_clean():
     if not LandingPage.objects.filter(slug='order'):
         LandingPage.objects.create(title="Главная", slug="main", content="")
@@ -21,7 +20,9 @@ def create_pages_clean():
         LandingPage.objects.create(title="Генеральная уборка", slug="clean-out", content="")
         LandingPage.objects.create(title="Уборка после ремонта", slug="clean-renovation", content="")
 
+
 def create_pages_clean_admin(modeladmin, request, queryset):
     create_pages_clean()
 
-create_pages_clean_admin.short_description = "Созадть страницы по умолчанию"
+
+create_pages_clean_admin.short_description = "Созадть страницы по умолчанию"

views.py

@@ -1,27 +1,29 @@
-from django.shortcuts import render
-from django.http import HttpResponseRedirect
-from .models import *
-from landing.forms import *
 # Create your views here.
 from django.core.mail import EmailMessage, get_connection
+from django.http import HttpResponseRedirect
+from django.shortcuts import render
+
 import core.settings as settings
+from landing.forms import *
+from .models import *
 
 
 def send_email_mess(body, sub):
-    with get_connection(  
-        host=settings.EMAIL_HOST, 
-        port=settings.EMAIL_PORT,  
-        username=settings.EMAIL_HOST_USER, 
-        password=settings.EMAIL_HOST_PASSWORD, 
-        use_tls=settings.EMAIL_USE_TLS,
-        use_ssl=settings.EMAIL_USE_SSL
-        ) as connection:
-        #print(form.cleaned_data)
-        subject = sub  
-        email_from = settings.EMAIL_HOST_USER  
-        recipient_list = [settings.EMAIL_TO]  
-        message = body 
-        EmailMessage(subject, message, email_from, recipient_list, connection=connection).send() 
+    with get_connection(
+            host=settings.EMAIL_HOST,
+            port=settings.EMAIL_PORT,
+            username=settings.EMAIL_HOST_USER,
+            password=settings.EMAIL_HOST_PASSWORD,
+            use_tls=settings.EMAIL_USE_TLS,
+            use_ssl=settings.EMAIL_USE_SSL
+    ) as connection:
+        # print(form.cleaned_data)
+        subject = sub
+        email_from = settings.EMAIL_HOST_USER
+        recipient_list = [settings.EMAIL_TO]
+        message = body
+        EmailMessage(subject, message, email_from, recipient_list, connection=connection).send()
+
 
 def index_html(request):
     if request.POST:
@@ -39,13 +41,12 @@ def index_html(request):
     menu = LandingPage.objects.filter(slug__startswith='clean')
     context = {
         # "mainpage":LandingPage.objects.get(slug="main"),
-        "menu":menu,
-        "form":form
+        "menu": menu,
+        "form": form
     }
     return render(request, 'landing/pages/main.html', context=context)
 
 
-
 def page_html(request):
     if request.POST:
         form = MyForm(request.POST)
@@ -60,44 +61,48 @@ def page_html(request):
         if not LandingPage.objects.filter(slug__startswith='clean'):
             menu = LandingPage.objects.filter(slug__startswith='clean')
             context = {
-                "form":form
+                "form": form
             }
         else:
             context = {
-                "form":form,
-                "menu":menu
+                "form": form,
+                "menu": menu
             }
         return render(request, 'landing/pages/in_work.html', context=context)
     else:
         menu = LandingPage.objects.filter(slug__startswith='clean')
         print(menu)
         context = {
-            "mainpage":LandingPage.objects.get(slug=slug),
-            "form":form,
-            "menu":menu
+            "mainpage": LandingPage.objects.get(slug=slug),
+            "form": form,
+            "menu": menu
         }
         return render(request, 'landing/pages/simple.html', context=context)
 
+
 def send_email(request):
     if request.method == 'POST':
         print(request.POST['email'])
-    
+
     return HttpResponseRedirect('/')
 
-#simple page
+
+# simple page
 def contact_html(request):
     return render(request, 'landing/pages/contact.html')
 
+
 def price_html(request):
     return render(request, 'landing/pages/price.html')
 
+
 def order_html(request):
     if request.POST:
         form = OrderForm(request.POST)
         if form.is_valid():
             services = ""
             for item in form.cleaned_data['service']:
-                services += f"{SERVICE_CHOICES[int(item)][1]}, " 
+                services += f"{SERVICE_CHOICES[int(item)][1]}, "
             body = f"""
             Имя: {form.cleaned_data['name']}\n
             Фамилия: {form.cleaned_data['surname']}\n
@@ -110,10 +115,11 @@ def order_html(request):
     else:
         form = OrderForm()
     context = {
-            "form":form
-        }
+        "form": form
+    }
     return render(request, 'landing/pages/order.html', context)
 
+
 def faq_html(request):
     if request.POST:
         form = MyForm(request.POST)
@@ -127,10 +133,7 @@ def faq_html(request):
     else:
         form = MyForm()
     context = {
-            "form":form,
-            "faq":FAQmodel.objects.all()
-        }
+        "form": form,
+        "faq": FAQmodel.objects.all()
+    }
     return render(request, 'landing/pages/faq.html', context)
-
-
-