added user's themes, minor fixes

akarpov/templates/base.html

@@ -21,6 +21,11 @@
 
     <!-- Latest compiled and minified Bootstrap CSS -->
     <link href="{% static 'css/bootstrap.min.css' %}" rel="stylesheet">
+    {% if request.user.is_authenticated %}
+      {% if request.user.theme %}
+        <link href="{{ request.user.theme.file.url }}" rel="stylesheet">
+      {% endif %}
+    {% endif %}
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.10.2/font/bootstrap-icons.css">
     <script src="https://kit.fontawesome.com/32fd82c823.js" crossorigin="anonymous"></script>
     <!-- Your stuff: Third-party CSS libraries go here -->

akarpov/templates/users/themes/create.html

@@ -0,0 +1,16 @@
+{% extends "base.html" %}
+{% load crispy_forms_tags %}
+
+{% block title %}Create Theme{% endblock %}
+
+{% block content %}
+  <form class="form-horizontal" enctype="multipart/form-data" method="post">
+    {% csrf_token %}
+    {{ form|crispy }}
+    <div class="control-group">
+      <div class="controls">
+        <button type="submit" class="btn btn-primary">Create</button>
+      </div>
+    </div>
+  </form>
+{% endblock %}

akarpov/templates/users/user_form.html

@@ -8,10 +8,34 @@
   <form class="form-horizontal" enctype="multipart/form-data" method="post" action="{% url 'users:update' %}">
     {% csrf_token %}
     {{ form|crispy }}
+    {# Themes block #}
+    <p class="mt-3 ml-3">Theme:</p>
+    <div class="row">
+      <label class="col-6 col-sm-4 col-md-3 gl-mb-5 text-center">
+        <div style="background-color: white; height: 48px; border-radius: 4px; min-width: 112px; margin-bottom: 8px;"></div>
+        <input {% if not request.user.theme %}checked{% endif %} type="radio" value="0" name="theme" id="user_theme_id_0">
+          Default
+      </label>
+      {% for theme in themes %}
+      <label class="col-6 col-sm-4 col-md-3 gl-mb-5 text-center">
+        <div style="background-color: {{ theme.color }}; height: 48px; border-radius: 4px; min-width: 112px; margin-bottom: 8px;"></div>
+        <input {% if request.user.theme_id == theme.id %}checked{% endif %} type="radio" value="{{ theme.id }}" name="theme" id="user_theme_id_{{ theme.id }}">
+        {{ theme.name }}
+      </label>
+      {% endfor %}
+    {% if request.user.is_superuser %}
+      <label class="col-6 col-sm-4 col-md-3 gl-mb-5 text-center">
+      <div style="background-color: white; height: 48px; border-radius: 4px; min-width: 112px; margin-bottom: 8px;"></div>
+      <a href="{% url 'users:themes:create' %}">Create new</a>
+      </label>
+    {% endif %}
+    </div>
+
     <div class="control-group">
       <div class="controls">
         <button type="submit" class="btn btn-primary">Update</button>
       </div>
     </div>
+
   </form>
 {% endblock %}

akarpov/users/migrations/0012_user_theme.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.6 on 2023-10-25 06:37
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("themes", "0001_initial"),
+        ("users", "0011_alter_userhistory_options_userhistory_created"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="user",
+            name="theme",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                to="themes.theme",
+            ),
+        ),
+    ]

akarpov/users/models.py

@@ -27,6 +27,7 @@ class User(AbstractUser, BaseImageModel, ShortLinkModel):
     left_file_upload = models.BigIntegerField(
         "Left file upload(in bites)", default=0, validators=[MinValueValidator(0)]
     )
