diff --git a/.vscode/PythonImportHelper-v2-Completion.json b/.vscode/PythonImportHelper-v2-Completion.json index ff1a015..2bd7e33 100644 --- a/.vscode/PythonImportHelper-v2-Completion.json +++ b/.vscode/PythonImportHelper-v2-Completion.json @@ -120,110 +120,6 @@ "detail": "django.db", "documentation": {} }, - { - "label": "migrations", - "importPath": "django.db", - "description": "django.db", - "isExtraImport": true, - "detail": "django.db", - "documentation": {} - }, - { - "label": "migrations", - "importPath": "django.db", - "description": "django.db", - "isExtraImport": true, - "detail": "django.db", - "documentation": {} - }, - { - "label": "models", - "importPath": "django.db", - "description": "django.db", - "isExtraImport": true, - "detail": "django.db", - "documentation": {} - }, - { - "label": "migrations", - "importPath": "django.db", - "description": "django.db", - "isExtraImport": true, - "detail": "django.db", - "documentation": {} - }, - { - "label": "models", - "importPath": "django.db", - "description": "django.db", - "isExtraImport": true, - "detail": "django.db", - "documentation": {} - }, - { - "label": "migrations", - "importPath": "django.db", - "description": "django.db", - "isExtraImport": true, - "detail": "django.db", - "documentation": {} - }, - { - "label": "models", - "importPath": "django.db", - "description": "django.db", - "isExtraImport": true, - "detail": "django.db", - "documentation": {} - }, - { - "label": "migrations", - "importPath": "django.db", - "description": "django.db", - "isExtraImport": true, - "detail": "django.db", - "documentation": {} - }, - { - "label": "models", - "importPath": "django.db", - "description": "django.db", - "isExtraImport": true, - "detail": "django.db", - "documentation": {} - }, - { - "label": "migrations", - "importPath": "django.db", - "description": "django.db", - "isExtraImport": true, - "detail": "django.db", - "documentation": {} - }, - { - "label": "models", - "importPath": "django.db", - "description": "django.db", - "isExtraImport": true, - "detail": "django.db", - "documentation": {} - }, - { - "label": "migrations", - "importPath": "django.db", - "description": "django.db", - "isExtraImport": true, - "detail": "django.db", - "documentation": {} - }, - { - "label": "models", - "importPath": "django.db", - "description": "django.db", - "isExtraImport": true, - "detail": "django.db", - "documentation": {} - }, { "label": "models", "importPath": "django.db", @@ -616,15 +512,6 @@ "detail": "frontImages.models", "documentation": {} }, - { - "label": "object.models", - "kind": 6, - "isExtraImport": true, - "importPath": "object.models", - "description": "object.models", - "detail": "object.models", - "documentation": {} - }, { "label": "django.core.validators", "kind": 6, @@ -650,6 +537,15 @@ "detail": "django.core.validators", "documentation": {} }, + { + "label": "object.models", + "kind": 6, + "isExtraImport": true, + "importPath": "object.models", + "description": "object.models", + "detail": "object.models", + "documentation": {} + }, { "label": "django_filters", "kind": 6, @@ -1157,91 +1053,28 @@ { "label": "Migration", "kind": 6, - "importPath": "back.object.migrations.0002_remove_element3d_parent", - "description": "back.object.migrations.0002_remove_element3d_parent", - "peekOfCode": "class Migration(migrations.Migration):\n dependencies = [\n ('object', '0001_initial'),\n ]\n operations = [\n migrations.RemoveField(\n model_name='element3d',\n name='parent',\n ),\n ]", - "detail": "back.object.migrations.0002_remove_element3d_parent", + "importPath": "back.object.migrations.0002_remove_clickablearea_tergetname", + "description": "back.object.migrations.0002_remove_clickablearea_tergetname", + "peekOfCode": "class Migration(migrations.Migration):\n dependencies = [\n ('object', '0001_initial'),\n ]\n operations = [\n migrations.RemoveField(\n model_name='clickablearea',\n name='tergetName',\n ),\n ]", + "detail": "back.object.migrations.0002_remove_clickablearea_tergetname", "documentation": {} }, { "label": "Migration", "kind": 6, - "importPath": "back.object.migrations.0003_element3d_parent", - "description": "back.object.migrations.0003_element3d_parent", - "peekOfCode": "class Migration(migrations.Migration):\n dependencies = [\n ('object', '0002_remove_element3d_parent'),\n ]\n operations = [\n migrations.AddField(\n model_name='element3d',\n name='parent',\n field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='object.element3d'),\n ),", - "detail": "back.object.migrations.0003_element3d_parent", + "importPath": "back.object.migrations.0003_clickablearea_target_name", + "description": "back.object.migrations.0003_clickablearea_target_name", + "peekOfCode": "class Migration(migrations.Migration):\n dependencies = [\n ('object', '0002_remove_clickablearea_tergetname'),\n ]\n operations = [\n migrations.AddField(\n model_name='clickablearea',\n name='target_name',\n field=models.CharField(default='name', max_length=200),\n preserve_default=False,", + "detail": "back.object.migrations.0003_clickablearea_target_name", "documentation": {} }, { "label": "Migration", "kind": 6, - "importPath": "back.object.migrations.0004_clickablearea_source_element3d_max_distance_and_more", - "description": "back.object.migrations.0004_clickablearea_source_element3d_max_distance_and_more", - "peekOfCode": "class Migration(migrations.Migration):\n dependencies = [\n ('object', '0003_element3d_parent'),\n ]\n operations = [\n migrations.AddField(\n model_name='clickablearea',\n name='source',\n field=models.ForeignKey(default=7, on_delete=django.db.models.deletion.PROTECT, to='object.element3d'),\n preserve_default=False,", - "detail": "back.object.migrations.0004_clickablearea_source_element3d_max_distance_and_more", - "documentation": {} - }, - { - "label": "Migration", - "kind": 6, - "importPath": "back.object.migrations.0005_remove_clickablearea_source", - "description": "back.object.migrations.0005_remove_clickablearea_source", - "peekOfCode": "class Migration(migrations.Migration):\n dependencies = [\n ('object', '0004_clickablearea_source_element3d_max_distance_and_more'),\n ]\n operations = [\n migrations.RemoveField(\n model_name='clickablearea',\n name='source',\n ),\n ]", - "detail": "back.object.migrations.0005_remove_clickablearea_source", - "documentation": {} - }, - { - "label": "Migration", - "kind": 6, - "importPath": "back.object.migrations.0006_clickablearea_source", - "description": "back.object.migrations.0006_clickablearea_source", - "peekOfCode": "class Migration(migrations.Migration):\n dependencies = [\n ('object', '0005_remove_clickablearea_source'),\n ]\n operations = [\n migrations.AddField(\n model_name='clickablearea',\n name='source',\n field=models.ForeignKey(default=7, on_delete=django.db.models.deletion.PROTECT, to='object.element3d'),\n preserve_default=False,", - "detail": "back.object.migrations.0006_clickablearea_source", - "documentation": {} - }, - { - "label": "Migration", - "kind": 6, - "importPath": "back.object.migrations.0007_alter_clickablearea_target", - "description": "back.object.migrations.0007_alter_clickablearea_target", - "peekOfCode": "class Migration(migrations.Migration):\n dependencies = [\n ('object', '0006_clickablearea_source'),\n ]\n operations = [\n migrations.AlterField(\n model_name='clickablearea',\n name='target',\n field=models.ForeignKey(default=7, on_delete=django.db.models.deletion.PROTECT, related_name='clickable_areas', to='object.element3d'),\n preserve_default=False,", - "detail": "back.object.migrations.0007_alter_clickablearea_target", - "documentation": {} - }, - { - "label": "Migration", - "kind": 6, - "importPath": "back.object.migrations.0008_alter_clickablearea_target", - "description": "back.object.migrations.0008_alter_clickablearea_target", - "peekOfCode": "class Migration(migrations.Migration):\n dependencies = [\n ('object', '0007_alter_clickablearea_target'),\n ]\n operations = [\n migrations.AlterField(\n model_name='clickablearea',\n name='target',\n field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='clickable_areas', to='object.element3d'),\n ),", - "detail": "back.object.migrations.0008_alter_clickablearea_target", - "documentation": {} - }, - { - "label": "Migration", - "kind": 6, - "importPath": "back.object.migrations.0009_alter_clickablearea_description_and_more", - "description": "back.object.migrations.0009_alter_clickablearea_description_and_more", - "peekOfCode": "class Migration(migrations.Migration):\n dependencies = [\n ('object', '0008_alter_clickablearea_target'),\n ]\n operations = [\n migrations.AlterField(\n model_name='clickablearea',\n name='description',\n field=models.TextField(verbose_name='описание'),\n ),", - "detail": "back.object.migrations.0009_alter_clickablearea_description_and_more", - "documentation": {} - }, - { - "label": "Migration", - "kind": 6, - "importPath": "back.object.migrations.0010_alter_clickablearea_target", - "description": "back.object.migrations.0010_alter_clickablearea_target", - "peekOfCode": "class Migration(migrations.Migration):\n dependencies = [\n ('object', '0009_alter_clickablearea_description_and_more'),\n ]\n operations = [\n migrations.AlterField(\n model_name='clickablearea',\n name='target',\n field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='clickable_areas', to='object.scene3d'),\n ),", - "detail": "back.object.migrations.0010_alter_clickablearea_target", - "documentation": {} - }, - { - "label": "Migration", - "kind": 6, - "importPath": "back.object.migrations.0011_remove_element3d_max_distance_and_more", - "description": "back.object.migrations.0011_remove_element3d_max_distance_and_more", - "peekOfCode": "class Migration(migrations.Migration):\n dependencies = [\n ('object', '0010_alter_clickablearea_target'),\n ]\n operations = [\n migrations.RemoveField(\n model_name='element3d',\n name='max_distance',\n ),\n migrations.RemoveField(", - "detail": "back.object.migrations.0011_remove_element3d_max_distance_and_more", + "importPath": "back.object.migrations.0004_alter_clickablearea_target_name", + "description": "back.object.migrations.0004_alter_clickablearea_target_name", + "peekOfCode": "class Migration(migrations.Migration):\n dependencies = [\n ('object', '0003_clickablearea_target_name'),\n ]\n operations = [\n migrations.AlterField(\n model_name='clickablearea',\n name='target_name',\n field=models.CharField(blank=True, max_length=200, null=True),\n ),", + "detail": "back.object.migrations.0004_alter_clickablearea_target_name", "documentation": {} }, { @@ -1276,7 +1109,7 @@ "kind": 6, "importPath": "back.object.models", "description": "back.object.models", - "peekOfCode": "class ClickableArea(models.Model):\n name = models.CharField(\"название\", max_length=255)\n description = models.TextField(\"описание\")\n object_name = models.CharField(\"название объекта\", max_length=255)\n target = models.ForeignKey(\n Scene3D,\n on_delete=models.PROTECT,\n related_name=\"clickable_areas\",\n blank=True,\n null=True,", + "peekOfCode": "class ClickableArea(models.Model):\n name = models.CharField(\"название\", max_length=255)\n description = models.TextField(\"описание\")\n object_name = models.CharField(\"название объекта\", max_length=255)\n target_name = models.CharField(\n max_length=200,\n blank=True,\n null=True,\n )\n target = models.ForeignKey(", "detail": "back.object.models", "documentation": {} }, diff --git a/back/object/models.py b/back/object/models.py index 72282a4..bc03bd5 100644 --- a/back/object/models.py +++ b/back/object/models.py @@ -43,7 +43,11 @@ class ClickableArea(models.Model): name = models.CharField("название", max_length=255) description = models.TextField("описание") object_name = models.CharField("название объекта", max_length=255) - tergetName = models.CharField(max_length=200) + target_name = models.CharField( + max_length=200, + blank=True, + null=True, + ) target = models.ForeignKey( Scene3D, on_delete=models.PROTECT, diff --git a/front/src/components/Promo/load_models.vue b/front/src/components/Promo/load_models.vue index 2e9ba22..5853e11 100644 --- a/front/src/components/Promo/load_models.vue +++ b/front/src/components/Promo/load_models.vue @@ -1,13 +1,13 @@ \ No newline at end of file diff --git a/front/src/components/Promo/sidebar.vue b/front/src/components/Promo/sidebar.vue index 95a2852..9a38597 100644 --- a/front/src/components/Promo/sidebar.vue +++ b/front/src/components/Promo/sidebar.vue @@ -20,7 +20,7 @@ onClickOutside(sidebar_obj, () => sidebar.close())

{{ p }}

- Перейти на темную сторону + {{ sidebar.target_name }} diff --git a/front/src/index.d.ts b/front/src/index.d.ts index 6bfb44c..3d77e52 100644 --- a/front/src/index.d.ts +++ b/front/src/index.d.ts @@ -42,6 +42,7 @@ interface PromoSidebarData { title: string description: string target?: string + target_name?: string } interface PromoSidebar extends PromoSidebarData { loading: boolean