flask-core-utils 2.0.0__tar.gz → 2.2.0__tar.gz

{flask_core_utils-2.0.0 → flask_core_utils-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flask-core-utils
-Version: 2.0.0
+Version: 2.2.0
 Summary: Standard utility components and scaffolding for Flask applications
 Home-page: https://github.com/flask-core-utils/scaffold
 Author: Open Source Community

{flask_core_utils-2.0.0 → flask_core_utils-2.2.0}/flask_core_utils/__init__.py

@@ -158,29 +158,29 @@ reportlabh
 '''
 
 BASH_CONTENT = r'''#!/bin/bash
-# Startup script for web application and background services
+# Быстрый запуск сервера и генератора
 chmod +x start.sh
 python3 check.py
 python3 app.py
 '''
 
-README_CONTENT = r'''# Web Application
+README_CONTENT = r'''# Веб-приложение
 
-Information system for managing user requests.
+Система для оформления заявок и генерации чеков.
 
-## Files
-* app.py - Main server file (Flask)
-* check.py - Document generation script
-* script.sql - Database structure dump
-* start.sh - Quick startup script
+## Файлы
+* app.py — сервер (Flask)
+* check.py — генерация PDF-чека
+* script.sql — структура таблиц
+* start.sh — быстрый запуск (чек+приложение)
 
-## Execution
-1. Grant execution permissions (if needed): `chmod +x start.sh`
-2. Run the application: `./start.sh` or `python3 app.py`
+## Запуск
+1. Дать права скрипту (если потребуется): `chmod +x start.sh`
+2. Запустить проект: `./start.sh` или `python3 app.py`
 '''
 
 SQL_CONTENT = r'''
--- Справочники системы
+-- Справочники
 CREATE TABLE roles (
     id SERIAL PRIMARY KEY,
     name VARCHAR(50) UNIQUE NOT NULL
@@ -201,7 +201,7 @@ CREATE TABLE courses (
     title VARCHAR(150) UNIQUE NOT NULL
 );
 
--- Основные таблицы пользователей и заявок
+-- Основные таблицы
 CREATE TABLE users (
     id SERIAL PRIMARY KEY,
     login VARCHAR(50) UNIQUE NOT NULL,
@@ -228,7 +228,7 @@ CREATE TABLE reviews (
     created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
 );
 
--- Заполнение справочников базовыми данными
+-- Заполнение базовыми данными
 INSERT INTO roles (name) VALUES ('user'), ('admin');
 
 INSERT INTO statuses (name) VALUES 
@@ -245,7 +245,7 @@ INSERT INTO courses (title) VALUES
 ('Основы веб-дизайна'), 
 ('Основы проектирования баз данных');
 
--- Учетная запись администратора системы
+-- Учетка админа
 INSERT INTO users (login, password, fio, phone, email, role_id)
 VALUES ('Admin', 'KorokNET', 'Администратор', '8(999) 999-99-99', 'admin@system.local', 2);
 '''
@@ -257,18 +257,16 @@ from psycopg2.extras import DictCursor
 from werkzeug.security import generate_password_hash, check_password_hash
 import re
 
-# Initialize the main Flask application
 app = Flask(__name__)
 app.secret_key = 'dev_key_123'
 
+# Класс для работы с БД
 class Database:
-    """Wrapper class for database connection and query execution."""
     def __init__(self):
-        # Database connection configuration
         self.conn_str = "dbname='exam_db' user='postgres' password='' host='127.0.0.1'"
 
+    # Метод для выполнения запросов
     def query(self, sql, params=(), fetchone=False, fetchall=False):
-        """Executes a SQL query and returns fetched data if requested."""
         with psycopg2.connect(self.conn_str) as conn:
             with conn.cursor(cursor_factory=DictCursor) as cur:
                 cur.execute(sql, params)
@@ -278,9 +276,9 @@ class Database:
 
 db = Database()
 
+# Главная страница
 @app.route('/')
 def index():
-    """Renders the main landing page with recent reviews."""
     reviews = db.query("""
         SELECT rv.review_text, u.fio, c.title as course
         FROM reviews rv
@@ -291,18 +289,18 @@ def index():
     """, fetchall=True)
     return render_template('index.html', reviews=reviews)
 
+# Регистрация
 @app.route('/register', methods=['GET', 'POST'])
 def register():
-    """Handles new user registration and input validation."""
     if request.method == 'POST':
-        # Retrieve and format form data
+        # Получаем данные из формы
         login = request.form.get('login', '').strip()
         password = request.form.get('password', '')
         fio = request.form.get('fio', '').strip()
         phone = request.form.get('phone', '').strip()
         email = request.form.get('email', '').strip()
 
-        # Regular expression validation
+        # Валидация
         if not re.match(r'^[A-Za-z0-9]{6,}$', login):
             flash("Логин должен состоять из латиницы и цифр (не менее 6 символов)", "error")
             return redirect('/register')
@@ -311,7 +309,7 @@ def register():
             return redirect('/register')
 
         try:
-            # Hash password and store new user record
+            # Хэшируем пароль
             hashed_password = generate_password_hash(password)
             db.query("""
                 INSERT INTO users (login, password, fio, phone, email, role_id) 
@@ -324,25 +322,24 @@ def register():
             
     return render_template('register.html')
 
+# Авторизация
 @app.route('/login', methods=['GET', 'POST'])
 def login():
-    """Handles user authentication and session management."""
     if request.method == 'POST':
         login_input = request.form.get('login')
         password_input = request.form.get('password')
         
-        # Retrieve user record by login
         user = db.query("SELECT * FROM users WHERE login=%s", (login_input,), fetchone=True)
         
         if user:
             is_valid = False
-            # Verify admin logic or standard user hashed password
+            # Проверка пароля (для админа без хэша)
             if user['login'] == 'Admin' and user['password'] == password_input:
                 is_valid = True
             elif user['login'] != 'Admin' and check_password_hash(user['password'], password_input):
                 is_valid = True
 
-            # Set session variables on successful authentication
+            # Записываем в сессию
             if is_valid:
                 session['user_id'] = user['id']
                 session['role_id'] = user['role_id']
@@ -352,13 +349,14 @@ def login():
         flash("Неверный логин или пароль", "error")
     return render_template('login.html')
 
+# Личный кабинет
 @app.route('/account', methods=['GET', 'POST'])
 def account():
-    """User dashboard for submitting requests and viewing history."""
+    # Проверка доступа
     if 'user_id' not in session or session.get('role_id') != 1:
         return redirect('/login')
         
-    # Handle new request submission
+    # Добавление новой заявки
     if request.method == 'POST':
         db.query("""
             INSERT INTO requests (user_id, course_id, start_date, payment_method_id, status_id) 
@@ -368,10 +366,10 @@ def account():
         flash("Заявка успешно отправлена", "success")
         return redirect('/account')
 
-    # Fetch reference data and user history
     courses = db.query("SELECT * FROM courses", fetchall=True)
     payments = db.query("SELECT * FROM payment_methods", fetchall=True)
     
+    # История заявок пользователя
     user_requests = db.query("""
         SELECT r.id, c.title as course, r.start_date, s.name as status, s.id as status_id, rv.review_text
         FROM requests r
@@ -383,27 +381,26 @@ def account():
     
     return render_template('account.html', courses=courses, payments=payments, requests=user_requests)
 
+# Оставить отзыв
 @app.route('/leave_review', methods=['POST'])
 def leave_review():
-    """Endpoint for users to submit a review."""
     if 'user_id' in session:
         db.query("INSERT INTO reviews (request_id, review_text) VALUES (%s, %s)", 
                  (request.form.get('req_id'), request.form.get('review_text')))
     return redirect('/account')
 
+# Панель администратора
 @app.route('/admin', methods=['GET', 'POST'])
 def admin():
-    """Administrative panel for managing user requests."""
     if session.get('role_id') != 2: 
         return redirect('/login')
         
-    # Handle status updates
+    # Смена статуса
     if request.method == 'POST':
         db.query("UPDATE requests SET status_id=%s WHERE id=%s", 
                  (request.form.get('status_id'), request.form.get('req_id')))
         return redirect('/admin')
         
-    # Fetch all system requests and statuses
     statuses = db.query("SELECT * FROM statuses", fetchall=True)
     all_requests = db.query("""
         SELECT r.id, u.fio, u.phone, c.title as course, r.start_date, pm.name as payment, s.id as status_id, s.name as status
@@ -417,14 +414,13 @@ def admin():
     
     return render_template('admin.html', requests=all_requests, statuses=statuses)
 
+# Выход
 @app.route('/logout')
 def logout():
-    """Clears the session and logs the user out."""
     session.clear()
     return redirect('/')
 
 if __name__ == '__main__':
-    # Start the server
     app.run(debug=True)
 '''
 

{flask_core_utils-2.0.0 → flask_core_utils-2.2.0}/flask_core_utils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flask-core-utils
-Version: 2.0.0
+Version: 2.2.0
 Summary: Standard utility components and scaffolding for Flask applications
 Home-page: https://github.com/flask-core-utils/scaffold
 Author: Open Source Community

{flask_core_utils-2.0.0 → flask_core_utils-2.2.0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='flask-core-utils', 
-    version='2.0.0',
+    version='2.2.0',
     packages=find_packages(),
     description='Standard utility components and scaffolding for Flask applications',
     long_description=open('README.md', encoding='utf-8').read(),