diff --git a/db/moona_data.db b/db/moona_data.db index e3c406a..6e3f620 100644 Binary files a/db/moona_data.db and b/db/moona_data.db differ diff --git a/fonts/Rostov.ttf b/fonts/Rostov.ttf new file mode 100644 index 0000000..abd4484 Binary files /dev/null and b/fonts/Rostov.ttf differ diff --git a/forms/post.py b/forms/post.py index 57e8d91..dbcb221 100644 --- a/forms/post.py +++ b/forms/post.py @@ -8,8 +8,8 @@ class AddPost(FlaskForm): name = StringField('Название') text = TextAreaField('Расскажите, что нового?') photo = FileField('Прикрепите фото', validators=[FileAllowed(['jpg', 'png'])]) - public = BooleanField('Опубликовать?') pos_emot = TextAreaField('Какие позитивные эмоции вы испытываете?') nig_emot = TextAreaField('Какие негативные эмоции вы испытываете?') link = TextAreaField('Вы можете оставить тут ссылки через пробел') + public = BooleanField('Опубликовать?') submit = SubmitField('Сохранить') diff --git a/main.py b/main.py index b7e33e6..6fc843d 100644 --- a/main.py +++ b/main.py @@ -227,6 +227,7 @@ def logout(): @app.route('/login', methods=['GET', 'POST']) def login(): form = LoginForm() + print(form.validate_on_submit()) if form.validate_on_submit(): db_sess = db_session.create_session() user = db_sess.query(User).filter(User.email == form.email.data).first() diff --git a/static/app_image/users_photo/Dinosaurik_logo.jpg b/static/app_image/users_photo/Dinosaurik_logo.jpg new file mode 100644 index 0000000..dcbf5b9 Binary files /dev/null and b/static/app_image/users_photo/Dinosaurik_logo.jpg differ diff --git a/static/css/diary.css b/static/css/diary.css index eb3be74..3010d91 100644 --- a/static/css/diary.css +++ b/static/css/diary.css @@ -48,4 +48,28 @@ margin-left: 85%; } #edit_btn { background-color: #c5f1ff; +} +input[type=text], input[type=email], input[type=password], input[type=file], input[type=number]{ + padding:10px; + border:5; + box-shadow:0 0 15px 4px rgba(0,0,0,0.06); + border-radius:10px; +} +textarea { + width:100%; + resize: vertical; + padding:10px; + border-radius:10px; + border:5; + box-shadow:0 0 15px 4px rgba(0,0,0,0.06); + height:150px; +} +.post_form { + margin-left: auto; + margin-right: auto; + width: 80%; + height: 50% +} +.box { + margin-left: 20px; } \ No newline at end of file diff --git a/static/css/register.css b/static/css/register.css index e7563f2..33ba945 100644 --- a/static/css/register.css +++ b/static/css/register.css @@ -1,8 +1,8 @@ .divlog { margin-left: auto; - margin-right: auto; - width: 80%; - height: 50% + margin-right: auto; + width: 80%; + height: 50% } .title { text-align: center; @@ -24,4 +24,10 @@ textarea { border:10; box-shadow:0 0 15px 4px rgba(0,0,0,0.06); height:150px; -} \ No newline at end of file +} +.but { + margin: 40px; +} +.box { + margin-left: 20px; +} diff --git a/templates/login.html b/templates/login.html index d41cdc4..009a059 100644 --- a/templates/login.html +++ b/templates/login.html @@ -4,28 +4,35 @@ {% block content %}

Авторизация

-
+ {{ form.hidden_tag() }} -

- {{ form.email.label }}
- {{ form.email(class="form-control", type="email") }}
- {% for error in form.email.errors %} -