From 3d4e002144e065930488b35447b0e8e30fa80329 Mon Sep 17 00:00:00 2001
From: Odelia Yechiel <odechann@gmail.com>
Date: Sat, 20 Feb 2021 04:49:07 +0200
Subject: [PATCH 1/4] fixed bugs in the user profile page

---
 .../partials/user_profile/middle_content.html |  13 +
 .../middle_content/event_card.html            |  15 +
 .../middle_content/event_settings.html        |  10 +
 .../middle_content/update_event_modal.html    |  16 +
 .../partials/user_profile/sidebar_left.html   |  12 +
 .../sidebar_left/daily_horoscope.html         |  13 +
 .../sidebar_left/features_card.html           |  33 ++
 .../sidebar_left/profile_card.html            |   8 +
 .../sidebar_left/profile_card/modals.html     |  17 +
 .../modals/calendar_privacy_modal.html        |  22 ++
 .../modals/description_modal.html             |  21 +
 .../profile_card/modals/email_modal.html      |  20 +
 .../profile_card/modals/name_modal.html       |  20 +
 .../profile_card/modals/telegram_modal.html   |  21 +
 .../modals/upload_photo_modal.html            |  21 +
 .../profile_card/profile_update_menu.html     |  46 +++
 .../profile_card/user_details.html            |  14 +
 .../partials/user_profile/sidebar_right.html  |  15 +
 .../user_profile/sidebar_right/meetups.html   |   7 +
 .../user_profile/sidebar_right/new_card.html  |   7 +
 .../user_profile/sidebar_right/new_card2.html |   7 +
 .../sidebar_right/on_this_day.html            |   5 +
 app/templates/profile.html                    | 369 +-----------------
 23 files changed, 367 insertions(+), 365 deletions(-)
 create mode 100644 app/templates/partials/user_profile/middle_content.html
 create mode 100644 app/templates/partials/user_profile/middle_content/event_card.html
 create mode 100644 app/templates/partials/user_profile/middle_content/event_settings.html
 create mode 100644 app/templates/partials/user_profile/middle_content/update_event_modal.html
 create mode 100644 app/templates/partials/user_profile/sidebar_left.html
 create mode 100644 app/templates/partials/user_profile/sidebar_left/daily_horoscope.html
 create mode 100644 app/templates/partials/user_profile/sidebar_left/features_card.html
 create mode 100644 app/templates/partials/user_profile/sidebar_left/profile_card.html
 create mode 100644 app/templates/partials/user_profile/sidebar_left/profile_card/modals.html
 create mode 100644 app/templates/partials/user_profile/sidebar_left/profile_card/modals/calendar_privacy_modal.html
 create mode 100644 app/templates/partials/user_profile/sidebar_left/profile_card/modals/description_modal.html
 create mode 100644 app/templates/partials/user_profile/sidebar_left/profile_card/modals/email_modal.html
 create mode 100644 app/templates/partials/user_profile/sidebar_left/profile_card/modals/name_modal.html
 create mode 100644 app/templates/partials/user_profile/sidebar_left/profile_card/modals/telegram_modal.html
 create mode 100644 app/templates/partials/user_profile/sidebar_left/profile_card/modals/upload_photo_modal.html
 create mode 100644 app/templates/partials/user_profile/sidebar_left/profile_card/profile_update_menu.html
 create mode 100644 app/templates/partials/user_profile/sidebar_left/profile_card/user_details.html
 create mode 100644 app/templates/partials/user_profile/sidebar_right.html
 create mode 100644 app/templates/partials/user_profile/sidebar_right/meetups.html
 create mode 100644 app/templates/partials/user_profile/sidebar_right/new_card.html
 create mode 100644 app/templates/partials/user_profile/sidebar_right/new_card2.html
 create mode 100644 app/templates/partials/user_profile/sidebar_right/on_this_day.html

