django-hero-gen 1.1.1 → 1.1.2

package/index.js

@@ -15,6 +15,8 @@ const actions = {
   auth: cmds.makeAuth, // вьюхи логина/регистрации
   orders: cmds.makeOrders, // Теперь эта команда будет работать
   admin: cmds.makeAdmin,
+  modelsOrders: cmds.makeModelOrders,
+  modelsUser: cmds.makeModelUser,
 
   // Полная сборка
   init: cmds.initFull,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "django-hero-gen",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Генератор шаблонов для Django",
   "main": "index.js",
   "bin": {

package/src/commands.js

@@ -7,6 +7,8 @@ const createCourseTpl = require("./templates/create_course");
 const myCourseTpl = require("./templates/my_course");
 const authViewsTpl = require("./view/auth_view");
 const orderViewsTpl = require("./view/order_view");
+const modelOrdersTpl = require("./model/orders_model");
+const modelUserTpl = require("./model/user_model");
 
 const saveFile = (fileName, content) => {
   const filePath = path.join(process.cwd(), fileName);
@@ -40,6 +42,8 @@ module.exports = {
   makeListPage: () => saveFile("my_course.html", myCourseTpl()),
   makeAuth: () => saveFile("views.py", authViewsTpl()),
   makeOrders: () => saveFile("order_views.py", orderViewsTpl()),
+  makeModelOrders: () => saveFile("models.py", modelOrdersTpl()),
+  makeModelUser: () => saveFile("models.py", modelUserTpl()),
   makeAdmin: () =>
     saveFile(
       "admin.py",

package/src/model/order_model.js

@@ -0,0 +1,38 @@
+module.exports = () => `
+from django.db import models
+from django.conf import settings
+# Create your models here.
+class Orders(models.Model):
+    
+    COURSE = [
+        
+        ('algo','АЛгоритмы'),
+        ('design','Дизайн'),
+        ('bd','БАЗЫ ДАННЫХ'),
+    ]
+    
+    
+    STATUS = [
+        ('new','новая'),
+        ('in_progress','в процессе выполнения'),
+        ('completed','завершено'),
+    ]
+    
+        
+    PAYMENT = [
+        ('cash','наличкой'),
+        ('on_phone','по номеру телефона'),
+    ]
+    
+    
+    user = models.ForeignKey(settings.AUTH_USER_MODEL,on_delete=models.CASCADE)
+    
+    course = models.CharField(max_length=120,choices=COURSE,verbose_name='Выберите курс')
+    payment = models.CharField(max_length=120,choices=PAYMENT,verbose_name='Выберите способ оплаты')
+    
+    status = models.CharField(max_length=120,default='new',choices=STATUS)
+    
+    date = models.DateField('дата')
+    
+    review = models.TextField(blank=True)
+`;

package/src/model/user_model.js

@@ -0,0 +1,42 @@
+module.exports = () => `
+# Модель базы данных авторизации
+from django.db import models
+from django.contrib.auth.models import AbstractUser
+from django_cryptography.fields import encrypt
+from phonenumber_field.modelfields import PhoneNumberField
+from django.core.validators import RegexValidator
+
+class CustomUser(AbstractUser):
+    
+    login_validator = RegexValidator(
+        regex=r'^[a-zA-Z0-9]{6,}$',
+        message='(латиница и цифры, не менее 6 символов)'
+    )
+    
+    full_name_validator = RegexValidator(
+        regex=r'^[а-яА-ЯёЁ\s]+$',
+        message='(символы кириллицы и пробелы)'
+    )
+    
+    username = models.CharField(
+        unique=True,
+        max_length=120,
+        verbose_name='Логин',
+        )
+    
+    
+    email = models.EmailField(
+        unique=True,
+        max_length=120, 
+        verbose_name='Почта'
+    )
+    
+    full_name = models.CharField(
+        max_length=120,
+        verbose_name='ФИО',
+        validators=[full_name_validator]
+    )
+    
+    phone = PhoneNumberField(region='RU')
+ 
+`;

package/src/templates/my_course.js

@@ -1,26 +1,41 @@
 module.exports = () => `
-{% extends "base.html" %} {% load bootstrap5 %} {% block content %}
+{% extends "base.html" %}
+{% load bootstrap5 %}
+
+{% block content %}
 <div class="container my-5">
   <div class="row">
+
     {% for order in course %}
     <div class="col-md-6 col-lg-4 mb-4">
-      <div class="card h-100">
+      <div class="card h-100 shadow-sm">
+
         <div class="card-header">
-          <h5 class="card-title mb-0">{{ order.get_course_display }}</h5>
+          <h5 class="mb-0">{{ order.get_course_display }}</h5>
         </div>
+
         <div class="card-body">
-          <p class="text-muted"><small>Дата: {{ order.date }}</small></p>
-          {% if order.review_text %}
-          <p><strong>Ваш отзыв:</strong> {{ order.review_text }}</p>
+          <p class="text-muted">
+            <small>Дата начала: {{ order.date }}</small>
+          </p>
+
+          {% if order.review %}
+            <p>
+              <strong>Ваш отзыв:</strong><br>
+              {{ order.review }}
+            </p>
           {% endif %}
         </div>
-        <div class="card-footer">
-          <span class="badge bg-secondary">{{ order.get_status_display }}</span>
 
-          {% if order.status == 'completed' %}
+        <div class="card-footer d-flex justify-content-between align-items-center">
+          <span class="badge bg-secondary">
+            {{ order.get_status_display }}
+          </span>
+
+          {% if order.status == 'completed' and not order.review %}
           <button
             type="button"
-            class="btn btn-sm btn-outline-primary float-end"
+            class="btn btn-sm btn-outline-primary"
             data-bs-toggle="modal"
             data-bs-target="#reviewModal{{ order.id }}"
           >
@@ -31,67 +46,61 @@ module.exports = () => `
       </div>
     </div>
 
-    <div
-      class="modal fade"
-      id="reviewModal{{ order.id }}"
-      tabindex="-1"
-      aria-hidden="true"
-    >
+    <div class="modal fade"
+         id="reviewModal{{ order.id }}"
+         tabindex="-1"
+         aria-hidden="true">
+
       <div class="modal-dialog modal-dialog-centered">
         <div class="modal-content">
+
           <form method="post" action="{% url 'add_review' order.id %}">
             {% csrf_token %}
+
             <div class="modal-header">
-              <h5 class="modal-title">Оставить отзыв о курсе</h5>
-              <button
-                type="button"
-                class="btn-close"
-                data-bs-dismiss="modal"
-              ></button>
+              <h5 class="modal-title">
+                Отзыв о курсе «{{ order.get_course_display }}»
+              </h5>
+              <button type="button"
+                      class="btn-close"
+                      data-bs-dismiss="modal"></button>
             </div>
+
             <div class="modal-body">
               <textarea
-                name="review_text"
+                name="review"
                 class="form-control"
                 rows="4"
                 placeholder="Напишите ваш отзыв..."
-                {%
-                if
-                order.review_text
-                %}readonly{%
-                endif
-                %}
-              >
-{{ order.review_text }}</textarea
-              >
+                required></textarea>
             </div>
+
             <div class="modal-footer">
-              <button
-                type="button"
-                class="btn btn-secondary"
-                data-bs-dismiss="modal"
-              >
+              <button type="button"
+                      class="btn btn-secondary"
+                      data-bs-dismiss="modal">
                 Закрыть
               </button>
-
-              {% if not order.review_text %}
-              <button type="submit" class="btn btn-primary">Отправить</button>
-              {% else %}
-              <button type="button" class="btn btn-success" disabled>
-                Отзыв уже оставлен
+              <button type="submit"
+                      class="btn btn-primary">
+                Отправить
               </button>
-              {% endif %}
             </div>
+
           </form>
+
         </div>
       </div>
     </div>
 
     {% empty %}
     <div class="col-12">
-      <div class="alert alert-info">У вас пока нет заявок</div>
+      <div class="alert alert-info text-center">
+        У вас пока нет заявок
+      </div>
     </div>
     {% endfor %}
+
   </div>
 </div>
 {% endblock %}