merge

.gitignore

@@ -3,9 +3,6 @@ files/*
 .vscode/
 __pycache__/
 poetry.lock
-<<<<<<< HEAD
 files/*
 .vscode/
-=======
 .env
->>>>>>> bx-596-makepromo

.vscode/PythonImportHelper-v2-Completion.json

@@ -630,7 +630,7 @@
         "kind": 6,
         "importPath": "back.api.models",
         "description": "back.api.models",
-        "peekOfCode": "class Product(models.Model):\n    title = models.CharField(max_length=100)\n    description = models.TextField(default=None, null=True)\n    model3d = models.FileField(default=None, blank=True, null=True, upload_to=\"files\")\n    image1 = models.ImageField(default=None, blank=True, null=True, upload_to=\"files\")\n    image2 = models.ImageField(default=None, blank=True, null=True, upload_to=\"files\")\n    image3 = models.ImageField(default=None, blank=True, null=True, upload_to=\"files\")\n    def __str__(self):\n        return self.title\n<<<<<<< HEAD",
+        "peekOfCode": "class Product(models.Model):\n    title = models.CharField(max_length=100)\n    description = models.TextField(default=None, null=True)\n    model3d = models.FileField(default=None, blank=True, null=True, upload_to=\"files\")\n    image1 = models.ImageField(default=None, blank=True, null=True, upload_to=\"files\")\n    image2 = models.ImageField(default=None, blank=True, null=True, upload_to=\"files\")\n    image3 = models.ImageField(default=None, blank=True, null=True, upload_to=\"files\")\n    def __str__(self):\n        return self.title\nclass Floorplan(models.Model):",
         "detail": "back.api.models",
         "documentation": {}
     },
@@ -639,7 +639,7 @@
         "kind": 6,
         "importPath": "back.api.models",
         "description": "back.api.models",
-        "peekOfCode": "class Floorplan(models.Model):\n    title = models.CharField(max_length=200)\n    np_field = models.TextField()\n    d_size = models.IntegerField(null=True, blank=True)\n    d_border = models.IntegerField(null=True, blank=True)\n    paths = models.TextField()\nclass FloorplanPoints(models.Model):\n    plan = models.OneToOneField(Floorplan, on_delete=models.CASCADE, primary_key=True)\n    points = models.JSONField()\n>>>>>>> bx-596-makepromo",
+        "peekOfCode": "class Floorplan(models.Model):\n    title = models.CharField(max_length=200)\n    np_field = models.TextField()\n    d_size = models.IntegerField(null=True, blank=True)\n    d_border = models.IntegerField(null=True, blank=True)\n    paths = models.TextField()\nclass FloorplanPoints(models.Model):\n    plan = models.OneToOneField(Floorplan, on_delete=models.CASCADE, primary_key=True)\n    points = models.JSONField()",
         "detail": "back.api.models",
         "documentation": {}
     },
@@ -648,7 +648,7 @@
         "kind": 6,
         "importPath": "back.api.models",
         "description": "back.api.models",
-        "peekOfCode": "class FloorplanPoints(models.Model):\n    plan = models.OneToOneField(Floorplan, on_delete=models.CASCADE, primary_key=True)\n    points = models.JSONField()\n>>>>>>> bx-596-makepromo",
+        "peekOfCode": "class FloorplanPoints(models.Model):\n    plan = models.OneToOneField(Floorplan, on_delete=models.CASCADE, primary_key=True)\n    points = models.JSONField()",
         "detail": "back.api.models",
         "documentation": {}
     },

back/.gitignore

@@ -89,10 +89,6 @@ local_settings.py
 .env
 db.sqlite3
 
-<<<<<<< HEAD
 /**/migrations/00*
-=======
-api/migrations/00*
->>>>>>> bx-596-makepromo
 
 files/*

back/api/admin.py

@@ -1,13 +1,6 @@
 from django.contrib import admin
-<<<<<<< HEAD
-from .models import  Product
-
-# Register your models here.
-admin.site.register(Product)
-=======
 from .models import Product, Floorplan
 
 # Register your models here.
 admin.site.register(Product)
 admin.site.register(Floorplan)
->>>>>>> bx-596-makepromo

back/api/models.py

@@ -18,8 +18,6 @@ class Product(models.Model):
         return self.title
 
 
-<<<<<<< HEAD
-=======
 class Floorplan(models.Model):
     title = models.CharField(max_length=200)
     np_field = models.TextField()
@@ -31,4 +29,3 @@ class Floorplan(models.Model):
 class FloorplanPoints(models.Model):
     plan = models.OneToOneField(Floorplan, on_delete=models.CASCADE, primary_key=True)
     points = models.JSONField()
->>>>>>> bx-596-makepromo