From 32a9bfaac89c3c75636b4354d7ca74d7c9a59faf Mon Sep 17 00:00:00 2001 From: Dinosaur <78600651+Darya-Tolmeneva@users.noreply.github.com> Date: Wed, 27 Apr 2022 13:53:23 +0500 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=20?= =?UTF-8?q?=D0=B2=D0=B8=D0=B4=20=D0=BF=D1=83=D0=B1=D0=BB=D0=B8=D0=BA=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D0=B9=20=D0=BD=D0=B0=20=D0=92=D0=A1=D0=95=D0=A5=20?= =?UTF-8?q?=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D0=B0=D1=85!=20?= =?UTF-8?q?=D0=9F=D1=8B.=D0=A1=D1=8B.=20=D1=8F=20=D1=87=D1=83=D1=82=D1=8C?= =?UTF-8?q?=20=D0=BD=D0=B5=20=D1=83=D0=BC=D0=B5=D1=80=D0=BB=D0=B0=20=D0=B7?= =?UTF-8?q?=D0=B0=20=D0=BF=D0=B0=D1=80=D1=83=20=D1=87=D0=B0=D1=81=D0=BE?= =?UTF-8?q?=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/moona_data.db | Bin 86016 -> 86016 bytes static/css/base.css | 10 +- static/css/diary.css | 20 +- static/css/main.css | 166 ++++++++++--- static/css/publications.css | 156 +++++++++--- templates/base.html | 5 +- templates/diary.html | 248 +++++++++---------- templates/main.html | 352 +++++++++++++------------- templates/publications.html | 474 ++++++++++++++++++------------------ 9 files changed, 815 insertions(+), 616 deletions(-) diff --git a/db/moona_data.db b/db/moona_data.db index ea51aec50856f6aef0e6c22bc0681684766ffca8..dd37cb78c0e489cc1eeb67c590850ced83b5bf1b 100644 GIT binary patch delta 1389 zcmaJ>O=}ZT6rD^Qp>4`2)P>l^%R)hF!_4S7CL1ZDE@DAkx+#JnMQDp{S0Xc$R9mSw zEm?|E-MNuz(lqJh3*3l{;(I^9KOp!U^xXF{C5XDn%=4tF8jnPU@eY>zGUOFt0M!BO@)n?xc!75h zJHj6_!ikC~DYQ?gBE+^O`EeKWKA!6c0y$PCCN_8roIM`n*AZpLV-biluVXoYQ;vwY zfg>)|#Y7n#k)q}eMki~sw9bHx*t;GHc8bnumLprP>T{p?u!ZMNnSYCzc zqw$h}4XURaIwK=VM^2P<+@>le%9kP^VBg?}q%%oH-J?Vag1Lxb%6IwPlkLU;qQSCw zNtU7i8rECbwMeQp5K*yR*aI_E=TL=sA(~`HkO+Jz0q;?Tk_RLq%A>)86FJ7;W1Y<1 zfs&U7jwnOa+rXstWQmxF3fN%_{EHY^BWw_&Zsk}2ajYfHQk(lNOv#{u#3d+A(?(q} zSc&%C6X8fk10b8H@B$fL{<4sNLR^2qNeG`L7ViaS;v=x8OE`c3S#1zIB6`igs9|n z$8wx$>&i5~fBR~|$rtQvIotI-&#Hd=#U|z#7MCBaKAC?!x3svtGUw)&79LeockFuc z=JLrCKn@n=%~QY`#0)Jf0lnQA!uqpsi8PmStkteM}<*nCqz z&9=?zyT!?SS>4c5sTn<;6z6!%whFFWu-u&Gd9LMVQwm}XL9Bei%@ZW=UaW_dZ@i2HdMsqsmPnP#rV`p}Cczk)EM}xrw -
  • - diff --git a/templates/diary.html b/templates/diary.html index 6ea3f01..0ffbd7b 100644 --- a/templates/diary.html +++ b/templates/diary.html @@ -3,85 +3,92 @@ {% block content %} {% if current_user.is_authenticated %} -

    Главная

    -     + + + + + +
    +

    Дневник

    +     		+ Добавить + запись +
    -

    Публикации

    +

    Публикации

    {% if my_post != [] %} {% for item in pub_post %} -
    -
    - {% if item.name != None %} -

    {{item.name}}

    - {% endif %} -     - {% if item.text != None %} - {{item.text}} - {% endif %} -
    - {% if emotion_pub[loop.index0]['pos_emot'] != None %} -
    -
    - - Позитивные эмоции - - {% for item2 in emotion_pub[loop.index0]['pos_emot'] %} - {{item2}} - {% endfor %} -
    -
    - {% endif %} - {% if emotion_pub[loop.index0]['nig_emot'] != None %} -
    -
    - - Негативные эмоции - -

    - {% for item2 in emotion_pub[loop.index0]['nig_emot'] %} - {{item2}} - {% endfor %} -
    -
    - {% endif %} + +
    {% if item.photo != None %} -
    - -
    + ... {% endif %} - {% if emotion_pub[loop.index0]['link'] != None %} -
    - - Ссылки - - {% for item2 in emotion_pub[loop.index0]['link'] %} -
    - Ссылка - {{ loop.index }} -
    - {% endfor %} -
    +
    + {% if item.name != None %} +

    {{item.name}}

    + {% endif %} +

    {{item.date}}

    + {% if item.text != None %} +

    {{item.text}}

    + {% endif %} +
    +
      +
    • + {% if emotion_pub[loop.index0]['pos_emot'] != None %} +
        + {% for item2 in emotion[loop.index0]['pos_emot'] %} +
      • +
        {{item2}}
        +
        • + {% endfor %} +
      {% endif %} +
      • +
    • + {% if emotion_pub[loop.index0]['nig_emot'] != None %} +
        + {% for item2 in emotion_pub[loop.index0]['nig_emot'] %} +
      • +
        {{item2}}
        +
        • + {% endfor %} +
      + {% endif %} +
      • +
    • + {% if emotion_pub[loop.index0]['link'] != None %} + + {% endif %} +
      • +
    +
    {% if item.public == 1 or item.public == 'True' %} -
    -

    Мои мысли

    +

    Мои мысли

    {% if my_post != [] %} {% for item in my_post %} -
    -
    - {% if item.name != None %} -

    {{item.name}}

    - {% endif %} -     - {% if item.text != None %} - {{item.text}} - {% endif %} -
    - {% if emotion[loop.index0]['pos_emot'] != None %} -
    -
    - - Позитивные эмоции - -
      +
      + {% if item.photo != None %} + ... + {% endif %} +
      + {% if item.name != None %} +

      {{item.name}}

      + {% endif %} +

      {{item.date}}

      + {% if item.text != None %} +

      {{item.text}}

      + {% endif %} +
      +
        +
      • + {% if emotion_pub[loop.index0]['pos_emot'] != None %} +
          {% for item2 in emotion[loop.index0]['pos_emot'] %}
        • {% endfor %}
        -
    -
    - {% endif %} - {% if emotion[loop.index0]['nig_emot'] != None %} -
    -
    - - Негативные эмоции - -
      - {% for item2 in emotion[loop.index0]['nig_emot'] %} + {% endif %} + +
    • + {% if emotion_pub[loop.index0]['nig_emot'] != None %} +
        + {% for item2 in emotion_pub[loop.index0]['nig_emot'] %}
      • {{item2}}
        • {% endfor %} -
      -
    -
    - {% endif %} - {% if item.photo != None %} -
    - -
    - {% endif %} - {% if emotion[loop.index0]['link'] != None %} -
    - - Ссылки - - {% for item2 in emotion[loop.index0]['link'] %} -
    - Ссылка - {{ loop.index }} -
    - {% endfor %} -
    - {% endif %} + + {% endif %} + +
  • + {% if emotion_pub[loop.index0]['link'] != None %} + + {% endif %} +
    • + +
    {% if item.public == 1 or item.public == 'True' %} -
    -

    Вопросы дня

    +

    Вопросы дня

    {% for item in question %} diff --git a/templates/main.html b/templates/main.html index b95752e..aaa9bd8 100644 --- a/templates/main.html +++ b/templates/main.html @@ -15,9 +15,9 @@
    -
    +
    -

    Вопросы дня

    +

    Вопросы дня

    {% for item in question %} @@ -39,206 +39,208 @@
    - -     		+ +
    -

    Вам будет интересно

    +

    Вам будет интересно

    {% if for_me_post != [] %} {% for item in for_me_post %} -
    -
    - - {% if item.name != None %} -

    {{item.name}}

    - {% endif %} -     - {% if item.text != None %} - {{item.text}} +
    + {% if item.photo != None %} + ... {% endif %} -
    - {% if emotion_for_you[loop.index0]['pos_emot'] != None %} -
    -
    - - Позитивные эмоции - -

    - {% for item2 in emotion_for_you[loop.index0]['pos_emot'] %} - {{item2}} - {% endfor %} -
    -
    -

    - {% endif %} - {% if emotion_for_you[loop.index0]['nig_emot'] != None %} -
    -
    - - Негативные эмоции - -

    - {% for item2 in emotion_for_you[loop.index0]['nig_emot'] %} - {{item2}} - {% endfor %} -
    -
    -

    - {% endif %} - {% if item.photo != None %} -

    -
    - -
    -

    - {% endif %} - {% if current_user.is_authenticated %} - - {% endif %} - {% if emotion_for_you[loop.index0]['link'] != None %} -
    - - Ссылки - -

    - {% for item2 in emotion_for_you[loop.index0]['link'] %} -
    - Ссылка - {{ loop.index }} + +
  • + {% if emotion_for_you[loop.index0]['nig_emot'] != None %} +
      + {% for item2 in emotion_for_you[loop.index0]['nig_emot'] %} +
    • +
      {{item2}}
      +
      • + {% endfor %} +
    + {% endif %} +
    • +
  • + {% if emotion_for_you[loop.index0]['link'] != None %} + + {% endif %} +
    • + +
    + {% if item.public == 1 or item.public == 'True' %} + + {% else %} + + {% endif %} +
    + {{ current_user.name }} +
    + + -

    - {% endfor %} -
    - {% endif %} -
    - {{ emotion_for_you[loop.index0]['author'].name }}
    - {{item.date}} + {% endfor %}
    - {% endfor %} {% else %}

    Ничего не нашлось :с

    {% endif %}
    - -     		+ +
    -

    Вам понравились эти посты

    +

    Вам понравилось

    {% if you_like_that != [] %} {% for item in you_like_that %} -
    -
    - - {% if item.name != None %} -

    {{item.name}}

    - {% endif %} -     - {% if item.text != None %} - {{item.text}} +
    + {% if item.photo != None %} + ... {% endif %} -
    - {% if emotion_you_like_that[loop.index0]['pos_emot'] != None %} -
    -
    - - Позитивные эмоции - -

    - {% for item2 in emotion_you_like_that[loop.index0]['pos_emot'] %} - {{item2}} - {% endfor %} -
    -
    -

    - {% endif %} - {% if emotion_you_like_that[loop.index0]['nig_emot'] != None %} -
    -
    - - Негативные эмоции - -

    - {% for item2 in emotion_you_like_that[loop.index0]['nig_emot'] %} - {{item2}} - {% endfor %} -
    -
    -

    - {% endif %} - {% if item.photo != None %} -

    -
    - -
    -

    - {% endif %} - {% if current_user.is_authenticated %} - - {% endif %} - {% if emotion_you_like_that[loop.index0]['link'] != None %} -
    - - Ссылки - -

    - {% for item2 in emotion_you_like_that[loop.index0]['link'] %} -
    - Ссылка - {{ loop.index }} + +
  • + {% if emotion_you_like_that[loop.index0]['nig_emot'] != None %} +
      + {% for item2 in emotion_you_like_that[loop.index0]['nig_emot'] %} +
    • +
      {{item2}}
      +
      • + {% endfor %} +
    + {% endif %} +
    • +
  • + {% if emotion_you_like_that[loop.index0]['link'] != None %} + + {% endif %} +
    • + +
    + {% if item.public == 1 or item.public == 'True' %} + + {% else %} + + {% endif %} +
    + {{ current_user.name }} +
    + + -

    - {% endfor %} -
    - {% endif %} -
    - {{ emotion_you_like_that[loop.index0]['author'].name }}
    - {{item.date}} + {% endfor %}
    - {% endfor %} {% else %}

    Ничего не нашлось :с

    {% endif %}
    - +
    {% endblock %} \ No newline at end of file diff --git a/templates/publications.html b/templates/publications.html index 7b5f2b5..b55ad6f 100644 --- a/templates/publications.html +++ b/templates/publications.html @@ -23,59 +23,74 @@
    {% if pop_post != [] %} {% for item in pop_post %} -
    -
    - - {% if item.name != None %} -

    {{item.name}}

    - {% endif %} -     - {% if item.text != None %} - {{item.text}} - {% endif %} -
    - {% if emotion_pop[loop.index0]['pos_emot'] != None %} -
    -
    - - Позитивные эмоции - -

    - {% for item2 in emotion_pop[loop.index0]['pos_emot'] %} - {{item2}} - {% endfor %} -
    -
    -

    - {% endif %} - {% if emotion_pop[loop.index0]['nig_emot'] != None %} -
    -
    - - Негативные эмоции - -

    - {% for item2 in emotion_pop[loop.index0]['nig_emot'] %} - {{item2}} - {% endfor %} -
    -
    -

    - {% endif %} +
    {% if item.photo != None %} -

    -
    - -
    -

    + ... {% endif %} - {% if current_user.is_authenticated %} - -
    +

    Свежее

    {% if fresh_post != [] %} {% for item in fresh_post %} -
    -
    - - {% if item.name != None %} -

    {{item.name}}

    - {% endif %} -     - {% if item.text != None %} - {{item.text}} - {% endif %} -
    - {% if emotion_fresh[loop.index0]['pos_emot'] != None %} -
    -
    - - Позитивные эмоции - -

    - {% for item2 in emotion_fresh[loop.index0]['pos_emot'] %} - {{item2}} - {% endfor %} -
    -
    -

    - {% endif %} - {% if emotion_fresh[loop.index0]['nig_emot'] != None %} -
    -
    - - Негативные эмоции - -

    - {% for item2 in emotion_fresh[loop.index0]['nig_emot'] %} - {{item2}} - {% endfor %} -
    -
    -

    - {% endif %} +
    {% if item.photo != None %} -

    -
    - -
    -

    + ... {% endif %} - {% if current_user.is_authenticated %} -
    • +
  • + {% if emotion_for_you[loop.index0]['nig_emot'] != None %} +
      + {% for item2 in emotion_for_you[loop.index0]['nig_emot'] %} +
    • +
      {{item2}}
      +
      • + {% endfor %} +
    + {% endif %} +
    • +
  • + {% if emotion_for_you[loop.index0]['link'] != None %} + + {% endif %} +
    • +
+
+ {% if item.public == 1 or item.public == 'True' %} + + {% else %} + + {% endif %} +
+ {{ current_user.name }} +
+ + -

- {% endfor %} - - {% endif %} -
- {{ emotion_for_you[loop.index0]['author'].name }}
- {{item.date}} + {% endfor %}
- {% endfor %} - - {% else %} -
-

Ничего не нашлось :с

-
- {% endif %} + {% else %} +
+

Ничего не нашлось :с

+
+ {% endif %}