Merge branch 'search_and_keywords' of https://github.com/smilerz/recipes into smilerz-search_and_keywords

# Conflicts:
#	cookbook/admin.py
#	cookbook/helper/recipe_search.py
#	cookbook/integration/chowdown.py
#	cookbook/integration/integration.py
#	cookbook/management/commands/rebuildindex.py
#	cookbook/managers.py
#	cookbook/migrations/0142_build_full_text_index.py
#	cookbook/models.py
#	cookbook/schemas.py
#	cookbook/serializer.py
#	cookbook/static/vue/css/keyword_list_view.css
#	cookbook/static/vue/js/chunk-vendors.js
#	cookbook/static/vue/js/keyword_list_view.js
#	cookbook/tests/api/test_api_keyword.py
#	cookbook/views/api.py
#	cookbook/views/data.py
#	cookbook/views/views.py
#	recipes/settings.py
#	vue/package.json
#	vue/src/apps/KeywordListView/KeywordListView.vue
#	vue/src/components/KeywordCard.vue
#	vue/src/locales/en.json
#	vue/src/utils/openapi/api.ts
#	vue/yarn.lock

cookbook/migrations/0141_auto_20210713_1042.py

@@ -0,0 +1,24 @@
+# Generated by Django 3.2.5 on 2021-07-13 08:42
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0140_userpreference_created_at'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='step',
+            name='step_recipe',
+            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.PROTECT, to='cookbook.recipe'),
+        ),
+        migrations.AlterField(
+            model_name='step',
+            name='type',
+            field=models.CharField(choices=[('TEXT', 'Text'), ('TIME', 'Time'), ('FILE', 'File'), ('RECIPE', 'Recipe')], default='TEXT', max_length=16),
+        ),
+    ]

cookbook/migrations/0142_build_full_text_index.py

@@ -27,7 +27,7 @@ def set_default_search_vector(apps, schema_editor):
 
 class Migration(migrations.Migration):
     dependencies = [
-        ('cookbook', '0141_keyword_to_tree'),
+        ('cookbook', '0141_auto_20210713_1042'),
     ]
     operations = [
         migrations.AddField(

cookbook/migrations/0146_keyword_to_tree.py

@@ -0,0 +1,70 @@
+# Generated by Django 3.1.7 on 2021-03-30 19:42
+
+from treebeard.mp_tree import MP_Node
+from django.db import migrations, models
+from django_scopes import scopes_disabled
+# update if needed
+steplen = MP_Node.steplen
+alphabet = MP_Node.alphabet
+node_order_by = ["name"]
+
+
+def update_paths(apps, schema_editor):
+    with scopes_disabled():
+        Node = apps.get_model("cookbook", "Keyword")
+        nodes = Node.objects.all().order_by(*node_order_by)
+        for i, node in enumerate(nodes, 1):
+            # for default values, this resolves to: "{:04d}".format(i)
+            node.path = f"{{:{alphabet[0]}{steplen}d}}".format(i)
+        if nodes:
+            Node.objects.bulk_update(nodes, ["path"])
+
+
+def backwards(apps, schema_editor):
+    """nothing to do"""
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0145_alter_userpreference_use_fractions'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='keyword',
+            name='depth',
+            field=models.PositiveIntegerField(default=1),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='keyword',
+            name='numchild',
+            field=models.PositiveIntegerField(default=0),
+        ),
+        migrations.AddField(
+            model_name='keyword',
+            name='path',
+            field=models.CharField(default="", max_length=255, unique=False),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='userpreference',
+            name='use_fractions',
+            field=models.BooleanField(default=True),
+        ),
+        migrations.RunPython(update_paths, backwards),
+        migrations.AlterField(
+            model_name="keyword",
+            name="path",
+            field=models.CharField(max_length=255, unique=True),
+        ),
+        migrations.AlterUniqueTogether(
+            name='keyword',
+            unique_together=set(),
+        ),
+        migrations.AddConstraint(
+            model_name='keyword',
+            constraint=models.UniqueConstraint(fields=('space', 'name'), name='unique_name_per_space'),
+        ),
+    ]

cookbook/migrations/0147_auto_20210813_1829.py

@@ -0,0 +1,66 @@
+# Generated by Django 3.2.5 on 2021-08-13 16:29
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0146_keyword_to_tree'),
+    ]
+
+    operations = [
+        migrations.RemoveConstraint(
+            model_name='keyword',
+            name='unique_name_per_space',
+        ),
+        migrations.AlterField(
+            model_name='userpreference',
+            name='use_fractions',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AlterUniqueTogether(
+            name='food',
+            unique_together=set(),
+        ),
+        migrations.AlterUniqueTogether(
+            name='recipebookentry',
+            unique_together=set(),
+        ),
+        migrations.AlterUniqueTogether(
+            name='supermarket',
+            unique_together=set(),
+        ),
+        migrations.AlterUniqueTogether(
+            name='supermarketcategory',
+            unique_together=set(),
+        ),
+        migrations.AlterUniqueTogether(
+            name='unit',
+            unique_together=set(),
+        ),
+        migrations.AddConstraint(
+            model_name='food',
+            constraint=models.UniqueConstraint(fields=('space', 'name'), name='f_unique_name_per_space'),
+        ),
+        migrations.AddConstraint(
+            model_name='keyword',
+            constraint=models.UniqueConstraint(fields=('space', 'name'), name='kw_unique_name_per_space'),
+        ),
+        migrations.AddConstraint(
+            model_name='recipebookentry',
+            constraint=models.UniqueConstraint(fields=('recipe', 'book'), name='rbe_unique_name_per_space'),
+        ),
+        migrations.AddConstraint(
+            model_name='supermarket',
+            constraint=models.UniqueConstraint(fields=('space', 'name'), name='sm_unique_name_per_space'),
+        ),
+        migrations.AddConstraint(
+            model_name='supermarketcategory',
+            constraint=models.UniqueConstraint(fields=('space', 'name'), name='smc_unique_name_per_space'),
+        ),
+        migrations.AddConstraint(
+            model_name='unit',
+            constraint=models.UniqueConstraint(fields=('space', 'name'), name='u_unique_name_per_space'),
+        ),
+    ]

cookbook/migrations/0148_fix_leading_trailing_spaces.py

@@ -0,0 +1,31 @@
+from django.db import migrations, models
+from django_scopes import scopes_disabled
+models = ["Keyword", "Food", "Unit"]
+
+def update_paths(apps, schema_editor):
+    with scopes_disabled():
+        for model in models:
+            Node = apps.get_model("cookbook", model)
+            nodes = Node.objects.all().filter(name__startswith=" ")
+            for i in nodes:
+                i.name = "_" + i.name
+                i.save()
+            nodes = Node.objects.all().filter(name__endswith=" ")
+            for i in nodes:
+                i.name = i.name + "_"
+                i.save()
+
+
+def backwards(apps, schema_editor):
+    """nothing to do"""
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0147_auto_20210813_1829'),
+    ]
+
+    operations = [
+        migrations.RunPython(update_paths, backwards),
+    ]