From 5a82a4753213476d7f683d03394a465377b897cb Mon Sep 17 00:00:00 2001
From: mrmur <andreiduvakin@mail.ru>
Date: Wed, 27 Apr 2022 22:15:58 +0500
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=A2=D0=9A=D0=90=D0=A2=20=D0=9A=D0=9E?=
 =?UTF-8?q?=D0=9C=D0=9C=D0=98=D0=A2=D0=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/moona_data.db     | Bin 86016 -> 86016 bytes
 main.py              | 101 ++++++++++--------
 static/css/diary.css |  35 +++---
 templates/diary.html | 249 ++++++++++++++++++++++---------------------
 templates/main.html  |   6 +-
 5 files changed, 208 insertions(+), 183 deletions(-)

diff --git a/db/moona_data.db b/db/moona_data.db
index dd37cb78c0e489cc1eeb67c590850ced83b5bf1b..c4061c0a2ae605a78a1e2394fda470539629f25f 100644
GIT binary patch
delta 83
zcmV-Z0IdIjpap=S1&|v7xRD$~1-Jk%Pkgatp+6A;0RRc@4-^c^3^D-$1xo{3k%6}a
p3%&$?lhHsh3y4Pr3;-*SO#wjwv)Dim1d{<wF@sA*w@XC<wF(lm7+?SZ

delta 71
zcmV-N0J#5vpap=S1&|v7w~-t}1-Ae$OOUZ-p+6A-%>W7Q4-^c^3^D-C1xo{3k%6}a
dh<gPLlhHshvo%5G1Cy^#WrIsaw@XC<wF+f47_k5V

diff --git a/main.py b/main.py
index 4077a8c..2498fa5 100644
--- a/main.py
+++ b/main.py
@@ -100,55 +100,62 @@ def main_page():
             if session.query(Like).filter(Like.post == i.id, Like.user == current_user.id).first():
                 emotion['is_like'] = 1
         emotion_for_you.append(emotion)
-    you_like_that = sorted(list(map(lambda x: session.query(DiaryPost).filter(DiaryPost.id == x).first(),
-                                    map(lambda x: x.post,
-                                        session.query(Like).filter(Like.user == current_user.id).all()))),
-                           key=lambda x: (len(x.text), 1 if x.photo else 0, -(x.date - datetime.datetime.now()).days))
-    emotion_you_like_that = []
-    for i in you_like_that:
-        emotion = {id: i.id, 'pos_emot': [], 'nig_emot': [], 'link': [],
-                   'author': session.query(User).filter(User.id == i.author).first(), 'like': None, 'is_like': 0}
-        if i.pos_emot:
-            emotion['pos_emot'] = i.pos_emot.split()
+    if current_user.is_authenticated:
+        you_like_that = sorted(list(map(lambda x: session.query(DiaryPost).filter(DiaryPost.id == x).first(),
+                                        map(lambda x: x.post,
+                                            session.query(Like).filter(Like.user == current_user.id).all()))),
+                               key=lambda x: (
+                                   len(x.text), 1 if x.photo else 0, -(x.date - datetime.datetime.now()).days))
+        emotion_you_like_that = []
+        for i in you_like_that:
+            emotion = {id: i.id, 'pos_emot': [], 'nig_emot': [], 'link': [],
+                       'author': session.query(User).filter(User.id == i.author).first(), 'like': None, 'is_like': 0}
+            if i.pos_emot:
+                emotion['pos_emot'] = i.pos_emot.split()
+            else:
+                emotion['pos_emot'] = None
+            if i.nig_emot:
+                emotion['nig_emot'] = i.nig_emot.split()
+            else:
+                emotion['nig_emot'] = None
+            if i.link:
+                emotion['link'] = i.link.split()
+            else:
+                emotion['link'] = None
+            like = session.query(Like).filter(Like.post == i.id).all()
+            if like:
+                emotion['like'] = len(like)
+            if current_user.is_authenticated:
+                if session.query(Like).filter(Like.post == i.id, Like.user == current_user.id).first():
+                    emotion['is_like'] = 1
+            emotion_you_like_that.append(emotion)
+        quest = session.query(Answer).filter(Answer.user == current_user.id).all()
+        days_reg = current_user.data_reg - datetime.date.today()
+        days_reg = abs(days_reg.days) + 1
+        if quest:
+            post_quest = session.query(Quest).filter(Quest.id.in_([i.id_question for i in quest])).all()
         else:
