back/object/models.py

@@ -36,12 +36,6 @@ class Scene3D(models.Model):
         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
@@ -53,6 +47,7 @@ class Scene3D(models.Model):
         return self.name
 
 
+
 class ClickableArea(models.Model):
     name = models.CharField("название", max_length=255)
     description = models.TextField("описание")
@@ -73,6 +68,15 @@ class ClickableArea(models.Model):
         Element3D,
         on_delete=models.PROTECT,
     )
+    image = models.ImageField('Картинка', upload_to='images', blank=True, null=True)
+
+    # def image_size_validator_factory(min_w=600, min_h=600, field_name='image'):
+    #     def validator(image):
+    #         if image.width < min_w or image.height < min_h:
+    #             raise ValidationError(
+    #             {field_name: f'Размер картинки от {min_w}х{min_h} пикселей. '}
+    #         )
+
     
     def __str__(self):
         return self.name

back/object/serializers.py

@@ -11,16 +11,11 @@ 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__"
@@ -32,3 +27,4 @@ class ClickableAreaSerializer(serializers.ModelSerializer):
         model = ClickableArea
         fields = "__all__"
 
+