Merge branch 'main' into partially-read-shelf

bookwyrm/migrations/0142_auto_20220227_1752.py

@@ -0,0 +1,68 @@
+# Generated by Django 3.2.12 on 2022-02-27 17:52
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+def add_default_themes(apps, schema_editor):
+    """add light and dark themes"""
+    db_alias = schema_editor.connection.alias
+    theme_model = apps.get_model("bookwyrm", "Theme")
+    theme_model.objects.using(db_alias).create(
+        name="BookWyrm Light",
+        path="css/themes/bookwyrm-light.scss",
+    )
+    theme_model.objects.using(db_alias).create(
+        name="BookWyrm Dark",
+        path="css/themes/bookwyrm-dark.scss",
+    )
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0141_alter_report_status"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="Theme",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("created_date", models.DateTimeField(auto_now_add=True)),
+                ("name", models.CharField(max_length=50, unique=True)),
+                ("path", models.CharField(max_length=50, unique=True)),
+            ],
+        ),
+        migrations.AddField(
+            model_name="sitesettings",
+            name="default_theme",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                to="bookwyrm.theme",
+            ),
+        ),
+        migrations.AddField(
+            model_name="user",
+            name="theme",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                to="bookwyrm.theme",
+            ),
+        ),
+        migrations.RunPython(
+            add_default_themes, reverse_code=migrations.RunPython.noop
+        ),
+    ]

bookwyrm/migrations/0142_user_hide_follows.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.2.12 on 2022-02-28 19:44
+
+import bookwyrm.models.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0141_alter_report_status"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="user",
+            name="hide_follows",
+            field=bookwyrm.models.fields.BooleanField(default=False),
+        ),
+    ]

bookwyrm/migrations/0143_merge_0142_auto_20220227_1752_0142_user_hide_follows.py

@@ -0,0 +1,13 @@
+# Generated by Django 3.2.12 on 2022-02-28 21:28
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0142_auto_20220227_1752"),
+        ("bookwyrm", "0142_user_hide_follows"),
+    ]
+
+    operations = []

bookwyrm/migrations/0144_alter_announcement_display_type.py

@@ -0,0 +1,39 @@
+# Generated by Django 3.2.12 on 2022-03-01 18:46
+
+from django.db import migrations, models
+
+
+def remove_white(apps, schema_editor):
+    """don't hardcode white announcements"""
+    db_alias = schema_editor.connection.alias
+    announcement_model = apps.get_model("bookwyrm", "Announcement")
+    announcement_model.objects.using(db_alias).filter(display_type="white-ter").update(
+        display_type=None
+    )
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0143_merge_0142_auto_20220227_1752_0142_user_hide_follows"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="announcement",
+            name="display_type",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("primary-light", "Primary"),
+                    ("success-light", "Success"),
+                    ("link-light", "Link"),
+                    ("warning-light", "Warning"),
+                    ("danger-light", "Danger"),
+                ],
+                max_length=20,
+                null=True,
+            ),
+        ),
+        migrations.RunPython(remove_white, reverse_code=migrations.RunPython.noop),
+    ]