Merge branch 'refs/heads/andrei' into prod

CineSync/static/css/includes/footer.css

@@ -0,0 +1,13 @@
+.warning_text {
+    width: 40vw;
+}
+.content_footer_block {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+}
+.footer {
+    margin-top: 5vw;
+}
+

CineSync/static/css/users/login.css

@@ -8,6 +8,7 @@
     margin-left: 30%;
     margin-right: 30%;
     margin-top: 10vw;
+    margin-bottom: 6vw;
     border-radius: 3vw;
     background-color: #eaeaea;
     padding-top: 2vw;

CineSync/static/css/users/password_change.css

@@ -0,0 +1,23 @@
+.password_change_block, form {
+    display: flex;
+    flex-direction: column;
+    flex-wrap: nowrap;
+    align-items: center;
+}
+.password_change_block {
+    margin-left: 30%;
+    margin-right: 30%;
+    margin-top: 4vw;
+    margin-bottom: 4vw;
+    border-radius: 3vw;
+    background-color: #eaeaea;
+    padding-top: 2vw;
+    padding-bottom: 2vw;
+    width: 40%;
+}
+.form_item {
+    width: 30vw !important;
+}
+.btn {
+    margin: 5px !important;
+}

CineSync/static/css/users/password_change_success.css

@@ -0,0 +1,22 @@
+.info_block {
+    height: 40vw;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+.text_block {
+    display: flex;
+    flex-direction: column;
+    flex-wrap: nowrap;
+    justify-content: center;
+    align-items: center;
+}
+.change_success_title, .change_success_text {
+    color: #eaeaea;
+}
+.change_success_btn {
+    margin-top: 3vw;
+}
+.change_success_image {
+    width: 20vw;
+}

CineSync/templates/base.html

@@ -7,7 +7,6 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>{% block title %}{% endblock title %}</title>
     <link href="{% static 'css/bootstrap/bootstrap.min.css' %}" rel="stylesheet">
-    <!--<link rel="stylesheet" href="{% static 'css/footer.css' %}"/>-->
     <link rel="apple-touch-icon" sizes="180x180" href="{% static 'img/apple-touch-icon.png' %}">
     <link rel="icon" type="image/png" sizes="32x32" href="{% static 'img/favicon-32x32.png' %}">
     <link rel="icon" type="image/png" sizes="16x16" href="{% static 'img/favicon-16x16.png' %}">
@@ -24,7 +23,7 @@
 <main>
     {% block content %} Контент не подвезлм :( {% endblock content %}
 </main>
-{% include 'includes/footer.html' %}
+<!--{% include 'includes/footer.html' %}-->
 <script defer src="{% static 'js/bootstrap/bootstrap.min.js' %}"></script>
 </body>
 </html>

CineSync/templates/includes/footer.html

@@ -0,0 +1,11 @@
+{% load static %}
+<link href="{% static 'css/includes/footer.css' %}" rel="stylesheet">
+<footer class="footer bg-dark text-light fixed-bottom">
+    <div class="content_footer_block">
+        <img class="header_icon" src="{% static 'img/logo.jpg' %}">
+        <p class="mt-3">CineSync ©️</p>
+        <p class="warning_text">*Вся информация на сайте, включая названия/описания/изображения фильмов, ФИО актеров
+            и режиссеров
+            сгенерированы нейросетью и не имеют отношения к реальности</p>
+    </div>
+</footer>

CineSync/templates/tickets/my_orders.html

@@ -7,10 +7,12 @@
 {% block content %}
 <link href="{% static 'css/style.css' %}" rel="stylesheet">
 <link href="{% static 'css/tickets/my_orders.css' %}" rel="stylesheet">
-<h1 class="header_title">Мои заказы</h1>
+<div class="container">
-<div class="my_orders_block">
+    <h1 class="header_title">Мои заказы</h1>
-    {% for order in my_orders %}
+    <div class="my_orders_block">
-    {% include "includes/my_order_card.html" %}
+        {% for order in my_orders %}
-    {% endfor %}
+        {% include "includes/my_order_card.html" %}
+        {% endfor %}
+    </div>
 </div>
 {% endblock %}

README.md

@@ -1,4 +1,4 @@
-# CineCync
+# CineSync
 
 Проект представляет собой интерфейс для работы с системой кинотеатра
 
@@ -60,7 +60,7 @@
 6) Запуск:
 
     ```bash
-    cd CineCync
+    cd CineSync
     python3 manage.py runserver
     ```