diff --git a/main.py b/main.py index 2498fa5..661771b 100644 --- a/main.py +++ b/main.py @@ -154,7 +154,7 @@ def main_page(): else: you_like_that = [] emotion_you_like_that = None - post_quest = None + post_quest = [] ans2 = None return render_template('main.html', title='moona', for_me_post=for_you_post, emotion_for_you=emotion_for_you, you_like_that=you_like_that, emotion_you_like_that=emotion_you_like_that, diff --git a/static/css/diary.css b/static/css/diary.css index 52764e2..b3bef88 100644 --- a/static/css/diary.css +++ b/static/css/diary.css @@ -24,10 +24,11 @@ summary { margin-bottom: 10px; } .my_author { - width:40%; - height:5%; - margin-left:30%; - margin-right:30%; + width:148px; + height:44px; + left:255px; + -webkit-border-radius: 22px; + -moz-border-radius: 22px; border-radius: 22px; border:2px solid #ffffff; background-color:#1daff0; @@ -39,14 +40,12 @@ summary { #image { width: 70%; } -.card-body { - background-color: #7fc3ff; -} -.all_my_post { +#all_my_post, #all_my_post1 { margin-left: auto; margin-right: auto; } -.card { +#my_post, #my_post1 { + text-align: center; margin-left: auto; margin-right: auto; background-color: #7fc3ff; @@ -55,13 +54,15 @@ summary { } .my_author, .my_post_zag { text-align: center; + margin-left: auto; + margin-right: auto; + margin-top: 25px; } .pub, .private { - width: 55%; + width: 60%; height: 10%; - margin-left:25%; - margin-right: 25%; - text-align: center; + margin-left: auto; + margin-right: auto; } #add_post { margin-top: 20px; @@ -69,9 +70,6 @@ summary { } #edit_btn, #edit_btn1 { background-color: #c5f1ff; - margin-left: 10%; - margin-right: auto; - margin-top: 15px; } input[type=text], input[type=email], input[type=password], input[type=file], input[type=number]{ padding:10px; @@ -98,24 +96,21 @@ textarea { margin-left: 20px; } #row2, #row1 { - width: 32%; + width: 30%; } #row1, #row2, #all_my_question { display:inline-block; vertical-align: top; } -.but { - width: 80%; - margin-bottom:5%; -} #all_my_question { width: 30%; height: -100%; } .question, .my_post { background-color:#7fc3ff; + border-radius: 22px; + width: 90%; margin-left: 10px; - margin-right: 10px; } .is_ans { background-color:#ddefff; @@ -137,7 +132,7 @@ table { margin-right: auto; } #row1_div, #row2_div { - width: 98%; +width: 98%; } td { margin: 20px; @@ -147,8 +142,4 @@ width: 25%; } .is_ans { width: 95%; -} -.card-text { - color:#ffffff; - text-align: center; } \ No newline at end of file diff --git a/static/css/main.css b/static/css/main.css index ee214b3..bf4c0c3 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -1,153 +1,49 @@ -.bad_user { - margin-left: auto; - margin-right: auto; - background-color: #1daff0; - color: #ffffff; - width: 50%; - height: 55%; - -webkit-border-radius:22px; - -moz-border-radius: 22px; - border-radius: 22px; - border:2px solid #ffffff; - margin-top: 20px; -} -#main_table { - margin-left:7% -} -.bad_centre { - text-align: center; -} -summary { - margin-bottom: 10px; -} -.pos_emot { - margin-bottom: 10px; -} -.nig_emot { - margin-bottom: 10px; -} -.my_author { - width:40%; - height:5%; - left:10%; - -webkit-border-radius: 22px; - -moz-border-radius: 22px; - border-radius: 22px; - border:2px solid #ffffff; - background-color:#1daff0; - top: 98px; -} -.emot { - margin-bottom: 30px; -} -#image { - width: 70%; -} -.card-body { - background-color: #7fc3ff; -} -#all_my_post, #all_my_post1 { - margin-left: auto; - margin-right: auto; -} -#my_post, #my_post1 { - text-align: center; - margin-left: auto; - margin-right: auto; - background-color: #7fc3ff; - border-radius: 50px; - margin-bottom: 20px; -} -.my_author, .my_post_zag { - margin-left: 50%; - margin-right: auto; - margin-top: -20%; -} -.pub, .private { - width: 60%; - height: 10%; - margin-left: auto; - margin-right: auto; -} #add_post { margin-top: 20px; margin-left: 83%; } -#edit_btn, #edit_btn1 { - 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; -} -.row2, .row1, .row3{ - width: 30%; -} -.row1, .row2, .question, .row3{ +.row1, .row2, .row3 { + width: 33%; display:inline-block; vertical-align: top; + margin-top: 39px; } -.but { - width: 80%; - margin-bottom:5%; +.rowdiv1, .rowdiv2, .rowdiv3 { + width: 95%; } -#all_my_question { - width: 30%; - height: -100%; +.post_zag, .card-text, .card-body, .post_zag, .author { + width: 90%; + margin-left: auto; + margin-right: auto; + text-align: center; } -.question, .my_post { +.post { + background-color: #7fc3ff; + border-radius: 50px; + width: 90%; + height: 95%; + margin-bottom: 20px; +} +details { + color: #ffffff; +} +#main_table { + margin-left: 10%; + margin-right: auto; + width: 90%; +} +.question { background-color:#7fc3ff; border-radius: 22px; - width: 100%; + width: 90%; + margin-left: 10px; } .is_ans { background-color:#ddefff; border:2px solid #ffffff; border-radius: 25px; - width: 380px; + width: 95%; } -.emot_block { - color: #ffffff; - font-weight: bolder; -} -table { - margin-left: 10%; - width: 90%; -} -.like { - width: 50%; - margin-left: auto; - margin-right: auto; -} -.row1_div, .row2_div, .row3div { - width: 100%; -} -td { - margin: 20px; -} -#all_my_question { -width: 25%; -} -.is_ans { -width: 95%; +.but { + width: 80%; } \ No newline at end of file diff --git a/static/css/publications.css b/static/css/publications.css index aa022a9..da17a29 100644 --- a/static/css/publications.css +++ b/static/css/publications.css @@ -1,141 +1,41 @@ -.bad_user { +.but { + width: 80%; +} +table { + margin-left: 10%; + margin-right: auto; + width: 90%; +} +#row1, #row2, #row3 { + width: 33%; + display:inline-block; + vertical-align: top; + margin-top: 39px; +} +#row1_div, #row2_div, #row3_div { + width: 95%; +} +.post_zag, .card-text, .card-body, .post_zag, .author { + width: 90%; margin-left: auto; margin-right: auto; - background-color: #1daff0; - color: #ffffff; - width: 50%; - height: 55%; - -webkit-border-radius:22px; - -moz-border-radius: 22px; - border-radius: 22px; - border:2px solid #ffffff; - margin-top: 20px; -} -.bad_centre { text-align: center; - margin-left:20%; - margin-right: -20% } -summary { - margin-bottom: 10px; -} -.pos_emot { - margin-bottom: 10px; -} -.nig_emot { - margin-bottom: 10px; -} -.my_author { - width:40%; - height:5%; - left:10%; - -webkit-border-radius: 22px; - -moz-border-radius: 22px; - border-radius: 22px; - border:2px solid #ffffff; - background-color:#1daff0; - top: 98px; -} -.emot { - margin-bottom: 30px; -} -#image { - width: 70%; -} -.card-body { - background-color: #7fc3ff; -} -#all_my_post, #all_my_post1 { - margin-left: auto; - margin-right: auto; -} -#my_post, #my_post1 { - text-align: center; - margin-left: auto; - margin-right: auto; +.post { background-color: #7fc3ff; border-radius: 50px; + width: 90%; + height: 95%; margin-bottom: 20px; } -.my_author, .post_zag { - margin-left: 50%; - margin-right: auto; - margin-top: -20%; -} -.pub, .private { - width: 60%; - height: 10%; - margin-left: auto; - margin-right: auto; +details { + color: #ffffff; } #add_post { margin-top: 20px; margin-left: 83%; } -#edit_btn, #edit_btn1 { - 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; -} -#row2, #row1 { - width: 30%; -} -#row1, #row2, #all_my_question { - display:inline-block; - vertical-align: top; -} -.but { - width: 80%; - margin-bottom:5%; -} -#all_my_question { - width: 30%; - height: -100%; -} -.question, .my_post { - background-color:#7fc3ff; - border-radius: 22px; - width: 100%; - margin-left: 10px; -} -.emot_block { - color: #ffffff; - font-weight: bolder; -} -table { - margin-left: 10%; - width: 90%; -} -.like { - width: 50%; - margin-left: auto; - margin-right: auto; -} -#row1_div, #row2_div { -width: 98%; -} -td { - margin: 20px; +.hz1 { + margin: 5%; + font-size: 160%; } \ No newline at end of file diff --git a/templates/diary.html b/templates/diary.html index b017fe4..ceb219e 100644 --- a/templates/diary.html +++ b/templates/diary.html @@ -3,116 +3,109 @@ {% block content %} {% if current_user.is_authenticated %} -
- Дневник- |
- - Добавить - запись - | -
|
- Публикации-
+ Публикации+
{% if my_post != [] %}
{% for item in pub_post %}
-
- {% if item.photo != None %}
-
- {% if item.name != None %}
- {{item.name}}- {% endif %} -{{item.date}} +
+
+
+ {% if emotion_pub[loop.index0]['pos_emot'] != None %}
+ {% if item.name != None %}
+
{% if item.text != None %}
- |
- Мои мысли-
+ Мои мысли+
{% if my_post != [] %}
{% for item in my_post %}
-
- {% if item.photo != None %}
-
- {% if item.name != None %}
- {{item.name}}- {% endif %} -{{item.date}} +
+
-
+ {% if item.name != None %}
+
{% if item.text != None %}
- |
- Вопросы дня+Вопросы дня
{% for item in question %}
diff --git a/templates/main.html b/templates/main.html
index bf6693e..b95752e 100644
--- a/templates/main.html
+++ b/templates/main.html
@@ -15,10 +15,9 @@
|
| + |
- {% if current_user.is_authenticated %}
-
-
- Вопросы дня+Вопросы дня
{% for item in question %}
@@ -39,212 +38,207 @@
{% endfor %}
Чтобы увидеть вопросы дня войдите в аккаунт - {% endif %} | + + |
- Вам будет интересно+Вам будет интересно{% if for_me_post != [] %} {% for item in for_me_post %} -
- {% if item.photo != None %}
-
+
-
-
+
+ {% if item.name != None %}
+
+ {% if item.text != None %}
+ {{item.text}}
{% endif %}
- |
+ + |
- Вам понравилось+Вам понравились эти посты{% if you_like_that != [] %} {% for item in you_like_that %} -
- {% if item.photo != None %}
-
+
-
+
+
+ {% if item.name != None %}
+
+ {% if item.text != None %}
+ {{item.text}}
{% endif %}
- |
|---|
{{item.date}}
- {% if item.text != None %} -{{item.text}}
- {% endif %} -
{% else %}
@@ -98,17 +83,32 @@
{% endif %}
{% if emotion_pop[loop.index0]['like'] != None %}
- {{emotion_pop[loop.index0]['like']}}
+{{emotion_pop[loop.index0]['like']}}
{% endif %}{{item.date}}
- {% if item.text != None %} -{{item.text}}
- {% endif %} -
{% else %}
@@ -200,17 +185,32 @@
{% endif %}
{% if emotion_fresh[loop.index0]['like'] != None %}
- {{emotion_fresh[loop.index0]['like']}}
+{{emotion_fresh[loop.index0]['like']}}
{% endif %}{{item.date}}
- {% if item.text != None %} -{{item.text}}
- {% endif %} -
- {% else %}
-
- {% endif %}
-
- {% if emotion_for_you[loop.index0]['like'] != None %}
- {{emotion_for_you[loop.index0]['like']}}
- {% endif %} -
+ {% else %}
+
+ {% endif %}
+
+ {% if emotion_for_you[loop.index0]['like'] != None %}
+ {{emotion_for_you[loop.index0]['like']}}
+ {% endif %} +Ничего не нашлось :с
-Ничего не нашлось :с
+