-            emotion['pos_emot'] = None
-        if i.nig_emot:
-            emotion['nig_emot'] = i.nig_emot.split()
-        else:
-            emotion['nig_emot'] = None
-        if i.link:
-            emotion['link'] = i.link.split()
-        else:
-            emotion['link'] = None
-        like = session.query(Like).filter(Like.post == i.id).all()
-        if like:
-            emotion['like'] = len(like)
-        if current_user.is_authenticated:
-            if session.query(Like).filter(Like.post == i.id, Like.user == current_user.id).first():
-                emotion['is_like'] = 1
-        emotion_you_like_that.append(emotion)
-    quest = session.query(Answer).filter(Answer.user == current_user.id).all()
-    days_reg = current_user.data_reg - datetime.date.today()
-    days_reg = abs(days_reg.days) + 1
-    if quest:
-        post_quest = session.query(Quest).filter(Quest.id.in_([i.id_question for i in quest])).all()
+            post_quest = []
+        while len(post_quest) < days_reg:
+            post_quest.append(
+                session.query(Quest).filter(Quest.id.notin_([i.id for i in post_quest])).first())
+        ans = []
+        for i in post_quest:
+            if i is not None:
+                ans_id = session.query(Answer).filter(
+                    Answer.id_question == i.id and Answer.user.id == current_user.id).first()
+                if ans_id is not None:
+                    ans.append(ans_id)
+        post_quest = post_quest[::-1]
+        ans = ans[::-1]
+        ans2 = {}
+        for i in ans:
+            ans2[i.id_question] = i
     else:
-        post_quest = []
-    while len(post_quest) < days_reg:
-        post_quest.append(
-            session.query(Quest).filter(Quest.id.notin_([i.id for i in post_quest])).first())
-    ans = []
-    for i in post_quest:
-        if i is not None:
-            ans_id = session.query(Answer).filter(
-                Answer.id_question == i.id and Answer.user.id == current_user.id).first()
-            if ans_id is not None:
-                ans.append(ans_id)
-    post_quest = post_quest[::-1]
-    ans = ans[::-1]
-    ans2 = {}
-    for i in ans:
-        ans2[i.id_question] = i
+        you_like_that = []
+        emotion_you_like_that = None
+        post_quest = None
+        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,
                            question=post_quest,
