diff --git a/CineSync/films/migrations/0003_film_description.py b/CineSync/films/migrations/0003_film_description.py new file mode 100644 index 0000000..916aaa0 --- /dev/null +++ b/CineSync/films/migrations/0003_film_description.py @@ -0,0 +1,21 @@ +# Generated by Django 4.2 on 2024-04-14 17:21 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("films", "0002_alter_film_genres"), + ] + + operations = [ + migrations.AddField( + model_name="film", + name="description", + field=models.CharField( + default="", help_text="Описание фильма", max_length=1000 + ), + preserve_default=False, + ), + ] diff --git a/CineSync/static/css/header.css b/CineSync/static/css/header.css deleted file mode 100644 index 08d8650..0000000 --- a/CineSync/static/css/header.css +++ /dev/null @@ -1,27 +0,0 @@ -.header_icon { - width: 5vw; - border-radius: 1.5vw; - padding:1vw; -} -.header_row, .auth_row, header { - display: flex; - flex-direction: row; - align-items: center; - flex-wrap: nowrap; -} -header { - justify-content: space-between; - background-color: #ffffff; - position: fixed; - margin: 1%; - width: 98%; - border-radius: 0.8vw;; -} -.header_container { - width: 100%; - z-index: 103; -} -.nav-item { - margin: 5px; -} - diff --git a/CineSync/static/css/includes/header.css b/CineSync/static/css/includes/header.css index 6f5a5fb..e47f403 100644 --- a/CineSync/static/css/includes/header.css +++ b/CineSync/static/css/includes/header.css @@ -15,6 +15,7 @@ header { margin: 1%; width: 98%; border-radius: 0.8vw;; + border: 2px solid #0d1d3a; } .header_container { width: 100%; @@ -29,3 +30,7 @@ header { .auth_row { margin-right: 1vw; } +.user_link { + text-decoration: none; + color: #424242; +} diff --git a/CineSync/static/css/users/profile.css b/CineSync/static/css/users/profile.css new file mode 100644 index 0000000..e728653 --- /dev/null +++ b/CineSync/static/css/users/profile.css @@ -0,0 +1,23 @@ +.profile_block, form { + display: flex; + flex-direction: column; + flex-wrap: nowrap; + align-items: center; +} +.profile_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; +} \ No newline at end of file diff --git a/CineSync/static/img/user.png b/CineSync/static/img/user.png new file mode 100644 index 0000000..7855bd6 Binary files /dev/null and b/CineSync/static/img/user.png differ diff --git a/CineSync/templates/includes/header.html b/CineSync/templates/includes/header.html index 7584c9c..6487a4a 100644 --- a/CineSync/templates/includes/header.html +++ b/CineSync/templates/includes/header.html @@ -22,7 +22,14 @@
{% if user.is_authenticated %} - + {{ user }} + + {% if user.image %} + {{ user.image_tmb }} + {% else %} + + {% endif %} + {% else %}