From 34462d76ee01fd0041cb3ddae609e496d164a867 Mon Sep 17 00:00:00 2001 From: Andrei Date: Sat, 11 Mar 2023 23:10:37 +0500 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=BB=D1=83=D1=87=D1=88=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=B0=D1=80=D1=83=D0=B6=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=B7=D0=B0=D0=B1=D0=BB=D0=BE=D0=BA=D0=B8=D1=80=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D0=BF=D0=BE=D0=BB=D1=8C?= =?UTF-8?q?=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 30 +++++++++++++++--------------- static/css/project.css | 2 +- templates/project.html | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/main.py b/main.py index b8ddef1..3b2838b 100644 --- a/main.py +++ b/main.py @@ -94,7 +94,7 @@ def admin(): @app.route('/template//create') def create_by_template(id_template): - if current_user.is_authenticated: + if current_user.is_authenticated and not current_user.banned: data_session = db_session.create_session() current_template = data_session.query(Projects).filter(Projects.id == id_template).first() if current_template: @@ -120,7 +120,7 @@ def create_by_template(id_template): @app.route('/template/') def template_project(id_template): - if current_user.is_authenticated: + if current_user.is_authenticated and not current_user.banned: data_session = db_session.create_session() current_project = data_session.query(Projects).filter(Projects.id == id_template).first() if current_project: @@ -136,7 +136,7 @@ def template_project(id_template): @app.route('/showcase/link//delete') def delete_link(id_link): - if current_user.is_authenticated: + if current_user.is_authenticated and not current_user.banned: if current_user.role in [1, 4]: data_session = db_session.create_session() link = data_session.query(ShowCaseLink).filter(ShowCaseLink.id == id_link).first() @@ -153,7 +153,7 @@ def delete_link(id_link): @app.route('/showcase', methods=['GET', 'POST']) def showcase(): - if current_user.is_authenticated: + if current_user.is_authenticated and not current_user.banned: form = AddLink() if current_user.role in [1, 4] else None data_session = db_session.create_session() if request.method == 'POST' and current_user.role in [1, 4]: @@ -178,7 +178,7 @@ def showcase(): @app.route('/project//quest//edit', methods=['GET', 'POST']) def edit_quest(id_project, id_task): - if current_user.is_authenticated: + if current_user.is_authenticated and not current_user.banned: data_session = db_session.create_session() current_project = data_session.query(Projects).filter(Projects.id == id_project).first() current_task = data_session.query(Quests).filter(Quests.id == id_task).first() @@ -215,7 +215,7 @@ def edit_quest(id_project, id_task): @app.route('/project//file//delete') def delete_file(id_project, id_file): - if current_user.is_authenticated: + if current_user.is_authenticated and not current_user.banned: from_path = request.args.get('from') if request.args.get('from') else '' data_session = db_session.create_session() current_project = data_session.query(Projects).filter(Projects.id == id_project).first() @@ -246,7 +246,7 @@ def delete_file(id_project, id_file): @app.route('/project//quest/', methods=['GET', 'POST']) def task_project(id_project, id_task): - if current_user.is_authenticated: + if current_user.is_authenticated and not current_user.banned: data_session = db_session.create_session() current_project = data_session.query(Projects).filter(Projects.id == id_project).first() current_task = data_session.query(Quests).filter(Quests.id == id_task).first() @@ -314,7 +314,7 @@ def task_project(id_project, id_task): @app.route('/project//quest/new', methods=['GET', 'POST']) def new_task_project(id_project): - if current_user.is_authenticated: + if current_user.is_authenticated and not current_user.banned: data_session = db_session.create_session() current_project = data_session.query(Projects).filter(Projects.id == id_project).first() if current_project: @@ -345,7 +345,7 @@ def new_task_project(id_project): @app.route('/project//edit', methods=['GET', 'POST']) def edit_project(id_project): - if current_user.is_authenticated: + if current_user.is_authenticated and not current_user.banned: data_session = db_session.create_session() current_project = data_session.query(Projects).filter(Projects.id == id_project).first() if current_project: @@ -403,7 +403,7 @@ def edit_project(id_project): @app.route('/project/', methods=['POST', 'GET']) def project(id_project): - if current_user.is_authenticated: + if current_user.is_authenticated and not current_user.banned: data_session = db_session.create_session() current_project = data_session.query(Projects).filter(Projects.id == id_project).first() if current_project: @@ -486,7 +486,7 @@ def recovery(): @app.route('/project//delete', methods=['GET', 'POST']) def delete_project(id_project): - if current_user.is_authenticated: + if current_user.is_authenticated and not current_user.banned: data_session = db_session.create_session() project_del = data_session.query(Projects).filter(Projects.id == id_project).first() if project_del: @@ -511,7 +511,7 @@ def delete_project(id_project): @app.route('/user/', methods=['GET', 'POST']) def user_view(_login): - if current_user.is_authenticated: + if current_user.is_authenticated and not current_user.banned: data_session = db_session.create_session() user = data_session.query(User).filter(User.login == _login).first() if user: @@ -532,7 +532,7 @@ def user_view(_login): @app.route('/projects/new', methods=['GET', 'POST']) def new_project(): - if current_user.is_authenticated: + if current_user.is_authenticated and not current_user.banned: form = ProjectForm() data_session = db_session.create_session() list_users = list( @@ -569,7 +569,7 @@ def new_project(): @app.route('/projects', methods=['GET', 'POST']) def projects(): - if current_user.is_authenticated: + if current_user.is_authenticated and not current_user.banned: find = False form = FindProjectForm() data_session = db_session.create_session() @@ -597,7 +597,7 @@ def projects(): @app.route('/profile', methods=['GET', 'POST']) def profile(): - if current_user.is_authenticated: + if current_user.is_authenticated and not current_user.banned: data_session = db_session.create_session() form = EditProfileForm( CombinedMultiDict((request.files, request.form)), diff --git a/static/css/project.css b/static/css/project.css index 894fa0a..2fea6c5 100644 --- a/static/css/project.css +++ b/static/css/project.css @@ -224,7 +224,7 @@ align-items: flex-start; } .quest_title_block { - width: 100%; + width: 60%; height: 4vw; display: flex; align-items: center; diff --git a/templates/project.html b/templates/project.html index b0ba458..942eca8 100644 --- a/templates/project.html +++ b/templates/project.html @@ -62,7 +62,7 @@ data-bs-target="#panelsStayOpen-collapse{{ quest.id }}" aria-expanded="true" aria-controls="panelsStayOpen-collapse{{ quest.id }}">
-
+

{{ quest.name }}

{% if not project.is_template %}