diff --git a/app/templates/partials/user_profile/middle_content.html b/app/templates/partials/user_profile/middle_content.html
new file mode 100644
index 00000000..9638ce14
--- /dev/null
+++ b/app/templates/partials/user_profile/middle_content.html
@@ -0,0 +1,13 @@
+<div class="col-5">
+  <div class="container card  mb-2 pb-0" id="daily_horoscope">
+  </div>
+  <!-- Upcoming events -->
+  <div class="mb-3">
+    {% for event in events %}
+      <!-- Event card -->
+      {% include 'partials/user_profile/middle_content/event_card.html' %}
+
+      {% include 'partials/user_profile/middle_content/update_event_modal.html' %}
+    {% endfor %}
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/templates/partials/user_profile/middle_content/event_card.html b/app/templates/partials/user_profile/middle_content/event_card.html
new file mode 100644
index 00000000..9c86560e
--- /dev/null
+++ b/app/templates/partials/user_profile/middle_content/event_card.html
@@ -0,0 +1,15 @@
+<div class="card card-event mb-2 pb-0">
+  <div class="card-header d-flex justify-content-between">
+    <small><i>{{ gettext("Upcoming event on (date)", date=event.start) }}</i></small>
+    <!-- Event settings -->
+    {% include 'partials/user_profile/middle_content/event_settings.html' %}
+  </div>
+
+  <div class="card-body pb-1">
+    <p class="card-text">
+      The Event {{ event }} - description ...
+    </p>
+    <hr class="mb-0">
+    <small class="event-posted-time text-muted">Last updated {{time}} ago</small>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/templates/partials/user_profile/middle_content/event_settings.html b/app/templates/partials/user_profile/middle_content/event_settings.html
new file mode 100644
index 00000000..8198b33a
--- /dev/null
+++ b/app/templates/partials/user_profile/middle_content/event_settings.html
@@ -0,0 +1,10 @@
+<a class="text-dark" href="#">
+  <div class="d-flex flex-row-reverse">
+    <span class="text-secondary p-1 mx-2" type="button">
+      <button type="button" class="btn text-secondary p-1 dropdown-item"
+              data-bs-toggle="modal" data-bs-target="#updateeventcontent">
+          <i class="fas fa-ellipsis-h"></i>
+      </button>
+    </span>
+  </div>
+</a>
\ No newline at end of file
diff --git a/app/templates/partials/user_profile/middle_content/update_event_modal.html b/app/templates/partials/user_profile/middle_content/update_event_modal.html
new file mode 100644
index 00000000..05e7b452
--- /dev/null
+++ b/app/templates/partials/user_profile/middle_content/update_event_modal.html
@@ -0,0 +1,16 @@
+<div class="modal modal-bg" id="updateeventcontent" tabindex="-1" data-bs-backdrop="static"
+     aria-labelledby="updateeventcontentlabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h2 class="modal-title">Update Event</h2>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+      <div class="modal-body">
+        <div id="editorSection">{{ event.content }}</div>
+        <button class="btn btn-sm btn-success" id="but">Save Changes</button>
+        <!--  TODO usage of update event, WAITING FOR FUNCTION -->
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/templates/partials/user_profile/sidebar_left.html b/app/templates/partials/user_profile/sidebar_left.html
new file mode 100644
index 00000000..92c48acb
--- /dev/null
+++ b/app/templates/partials/user_profile/sidebar_left.html
@@ -0,0 +1,12 @@
+<div class="col-3">
+
+  <!-- Profile card -->
+{% include 'partials/user_profile/sidebar_left/profile_card.html' %}
+
+  <!-- Features card -->
+  {% include 'partials/user_profile/sidebar_left/features_card.html' %}
+
+  <!-- Daily Horoscope -->
+  {% include 'partials/user_profile/sidebar_left/daily_horoscope.html' %}
+
+</div>
\ No newline at end of file
diff --git a/app/templates/partials/user_profile/sidebar_left/daily_horoscope.html b/app/templates/partials/user_profile/sidebar_left/daily_horoscope.html
new file mode 100644
index 00000000..1c9c98cd
--- /dev/null
+++ b/app/templates/partials/user_profile/sidebar_left/daily_horoscope.html
@@ -0,0 +1,13 @@
+<div class="card card-profile mt-2">
+    <div class="btn-group">
+      <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton"
+              data-bs-toggle="dropdown" aria-expanded="false">
+        daily horoscope
+      </button>
+      <div class="dropdown-menu dropdown-menu-right" id='signs'>
+        {% for sign in signs %}
+        <button class="dropdown-item sign" type="button" id="sign" name="{{ sign }}">{{ sign }}</button>
+        {% endfor %}
+      </div>
+    </div>
+  </div>
\ No newline at end of file
diff --git a/app/templates/partials/user_profile/sidebar_left/features_card.html b/app/templates/partials/user_profile/sidebar_left/features_card.html
new file mode 100644
index 00000000..3015edcc
--- /dev/null
+++ b/app/templates/partials/user_profile/sidebar_left/features_card.html
@@ -0,0 +1,33 @@
+<div class="card card-profile">
+  <div class="card-body">
+
+    <p class="card-title">
+      Explore more features
+    </p>
+
+    <ul class="list-group">
+      {% if not user.telegram_id %}
+      <li class="list-group-item list-group-item-action no-border">
+        <a class="text-decoration-none text-success" href="https://t.me/pylander_bot" target="_blank">
+          <strong>Try PyLander bot</strong>
+        </a>
+      </li>
+      {% endif %}
+      <li class="list-group-item list-group-item-action no-border">
+        <a class="text-decoration-none text-secondary" href="#">Export my calendar</a>
+      </li>
+      <li class="list-group-item list-group-item-action no-border">
+        <a class="text-decoration-none text-secondary" href="{{ url_for('import_holidays') }}">Add
+          holidays to calendar</a>
+      </li>
+      <li class="list-group-item list-group-item-action no-border">
+        {% if google_error %}
+        <a class="text-decoration-none text-secondary" href="{{ url_for('google_sync') }}">Sync with
+          Google - Not
+          Avaliable</a> {% else %}
+        <a class="text-decoration-none text-secondary" href="{{ url_for('google_sync') }}">Sync with
+          Google</a> {% endif %}
+      </li>
+    </ul>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/templates/partials/user_profile/sidebar_left/profile_card.html b/app/templates/partials/user_profile/sidebar_left/profile_card.html
new file mode 100644
index 00000000..b4dbaec2
--- /dev/null
+++ b/app/templates/partials/user_profile/sidebar_left/profile_card.html
@@ -0,0 +1,8 @@
+<div class="card card-profile mb-3">
+
+  {% include 'partials/user_profile/sidebar_left/profile_card/profile_update_menu.html' %}
+
+  {% include 'partials/user_profile/sidebar_left/profile_card/modals.html' %}
+
+  {% include 'partials/user_profile/sidebar_left/profile_card/user_details.html' %}
+</div>
\ No newline at end of file
diff --git a/app/templates/partials/user_profile/sidebar_left/profile_card/modals.html b/app/templates/partials/user_profile/sidebar_left/profile_card/modals.html
new file mode 100644
index 00000000..cde0ca1e
--- /dev/null
+++ b/app/templates/partials/user_profile/sidebar_left/profile_card/modals.html
@@ -0,0 +1,17 @@
+<!-- Name Modal -->
+{% include 'partials/user_profile/sidebar_left/profile_card/modals/name_modal.html' %}
+
+<!-- Email modal -->
+{% include 'partials/user_profile/sidebar_left/profile_card/modals/email_modal.html' %}
+
+<!-- Description modal -->
+{% include 'partials/user_profile/sidebar_left/profile_card/modals/description_modal.html' %}
+
+<!-- Upload photo modal -->
+{% include 'partials/user_profile/sidebar_left/profile_card/modals/upload_photo_modal.html' %}
+
+<!-- Telegram modal -->
+{% include 'partials/user_profile/sidebar_left/profile_card/modals/telegram_modal.html' %}
+
+<!-- Calendar Privacy modal -->
+{% include 'partials/user_profile/sidebar_left/profile_card/modals/calendar_privacy_modal.html' %}
\ No newline at end of file
diff --git a/app/templates/partials/user_profile/sidebar_left/profile_card/modals/calendar_privacy_modal.html b/app/templates/partials/user_profile/sidebar_left/profile_card/modals/calendar_privacy_modal.html
new file mode 100644
index 00000000..1ac25b2c
--- /dev/null
+++ b/app/templates/partials/user_profile/sidebar_left/profile_card/modals/calendar_privacy_modal.html
@@ -0,0 +1,22 @@
+<div class="modal modal-sm" id="calendarPrivacyModal" tabindex="-1" data-bs-backdrop="static"
+     aria-labelledby="updateCalendarPrivacyModalLabel" aria-hidden="true">
+  <div class="modal-dialog profile-modal-dialog profile-modal-fadeIn">
+    <div class="modal-content">
+      <div class="modal-header profile-modal-header">
+        <h2 class="modal-title">Set your calendar privacy</h2>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+      <div class="modal-body">
+        <form action="update_calendar_privacy" method="post">
+          <select class="form-control-sm" name="privacy">
+            <option value="private">Private</option>
+            <option value="public">Public</option>
+          </select>
+          <div class="d-flex flex-row-reverse mt-4">
+            <button type="submit" class="btn btn-sm btn-success">Save changes</button>
+          </div>
+        </form>
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/templates/partials/user_profile/sidebar_left/profile_card/modals/description_modal.html b/app/templates/partials/user_profile/sidebar_left/profile_card/modals/description_modal.html
new file mode 100644
index 00000000..7f6f85da
--- /dev/null
+++ b/app/templates/partials/user_profile/sidebar_left/profile_card/modals/description_modal.html
@@ -0,0 +1,21 @@
+<div class="modal" id="updateDescriptionModal" tabindex="-1" data-bs-backdrop="static"
+     aria-labelledby="updateDescriptionModalLabel" aria-hidden="true">
+  <div class="modal-dialog profile-modal-dialog profile-modal-fadeIn">
+    <div class="modal-content">
+      <div class="modal-header profile-modal-header">
+        <h2 class="modal-title">{{ gettext("Update description") }}</h2>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+      <div class="modal-body">
+        <form action="update_user_description" method="post">
+          <input type="text" class="form-control border-top-0 border-end-0 border-start-0 mb-2"
+                 name="description" placeholder="About me" value="{{ user.description }}">
+          <div class="d-flex flex-row-reverse mt-4">
+            <button type="submit" class="btn btn-sm btn-success">{{ gettext("Save changes") }}</button>
+          </div>
+        </form>
+      </div>
+
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/templates/partials/user_profile/sidebar_left/profile_card/modals/email_modal.html b/app/templates/partials/user_profile/sidebar_left/profile_card/modals/email_modal.html
new file mode 100644
index 00000000..8a55a53a
--- /dev/null
+++ b/app/templates/partials/user_profile/sidebar_left/profile_card/modals/email_modal.html
@@ -0,0 +1,20 @@
+<div class="modal modal-sm" id="updateEmailModal" tabindex="-1" data-bs-backdrop="static"
+     aria-labelledby="updateEmailModalLabel" aria-hidden="true">
+  <div class="modal-dialog profile-modal-dialog profile-modal-fadeIn">
+    <div class="modal-content">
+      <div class="modal-header profile-modal-header">
+        <h2 class="modal-title">{{ gettext("Update email") }}</h2>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+      <div class="modal-body">
+        <form action="update_user_email" method="post">
+          <input type="email" class="form-control border-top-0 border-end-0 border-start-0 mb-2" name="email"
+                 placeholder="E-mail" value="{{ user.email }}">
+          <div class="d-flex flex-row-reverse mt-4">
+            <button type="submit" class="btn btn-sm btn-success">{{ gettext("Save changes") }}</button>
+          </div>
+        </form>
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/templates/partials/user_profile/sidebar_left/profile_card/modals/name_modal.html b/app/templates/partials/user_profile/sidebar_left/profile_card/modals/name_modal.html
new file mode 100644
index 00000000..42471dce
--- /dev/null
+++ b/app/templates/partials/user_profile/sidebar_left/profile_card/modals/name_modal.html
@@ -0,0 +1,20 @@
+<div class="modal modal-sm" id="updateNameModal" tabindex="-1" data-bs-backdrop="static"
+     aria-labelledby="updateNameModalLabel" aria-hidden="true">
+  <div class="modal-dialog profile-modal-dialog profile-modal-fadeIn">
+    <div class="modal-content">
+      <div class="modal-header profile-modal-header">
+        <h2 class="modal-title">{{ gettext("Update name") }}</h2>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+      <div class="modal-body">
+        <form action="update_user_fullname" method="post">
+          <input type="text" class="form-control border-top-0 border-end-0 border-start-0 mb-2"
+                 name="fullname" placeholder="Full Name" value="{{ user.full_name }}">
+          <div class="d-flex flex-row-reverse mt-4">
+            <button type="submit" class="btn btn-sm btn-success">{{ gettext("Save changes") }}</button>
+          </div>
+        </form>
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/templates/partials/user_profile/sidebar_left/profile_card/modals/telegram_modal.html b/app/templates/partials/user_profile/sidebar_left/profile_card/modals/telegram_modal.html
new file mode 100644
index 00000000..aea3ccc5
--- /dev/null
+++ b/app/templates/partials/user_profile/sidebar_left/profile_card/modals/telegram_modal.html
@@ -0,0 +1,21 @@
+<div class="modal modal-sm" id="telegramModal" tabindex="-1" data-bs-backdrop="static"
+     aria-labelledby="telegramModalLabel" aria-hidden="true">
+  <div class="modal-dialog profile-modal-dialog profile-modal-fadeIn">
+    <div class="modal-content">
+      <div class="modal-header profile-modal-header">
+        <h2 class="modal-title">My Telegram Id</h2>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+      <div class="modal-body">
+        <form action="update_telegram_id" method="post">
+          <input type="text" class="form-control border-top-0 border-end-0 border-start-0 mb-2"
+                 name="telegram_id" placeholder="Telegram id" {% if user.telegram_id %}
+                 value="{{ user.telegram_id }}" {% endif %}>
+          <div class="d-flex flex-row-reverse mt-4">
+            <button type="submit" class="btn btn-sm btn-success">{{ gettext("Save changes") }}</button>
+          </div>
+        </form>
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/templates/partials/user_profile/sidebar_left/profile_card/modals/upload_photo_modal.html b/app/templates/partials/user_profile/sidebar_left/profile_card/modals/upload_photo_modal.html
new file mode 100644
index 00000000..b1731a29
--- /dev/null
+++ b/app/templates/partials/user_profile/sidebar_left/profile_card/modals/upload_photo_modal.html
@@ -0,0 +1,21 @@
+<div class="modal modal-sm" id="updatePhotoModal" tabindex="-1" data-bs-backdrop="static"
+     aria-labelledby="updatePhotoModalLabel" aria-hidden="true">
+  <div class="modal-dialog profile-modal-dialog profile-modal-fadeIn">
+    <div class="modal-content">
+      <div class="modal-header profile-modal-header">
+        <h2 class="modal-title">{{ gettext("Update photo") }}</h2>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+      <div class="modal-body">
+        <form action="upload_user_photo" method="post" enctype="multipart/form-data">
+          <div class="input-group">
+            <input type="file" class="form-control-sm" accept="image/png, image/jpeg" name="file">
+          </div>
+          <div class="d-flex flex-row-reverse mt-4">
+            <button type="submit" class="btn btn-sm btn-success">{{ gettext("Save changes") }}</button>
+          </div>
+        </form>
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/templates/partials/user_profile/sidebar_left/profile_card/profile_update_menu.html b/app/templates/partials/user_profile/sidebar_left/profile_card/profile_update_menu.html
new file mode 100644
index 00000000..2046b46e
--- /dev/null
+++ b/app/templates/partials/user_profile/sidebar_left/profile_card/profile_update_menu.html
@@ -0,0 +1,46 @@
+<div class="d-flex flex-row-reverse">
+  <div class="dropdown">
+                        <span class="text-secondary p-1 mx-2" type="button" id="dropdownMenuButton"
+                              data-bs-toggle="dropdown" aria-expanded="false">
+                                <i class="fa fa-edit"></i>
+                            </span>
+    <ul class="dropdown-menu" aria-labelledby="dropdownMenuButton">
+      <li class="list-group-item no-border">
+        <button type="button" class="btn text-secondary p-1 dropdown-item" data-bs-toggle="modal"
+                data-bs-target="#updateNameModal">
+          Update full name
+        </button>
+      </li>
+      <li class="list-group-item no-border">
+        <button type="button" class="btn text-secondary p-1 dropdown-item" data-bs-toggle="modal"
+                data-bs-target="#updateEmailModal">
+          Update email adress
+        </button>
+      </li>
+      <li class="list-group-item no-border">
+        <button type="button" class="btn text-secondary p-1 dropdown-item" data-bs-toggle="modal"
+                data-bs-target="#updatePhotoModal">
+          Update profile photo
+        </button>
+      </li>
+      <li class="list-group-item no-border">
+        <button type="button" class="btn text-secondary p-1 dropdown-item" data-bs-toggle="modal"
+                data-bs-target="#updateDescriptionModal">
+          Update profile status
+        </button>
+      </li>
+      <li class="list-group-item no-border">
+        <button type="button" class="btn text-secondary p-1 dropdown-item" data-bs-toggle="modal"
+                data-bs-target="#telegramModal">
+          Register telegram Id
+        </button>
+      </li>
+      <li class="list-group-item no-border">
+        <button type="button" class="btn text-secondary p-1 dropdown-item" data-bs-toggle="modal"
+                data-bs-target="#calendarPrivacyModal">
+          Update calendar privacy
+        </button>
+      </li>
+    </ul>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/templates/partials/user_profile/sidebar_left/profile_card/user_details.html b/app/templates/partials/user_profile/sidebar_left/profile_card/user_details.html
new file mode 100644
index 00000000..5f85416f
--- /dev/null
+++ b/app/templates/partials/user_profile/sidebar_left/profile_card/user_details.html
@@ -0,0 +1,14 @@
+<img class="card-img-top profile-image rounded-circle mx-auto d-block"
+     src="{{ url_for('media', path=user.avatar) }}" alt="Profile image">
+<div class="card-body">
+  <h6 class="card-title text-center mb-1">{{ user.full_name }}</h6>
+  <p class="card-text text-center mt-0">
+    <a class="nav-link text-secondary" href="#">
+      <i class="fa fa-spin fa-cog" aria-hidden="true"></i> Settings
+    </a>
+  </p>
+  <hr>
+  <p class="card-text text-center">
+    <small>{{ user.description }}</small>
+  </p>
+</div>
\ No newline at end of file
diff --git a/app/templates/partials/user_profile/sidebar_right.html b/app/templates/partials/user_profile/sidebar_right.html
new file mode 100644
index 00000000..c84dedb8
--- /dev/null
+++ b/app/templates/partials/user_profile/sidebar_right.html
@@ -0,0 +1,15 @@
+<div class="col-4">
+
+  <!-- Meetups -->
+  {% include 'partials/user_profile/sidebar_right/meetups.html' %}
+
+  <!-- On This Day -->
+  {% include 'partials/user_profile/sidebar_right/on_this_day.html' %}
+
+  <!-- Card -->
+  {% include 'partials/user_profile/sidebar_right/new_card.html' %}
+
+  <!-- Card -->
+  {% include 'partials/user_profile/sidebar_right/new_card2.html' %}
+
+</div>
\ No newline at end of file
diff --git a/app/templates/partials/user_profile/sidebar_right/meetups.html b/app/templates/partials/user_profile/sidebar_right/meetups.html
new file mode 100644
index 00000000..bc9ee2c4
--- /dev/null
+++ b/app/templates/partials/user_profile/sidebar_right/meetups.html
@@ -0,0 +1,7 @@
+<div class="card card-profile mb-3" style="min-height: 6em;">
+  <div class="card-body">
+    <p class="card-title">
+      {{ gettext("Explore MeetUps near you") }}
+    </p>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/templates/partials/user_profile/sidebar_right/new_card.html b/app/templates/partials/user_profile/sidebar_right/new_card.html
new file mode 100644
index 00000000..ff6350f7
--- /dev/null
+++ b/app/templates/partials/user_profile/sidebar_right/new_card.html
@@ -0,0 +1,7 @@
+<div class="card card-profile mb-3" style="min-height: 6em;">
+  <div class="card-body">
+    <p class="card-title">
+      {{ gettext("Your Card") }}
+    </p>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/templates/partials/user_profile/sidebar_right/new_card2.html b/app/templates/partials/user_profile/sidebar_right/new_card2.html
new file mode 100644
index 00000000..20529588
--- /dev/null
+++ b/app/templates/partials/user_profile/sidebar_right/new_card2.html
@@ -0,0 +1,7 @@
+<div class="card card-profile mb-3" style="min-height: 6em;">
+  <div class="card-body">
+    <p class="card-title">
+      Your Card
+    </p>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/templates/partials/user_profile/sidebar_right/on_this_day.html b/app/templates/partials/user_profile/sidebar_right/on_this_day.html
new file mode 100644
index 00000000..71b9fe42
--- /dev/null
+++ b/app/templates/partials/user_profile/sidebar_right/on_this_day.html
@@ -0,0 +1,5 @@
+<div class="card card-profile mb-3" style="height: 18em;">
+  <div class="card-body">
+    {% include "on_this_day.html" %}
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/templates/profile.html b/app/templates/profile.html
index b12f25ee..e98a010f 100644
--- a/app/templates/profile.html
+++ b/app/templates/profile.html
@@ -3,375 +3,14 @@
 <div class="container mt-4">
   <div class="row">
     <!-- Left side -->
