diff --git a/main.py b/main.py index ad0ff90..a9ddb3b 100644 --- a/main.py +++ b/main.py @@ -1,7 +1,6 @@ import datetime import os import logging -import shutil from flask import Flask, render_template, request, url_for from flask_login import login_user, current_user, LoginManager, logout_user, login_required @@ -56,6 +55,14 @@ def base(): return redirect('/projects') +@app.route('/showcase', methods=['GET', 'POST']) +def showcase(): + if current_user.is_authenticated: + return render_template('showcase.html', title='Витрина') + else: + return redirect('/login') + + @app.route('/project//quest//edit', methods=['GET', 'POST']) def edit_quest(id_project, id_task): if current_user.is_authenticated: @@ -232,7 +239,7 @@ def edit_project(id_project): staff = data_session.query(StaffProjects).filter(StaffProjects.project == current_project.id).all() if current_user.id == current_project.creator: list_users = list( - map(lambda x: get_user_data(x), data_session.query(User).filter(User.id != current_user.id).all())) + map(lambda x: get_user_data(x), data_session.query(User).filter(User.id != current_user.id, User.activated == 1).all())) staff = list(map(lambda x: get_user_data(x), data_session.query(User).filter( User.id.in_(list(map(lambda x: x.user, staff)))).all())) if staff else [] form = ProjectForm() diff --git a/static/css/showcase.css b/static/css/showcase.css new file mode 100644 index 0000000..00c5268 --- /dev/null +++ b/static/css/showcase.css @@ -0,0 +1,4 @@ +.showscale_page { + height: 120vw; + background-color: #dcb495; +} \ No newline at end of file diff --git a/templates/base.html b/templates/base.html index 88c4f07..6561a81 100644 --- a/templates/base.html +++ b/templates/base.html @@ -14,13 +14,8 @@ - {% if current_user.is_authenticated %}