diff --git a/static/css/diary.css b/static/css/diary.css
index af196d0..52764e2 100644
--- a/static/css/diary.css
+++ b/static/css/diary.css
@@ -26,9 +26,8 @@ summary {
 .my_author {
     width:40%;
     height:5%;
-    left:10%;
-    -webkit-border-radius: 22px;
-    -moz-border-radius: 22px;
+    margin-left:30%;
+    margin-right:30%;
     border-radius: 22px;
     border:2px solid #ffffff;
     background-color:#1daff0;
@@ -43,12 +42,11 @@ summary {
 .card-body {
     background-color: #7fc3ff;
 }
-#all_my_post, #all_my_post1 {
+.all_my_post {
     margin-left: auto;
     margin-right: auto;
 }
-#my_post, #my_post1 {
-    text-align: center;
+.card {
     margin-left: auto;
     margin-right: auto;
     background-color: #7fc3ff;
@@ -56,15 +54,14 @@ summary {
     margin-bottom: 20px;
 }
 .my_author, .my_post_zag {
-    margin-left: 50%;
-    margin-right: auto;
-    margin-top: -20%;
+    text-align: center;
 }
 .pub, .private {
-    width: 60%;
+    width: 55%;
     height: 10%;
-    margin-left: auto;
-    margin-right: auto;
+    margin-left:25%;
+    margin-right: 25%;
+    text-align: center;
 }
 #add_post {
     margin-top: 20px;
@@ -72,6 +69,9 @@ 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,7 +98,7 @@ textarea {
     margin-left: 20px;
 }
 #row2, #row1 {
-    width: 30%;
+    width: 32%;
 }
 #row1, #row2, #all_my_question {
     display:inline-block;
@@ -114,9 +114,8 @@ textarea {
 }
 .question, .my_post {
     background-color:#7fc3ff;
-    border-radius: 22px;
-    width: 100%;
     margin-left: 10px;
+    margin-right: 10px;
 }
 .is_ans {
     background-color:#ddefff;
@@ -138,7 +137,7 @@ table {
     margin-right: auto;
 }
 #row1_div, #row2_div {
-width: 98%;
+    width: 98%;
 }
 td {
     margin: 20px;
@@ -148,4 +147,8 @@ width: 25%;
 }
 .is_ans {
 width: 95%;
+}
+.card-text {
+    color:#ffffff;
+    text-align: center;
 }
\ No newline at end of file
diff --git a/templates/diary.html b/templates/diary.html
index 0ffbd7b..b017fe4 100644
--- a/templates/diary.html
+++ b/templates/diary.html
@@ -19,95 +19,100 @@
     <td id="row1">
         <div id="row1_div">
             <h2 class="my_post_zag" style="margin-bottom: 10%; margin-left:15%">Публикации</h2>
-            <div id="all_my_post1">
+            <div class="all_my_post">
                 {% if my_post != [] %}
                 {% for item in pub_post %}
-
-                <div class="card" style="width: 25rem;">
+                <div class="card">
                     {% if item.photo != None %}
                     <img src="{{ item.photo }}" class="card-img-top" alt="...">
                     {% endif %}
-                  <div class="card-body">
-                      {% if item.name != None %}
-                      <h4 class="card-title" style="color: #c5f1ff">{{item.name}}</h4>
-                      {% endif %}
-                      <p><small>{{item.date}}</small></p>
-                      {% if item.text != None %}
-                      <p class="card-text">{{item.text}}</p>
-                      {% endif %}
-                  </div>
-                  <ul class="list-group list-group-flush">
-                  <li class="list-group-item">
-                    {% if emotion_pub[loop.index0]['pos_emot'] != None %}
-                        <ul style="list-style-type: none; margin-left:-15%; margin-top:5%;">
-                            {% for item2 in emotion[loop.index0]['pos_emot'] %}
-                            <li>
-                                <div class="emot"><strong class="alert alert-success" role="alert"
-                                                          style="border-radius: 22px;">{{item2}}</strong></div>
-                            </li>
-                            {% endfor %}
-                        </ul>
-                    {% endif %}
-                  </li>
-                    <li class="list-group-item">
+                    <div class="card-body">
+                        {% if item.name != None %}
+                        <h4 class="card-title" style="color: #c5f1ff">{{item.name}}</h4>
+                        {% endif %}
+                        <p><small>{{item.date}}</small></p>
+                        {% if item.text != None %}
+                        <p class="card-text">{{item.text}}</p>
+                        {% endif %}
+                    </div>
+                    <ul class="list-group list-group-flush">
+                        {% if emotion_pub[loop.index0]['pos_emot'] != None %}
+                        <li class="list-group-item">
+                            <ul style="list-style-type: none; margin-left:-15%; margin-top:5%;">
+                                {% for item2 in emotion_pub[loop.index0]['pos_emot'] %}
+                                <li>
+                                    <div class="emot"><strong class="alert alert-success" role="alert"
+                                                              style="border-radius: 22px;">{{item2}}</strong></div>
+                                </li>
+                                {% endfor %}
+                            </ul>
+                        </li>
+                        {% endif %}
                         {% if emotion_pub[loop.index0]['nig_emot'] != None %}
-                        <ul style="list-style-type: none; margin-left:-15%; margin-top:5%">
+                        <li class="list-group-item">
+                            <ul style="list-style-type: none; margin-left:-15%; margin-top:5%">
                                 {% for item2 in emotion_pub[loop.index0]['nig_emot'] %}
                                 <li>
                                     <div class="emot"><strong class="alert alert-danger" role="alert"
                                                               style="border-radius: 22px;">{{item2}}</strong></div>
                                 </li>
                                 {% endfor %}
-                        </ul>
+                            </ul>
+                        </li>
                         {% endif %}
-                    </li>
-                    <li class="list-group-item">
                         {% if emotion_pub[loop.index0]['link'] != None %}
-                        <ul style="list-style-type: none; margin-left:-15%; margin-top:5%; margin-bottom:5%">
+                        <li class="list-group-item">
+                            <ul style="list-style-type: none; margin-left:-15%; margin-top:5%; margin-bottom:5%">
                                 {% for item2 in emotion_pub[loop.index0]['link'] %}
                                 <li>
-                                    <div class="emot"><a class="alert alert-light" role="alert" href="{{ item2 }}" style="border-radius: 22px;">Ссылка
+                                    <div class="emot"><a class="alert alert-light" role="alert" href="{{ item2 }}"
+                                                         style="border-radius: 22px;">Ссылка
                                         {{ loop.index }}</a></div>
                                 </li>
                                 {% endfor %}
-                        </ul>
+                            </ul>
+                        </li>
                         {% endif %}
-                    </li>
-                  </ul>
-                  <div class="card-body">
-                    {% if item.public == 1 or item.public == 'True' %}
-                    <div style="border-radius: 22px; margin-left:-5%; width: 50%" class="alert alert-success pub" role="alert">Запись
-                        опубликована
-                    </div>
-                    {% else %}
-                    <div style="border-radius: 22px; margin-left:-5% width: 50%" class="alert alert-danger private" role="alert">Запись
-                        приватная
-                    </div>
-                    {% endif %}
-                    <div class="my_author"><img src="../{{ current_user.photo }}" width="40" height="40"
-                                                style="border-radius: 22px">
-                        <strong style="color: #ffffff">{{ current_user.name }}</strong>
-                    </div>
-                    <div class="like" style="margin-top:5%; margin-left:1%">
-                        <a type="button"
-                           href="/new_like/{{current_user.id}}/{{item.id}}/diary">
-                            {% if emotion_pub[loop.index0]['is_like'] %}
-                            <img src="../static/img/like_add.png" width="117" height="100">
-                            {% else %}
-                            <img src="../static/img/like.png" width="94" height="80">
+                    </ul>
+                    <div class="card-body">
+                        {% if item.public == 1 or item.public == 'True' %}
+                        <div style="border-radius: 22px;" class="alert alert-success pub"
+                             role="alert">Запись
+                            опубликована
+                        </div>
+                        {% else %}
+                        <div style="border-radius: 22px;" class="alert alert-danger private"
+                             role="alert">Запись
+                            приватная
+                        </div>
+                        {% endif %}
+                        <div class="my_author"><img src="../{{ current_user.photo }}" width="40" height="40"
+                                                    style="border-radius: 22px">
+                            <strong style="color: #ffffff">{{ current_user.name }}</strong>
+                        </div>
+                        <div class="like" style="margin-top:5%; margin-left:1%">
+                            <a type="button"
+                               href="/new_like/{{current_user.id}}/{{item.id}}/diary">
+                                {% if emotion_pub[loop.index0]['is_like'] %}
+                                <img src="../static/img/like_add.png" width="117" height="100">
+                                {% else %}
+                                <img src="../static/img/like.png" width="94" height="80">
+                                {% endif %}
+                            </a>
+                            {% if emotion_pub[loop.index0]['like'] != None %}
+                            <p style="color:#ffffff; margin-left:30%">{{emotion_pub[loop.index0]['like']}}</p>
                             {% endif %}
-                        </a>
-                        {% if emotion_pub[loop.index0]['like'] != None %}
-                        <p style="color:#ffffff; margin-left:30%">{{emotion_pub[loop.index0]['like']}}</p>
-                        {% endif %}
-                    </div>
-                    <div>
-                        <a style="border-radius: 15px; margin-top:10%; margin-left:1%" href="/post/{{ item.id }}" class="btn" id="edit_btn">
-                            Изменить
-                        </a>
-                        <a style="border-radius: 15px; margin-top:10%" href="/post_deleted/{{ item.id }}" class="btn btn-danger">
-                            Удалить
-                        </a>
+                        </div>
+                        <div class="edit">
+                            <a style="border-radius: 15px;" href="/post/{{ item.id }}"
+                               class="btn" id="edit_btn">
+                                Изменить
+                            </a>
+                            <a style="border-radius: 15px;" href="/post_deleted/{{ item.id }}"
+                               class="btn btn-danger">
+                                Удалить
+                            </a>
+                        </div>
                     </div>
                 </div>
                 {% endfor %}
@@ -121,26 +126,26 @@
     </td>
     <td id="row2">
         <div id="row2_div">
-            <h2 class="my_post_zag" style="margin-bottom: 10%; margin-left:15%">Мои мысли</h2>
-            <div id="all_my_post">
+            <h2 class="my_post_zag">Мои мысли</h2>
+            <div class="all_my_post">
                 {% if my_post != [] %}
                 {% for item in my_post %}
-                <div class="card" style="width: 25rem;">
+                <div class="card">
                     {% if item.photo != None %}
                     <img src="{{ item.photo }}" class="card-img-top" alt="...">
                     {% endif %}
-                  <div class="card-body">
-                      {% if item.name != None %}
-                      <h4 class="card-title" style="color: #c5f1ff">{{item.name}}</h4>
-                      {% endif %}
-                      <p><small>{{item.date}}</small></p>
-                      {% if item.text != None %}
-                      <p class="card-text">{{item.text}}</p>
-                      {% endif %}
-                  </div>
-                  <ul class="list-group list-group-flush">
-                    <li class="list-group-item">
-                        {% if emotion_pub[loop.index0]['pos_emot'] != None %}
+                    <div class="card-body">
+                        {% if item.name != None %}
+                        <h4 class="card-title" style="color: #c5f1ff">{{item.name}}</h4>
+                        {% endif %}
+                        <p><small>{{item.date}}</small></p>
+                        {% if item.text != None %}
+                        <p class="card-text">{{item.text}}</p>
+                        {% endif %}
+                    </div>
+                    <ul class="list-group list-group-flush">
+                        {% if emotion[loop.index0]['pos_emot'] != None %}
+                        <li class="list-group-item">
                             <ul style="list-style-type: none; margin-left:-15%; margin-top:5%;">
                                 {% for item2 in emotion[loop.index0]['pos_emot'] %}
                                 <li>
@@ -149,54 +154,60 @@
                                 </li>
                                 {% endfor %}
                             </ul>
+                        </li>
                         {% endif %}
-                    </li>
-                    <li class="list-group-item">
-                        {% if emotion_pub[loop.index0]['nig_emot'] != None %}
-                        <ul style="list-style-type: none; margin-left:-15%; margin-top:5%">
-                                {% for item2 in emotion_pub[loop.index0]['nig_emot'] %}
+                        {% if emotion[loop.index0]['nig_emot'] != None %}
+                        <li class="list-group-item">
+                            <ul style="list-style-type: none; margin-left:-15%; margin-top:5%">
+                                {% for item2 in emotion[loop.index0]['nig_emot'] %}
                                 <li>
                                     <div class="emot"><strong class="alert alert-danger" role="alert"
                                                               style="border-radius: 22px;">{{item2}}</strong></div>
                                 </li>
                                 {% endfor %}
-                        </ul>
+                            </ul>
+                        </li>
                         {% endif %}
-                    </li>
-                    <li class="list-group-item">
-                        {% if emotion_pub[loop.index0]['link'] != None %}
-                        <ul style="list-style-type: none; margin-left:-15%; margin-top:5%; margin-bottom:5%">
-                                {% for item2 in emotion_pub[loop.index0]['link'] %}
+                        {% if emotion[loop.index0]['link'] != None %}
+                        <li class="list-group-item">
+                            <ul style="list-style-type: none; margin-left:-15%; margin-top:5%; margin-bottom:5%">
+                                {% for item2 in emotion[loop.index0]['link'] %}
                                 <li>
-                                    <div class="emot"><a class="alert alert-light" role="alert" href="{{ item2 }}" style="border-radius: 22px;">Ссылка
+                                    <div class="emot"><a class="alert alert-light" role="alert" href="{{ item2 }}"
+                                                         style="border-radius: 22px;">Ссылка
                                         {{ loop.index }}</a></div>
                                 </li>
                                 {% endfor %}
-                        </ul>
+                            </ul>
+                        </li>
                         {% endif %}
-                    </li>
-                  </ul>
-                  <div class="card-body">
-                    {% if item.public == 1 or item.public == 'True' %}
-                    <div style="border-radius: 22px; margin-left:-5%; width: 50%" class="alert alert-success pub" role="alert">Запись
-                        опубликована
-                    </div>
-                    {% else %}
-                    <div style="border-radius: 22px; margin-left:-5% width: 50%" class="alert alert-danger private" role="alert">Запись
-                        приватная
-                    </div>
-                    {% endif %}
-                    <div class="my_author"><img src="../{{ current_user.photo }}" width="40" height="40"
-                                                style="border-radius: 22px">
-                        <strong style="color: #ffffff">{{ current_user.name }}</strong>
-                    </div>
-                    <div>
-                        <a style="border-radius: 15px; margin-top:10%; margin-left:1%" href="/post/{{ item.id }}" class="btn" id="edit_btn">
-                            Изменить
-                        </a>
-                        <a style="border-radius: 15px; margin-top:10%" href="/post_deleted/{{ item.id }}" class="btn btn-danger">
-                            Удалить
-                        </a>
+                    </ul>
+                    <div class="card-body">
+                        {% if item.public == 1 or item.public == 'True' %}
+                        <div style="border-radius: 22px;" class="alert alert-success pub"
+                             role="alert">Запись
+                            опубликована
+                        </div>
+                        {% else %}
+                        <div style="border-radius: 22px;" class="alert alert-danger private"
+                             role="alert">Запись
+                            приватная
+                        </div>
+                        {% endif %}
+                        <div class="my_author"><img src="../{{ current_user.photo }}" width="40" height="40"
+                                                    style="border-radius: 22px">
+                            <strong style="color: #ffffff">{{ current_user.name }}</strong>
+                        </div>
+                        <div>
+                            <a style="border-radius: 15px;" href="/post/{{ item.id }}"
+                               class="btn" id="edit_btn1">
+                                Изменить
+                            </a>
+                            <a style="border-radius: 15px;" href="/post_deleted/{{ item.id }}"
+                               class="btn btn-danger">
+                                Удалить
+                            </a>
+                        </div>
                     </div>
                 </div>
                 {% endfor %}
diff --git a/templates/main.html b/templates/main.html
index aaa9bd8..bf6693e 100644
--- a/templates/main.html
+++ b/templates/main.html
@@ -17,6 +17,7 @@
 <table id="main_table">
     <td class="row1">
         <div class="rowdiv1">
+            {% if current_user.is_authenticated %}
             <h2 class="my_post_zag" style="margin-left:15%">Вопросы дня</h2>
             <div class="my_post">
                 <div class="question">
@@ -38,6 +39,9 @@
                     {% endfor %}
                 </div>
             </div>
+            {% else %}
+            <p>Чтобы увидеть вопросы дня войдите в аккаунт</p>
+            {% endif %}
         </div>
     </td>
     <td class="row2">
@@ -225,7 +229,7 @@
                         {% endif %}
                     </div>
                     <div>
-                        <a style="border-radius: 15px; margin-top:10%; margin-left:1%" href="/post/{{ item.id }}" class="btn" id="edit_btn">
+                        <a style="border-radius: 15px; margin-top:10%; margin-left:1%" href="/post/{{ item.id }}" class="btn" id="edit_btn1">
                             Изменить
                         </a>
                         <a style="border-radius: 15px; margin-top:10%" href="/post_deleted/{{ item.id }}" class="btn btn-danger">