-    <div class="col-3">
-      <!-- Profile card -->
-      <div class="card card-profile mb-3">
+    {% include 'partials/user_profile/sidebar_left.html' %}
 
-        <!-- Profile update menu -->
-        <div class="d-flex flex-row-reverse">
-          <div class="dropdown">
-                        <span class="text-secondary p-1 mx-2" type="button" id="dropdownMenuButton"
-                              data-bs-toggle="dropdown" aria-expanded="false">
-                                <i class="fa fa-edit"></i>
-                            </span>
-            <ul class="dropdown-menu" aria-labelledby="dropdownMenuButton">
-              <li class="list-group-item no-border">
-                <button type="button" class="btn text-secondary p-1 dropdown-item" data-bs-toggle="modal"
-                        data-bs-target="#updateNameModal">
-                  Update full name
-                </button>
-              </li>
-              <li class="list-group-item no-border">
-                <button type="button" class="btn text-secondary p-1 dropdown-item" data-bs-toggle="modal"
-                        data-bs-target="#updateEmailModal">
-                  Update email adress
-                </button>
-              </li>
-              <li class="list-group-item no-border">
-                <button type="button" class="btn text-secondary p-1 dropdown-item" data-bs-toggle="modal"
-                        data-bs-target="#updatePhotoModal">
-                  Update profile photo
-                </button>
-              </li>
-              <li class="list-group-item no-border">
-                <button type="button" class="btn text-secondary p-1 dropdown-item" data-bs-toggle="modal"
-                        data-bs-target="#updateDescriptionModal">
-                  Update profile status
-                </button>
-              </li>
-              <li class="list-group-item no-border">
-                <button type="button" class="btn text-secondary p-1 dropdown-item" data-bs-toggle="modal"
-                        data-bs-target="#telegramModal">
-                  Register telegram Id
-                </button>
-              </li>
-              <li class="list-group-item no-border">
-                <button type="button" class="btn text-secondary p-1 dropdown-item" data-bs-toggle="modal"
-                        data-bs-target="#calendarPrivacyModal">
-                  Update calendar privacy
-                </button>
-              </li>
-            </ul>
-          </div>
-
-          <!-- Name Modal -->
-          <div class="modal modal-sm" id="updateNameModal" tabindex="-1" data-bs-backdrop="static"
-               aria-labelledby="updateNameModalLabel" aria-hidden="true">
-            <div class="modal-dialog profile-modal-dialog profile-modal-fadeIn">
-              <div class="modal-content">
-                <div class="modal-header profile-modal-header">
-                  <h2 class="modal-title">{{ gettext("Update name") }}</h2>
-                  <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                </div>
-                <div class="modal-body">
-                  <form action="update_user_fullname" method="post">
-                    <input type="text" class="form-control border-top-0 border-end-0 border-start-0 mb-2"
-                           name="fullname" placeholder="Full Name" value="{{ user.full_name }}">
-                    <div class="d-flex flex-row-reverse mt-4">
-                      <button type="submit" class="btn btn-sm btn-success">{{ gettext("Save changes") }}</button>
-                    </div>
-                  </form>
-                </div>
-              </div>
-            </div>
-          </div>
-
-          <!-- Email modal -->
-          <div class="modal modal-sm" id="updateEmailModal" tabindex="-1" data-bs-backdrop="static"
-               aria-labelledby="updateEmailModalLabel" aria-hidden="true">
-            <div class="modal-dialog profile-modal-dialog profile-modal-fadeIn">
-              <div class="modal-content">
-                <div class="modal-header profile-modal-header">
-                  <h2 class="modal-title">{{ gettext("Update email") }}</h2>
-                  <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                </div>
-                <div class="modal-body">
-                  <form action="update_user_email" method="post">
-                    <input type="email" class="form-control border-top-0 border-end-0 border-start-0 mb-2" name="email"
-                           placeholder="E-mail" value="{{ user.email }}">
-                    <div class="d-flex flex-row-reverse mt-4">
-                      <button type="submit" class="btn btn-sm btn-success">{{ gettext("Save changes") }}</button>
-                    </div>
-                  </form>
-                </div>
-              </div>
-            </div>
-          </div>
-
-          <!-- Description modal -->
-          <div class="modal" id="updateDescriptionModal" tabindex="-1" data-bs-backdrop="static"
-               aria-labelledby="updateDescriptionModalLabel" aria-hidden="true">
-            <div class="modal-dialog profile-modal-dialog profile-modal-fadeIn">
-              <div class="modal-content">
-                <div class="modal-header profile-modal-header">
-                  <h2 class="modal-title">{{ gettext("Update description") }}</h2>
-                  <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                </div>
-                <div class="modal-body">
-                  <form action="update_user_description" method="post">
-                    <input type="text" class="form-control border-top-0 border-end-0 border-start-0 mb-2"
-                           name="description" placeholder="About me" value="{{ user.description }}">
-                    <div class="d-flex flex-row-reverse mt-4">
-                      <button type="submit" class="btn btn-sm btn-success">{{ gettext("Save changes") }}</button>
-                    </div>
-                  </form>
-                </div>
-
-              </div>
-            </div>
-          </div>
-
-          <!-- Upload photo -->
-          <div class="modal modal-sm" id="updatePhotoModal" tabindex="-1" data-bs-backdrop="static"
-               aria-labelledby="updatePhotoModalLabel" aria-hidden="true">
-            <div class="modal-dialog profile-modal-dialog profile-modal-fadeIn">
-              <div class="modal-content">
-                <div class="modal-header profile-modal-header">
-                  <h2 class="modal-title">{{ gettext("Update photo") }}</h2>
-                  <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                </div>
-                <div class="modal-body">
-                  <form action="upload_user_photo" method="post" enctype="multipart/form-data">
-                    <div class="input-group">
-                      <input type="file" class="form-control-sm" accept="image/png, image/jpeg" name="file">
-                    </div>
-                    <div class="d-flex flex-row-reverse mt-4">
-                      <button type="submit" class="btn btn-sm btn-success">{{ gettext("Save changes") }}</button>
-                    </div>
-                  </form>
-                </div>
-              </div>
-              <!-- End profile update menu -->
-
-              <!-- Telegram modal -->
-              <div class="modal modal-sm" id="telegramModal" tabindex="-1" data-bs-backdrop="static"
-                   aria-labelledby="telegramModalLabel" aria-hidden="true">
-                <div class="modal-dialog profile-modal-dialog profile-modal-fadeIn">
-                  <div class="modal-content">
-                    <div class="modal-header profile-modal-header">
-                      <h2 class="modal-title">My Telegram Id</h2>
-                      <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                    </div>
-                    <div class="modal-body">
-                      <form action="update_telegram_id" method="post">
-                        <input type="text" class="form-control border-top-0 border-end-0 border-start-0 mb-2"
-                               name="telegram_id" placeholder="Telegram id" {% if user.telegram_id %}
-                               value="{{ user.telegram_id }}" {% endif %}>
-                        <div class="d-flex flex-row-reverse mt-4">
-                          <button type="submit" class="btn btn-sm btn-success">{{ gettext("Save changes") }}</button>
-                        </div>
-                      </form>
-                    </div>
-                  </div>
-                </div>
-
-                <!-- Calendar Privacy -->
-                <div class="modal modal-sm" id="calendarPrivacyModal" tabindex="-1" data-bs-backdrop="static"
-                     aria-labelledby="updateCalendarPrivacyModalLabel" aria-hidden="true">
-                  <div class="modal-dialog profile-modal-dialog profile-modal-fadeIn">
-                    <div class="modal-content">
-                      <div class="modal-header profile-modal-header">
-                        <h2 class="modal-title">Set your calendar privacy</h2>
-                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                      </div>
-                      <div class="modal-body">
-                        <form action="update_calendar_privacy" method="post">
-                          <select class="form-control-sm" name="privacy">
-                            <option value="private">Private</option>
-                            <option value="public">Public</option>
-                          </select>
-                          <div class="d-flex flex-row-reverse mt-4">
-                            <button type="submit" class="btn btn-sm btn-success">Save changes</button>
-                          </div>
-                        </form>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <!-- End profile update menu -->
-
-              <img class="card-img-top profile-image rounded-circle mx-auto d-block"
-                   src="{{ url_for('media', path=user.avatar) }}" alt="Profile image">
-              <div class="card-body">
-                <h6 class="card-title text-center mb-1">{{ user.full_name }}</h6>
-                <p class="card-text text-center mt-0">
-                  <a class="nav-link text-secondary" href="#">
-                    <i class="fa fa-spin fa-cog" aria-hidden="true"></i> Settings
-                  </a>
-                </p>
-                <hr>
-                <p class="card-text text-center">
-                  <small>{{ user.description }}</small>
-                </p>
-              </div>
-            </div>
-            <!-- End Profile card -->
-
-            <div class="card card-profile">
-              <div class="card-body">
-                <p class="card-title">
-                <div class="btn-group">
-                  <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton"
-                          data-bs-toggle="dropdown" aria-expanded="false">
-                    daily horoscope
-                  </button>
-                  <div class="dropdown-menu dropdown-menu-right" id='signs'>
-                    {% for sign in signs %}
-                    <button class="dropdown-item sign" type="button" id="sign" name="{{ sign }}">{{ sign }}</button>
-                    {% endfor %}
-                  </div>
-                </div>
-
-                <!-- Features card -->
-                <div class="card card-profile">
-                  <div class="card-body">
-                    <p class="card-title">
-                      Explore more features
-                    </p>
-                    <ul class="list-group">
-                      {% if not user.telegram_id %}
-                      <li class="list-group-item list-group-item-action no-border">
-                        <a class="text-decoration-none text-success" href="https://t.me/pylander_bot" target="_blank">
-                          <strong>Try PyLander bot</strong>
-                        </a>
-                      </li>
-                      {% endif %}
-                      <li class="list-group-item list-group-item-action no-border">
-                        <a class="text-decoration-none text-secondary" href="#">Export my calendar</a>
-                      </li>
-                      <li class="list-group-item list-group-item-action no-border">
-                        <a class="text-decoration-none text-secondary" href="{{ url_for('import_holidays') }}">Add
-                          holidays to calendar</a>
-                      </li>
-                      <li class="list-group-item list-group-item-action no-border">
-                        {% if google_error %}
-                        <a class="text-decoration-none text-secondary" href="{{ url_for('google_sync') }}">Sync with
-                          Google - Not
-                          Avaliable</a> {% else %}
-                        <a class="text-decoration-none text-secondary" href="{{ url_for('google_sync') }}">Sync with
-                          Google</a> {% endif %}
-                      </li>
-                    </ul>
-                  </div>
-                </div>
-                <!-- End Features card -->
-
-              </div>
-
-              <!-- Center -->
-              <div class="col-5">
-                <div class="container" id="daily_horoscope">
-                </div>
-              </div>
-            </div>
-          </div>
-
-          <!-- Center -->
-          <div class="col-5">
-
-            <!-- Upcoming events -->
-            <div class="mb-3">
-              {% for event in events %}
-              <!-- Events card -->
-              <div class="card card-event mb-2 pb-0">
-                <div class="card-header d-flex justify-content-between">
-                  <small><i>{{ gettext("Upcoming event on (date)", date=event.start) }}</i></small>
-                  <!-- Event settings -->
-                  <a class="text-dark" href="#">
-                    <div class="d-flex flex-row-reverse">
-
-                                            <span class="text-secondary p-1 mx-2" type="button">
-                                    <button type="button" class="btn text-secondary p-1 dropdown-item"
-                                            data-bs-toggle="modal" data-bs-target="#updateeventcontent">
-                                        <i class="fas fa-ellipsis-h"></i>
-                                    </button>
-                                </span>
-                    </div>
-                  </a>
-
-
-                </div>
-                <div class="card-body pb-1">
-                  <p class="card-text">
-                    The Event {{ event }} - description ...
-                  </p>
-                  <hr class="mb-0">
-                  <small class="event-posted-time text-muted">Last updated 3 mins ago</small>
-                </div>
-              </div>
-              <div class="card-body pb-1">
-                <p class="card-text">
-                  {{ gettext("The Event (event)", event=event.title) }}
-                </p>
-                <hr class="mb-0">
-                <small class="event-posted-time text-muted">{{ gettext("Last updated (time) ago") }}</small>
-              </div>
-              <div class="modal modal-bg" id="updateeventcontent" tabindex="-1" data-bs-backdrop="static"
-                   aria-labelledby="updateeventcontentlabel" aria-hidden="true">
-                <div class="modal-dialog">
-                  <div class="modal-content">
-                    <div class="modal-header">
-                      <h2 class="modal-title">Update Event</h2>
-                      <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                    </div>
-                    <div class="modal-body">
-                      <div id="editorSection">{{ event.content }}</div>
-                      <button class="btn btn-sm btn-success" id="but">Save Changes</button>
-                      <!--  TODO usage of update event, WAITING FOR FUNCTION -->
-
-                    </div>
-
-                  </div>
-
-                </div>
-              </div>
-              {% endfor %}
-            </div>
-
-          </div>
-        </div>
-      </div>
-    </div>
+    <!-- Center -->
+    {% include 'partials/user_profile/middle_content.html' %}
 
     <!-- Right side -->
