diff --git a/forms/edit_profile.py b/forms/edit_profile.py index c11d8bb..f5e2128 100644 --- a/forms/edit_profile.py +++ b/forms/edit_profile.py @@ -1,7 +1,7 @@ from flask_wtf import FlaskForm from flask_wtf.file import FileAllowed from wtforms import EmailField, StringField, TextAreaField, FileField, SubmitField, DateField -from wtforms.validators import DataRequired +from wtforms.validators import DataRequired, Optional class EditProfileForm(FlaskForm): @@ -9,7 +9,7 @@ class EditProfileForm(FlaskForm): name = StringField('Имя', validators=[DataRequired()]) surname = StringField('Фамилия') about = TextAreaField('Расскажите о себе', default='') - birthday = DateField('Дата рождения') + birthday = DateField('Дата рождения', validators=(Optional(),)) photo = FileField('Фото', validators=[FileAllowed(['jpg', 'png', 'bmp'], 'Только фотографии!')]) del_photo = SubmitField('Удалить фотографию') submit = SubmitField('Сохранить') \ No newline at end of file diff --git a/forms/task.py b/forms/task.py index 7c2f195..6d0b75a 100644 --- a/forms/task.py +++ b/forms/task.py @@ -1,14 +1,14 @@ from flask_wtf import FlaskForm from wtforms import StringField, SubmitField, TextAreaField, DateField, TimeField, MultipleFileField, \ BooleanField -from wtforms.validators import DataRequired +from wtforms.validators import DataRequired, Optional class Task(FlaskForm): name = StringField('Название', validators=[DataRequired()]) description = TextAreaField('Описание', validators=[DataRequired()]) - deadline_date = DateField('Дедлайн') - deadline_time = TimeField('') + deadline_date = DateField('Дедлайн', validators=(Optional(),)) + deadline_time = TimeField('', validators=(Optional(),)) submit = SubmitField('Создать') save = SubmitField('Сохранить') delete = SubmitField('Удалить') diff --git a/main.py b/main.py index e68ac1c..447222e 100644 --- a/main.py +++ b/main.py @@ -200,8 +200,9 @@ def edit_quest(id_project, id_task): if request.method == 'GET': form.name.data = current_task.name form.description.data = current_task.description - form.deadline_time.data = current_task.deadline.time() - form.deadline_date.data = current_task.deadline.date() + if current_task.deadline: + form.deadline_time.data = current_task.deadline.time() + form.deadline_date.data = current_task.deadline.date() if form.delete.data: delete_quest_data(current_task, data_session) data_session.delete(current_task) diff --git a/static/css/project.css b/static/css/project.css index de6691f..a961f31 100644 --- a/static/css/project.css +++ b/static/css/project.css @@ -34,8 +34,17 @@ margin-right: 4vw; overflow-y: hidden; overflow-x: auto; - white-space: nowrap + white-space: nowrap; + max-width: 40vw; } +.name_project::-webkit-scrollbar { + height: 0.8vw; /* ширина scrollbar */ +} +.name_project::-webkit-scrollbar-thumb { + background-color: #d49d51; /* цвет плашки */ + border-radius: 5vw; /* закругления плашки */ + border: 0.25vw solid #ffffff; +} .edit_block { display: flex; align-items: center; @@ -44,7 +53,7 @@ .edit_button { background-color: #9E795A; border: #9E795A; - width: 12vw; + width: 15vw; height: 5vw; color: #ffffff; border-radius: 5vw; @@ -54,10 +63,10 @@ .edit_button_text { color: #ffffff; height: 5vw; - margin-top: 32%; + margin-top: 25%; } .edit_button_link { - width: 12vw; + width: 15vw; height: 5vw; display: flex; align-items: center; @@ -152,6 +161,14 @@ .task { margin: 20px; } +.task_block::-webkit-scrollbar { + width: 0.8vw; /* ширина scrollbar */ +} +.task_block::-webkit-scrollbar-thumb { + background-color: #d49d51; /* цвет плашки */ + border-radius: 5vw; /* закругления плашки */ + border: 0.25vw solid #ffffff; +} .body_block { display: flex; justify-content: space-evenly; @@ -218,13 +235,13 @@ align-items: center; } .quest_button_block_one { - width: 90%; + width: 68%; display: flex; justify-content: space-between; align-items: flex-start; } .quest_title_block { - width: 60%; + width: 96%; height: 4vw; display: flex; align-items: center; @@ -232,11 +249,11 @@ .quest_title { overflow-y: hidden; overflow-x: auto; - max-height: 4vw; - font-size: 1.5vw; + max-height: 5vw; + font-size: 2.1vw !important; display: flex; align-items: center; - margin-top: 0.7vw; + margin-top: 0.8vw; margin-left: 1.8vw; font-size: 3.5vw; white-space: nowrap diff --git a/static/css/showcase.css b/static/css/showcase.css index f543ddd..76af687 100644 --- a/static/css/showcase.css +++ b/static/css/showcase.css @@ -175,7 +175,7 @@ } .link_block { margin: 1vw; - width: 15vw; + width: 25vw; height: 6vw; background-color: #9E795A; display: flex; @@ -199,10 +199,28 @@ color: #ffffff; } .link_text { - height: 1.8vw; + margin-top: 1vw; + width: 13vw; + height: 3.5vw; color: #ffffff; font-size: 2vw; + overflow-x: auto; + overflow-y: hidden; + overflow-wrap: normal; /* не поддерживает IE, Firefox; является копией word-wrap */ + word-wrap: normal; + word-break: normal; /* не поддерживает Opera12.14, значение keep-all не поддерживается IE, Chrome */ + line-break: auto; /* нет поддержки для русского языка */ + hyphens: manual; + white-space: nowrap } +.link_text::-webkit-scrollbar { + height: 0.8vw; /* ширина scrollbar */ +} +.link_text::-webkit-scrollbar-thumb { + background-color: #d49d51; /* цвет плашки */ + border-radius: 5vw; /* закругления плашки */ + border: 0.25vw solid #ffffff; +} .add_button, .link_delete, .repeal_button, .submit_button { border-radius: 1vw !important; margin: 1vw; diff --git a/templates/project.html b/templates/project.html index 31abd2e..261dd93 100644 --- a/templates/project.html +++ b/templates/project.html @@ -61,7 +61,7 @@ data-bs-toggle="collapse" data-bs-target="#panelsStayOpen-collapse{{ quest.id }}" aria-expanded="true" aria-controls="panelsStayOpen-collapse{{ quest.id }}"> -
+

{{ quest.name }}

diff --git a/templates/showcase.html b/templates/showcase.html index b4760ce..9cea095 100644 --- a/templates/showcase.html +++ b/templates/showcase.html @@ -28,16 +28,18 @@