diff --git a/App/Auth/auth_route.py b/App/Auth/auth_route.py index 4298f15..72fe577 100644 --- a/App/Auth/auth_route.py +++ b/App/Auth/auth_route.py @@ -1,7 +1,7 @@ from flask import request, Blueprint, render_template, session, redirect, url_for from os import path -from db.sql_provider import SQLProvider -from db.select import select_list +from Database.sql_provider import SQLProvider +from Database.select import select_list import json sql_provider = SQLProvider(path.join(path.dirname(__file__), 'sql')) @@ -15,14 +15,17 @@ def auth(): if request.method == 'GET': return render_template('auth.html') else: - data = dict(request.form) + data = request.form.to_dict() print(data) result = select_list(config, sql_provider.get('auth.sql', data)) + if result[1]: - session['user_id'] = result[1][0]['user_ID'] - session['role'] = result[1][0]['role'] - session['db_config'] = config - session.permanent = True + session.update({ + 'user_id': result[1][0]['user_ID'], + 'role': result[1][0]['role'], + 'db_config': config, + 'permanent': True + }) return redirect(url_for('index')) - else: - return 'Неправильный логин или пароль' \ No newline at end of file + + return 'Неправильный логин или пароль' diff --git a/App/db/DBconnect.py b/App/Database/DBconnect.py similarity index 100% rename from App/db/DBconnect.py rename to App/Database/DBconnect.py diff --git a/App/Database/__init__.py b/App/Database/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/App/db/config.json b/App/Database/config.json similarity index 100% rename from App/db/config.json rename to App/Database/config.json diff --git a/App/db/select.py b/App/Database/select.py similarity index 100% rename from App/db/select.py rename to App/Database/select.py diff --git a/App/db/sql_provider.py b/App/Database/sql_provider.py similarity index 100% rename from App/db/sql_provider.py rename to App/Database/sql_provider.py diff --git a/App/Queries/category_list.py b/App/Queries/category_list.py deleted file mode 100644 index 7bb44be..0000000 --- a/App/Queries/category_list.py +++ /dev/null @@ -1,13 +0,0 @@ -import db.DBconnect - -sql_provider = 1 -""" def select_list(db_config, sql): - with DBContextManager(db_config) as cursor: - if cursor is None: - raise ValueError("Cursor not created") - else: - cursor.execute(sql) - result = cursor.fetchall() - schema = [item[0] for item in cursor.description] - lst = [dict(zip(schema, row)) for row in result] - return schema, lst """ \ No newline at end of file diff --git a/App/Queries/req.py b/App/Queries/req.py index c1b7c3c..453ca67 100644 --- a/App/Queries/req.py +++ b/App/Queries/req.py @@ -1,7 +1,7 @@ -from flask import request, Blueprint, render_template, session, redirect, url_for +from flask import request, Blueprint, render_template, session from os import path -from db.sql_provider import SQLProvider -from db.select import select_list +from Database.sql_provider import SQLProvider +from Database.select import select_list from checker import check_auth sql_provider = SQLProvider(path.join(path.dirname(__file__), 'sql')) @@ -15,6 +15,5 @@ def sklad_zapros(): return render_template('sklad_zapros.html', materials=result[1], status=True) else: name = dict(request.form) - print(name) result = select_list(session['db_config'], sql_provider.get('zapros1.sql', name)) return render_template('sklad_zapros.html', materials=result[1], result_table=result) \ No newline at end of file diff --git a/App/app.py b/App/app.py index 049d661..3c016df 100644 --- a/App/app.py +++ b/App/app.py @@ -1,11 +1,10 @@ -from flask import Flask, redirect, render_template, url_for, session, request -from os import path +from flask import Flask, render_template, session from Queries.req import requests_bp from Auth.auth_route import auth_bp from checker import check_auth app = Flask(__name__) -app.secret_key = 'super secret key' +app.secret_key = 'suplex' app.register_blueprint(requests_bp, url_prefix='/requests') app.register_blueprint(auth_bp, url_prefix='/auth') @@ -13,7 +12,7 @@ app.register_blueprint(auth_bp, url_prefix='/auth') @app.route('/') @check_auth def index(): - return "YATTA" + return render_template('index.html') @app.route('/logout') @check_auth diff --git a/App/checker.py b/App/checker.py index a5fad32..99eb81b 100644 --- a/App/checker.py +++ b/App/checker.py @@ -1,4 +1,4 @@ -from flask import render_template, redirect, url_for, session, request +from flask import redirect, url_for, session from functools import wraps