+    {% include 'partials/user_profile/sidebar_right.html' %}
 
-    <div class="col-4">
-
-      <!-- Meetups -->
-      <div class="card card-profile mb-3" style="height: 18em;">
-        <div class="card-body">
-          <p class="card-title">
-            {{ gettext("Explore MeetUps near you") }}
-          </p>
-        </div>
-
-        <!-- Card -->
-        <div class="card card-profile mb-3" style="height: 18em;">
-          <div class="card-body">
-            <p class="card-title">
-              {{ gettext("Your Card") }}
-            </p>
-          </div>
-
-
-          <!-- Card -->
-          <div class="card card-profile mb-3" style="height: 18em;">
-            <div class="card-body">
-              <p class="card-title">
-                Your Card
-              </p>
-              <!-- Card -->
-              <div class="card card-profile mb-3" style="height: 18em;">
-                <div class="card-body">
-                  {% include "on_this_day.html" %}
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
   </div>
 </div>
 {% include "partials/calendar/event/text_editor_partial_body.html" %} {% endblock content %}
\ No newline at end of file

From f84e8a2ba20e2b8f3f8e655273ab7b3d1ca76db4 Mon Sep 17 00:00:00 2001
From: Odelia Yechiel <odechann@gmail.com>
Date: Sat, 20 Feb 2021 05:04:54 +0200
Subject: [PATCH 2/4] class and id name fixes

