From 602250fc3795520b2fdd35b384cda50e63014d99 Mon Sep 17 00:00:00 2001 From: Kseninia Mikhaylova Date: Tue, 25 Jun 2024 16:35:28 +0300 Subject: [PATCH] merge --- .gitignore | 3 --- .vscode/PythonImportHelper-v2-Completion.json | 6 +++--- back/.gitignore | 4 ---- back/api/admin.py | 7 ------- back/api/models.py | 3 --- 5 files changed, 3 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 66b7f09..9bb272d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,9 +3,6 @@ files/* .vscode/ __pycache__/ poetry.lock -<<<<<<< HEAD files/* .vscode/ -======= .env ->>>>>>> bx-596-makepromo diff --git a/.vscode/PythonImportHelper-v2-Completion.json b/.vscode/PythonImportHelper-v2-Completion.json index cc01f8c..aed3299 100644 --- a/.vscode/PythonImportHelper-v2-Completion.json +++ b/.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": {} }, diff --git a/back/.gitignore b/back/.gitignore index 50f576c..94ac916 100644 --- a/back/.gitignore +++ b/back/.gitignore @@ -89,10 +89,6 @@ local_settings.py .env db.sqlite3 -<<<<<<< HEAD /**/migrations/00* -======= -api/migrations/00* ->>>>>>> bx-596-makepromo files/* \ No newline at end of file diff --git a/back/api/admin.py b/back/api/admin.py index e17f43a..6bb7c61 100644 --- a/back/api/admin.py +++ b/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 diff --git a/back/api/models.py b/back/api/models.py index de70a66..8e8504c 100644 --- a/back/api/models.py +++ b/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