diff --git a/.vscode/PythonImportHelper-v2-Completion.json b/.vscode/PythonImportHelper-v2-Completion.json index 11fd02a..3c39f05 100644 --- a/.vscode/PythonImportHelper-v2-Completion.json +++ b/.vscode/PythonImportHelper-v2-Completion.json @@ -120,6 +120,22 @@ "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", @@ -1077,6 +1093,15 @@ "detail": "back.object.migrations.0004_alter_clickablearea_target_name", "documentation": {} }, + { + "label": "Migration", + "kind": 6, + "importPath": "back.object.migrations.0005_scene3d_hdr_gainmap_scene3d_hdr_json_and_more", + "description": "back.object.migrations.0005_scene3d_hdr_gainmap_scene3d_hdr_json_and_more", + "peekOfCode": "class Migration(migrations.Migration):\n dependencies = [\n ('object', '0004_alter_clickablearea_target_name'),\n ]\n operations = [\n migrations.AddField(\n model_name='scene3d',\n name='hdr_gainmap',\n field=models.FileField(blank=True, null=True, upload_to=''),\n ),", + "detail": "back.object.migrations.0005_scene3d_hdr_gainmap_scene3d_hdr_json_and_more", + "documentation": {} + }, { "label": "Scene3DAdmin", "kind": 6, @@ -1100,7 +1125,7 @@ "kind": 6, "importPath": "back.object.models", "description": "back.object.models", - "peekOfCode": "class Element3D(models.Model):\n parent = models.ForeignKey(\"self\", on_delete=models.PROTECT, blank=True, null=True)\n model_file = models.FileField(upload_to=group_based_upload_to)\n name = models.CharField(max_length=255)\n description = models.TextField()\n def __str__(self):\n return self.name\nclass Scene3D(models.Model):\n filter_horizontal = ('elements',)\n name = models.CharField(", + "peekOfCode": "class Element3D(models.Model):\n parent = models.ForeignKey(\"self\", on_delete=models.PROTECT, blank=True, null=True)\n model_file = models.FileField(upload_to=group_based_upload_to)\n name = models.CharField(max_length=255)\n description = models.TextField()\n def __str__(self):\n return self.name\nclass Scene3D(models.Model):\n filter_horizontal = (\"elements\",)\n name = models.CharField(", "detail": "back.object.models", "documentation": {} }, @@ -1109,7 +1134,7 @@ "kind": 6, "importPath": "back.object.models", "description": "back.object.models", - "peekOfCode": "class Scene3D(models.Model):\n filter_horizontal = ('elements',)\n name = models.CharField(\n max_length=120,\n )\n elements = models.ManyToManyField(Element3D)\n min_distance = models.IntegerField(\n validators=[MinValueValidator(1), MaxValueValidator(600)], blank=True, null=True\n )\n max_distance = models.IntegerField(", + "peekOfCode": "class Scene3D(models.Model):\n filter_horizontal = (\"elements\",)\n name = models.CharField(\n max_length=120,\n )\n elements = models.ManyToManyField(Element3D)\n min_distance = models.IntegerField(\n validators=[MinValueValidator(1), MaxValueValidator(600)], blank=True, null=True\n )\n max_distance = models.IntegerField(", "detail": "back.object.models", "documentation": {} }, @@ -1145,7 +1170,7 @@ "kind": 6, "importPath": "back.object.serializers", "description": "back.object.serializers", - "peekOfCode": "class Element3DSerializer(serializers.ModelSerializer):\n model_file = serializers.ImageField(use_url=False)\n class Meta:\n model = Element3D\n fields = \"__all__\"\nclass Scene3DSerializer(serializers.ModelSerializer):\n elements = Element3DSerializer(many=True)\n class Meta:\n model = Scene3D\n fields = \"__all__\"", + "peekOfCode": "class Element3DSerializer(serializers.ModelSerializer):\n model_file = serializers.ImageField(use_url=False)\n class Meta:\n model = Element3D\n fields = \"__all__\"\nclass Scene3DSerializer(serializers.ModelSerializer):\n elements = Element3DSerializer(many=True)\n hdr_gainmap = serializers.FileField(use_url=False)\n hdr_json = serializers.FileField(use_url=False)\n hdr_webp = serializers.FileField(use_url=False)", "detail": "back.object.serializers", "documentation": {} }, @@ -1154,7 +1179,7 @@ "kind": 6, "importPath": "back.object.serializers", "description": "back.object.serializers", - "peekOfCode": "class Scene3DSerializer(serializers.ModelSerializer):\n elements = Element3DSerializer(many=True)\n class Meta:\n model = Scene3D\n fields = \"__all__\"\n depth = 2\nclass ClickableAreaSerializer(serializers.ModelSerializer):\n class Meta:\n model = ClickableArea\n fields = \"__all__\"", + "peekOfCode": "class Scene3DSerializer(serializers.ModelSerializer):\n elements = Element3DSerializer(many=True)\n hdr_gainmap = serializers.FileField(use_url=False)\n hdr_json = serializers.FileField(use_url=False)\n hdr_webp = serializers.FileField(use_url=False)\n class Meta:\n model = Scene3D\n fields = \"__all__\"\n depth = 2\nclass ClickableAreaSerializer(serializers.ModelSerializer):", "detail": "back.object.serializers", "documentation": {} }, diff --git a/back/object/models.py b/back/object/models.py index 6597479..a6055c3 100644 --- a/back/object/models.py +++ b/back/object/models.py @@ -22,7 +22,7 @@ class Element3D(models.Model): return self.name class Scene3D(models.Model): - filter_horizontal = ('elements',) + filter_horizontal = ("elements",) name = models.CharField( max_length=120, ) @@ -32,12 +32,22 @@ class Scene3D(models.Model): validators=[MinValueValidator(1), MaxValueValidator(600)], blank=True, null=True ) max_distance = models.IntegerField( - validators=[MinValueValidator(2), MaxValueValidator(1000)], blank=True, null=True + validators=[MinValueValidator(2), MaxValueValidator(1000)], + blank=True, + null=True, ) +<<<<<<< HEAD gainmap = models.FileField(upload_to=group_based_upload_to) json = models.FileField() webp = models.FileField() +======= +>>>>>>> 46d2586e693673bf1d8b8a390b297209bdf70ecb + hdr_gainmap = models.FileField( + upload_to=group_based_upload_to, blank=True, null=True + ) + hdr_json = models.FileField(upload_to=group_based_upload_to, blank=True, null=True) + hdr_webp = models.FileField(upload_to=group_based_upload_to, blank=True, null=True) def __str__(self): return self.name diff --git a/back/object/serializers.py b/back/object/serializers.py index 3b2e6b3..e8db76d 100644 --- a/back/object/serializers.py +++ b/back/object/serializers.py @@ -11,8 +11,16 @@ class Element3DSerializer(serializers.ModelSerializer): class Scene3DSerializer(serializers.ModelSerializer): +<<<<<<< HEAD elements = serializers.ImageField(many=True, use_url=False) +======= + elements = Element3DSerializer(many=True) + hdr_gainmap = serializers.FileField(use_url=False) + hdr_json = serializers.FileField(use_url=False) + hdr_webp = serializers.FileField(use_url=False) + +>>>>>>> 46d2586e693673bf1d8b8a390b297209bdf70ecb class Meta: model = Scene3D fields = "__all__" diff --git a/front/components.d.ts b/front/components.d.ts index fcab68f..f13080a 100644 --- a/front/components.d.ts +++ b/front/components.d.ts @@ -17,6 +17,7 @@ declare module 'vue' { IMdiHexagonOutline: typeof import('~icons/mdi/hexagon-outline')['default'] IMdiHome: typeof import('~icons/mdi/home')['default'] IMdiMonitorScreenshot: typeof import('~icons/mdi/monitor-screenshot')['default'] + IMdiPagePreviousOutline: typeof import('~icons/mdi/page-previous-outline')['default'] IMdiShop: typeof import('~icons/mdi/shop')['default'] IMdiVideo3d: typeof import('~icons/mdi/video3d')['default'] Item: typeof import('./src/components/Floorplan/item.vue')['default'] diff --git a/front/src/components/Promo/env.vue b/front/src/components/Promo/env.vue index ee62998..cbfbd49 100644 --- a/front/src/components/Promo/env.vue +++ b/front/src/components/Promo/env.vue @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/front/src/components/Promo/load_models.vue b/front/src/components/Promo/load_models.vue index 7ecd0d3..e7b2d99 100644 --- a/front/src/components/Promo/load_models.vue +++ b/front/src/components/Promo/load_models.vue @@ -1,11 +1,14 @@