---
 .../partials/user_profile/middle_content.html |  2 +-
 .../middle_content/event_settings.html        |  2 +-
 .../middle_content/update_event_modal.html    |  4 +--
 .../sidebar_left/daily_horoscope.html         |  2 +-
 .../modals/calendar_privacy_modal.html        |  4 +--
 .../modals/description_modal.html             |  5 ++--
 .../profile_card/modals/email_modal.html      |  4 +--
 .../profile_card/modals/name_modal.html       |  4 +--
 .../profile_card/modals/telegram_modal.html   |  4 +--
 .../modals/upload_photo_modal.html            |  4 +--
 .../profile_card/profile_update_menu.html     | 26 +++++++++----------
 app/templates/profile.html                    |  7 +++--
 12 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/app/templates/partials/user_profile/middle_content.html b/app/templates/partials/user_profile/middle_content.html
index 9638ce14..193dc351 100644
--- a/app/templates/partials/user_profile/middle_content.html
+++ b/app/templates/partials/user_profile/middle_content.html
@@ -1,5 +1,5 @@
 <div class="col-5">
-  <div class="container card  mb-2 pb-0" id="daily_horoscope">
+  <div class="container card mb-2 pb-0" id="daily_horoscope">
   </div>
   <!-- Upcoming events -->
   <div class="mb-3">
diff --git a/app/templates/partials/user_profile/middle_content/event_settings.html b/app/templates/partials/user_profile/middle_content/event_settings.html
index 8198b33a..b9d7f048 100644
--- a/app/templates/partials/user_profile/middle_content/event_settings.html
+++ b/app/templates/partials/user_profile/middle_content/event_settings.html
@@ -2,7 +2,7 @@
   <div class="d-flex flex-row-reverse">
     <span class="text-secondary p-1 mx-2" type="button">
       <button type="button" class="btn text-secondary p-1 dropdown-item"
-              data-bs-toggle="modal" data-bs-target="#updateeventcontent">
+              data-bs-toggle="modal" data-bs-target="#update-event-content">
           <i class="fas fa-ellipsis-h"></i>
       </button>
     </span>
diff --git a/app/templates/partials/user_profile/middle_content/update_event_modal.html b/app/templates/partials/user_profile/middle_content/update_event_modal.html
index 05e7b452..a6966e28 100644
--- a/app/templates/partials/user_profile/middle_content/update_event_modal.html
+++ b/app/templates/partials/user_profile/middle_content/update_event_modal.html
@@ -1,5 +1,5 @@
-<div class="modal modal-bg" id="updateeventcontent" tabindex="-1" data-bs-backdrop="static"
-     aria-labelledby="updateeventcontentlabel" aria-hidden="true">
+<div class="modal modal-bg" id="update-event-content" tabindex="-1" data-bs-backdrop="static"
+     aria-labelledby="update-event-content-label" aria-hidden="true">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
diff --git a/app/templates/partials/user_profile/sidebar_left/daily_horoscope.html b/app/templates/partials/user_profile/sidebar_left/daily_horoscope.html
index 1c9c98cd..29bea347 100644
--- a/app/templates/partials/user_profile/sidebar_left/daily_horoscope.html
+++ b/app/templates/partials/user_profile/sidebar_left/daily_horoscope.html
@@ -1,6 +1,6 @@
 <div class="card card-profile mt-2">
     <div class="btn-group">
-      <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton"
+      <button class="btn btn-secondary dropdown-toggle" type="button" id="drop-down-menu-button"
               data-bs-toggle="dropdown" aria-expanded="false">
         daily horoscope
       </button>
diff --git a/app/templates/partials/user_profile/sidebar_left/profile_card/modals/calendar_privacy_modal.html b/app/templates/partials/user_profile/sidebar_left/profile_card/modals/calendar_privacy_modal.html
index 1ac25b2c..b56b1572 100644
--- a/app/templates/partials/user_profile/sidebar_left/profile_card/modals/calendar_privacy_modal.html
+++ b/app/templates/partials/user_profile/sidebar_left/profile_card/modals/calendar_privacy_modal.html
@@ -1,5 +1,5 @@
-<div class="modal modal-sm" id="calendarPrivacyModal" tabindex="-1" data-bs-backdrop="static"
-     aria-labelledby="updateCalendarPrivacyModalLabel" aria-hidden="true">
+<div class="modal modal-sm" id="calendar-privacy-modal" tabindex="-1" data-bs-backdrop="static"
+     aria-labelledby="update-calendar-privacy-modal-label" aria-hidden="true">
   <div class="modal-dialog profile-modal-dialog profile-modal-fadeIn">
     <div class="modal-content">
       <div class="modal-header profile-modal-header">
