From 0be8e9b0aae1ce543385c6df4bf5c1752becf65c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=97=D0=B5=D0=BB=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F=20?= =?UTF-8?q?=D0=90=D0=BD=D0=B0=D1=81=D1=82=D0=B0=D1=81=D0=B8=D1=8F=20=D0=9D?= =?UTF-8?q?=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B5=D0=B2=D0=BD=D0=B0?= Date: Tue, 25 Jun 2024 16:08:10 +0300 Subject: [PATCH] object --- back/back/settings.py | 1 + back/frontImages/admin.py | 3 +-- back/frontImages/models.py | 9 --------- back/object/__init__.py | 0 back/object/admin.py | 5 +++++ back/object/apps.py | 6 ++++++ back/object/migrations/__init__.py | 0 back/object/models.py | 9 +++++++++ back/object/tests.py | 3 +++ back/object/views.py | 3 +++ 10 files changed, 28 insertions(+), 11 deletions(-) create mode 100644 back/object/__init__.py create mode 100644 back/object/admin.py create mode 100644 back/object/apps.py create mode 100644 back/object/migrations/__init__.py create mode 100644 back/object/models.py create mode 100644 back/object/tests.py create mode 100644 back/object/views.py diff --git a/back/back/settings.py b/back/back/settings.py index 05fbc34..5a83d12 100644 --- a/back/back/settings.py +++ b/back/back/settings.py @@ -72,6 +72,7 @@ INSTALLED_APPS = [ "api", "rest_framework", "frontImages", + "object", ] MIDDLEWARE = [ diff --git a/back/frontImages/admin.py b/back/frontImages/admin.py index 267dd60..0b4e6dd 100644 --- a/back/frontImages/admin.py +++ b/back/frontImages/admin.py @@ -1,6 +1,5 @@ from django.contrib import admin -from .models import Image, Element3D, ClickableArea +from .models import Element3D, ClickableArea -admin.site.register(Image) admin.site.register(Element3D) admin.site.register(ClickableArea) \ No newline at end of file diff --git a/back/frontImages/models.py b/back/frontImages/models.py index 88533d1..7ec7025 100644 --- a/back/frontImages/models.py +++ b/back/frontImages/models.py @@ -1,14 +1,5 @@ from django.db import models -class Image(models.Model): - file = models.ImageField(upload_to='images/') - alt = models.CharField(max_length=255) - title = models.CharField(max_length=255) - - def __str__(self): - return self.title - - class Element3D(models.Model): model_file = models.FileField(upload_to='models/') name = models.CharField(max_length=255) diff --git a/back/object/__init__.py b/back/object/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/back/object/admin.py b/back/object/admin.py new file mode 100644 index 0000000..bf620dd --- /dev/null +++ b/back/object/admin.py @@ -0,0 +1,5 @@ +from django.contrib import admin +from .models import object + +admin.site.register(object) + diff --git a/back/object/apps.py b/back/object/apps.py new file mode 100644 index 0000000..54ca85d --- /dev/null +++ b/back/object/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class ObjectConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'object' diff --git a/back/object/migrations/__init__.py b/back/object/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/back/object/models.py b/back/object/models.py new file mode 100644 index 0000000..5ddc9ce --- /dev/null +++ b/back/object/models.py @@ -0,0 +1,9 @@ +from django.db import models + +class Image(models.Model): + file = models.ImageField(upload_to='images/') + alt = models.CharField(max_length=255) + title = models.CharField(max_length=255) + + def __str__(self): + return self.title \ No newline at end of file diff --git a/back/object/tests.py b/back/object/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/back/object/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/back/object/views.py b/back/object/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/back/object/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here.