From f05d705219682b7a8494181c10a711a230baecf4 Mon Sep 17 00:00:00 2001 From: Andrei Date: Sun, 25 Dec 2022 20:24:38 +0500 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D1=83=20=D1=80=D0=B0=D1=81=D0=BA?= =?UTF-8?q?=D1=80=D1=8B=D1=82=D0=B8=D1=8F=20=D1=80=D0=B5=D0=B4=D0=B0=D0=BA?= =?UTF-8?q?=D1=82=D0=BE=D1=80=D0=B0=20=D0=BF=D1=80=D0=BE=D1=84=D0=B8=D0=BB?= =?UTF-8?q?=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/files.py | 3 --- data/users.py | 2 +- main.py | 15 ++++++----- static/css/profile.css | 56 +++++++++++++++++++++++++++++++++++--- static/css/projects.css | 3 +++ templates/login.html | 22 +++++++-------- templates/profile.html | 59 ++++++++++++++++++++++++++--------------- templates/projects.html | 6 +++++ 8 files changed, 120 insertions(+), 46 deletions(-) create mode 100644 static/css/projects.css create mode 100644 templates/projects.html diff --git a/data/files.py b/data/files.py index e22e444..7369580 100644 --- a/data/files.py +++ b/data/files.py @@ -1,8 +1,5 @@ -from datetime import date - import sqlalchemy from flask_login import UserMixin -from werkzeug.security import check_password_hash, generate_password_hash from .db_session import SqlAlchemyBase diff --git a/data/users.py b/data/users.py index c2823e6..50e4a3f 100644 --- a/data/users.py +++ b/data/users.py @@ -22,7 +22,7 @@ class User(SqlAlchemyBase, UserMixin): password = sqlalchemy.Column(sqlalchemy.String, nullable=True) data_reg = sqlalchemy.Column(sqlalchemy.Date, default=date.today()) - role = sqlalchemy.Column(sqlalchemy.String, nullable=True) + role = sqlalchemy.Column(sqlalchemy.Integer, sqlalchemy.ForeignKey("roles.id"), nullable=True) activity = sqlalchemy.Column(sqlalchemy.DateTime, nullable=True) birthday = sqlalchemy.Column(sqlalchemy.Date, nullable=True) activated = sqlalchemy.Column(sqlalchemy.Boolean, nullable=False, default=False) diff --git a/main.py b/main.py index 43067ab..25e2b95 100644 --- a/main.py +++ b/main.py @@ -12,6 +12,7 @@ from forms.edit_profile import EditProfileForm from forms.login import LoginForm from forms.register import RegisterForm from data.users import User +from data.files import Files from waitress import serve from data import db_session @@ -28,13 +29,13 @@ def base(): if not current_user.is_authenticated: return render_template('main.html', title='Главная') else: - return redirect('/project') + return redirect('/projects') -@app.route('/project') +@app.route('/projects') def project(): if current_user.is_authenticated: - return redirect(f'/profile') + return render_template('projects.html', title='Проекты') else: return redirect('/login') @@ -105,7 +106,7 @@ def login(): if user and user.check_password(form.password.data): if user.activated: login_user(user, remember=form.remember_me.data) - return redirect('/') + return redirect('/projects') else: return render_template('login.html', message="Ваша почта не подтверждена", @@ -118,7 +119,7 @@ def login(): return render_template('login.html', title='Авторизация', form=form, message=message, danger=danger) else: - return redirect('/project') + return redirect('/projects') @app.route('/logout') @@ -149,7 +150,7 @@ def register(): activity=datetime.datetime.now(), data_reg=datetime.date.today(), photo='static/images/none_logo.png', - role='user' + role=1 ) user.set_password(form.password.data) data_session.add(user) @@ -162,7 +163,7 @@ def register(): return redirect('/login?message=Мы выслали ссылку для подтверждения почты') return render_template('register.html', form=form, message='', title='Регистрация') else: - return redirect('/project') + return redirect('/projects') @app.route('/confirmation/') diff --git a/static/css/profile.css b/static/css/profile.css index 6e6679b..05f6d15 100644 --- a/static/css/profile.css +++ b/static/css/profile.css @@ -1,15 +1,15 @@ .profile_page { display: flex; flex-direction: column; - height: 70vw; + height: auto; width: 100%; background: linear-gradient( rgba(0, 0, 0, 0.8), rgba(0, 0, 0, 0.8) ), url(../images/back_profile_one.jpg);background-repeat: repeat; background-position: center; } .profile_block { - height: 83%; + height: 65vw; width: 85%; margin-left: 7.5%; - margin-top: 10%; + margin-bottom: 6%; background: linear-gradient( rgba(0, 0, 0, 0.3), rgba(0, 0, 0, 0.3) ), url(../images/back_profile_two.jpg);background-repeat: repeat; background-position: center; display: flex; flex-direction: column; @@ -113,4 +113,54 @@ form { text-align: center; font-size: 1.5vw; margin-top: 6%; +} +.open_button_block { + height: 35vw; + width: 85%; + margin-left: 7.5%; + margin-top: 3%; + margin-bottom: 6%; + background: linear-gradient( rgba(0, 0, 0, 0.3), rgba(0, 0, 0, 0.3) ), url(../images/back_profile_two.jpg);background-repeat: repeat; background-position: center; + display: flex; + flex-direction: column; + overflow-y: auto; +} +.open_button_content { + display: flex; + flex-direction: column; + width: 100%; + height: 100%; + justify-content: center; + align-items: center; +} +.open_button_title { + margin-bottom: 3%; + color: #ffffff; + font: bold; + font-size: 4.5vw; +} +.open_button_article { + margin-bottom: 5%; + color: #ffffff; + font: bold; + font-size: 2vw; +} +.open_button { + background-color: #ffffff; + color: #000000; + width: 20vw; + height: 5vw; + vertical-align: middle; + border-radius: 30px; +} +.open_button:hover { + text-decoration: none; + color: #000000; +} +.open_button_text { + width: 100%; + height: 100%; + text-align: center; + font-size: 1.5vw; + margin-top: 5%; } \ No newline at end of file diff --git a/static/css/projects.css b/static/css/projects.css new file mode 100644 index 0000000..31fb06c --- /dev/null +++ b/static/css/projects.css @@ -0,0 +1,3 @@ +.projects_page { + height: 65vw; +} \ No newline at end of file diff --git a/templates/login.html b/templates/login.html index 67795d5..9eb23a8 100644 --- a/templates/login.html +++ b/templates/login.html @@ -36,17 +36,17 @@ {% endfor %}
- {% if message != '' %} - {% if danger %} - - {% else %} - - {% endif %} - {% endif %} + {% if message != '' %} + {% if danger %} + + {% else %} + + {% endif %} + {% endif %}
diff --git a/templates/profile.html b/templates/profile.html index 7ee3e76..b914ecd 100644 --- a/templates/profile.html +++ b/templates/profile.html @@ -1,33 +1,49 @@ {% extends "base.html" %} {% block content %}
-
+
+
+

Профиль

+

Здесь можно поменять настройки учетной записи

+ +
+
+
- +
-
+ {{ form.hidden_tag() }}
- {{ form.email(class="input_data", type="email", placeholder='example@mail.ex') }} {% for - error in form.email.errors %} + {{ form.email(class="input_data", type="email", + placeholder='example@mail.ex') }} {% for error in + form.email.errors %} {% endfor %}
- {{ form.name(class="input_data", type="name", placeholder='name') }} {% - for error in form.name.errors %} + {{ form.name(class="input_data", type="name", placeholder='name') + }} {% for error in form.name.errors %} {% endfor %}
- {{ form.surname(class="input_data", type="surname", placeholder='surname') }} - {% for error in form.surname.errors %} + {{ form.surname(class="input_data", type="surname", + placeholder='surname') }} {% for error in form.surname.errors %} {% endfor %}
@@ -35,36 +51,37 @@
- {{ form.birthday(class="input_data", type="date") }} - {% for error in form.birthday.errors %} - + {{ form.birthday(class="input_data", type="date") }} {% for error + in form.birthday.errors %} + {% endfor %}
- {{ form.about(class="input_data dop_data", type="name", placeholder='about') }} {% - for error in form.about.errors %} + {{ form.about(class="input_data dop_data", type="name", + placeholder='about') }} {% for error in form.about.errors %} {% endfor %}
{% if 'none' in current_user.photo %}
- {{ form.photo(class="input_data dop_data", type="file") }} - {% for error in form.photo.errors %} + {{ form.photo(class="input_data dop_data", type="file") }} {% for + error in form.photo.errors %} {% endfor %}
{% else %}
- {{ form.del_photo(type="submit", class="profile_button", id="delete_button") }} + {{ form.del_photo(type="submit", class="profile_button", + id="delete_button") }}
{% endif %}
{% if message != '' %} - + {% endif %}
@@ -81,4 +98,4 @@
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/projects.html b/templates/projects.html new file mode 100644 index 0000000..e93cc60 --- /dev/null +++ b/templates/projects.html @@ -0,0 +1,6 @@ + +{% extends "base.html" %} {% block content %} +
+ +
+{% endblock %} \ No newline at end of file