diff --git a/app/templates/partials/user_profile/sidebar_left/profile_card/modals/description_modal.html b/app/templates/partials/user_profile/sidebar_left/profile_card/modals/description_modal.html
index 7f6f85da..ad13a645 100644
--- a/app/templates/partials/user_profile/sidebar_left/profile_card/modals/description_modal.html
+++ b/app/templates/partials/user_profile/sidebar_left/profile_card/modals/description_modal.html
@@ -1,5 +1,5 @@
-<div class="modal" id="updateDescriptionModal" tabindex="-1" data-bs-backdrop="static"
-     aria-labelledby="updateDescriptionModalLabel" aria-hidden="true">
+<div class="modal" id="update-description-modal" tabindex="-1" data-bs-backdrop="static"
+     aria-labelledby="update-description-modal-label" aria-hidden="true">
   <div class="modal-dialog profile-modal-dialog profile-modal-fadeIn">
     <div class="modal-content">
       <div class="modal-header profile-modal-header">
@@ -15,7 +15,6 @@ <h2 class="modal-title">{{ gettext("Update description") }}</h2>
           </div>
         </form>
       </div>
-
     </div>
   </div>
 </div>
\ No newline at end of file
diff --git a/app/templates/partials/user_profile/sidebar_left/profile_card/modals/email_modal.html b/app/templates/partials/user_profile/sidebar_left/profile_card/modals/email_modal.html
index 8a55a53a..49055e94 100644
--- a/app/templates/partials/user_profile/sidebar_left/profile_card/modals/email_modal.html
+++ b/app/templates/partials/user_profile/sidebar_left/profile_card/modals/email_modal.html
@@ -1,5 +1,5 @@
-<div class="modal modal-sm" id="updateEmailModal" tabindex="-1" data-bs-backdrop="static"
-     aria-labelledby="updateEmailModalLabel" aria-hidden="true">
+<div class="modal modal-sm" id="update-email-modal" tabindex="-1" data-bs-backdrop="static"
+     aria-labelledby="update-email-modal-label" aria-hidden="true">
   <div class="modal-dialog profile-modal-dialog profile-modal-fadeIn">
     <div class="modal-content">
       <div class="modal-header profile-modal-header">
diff --git a/app/templates/partials/user_profile/sidebar_left/profile_card/modals/name_modal.html b/app/templates/partials/user_profile/sidebar_left/profile_card/modals/name_modal.html
index 42471dce..264c9c3a 100644
--- a/app/templates/partials/user_profile/sidebar_left/profile_card/modals/name_modal.html
+++ b/app/templates/partials/user_profile/sidebar_left/profile_card/modals/name_modal.html
@@ -1,5 +1,5 @@
-<div class="modal modal-sm" id="updateNameModal" tabindex="-1" data-bs-backdrop="static"
-     aria-labelledby="updateNameModalLabel" aria-hidden="true">
+<div class="modal modal-sm" id="update-name-modal" tabindex="-1" data-bs-backdrop="static"
+     aria-labelledby="update-name-modal-label" aria-hidden="true">
   <div class="modal-dialog profile-modal-dialog profile-modal-fadeIn">
     <div class="modal-content">
       <div class="modal-header profile-modal-header">
diff --git a/app/templates/partials/user_profile/sidebar_left/profile_card/modals/telegram_modal.html b/app/templates/partials/user_profile/sidebar_left/profile_card/modals/telegram_modal.html
index aea3ccc5..bf9be4fc 100644
--- a/app/templates/partials/user_profile/sidebar_left/profile_card/modals/telegram_modal.html
+++ b/app/templates/partials/user_profile/sidebar_left/profile_card/modals/telegram_modal.html
@@ -1,5 +1,5 @@
-<div class="modal modal-sm" id="telegramModal" tabindex="-1" data-bs-backdrop="static"
-     aria-labelledby="telegramModalLabel" aria-hidden="true">
+<div class="modal modal-sm" id="telegram-modal" tabindex="-1" data-bs-backdrop="static"
+     aria-labelledby="telegram-modal-label" aria-hidden="true">
   <div class="modal-dialog profile-modal-dialog profile-modal-fadeIn">
     <div class="modal-content">
       <div class="modal-header profile-modal-header">
diff --git a/app/templates/partials/user_profile/sidebar_left/profile_card/modals/upload_photo_modal.html b/app/templates/partials/user_profile/sidebar_left/profile_card/modals/upload_photo_modal.html
index b1731a29..d1e44547 100644
--- a/app/templates/partials/user_profile/sidebar_left/profile_card/modals/upload_photo_modal.html
+++ b/app/templates/partials/user_profile/sidebar_left/profile_card/modals/upload_photo_modal.html
@@ -1,5 +1,5 @@
-<div class="modal modal-sm" id="updatePhotoModal" tabindex="-1" data-bs-backdrop="static"
-     aria-labelledby="updatePhotoModalLabel" aria-hidden="true">
+<div class="modal modal-sm" id="update-photo-modal" tabindex="-1" data-bs-backdrop="static"
+     aria-labelledby="update-photo-modal-label" aria-hidden="true">
   <div class="modal-dialog profile-modal-dialog profile-modal-fadeIn">
     <div class="modal-content">
       <div class="modal-header profile-modal-header">
diff --git a/app/templates/partials/user_profile/sidebar_left/profile_card/profile_update_menu.html b/app/templates/partials/user_profile/sidebar_left/profile_card/profile_update_menu.html
index 2046b46e..df643cf1 100644
--- a/app/templates/partials/user_profile/sidebar_left/profile_card/profile_update_menu.html
+++ b/app/templates/partials/user_profile/sidebar_left/profile_card/profile_update_menu.html
@@ -1,43 +1,43 @@
 <div class="d-flex flex-row-reverse">
   <div class="dropdown">
-                        <span class="text-secondary p-1 mx-2" type="button" id="dropdownMenuButton"
-                              data-bs-toggle="dropdown" aria-expanded="false">
-                                <i class="fa fa-edit"></i>
-                            </span>
-    <ul class="dropdown-menu" aria-labelledby="dropdownMenuButton">
+    <span class="text-secondary p-1 mx-2" type="button" id="drop-down-menu-button" data-bs-toggle="dropdown"
+          aria-expanded="false">
+      <i class="fa fa-edit"></i>
+    </span>
+    <ul class="dropdown-menu" aria-labelledby="drop-down-menu-button">
       <li class="list-group-item no-border">
         <button type="button" class="btn text-secondary p-1 dropdown-item" data-bs-toggle="modal"
-                data-bs-target="#updateNameModal">
+                data-bs-target="#update-name-modal">
           Update full name
         </button>
       </li>
       <li class="list-group-item no-border">
         <button type="button" class="btn text-secondary p-1 dropdown-item" data-bs-toggle="modal"
-                data-bs-target="#updateEmailModal">
-          Update email adress
+                data-bs-target="#update-email-modal">
+          Update email address
         </button>
       </li>
       <li class="list-group-item no-border">
         <button type="button" class="btn text-secondary p-1 dropdown-item" data-bs-toggle="modal"
-                data-bs-target="#updatePhotoModal">
+                data-bs-target="#update-photo-modal">
           Update profile photo
         </button>
       </li>
       <li class="list-group-item no-border">
         <button type="button" class="btn text-secondary p-1 dropdown-item" data-bs-toggle="modal"
-                data-bs-target="#updateDescriptionModal">
+                data-bs-target="#update-description-modal">
           Update profile status
         </button>
       </li>
       <li class="list-group-item no-border">
         <button type="button" class="btn text-secondary p-1 dropdown-item" data-bs-toggle="modal"
-                data-bs-target="#telegramModal">
-          Register telegram Id
+                data-bs-target="#telegram-modal">
+          Register telegram ID
         </button>
       </li>
       <li class="list-group-item no-border">
         <button type="button" class="btn text-secondary p-1 dropdown-item" data-bs-toggle="modal"
-                data-bs-target="#calendarPrivacyModal">
+                data-bs-target="#calendar-privacy-modal">
           Update calendar privacy
         </button>
       </li>
diff --git a/app/templates/profile.html b/app/templates/profile.html
index e98a010f..900739ec 100644
--- a/app/templates/profile.html
+++ b/app/templates/profile.html
@@ -1,5 +1,7 @@
-{% extends "base.html" %} {% include "partials/calendar/event/text_editor_partial_head.html" %} {% block content %}
+{% extends "base.html" %}
+{% include "partials/calendar/event/text_editor_partial_head.html" %}
 
