diff --git a/App/Queries/templates/sklad_zapros.html b/App/Queries/templates/sklad_zapros.html
index 6dcb26a..70ca9ad 100644
--- a/App/Queries/templates/sklad_zapros.html
+++ b/App/Queries/templates/sklad_zapros.html
@@ -5,6 +5,7 @@
Заготовки на складе
+
{% if status %}
Выберите материал
diff --git a/App/app.py b/App/app.py
index 42d5791..85540ad 100644
--- a/App/app.py
+++ b/App/app.py
@@ -1,7 +1,9 @@
from flask import Flask, render_template, session
from Queries.requests import requests_bp
from Auth.auth import auth_bp
+from os import path
from checker import check_auth
+import json
app = Flask(__name__)
app.secret_key = 'suplex'
@@ -10,13 +12,14 @@ app.register_blueprint(requests_bp, url_prefix='/requests')
app.register_blueprint(auth_bp, url_prefix='/auth')
@app.route('/')
-@check_auth
def index():
- return render_template('index.html')
+ with open(path.join(path.dirname(__file__), 'datafiles/menu.json')) as f:
+ urls = json.load(f)
+ return render_template('main_menu.html', menu=urls, ses=session)
@app.route('/logout')
@check_auth
def logout():
session.clear()
- return 'OK'
+ return render_template('exit.html')
app.run(port=5001, debug=True)
\ No newline at end of file
diff --git a/App/datafiles/menu.json b/App/datafiles/menu.json
new file mode 100644
index 0000000..1af7457
--- /dev/null
+++ b/App/datafiles/menu.json
@@ -0,0 +1,3 @@
+[
+ {"name": "Меню запросов", "url": "requests_bp.sklad_zapros"}
+]
\ No newline at end of file
diff --git a/App/templates/exit.html b/App/templates/exit.html
new file mode 100644
index 0000000..092a0bf
--- /dev/null
+++ b/App/templates/exit.html
@@ -0,0 +1,11 @@
+
+
+
+
+ Успешно
+
+
+
До свидания!
+
+
+
\ No newline at end of file
diff --git a/App/templates/index.html b/App/templates/index.html
index f8797bf..2779380 100644
--- a/App/templates/index.html
+++ b/App/templates/index.html
@@ -6,5 +6,10 @@