+    theme = models.ForeignKey("themes.Theme", null=True, on_delete=models.SET_NULL)
 
     def get_absolute_url(self):
         """Get url for user's detail view.

akarpov/users/themes/admin.py

@@ -0,0 +1,8 @@
+from django.contrib import admin
+
+from akarpov.users.themes.models import Theme
+
+
+@admin.register(Theme)
+class ThemeAdmin(admin.ModelAdmin):
+    ...

akarpov/users/themes/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class ThemesConfig(AppConfig):
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "akarpov.users.themes"

akarpov/users/themes/forms.py

@@ -0,0 +1,9 @@
+from django import forms
+
+from akarpov.users.themes.models import Theme
+
+
+class ThemeForm(forms.ModelForm):
+    class Meta:
+        model = Theme
+        fields = ["name", "file", "color"]

akarpov/users/themes/migrations/0001_initial.py

@@ -0,0 +1,35 @@
+# Generated by Django 4.2.6 on 2023-10-25 06:37
+
+import colorfield.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    initial = True
+
+    dependencies = []
+
+    operations = [
+        migrations.CreateModel(
+            name="Theme",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("name", models.CharField(max_length=250)),
+                ("file", models.FileField(upload_to="themes/")),
+                (
+                    "color",
+                    colorfield.fields.ColorField(
+                        default="#FFFFFF", image_field=None, max_length=18, samples=None
+                    ),
+                ),
+            ],
+        ),
+    ]

akarpov/users/themes/models.py

@@ -0,0 +1,11 @@
+from colorfield.fields import ColorField
+from django.db import models
+
+
+class Theme(models.Model):
+    name = models.CharField(max_length=250)
+    file = models.FileField(upload_to="themes/")
+    color = ColorField()
+
+    def __str__(self):
+        return self.name

akarpov/users/themes/urls.py

@@ -0,0 +1,8 @@
+from django.urls import path
+
+from akarpov.users.themes.views import CreateFormView
+
+app_name = "themes"
+urlpatterns = [
+    path("create", CreateFormView.as_view(), name="create"),
+]

akarpov/users/themes/views.py

@@ -0,0 +1,13 @@
+from django.views import generic
+
+from akarpov.common.views import SuperUserRequiredMixin
+from akarpov.users.themes.models import Theme
+
+
+class CreateFormView(generic.CreateView, SuperUserRequiredMixin):
+    model = Theme
+    fields = ["name", "file", "color"]
+    template_name = "users/themes/create.html"
+
+    def get_success_url(self):
+        return ""

akarpov/users/urls.py

@@ -1,4 +1,4 @@
-from django.urls import path
+from django.urls import include, path
 
 from akarpov.users.views import (
     user_detail_view,
@@ -11,6 +11,7 @@
 app_name = "users"
 urlpatterns = [
     path("redirect/", view=user_redirect_view, name="redirect"),
+    path("themes/", include("akarpov.users.themes.urls", namespace="themes")),
     path("update/", view=user_update_view, name="update"),
     path("history/", view=user_history_view, name="history"),
     path("history/delete", view=user_history_delete_view, name="history_delete"),

akarpov/users/views.py

@@ -7,6 +7,7 @@
 
 from akarpov.users.models import UserHistory
 from akarpov.users.services.history import create_history_warning_note
+from akarpov.users.themes.models import Theme
 
 User = get_user_model()
 
@@ -26,11 +27,24 @@ class UserUpdateView(LoginRequiredMixin, SuccessMessageMixin, UpdateView):
     success_message = _("Information successfully updated")
 
     def get_success_url(self):
-        assert (
-            self.request.user.is_authenticated
-        )  # for mypy to know that the user is authenticated
         return self.request.user.get_absolute_url()
 
+    def get_context_data(self, **kwargs):
+        kwargs["themes"] = Theme.objects.all()
+        return super().get_context_data(**kwargs)
+
+    def form_valid(self, form):
+        data = self.request.POST
+        if "theme" in data:
+            if data["theme"] == "0":
+                self.object.theme = None
+            else:
+                try:
+                    self.object.theme = Theme.objects.get(id=data["theme"])
+                except Theme.DoesNotExist:
+                    ...
+        return super().form_valid(form)
+
     def get_object(self):
         return self.request.user
 

config/settings/base.py

@@ -81,7 +81,7 @@
     "default": {
         "BACKEND": "channels_redis.core.RedisChannelLayer",
         "CONFIG": {
-            "hosts": [("127.0.0.1", 6379)],
+            "hosts": [env("REDIS_URL")],
         },
     },
 }
@@ -157,6 +157,7 @@
     "akarpov.gallery",
     "akarpov.tools.qr",
     "akarpov.pipeliner",
+    "akarpov.users.themes",
     "akarpov.notifications",
     "akarpov.test_platform",
     "akarpov.tools.shortener",