Merge branch 'develop' into feature/keywords-rework

# Conflicts:
#	cookbook/static/vue/js/chunk-vendors.js
#	cookbook/static/vue/js/import_response_view.js
#	cookbook/static/vue/js/offline_view.js
#	cookbook/static/vue/js/recipe_search_view.js
#	cookbook/static/vue/js/recipe_view.js
#	cookbook/static/vue/js/supermarket_view.js
#	cookbook/static/vue/js/user_file_view.js
#	cookbook/templates/sw.js
#	cookbook/views/views.py
#	vue/src/components/RecipeCard.vue
#	vue/src/locales/en.json

cookbook/migrations/0132_sharelink_request_count.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.4 on 2021-06-12 18:39
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0131_auto_20210608_1929'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='sharelink',
+            name='request_count',
+            field=models.IntegerField(default=0),
+        ),
+    ]

cookbook/migrations/0133_sharelink_abuse_blocked.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.4 on 2021-06-12 18:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0132_sharelink_request_count'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='sharelink',
+            name='abuse_blocked',
+            field=models.BooleanField(default=False),
+        ),
+    ]

cookbook/migrations/0134_space_allow_sharing.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.4 on 2021-06-15 19:07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0133_sharelink_abuse_blocked'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='space',
+            name='allow_sharing',
+            field=models.BooleanField(default=True),
+        ),
+    ]

cookbook/migrations/0135_auto_20210615_2210.py

@@ -0,0 +1,29 @@
+# Generated by Django 3.2.4 on 2021-06-15 20:10
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('cookbook', '0134_space_allow_sharing'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='ingredient',
+            name='space',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='cookbook.space'),
+        ),
+        migrations.AddField(
+            model_name='nutritioninformation',
+            name='space',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='cookbook.space'),
+        ),
+        migrations.AddField(
+            model_name='step',
+            name='space',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='cookbook.space'),
+        ),
+
+    ]

cookbook/migrations/0136_auto_20210617_1343.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.4 on 2021-06-17 11:43
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0135_auto_20210615_2210'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='importlog',
+            name='imported_recipes',
+            field=models.IntegerField(default=0),
+        ),
+        migrations.AddField(
+            model_name='importlog',
+            name='total_recipes',
+            field=models.IntegerField(default=0),
+        ),
+    ]

cookbook/migrations/0137_auto_20210617_1501.py

@@ -0,0 +1,34 @@
+# Generated by Django 3.2.4 on 2021-06-17 13:01
+
+from django.db import migrations
+from django.db.models import Subquery, OuterRef
+from django_scopes import scopes_disabled
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+def migrate_spaces(apps, schema_editor):
+    with scopes_disabled():
+        Recipe = apps.get_model('cookbook', 'Recipe')
+        Step = apps.get_model('cookbook', 'Step')
+        Ingredient = apps.get_model('cookbook', 'Ingredient')
+        NutritionInformation = apps.get_model('cookbook', 'NutritionInformation')
+
+        Step.objects.filter(recipe__isnull=True).delete()
+        Ingredient.objects.filter(step__recipe__isnull=True).delete()
+        NutritionInformation.objects.filter(recipe__isnull=True).delete()
+
+        Step.objects.update(space=Subquery(Step.objects.filter(pk=OuterRef('pk')).values('recipe__space')[:1]))
+        Ingredient.objects.update(space=Subquery(Ingredient.objects.filter(pk=OuterRef('pk')).values('step__recipe__space')[:1]))
+        NutritionInformation.objects.update(space=Subquery(NutritionInformation.objects.filter(pk=OuterRef('pk')).values('recipe__space')[:1]))
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('cookbook', '0136_auto_20210617_1343'),
+    ]
+
+    operations = [
+        migrations.RunPython(migrate_spaces),
+
+    ]

cookbook/migrations/0138_auto_20210617_1602.py

@@ -0,0 +1,31 @@
+# Generated by Django 3.2.4 on 2021-06-17 14:02
+
+from django.db import migrations
+from django.db.models import Subquery, OuterRef
+from django_scopes import scopes_disabled
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('cookbook', '0137_auto_20210617_1501'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='ingredient',
+            name='space',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cookbook.space'),
+        ),
+        migrations.AlterField(
+            model_name='nutritioninformation',
+            name='space',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cookbook.space'),
+        ),
+        migrations.AlterField(
+            model_name='step',
+            name='space',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cookbook.space'),
+        ),
+    ]

cookbook/migrations/0139_space_created_at.py

@@ -0,0 +1,20 @@
+# Generated by Django 3.2.4 on 2021-06-22 16:14
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0138_auto_20210617_1602'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='space',
+            name='created_at',
+            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
+            preserve_default=False,
+        ),
+    ]

cookbook/migrations/0140_userpreference_created_at.py

@@ -0,0 +1,20 @@
+# Generated by Django 3.2.4 on 2021-06-22 16:19
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0139_space_created_at'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='userpreference',
+            name='created_at',
+            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
+            preserve_default=False,
+        ),
+    ]