+{% block content %}
 <div class="container mt-4">
   <div class="row">
     <!-- Left side -->
@@ -13,4 +15,5 @@
 
   </div>
 </div>
-{% include "partials/calendar/event/text_editor_partial_body.html" %} {% endblock content %}
\ No newline at end of file
+{% include "partials/calendar/event/text_editor_partial_body.html" %}
+{% endblock content %}
\ No newline at end of file

From 5202fa48a13c5ff404b570782e29d97776a4b0c1 Mon Sep 17 00:00:00 2001
From: Odelia Yechiel <odechann@gmail.com>
Date: Sat, 20 Feb 2021 05:13:42 +0200
Subject: [PATCH 3/4] dev: fixed an issue in edit_event_details_tab.html due to
 conflicts

---
 .../partials/edit_event_details_tab.html      |  86 -----------
 .../event/edit_event_details_tab.html         | 144 ++++++++++--------
 2 files changed, 82 insertions(+), 148 deletions(-)
 delete mode 100644 app/templates/event/partials/edit_event_details_tab.html

diff --git a/app/templates/event/partials/edit_event_details_tab.html b/app/templates/event/partials/edit_event_details_tab.html
deleted file mode 100644
index 871b1eab..00000000
--- a/app/templates/event/partials/edit_event_details_tab.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<div class="form_row">
-    <input id="say" type="text" name="title" placeholder="Event Title" required>
-    <input type="button" id="speak" name="speak" value="Speak it!">
-    <div>
-        <!-- Voices gets its own row for being so wide! -->
-        <div class="field" id="voices">
-            <label for="voice">Voice</label>
-            <select id="voice" name="voice"></select>
-        </div>
-    </div>
-    <div class="panel">
-        <div class="field">
-            <label for="volume">Volume</label>
-            <input type="range" id="volume" name="volume" min="0" max="1" step="0.01" value="0.5">
-            <output for="volume"></output>
-        </div>
-        <div class="field">
-            <label for="pitch">Pitch</label>
-            <input type="range" id="pitch" name="pitch" min="0" max="2" step="0.01" value="1">
-            <output for="pitch"></output>
-        </div>
-        <div class="field">
-            <label for="rate">Rate</label>
-            <input type="range" id="rate" name="rate" min="0.1" max="10" step="0.1" value="1">
-            <output for="rate"></output>
-        </div>
-    </div>
-    <div class="form_row">
-        <label for="start_date">Start Date:</label>
-        <input id="start_date" type="date" name="start_date" placeholder="Start Date" required>
-        <label for="start_time">Start Time:</label>
-        <input id="start_time" type="time" name="start_time" placeholder="Start Time" required>
-    </div>
-    <div class="form_row">
-        <label for="end_date">End Date:</label>
-        <input id="end_date" type="date" name="end_date" placeholder="End Date" required>
-        <label for="end_time">End Time:</label>
-        <input id="end_time" type="time" name="end_time" placeholder="End Time" required>
-    </div>
-    <div class="form_row">
-        <label for="location_type">Location Type:</label>
-        <select id="location_type" name="location_type" required>
-      <option value="" disabled selected>Type</option>
-      <option value="vc_url">VC URL</option>
-      <option value="address">Address</option>
-   </select>
-        <input type="text" name="location" placeholder="VC URL/Location">
-    </div>
-    <div class="form_row textarea">
-        <textarea id="say" name="description" placeholder="Description"></textarea>
-    </div>
-    <div class="form_row">
-      <label for="event_type">All-day:</label>
-      <select name="event_type" required>
-          <option value="on">Yes</option>
-          <option value="off" selected>No</option>
-      </select>
-    </div>
-    <div class="form_row">
-        <div class="form_row_start">
-            <label for="color">Color:</label>
-            <select id="color" name="color">
-         <option value="red">Red</option>
-         <option value="green">Green</option>
-         <option value="blue">Blue</option>
-      </select>
-        </div>
-        <div class="form_row_end">
-            <label for="availability">Availability:</label>
-            <select id="availability" name="availability">
-         <option value="free">Free</option>
-         <option value="busy" selected>Busy</option>
-      </select>
-            <label for="privacy">Privacy:</label>
-            <select id="privacy" name="privacy">
-         <option value="private">Private</option>
-         <option value="public" selected>Public</option>
-      </select>
-            <label for="is_google_event">Google event:</label>
-            <select id="is_google_event" name="is_google_event">
-         <option value="True">Yes</option>
-         <option value="False" selected>No</option>
-      </select>
-
-        </div>
-    </div>
diff --git a/app/templates/partials/calendar/event/edit_event_details_tab.html b/app/templates/partials/calendar/event/edit_event_details_tab.html
index 4e27dadf..e9fde613 100644
--- a/app/templates/partials/calendar/event/edit_event_details_tab.html
+++ b/app/templates/partials/calendar/event/edit_event_details_tab.html
@@ -1,75 +1,95 @@
 <div class="form_row">
-    <input id="say" type="text" name="title" placeholder="Event Title" required>
-    <input type="button" id="speak" name="speak" value="Speak it!">
-</div>
-<div>
-    <!-- Voices gets its own row for being so wide! -->
-    <div class="field" id="voices">
-        <label for="voice">Voice</label>
-        <select id="voice" name="voice"></select>
-    </div>
-</div>
-<div class="form_row panel">
-    <div class="field">
-        <label for="volume">Volume</label>
-        <input type="range" id="volume" name="volume" min="0" max="1" step="0.01" value="0.5">
-        <output for="volume"></output>
-    </div>
-    <div class="field">
-        <label for="pitch">Pitch</label>
-        <input type="range" id="pitch" name="pitch" min="0" max="2" step="0.01" value="1">
-        <output for="pitch"></output>
-    </div>
-    <div class="field">
-        <label for="rate">Rate</label>
-        <input type="range" id="rate" name="rate" min="0.1" max="10" step="0.1" value="1">
-        <output for="rate"></output>
-    </div>
+  <input id="say" type="text" name="title" placeholder="Event Title" required>
+  <input type="button" id="speak" name="speak" value="Speak it!">
+</div
+>
+<div class="form_row">
+  <div class="field" id="voices">
+    <label for="voice">Voice</label>
+    <select id="voice" name="voice"></select>
+  </div>
+  <div class="field">
+    <label for="volume">Volume</label>
+    <input type="range" id="volume" name="volume" min="0" max="1" step="0.01" value="0.5">
+    <output for="volume"></output>
+  </div>
+  <div class="field">
+    <label for="pitch">Pitch</label>
+    <input type="range" id="pitch" name="pitch" min="0" max="2" step="0.01" value="1">
+    <output for="pitch"></output>
+  </div>
+  <div class="field">
+    <label for="rate">Rate</label>
+    <input type="range" id="rate" name="rate" min="0.1" max="10" step="0.1" value="1">
+    <output for="rate"></output>
+  </div>
 </div>
+
 <div class="form_row">
-    <label for="start_date">Start Date:</label>
-    <input id="start_date" type="date" name="start_date" placeholder="Start Date" required>
-    <label for="start_time">Start Time:</label>
-    <input id="start_time" type="time" name="start_time" placeholder="Start Time" required>
+  <label for="start_date">Start Date:</label>
+  <input id="start_date" type="date" name="start_date" placeholder="Start Date" required>
+  <label for="start_time">Start Time:</label>
+  <input id="start_time" type="time" name="start_time" placeholder="Start Time" required>
 </div>
+
 <div class="form_row">
-    <label for="end_date">End Date:</label>
-    <input id="end_date" type="date" name="end_date" placeholder="End Date" required>
-    <label for="end_time">End Time:</label>
-    <input id="end_time" type="time" name="end_time" placeholder="End Time" required>
+  <label for="end_date">End Date:</label>
+  <input id="end_date" type="date" name="end_date" placeholder="End Date" required>
+  <label for="end_time">End Time:</label>
+  <input id="end_time" type="time" name="end_time" placeholder="End Time" required>
 </div>
+
 <div class="form_row">
-    <label for="location_type">Location Type:</label>
-    <select id="location_type" name="location_type" required>
-        <option value="" disabled selected>Type</option>
-        <option value="vc_url">VC URL</option>
-        <option value="address">Address</option>
-    </select>
-    <input type="text" name="location" placeholder="VC URL/Location">
+  <label for="location_type">Location Type:</label>
+  <select id="location_type" name="location_type" required>
+    <option value="" disabled selected>Type</option>
+    <option value="vc_url">VC URL</option>
+    <option value="address">Address</option>
+  </select>
+  <input type="text" name="location" placeholder="VC URL/Location">
 </div>
+
 <div class="form_row textarea">
-    <textarea id="say" name="description" placeholder="Description"></textarea>
+  <textarea id="say" name="description" placeholder="Description"></textarea>
+</div>
+
+<div class="form_row">
+  <label for="event_type">All-day:</label>
+  <select id="event_type" name="event_type" required>
+    <option value="on">Yes</option>
+    <option value="off" selected>No</option>
+  </select>
 </div>
+
 <div class="form_row">
-    <div class="form_row_start">
-        <label for="color">Color:</label>
-        <select id="color" name="color">
-            <option value="red">Red</option>
-            <option value="green">Green</option>
-            <option value="blue">Blue</option>
-        </select>
-    </div>
-    <div class="form_row_end">
-        <label for="availability">Availability:</label>
-        <select id="availability" name="availability">
-            <option value="free">Free</option>
-            <option value="busy" selected>Busy</option>
-        </select>
-        <label for="privacy">Privacy:</label>
-        <select id="privacy" name="privacy">
-            <option value="private">Private</option>
-            <option value="public" selected>Public</option>
-        </select>
-    </div>
+  <div class="form_row_start">
+    <label for="color">Color:</label>
+    <select id="color" name="color">
+      <option value="red">Red</option>
+      <option value="green">Green</option>
+      <option value="blue">Blue</option>
+    </select>
+  </div>
+
+  <div class="form_row_end">
+    <label for="availability">Availability:</label>
+    <select id="availability" name="availability">
+      <option value="free">Free</option>
+      <option value="busy" selected>Busy</option>
+    </select>
+
+    <label for="privacy">Privacy:</label>
+    <select id="privacy" name="privacy">
+      <option value="private">Private</option>
+      <option value="public" selected>Public</option>
+    </select>
+
+    <label for="is_google_event">Google event:</label>
+    <select id="is_google_event" name="is_google_event">
+      <option value="True">Yes</option>
+      <option value="False" selected>No</option>
+    </select>
+
+  </div>
 </div>
 

From 17296f49b9e99e516a197c157384ab8df4554248 Mon Sep 17 00:00:00 2001
From: Odelia Yechiel <odechann@gmail.com>
Date: Sat, 20 Feb 2021 05:21:08 +0200
Subject: [PATCH 4/4] dev: fixed an issue in calendar_day_view.html due to
 conflicts

---
 app/templates/calendar_day_view.html | 32 +++++++-----
 app/templates/dayview.html           | 75 ----------------------------
 2 files changed, 19 insertions(+), 88 deletions(-)
 delete mode 100644 app/templates/dayview.html

diff --git a/app/templates/calendar_day_view.html b/app/templates/calendar_day_view.html
index 745864de..ba681c9f 100644
--- a/app/templates/calendar_day_view.html
+++ b/app/templates/calendar_day_view.html
@@ -20,19 +20,24 @@
     <span class="fw-bold text-white date-nums">{{day}} / {{month}}</span>
     {% endif %}
   </div>
+  <div class="all_day_events">
+    {% for event in all_day_events %}
+      <p class="text-truncate my-0 {{size}}">{{ event.title }}</p>
+    {% endfor %}
+  </div>
   <div class="schedule">
     <div class="container times bg-primeary position">
-        {% for hour in range(25)%}
-          <div class='hour-block'>
-              <div class="row bg-transparent hour-mark">
-                  {% if view == 'day'%}
-                      {% set hour = hour|string() %}
-                      {{hour.zfill(2)}}:00
-                  {% endif %}
-              </div>
-              <div class="hour-bar row text-white border-bottom"></div>
-          </div>
-        {% endfor %}
+      {% for hour in range(25)%}
+      <div class='hour-block'>
+        <div class="row bg-transparent hour-mark">
+          {% if view == 'day'%}
+          {% set hour = hour|string() %}
+          {{hour.zfill(2)}}:00
+          {% endif %}
+        </div>
+        <div class="hour-bar row text-white border-bottom"></div>
+      </div>
+      {% endfor %}
     </div>
     <div class="event-grid">
       {% for event, attr in events %}
@@ -56,14 +61,15 @@
       </div>
       {% endfor %}
     </div>
-    </div>
+  </div>
   {% if view == 'day'%}
   <button title="Add Event" class="event-btn add-event-icon">
     <ion-icon name="add"></ion-icon>
   </button>
   {% endif %}
 </div>
-{% if view == 'day'%}<div id="event_block"></div>{% endif %}
+{% if view == 'day'%}
+<div id="event_block"></div>{% endif %}
 <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta1/dist/js/bootstrap.bundle.min.js"
         integrity="sha384-ygbV9kiqUc6oa4msXn9868pTtWMgiQaeYH7/t7LECLbyPA2x65Kgf80OJFdroafW"
         crossorigin="anonymous"></script>
diff --git a/app/templates/dayview.html b/app/templates/dayview.html
deleted file mode 100644
index 8a5a2a16..00000000
--- a/app/templates/dayview.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-giJF6kkoqNQ00vy+HMDP7azOuL0xtbfIcaT9wjKHr8RbDVddVHyTfAAsrekwKmP1" crossorigin="anonymous">
-        <link rel="stylesheet" href="{{ url_for('static', path='/dayview.css') }}">
-        <link href="https://fonts.googleapis.com/css2?family=Assistant&family=Open+Sans&family=Roboto&family=Roboto+Condensed&display=swap" rel="stylesheet">
-        <title>dayview</title>
-    </head>
-    <body>
-        <div id="toptab" class="d-flex justify-content-around sticky-top">
-            {% if view == 'day' %}
-                <a href="/closethedayview" title="close day view"><img class="pb-1" src="{{ url_for('static', path='/images/icons/close_sidebar.svg')}}" width="15em" height="15em"></a>
-                <span id="month-num" class="month-num fw-bold text-white">{{month}}</span>
-                <span id="day-num" class="day-num fw-bold text-white">{{day}}</span>
-                {% if zodiac %}
-                  <div class="zodiac-sign">
-                      <a href="https://www.horoscope.com/zodiac-signs/{{zodiac.name}}" title="Zodiac-sign: {{zodiac.name}}" target="_blank"><img src="{{ url_for('static', path='/images/zodiac/' + zodiac.name + '.svg') }}" alt="zodiac sign" width="14em" height="13em"></a>
-                  </div>
-                {% endif %}
-            {% else %}
-                <span class="fw-bold text-white date-nums">{{day}} / {{month}}</span>
-            {% endif %}
-        </div>
-        <div class="all_day_events">
-            {% for event in all_day_events %}
-                <p class="text-truncate my-0 {{size}}">{{ event.title }}</p>
-            {% endfor %}
-        </div>
-        <div class="schedule">
-            <div class="container times bg-primeary position">
-                {% if view == 'day'%}
-                    {% for hour in range(24)%}
-                        <div class="row bg-transparent hourmark">
-                        {% set hour = hour|string() %}
-                        {{hour.zfill(2)}}:00
-                        </div>
-                    {% endfor %}
-                {% endif %}
-            </div>
-            <div class="eventgrid">
-                {% for event, attr in events %}
-                    <div id="event{{event.id}}" class="text-truncate px-2 d-flex flex-column justify-content-evenly event" style="background-color: {{attr.color}}; grid-row: {{attr.grid_position}}; max-hight:1.5rem;">
-                        <p class="text-truncate my-0 {{ attr.title_size_class }}">{{ event.title }}</p>
-                        {% if attr.total_time_visible %}
-                            <p class="total-time text-truncate fw-light my-0">{{attr.total_time}}</p>
-                        {% endif %}
-                    </div>
-                {% endfor %}
-            </div>
-            <div class="container baselines bg-transparent">
-                {% for i in range(25)%}
-                    <div class="hourbar {{i}} row text-white border-bottom">---</div>
-                {% endfor %}
-            </div>
-            <div class="actiongrid">
-
-                {% for event, attr in events %}
-                    <div class="d-flex flex-row justify-content-around align-items-end action-continer" style="grid-row: {{attr.grid_position}};">
-                        <a href="/edit/{{event.id}}" title="Edit event" class="action-icon"><img class="pb-1" src="{{ url_for('static', path='/images/icons/pencil.svg')}}"></a>
-                        <a href="/delete/{{event.id}}" title="Delete event" class="action-icon"><img class="pb-1" src="{{ url_for('static', path='/images/icons/trash-can.svg')}}"></a>
-                        <a href="/event/{{event.id}}" title="See full event" class="action-icon"><img class="pb-1" src="{{ url_for('static', path='/images/icons/view.svg')}}"></a>
-                    </div>
-                {% endfor %}
-            </div>
-        </div>
-        <div>
-            <button class="event-btn" title="Add Event" class="add-event-icon"><img class="plus_image" src="{{ url_for('static', path='/images/icons/plus.svg')}}"></a>
-        </div>
-        <div id="here">Have a nice day</div>
-       <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta1/dist/js/bootstrap.bundle.min.js" integrity="sha384-ygbV9kiqUc6oa4msXn9868pTtWMgiQaeYH7/t7LECLbyPA2x65Kgf80OJFdroafW" crossorigin="anonymous"></script>
-       <script type="text/javascript" src="{{ url_for('static', path='/eventdisplay.js') }}"></script>
-    </body>
-</html>