From 1d65625611a1d92440cc287c1080bde02d2d98d5 Mon Sep 17 00:00:00 2001 From: Kseninia Mikhaylova Date: Fri, 26 Apr 2024 16:49:48 +0300 Subject: [PATCH] base vue 3d --- back/api/models.py | 2 +- back/back/urls.py | 3 +- подставка.fbx => back/files/подставка.fbx | Bin .../files/подставка_pVWRVbi.fbx | Bin .../files/подставка_xMoxiWB.fbx | Bin front/package-lock.json | 33 ++++++++++++++- front/package.json | 3 +- front/src/App.vue | 9 +++-- front/src/components/HelloWorld.vue | 38 ------------------ 9 files changed, 43 insertions(+), 45 deletions(-) rename подставка.fbx => back/files/подставка.fbx (100%) rename подставка_YdPFIz0.fbx => back/files/подставка_pVWRVbi.fbx (100%) rename подставка_bTXKvjX.fbx => back/files/подставка_xMoxiWB.fbx (100%) delete mode 100644 front/src/components/HelloWorld.vue diff --git a/back/api/models.py b/back/api/models.py index 809c60a..2e06047 100644 --- a/back/api/models.py +++ b/back/api/models.py @@ -4,7 +4,7 @@ from django.db import models # Create your models here. class Product(models.Model): title = models.CharField(max_length=100) - model3d = models.FileField(default=None, null=True) + model3d = models.FileField(default=None, null=True, upload_to="back/files") description = models.TextField(default=None, null=True) def __str__(self): diff --git a/back/back/urls.py b/back/back/urls.py index 8af0b95..7dda663 100644 --- a/back/back/urls.py +++ b/back/back/urls.py @@ -16,9 +16,10 @@ Including another URLconf """ from django.contrib import admin from django.urls import path +from django.conf.urls.static import static from api import views urlpatterns = [ path("admin/", admin.site.urls), path("api/products", views.products), -] +] + static('/files', document_root='back/files') diff --git a/подставка.fbx b/back/files/подставка.fbx similarity index 100% rename from подставка.fbx rename to back/files/подставка.fbx diff --git a/подставка_YdPFIz0.fbx b/back/files/подставка_pVWRVbi.fbx similarity index 100% rename from подставка_YdPFIz0.fbx rename to back/files/подставка_pVWRVbi.fbx diff --git a/подставка_bTXKvjX.fbx b/back/files/подставка_xMoxiWB.fbx similarity index 100% rename from подставка_bTXKvjX.fbx rename to back/files/подставка_xMoxiWB.fbx diff --git a/front/package-lock.json b/front/package-lock.json index c22b4c1..c7d16ab 100644 --- a/front/package-lock.json +++ b/front/package-lock.json @@ -10,7 +10,8 @@ "dependencies": { "pinia": "^2.1.7", "reset-css": "^5.0.2", - "vue": "^3.4.21" + "vue": "^3.4.21", + "vue-3d-model": "^2.0.0-alpha.4" }, "devDependencies": { "@vitejs/plugin-vue": "^5.0.4", @@ -618,6 +619,19 @@ "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", "dev": true }, + "node_modules/@types/three": { + "version": "0.141.0", + "resolved": "https://registry.npmjs.org/@types/three/-/three-0.141.0.tgz", + "integrity": "sha512-OJdKDgTPVBUgc+s74DYoy4aLznbFFC38Xm4ElmU1YwGNgR7GGFVvFCX7lpVgOsT6S1zSJtGdajTsOYE8/xY9nA==", + "dependencies": { + "@types/webxr": "*" + } + }, + "node_modules/@types/webxr": { + "version": "0.5.15", + "resolved": "https://registry.npmjs.org/@types/webxr/-/webxr-0.5.15.tgz", + "integrity": "sha512-nC9116Gd4N+CqTxqo6gvCfhAMAzgRcfS8ZsciNodHq8uwW4JCVKwhagw8yN0XmC7mHrLnWqniJpoVEiR+72Drw==" + }, "node_modules/@vitejs/plugin-vue": { "version": "5.0.4", "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.0.4.tgz", @@ -1278,6 +1292,11 @@ "node": ">=0.10.0" } }, + "node_modules/three": { + "version": "0.141.0", + "resolved": "https://registry.npmjs.org/three/-/three-0.141.0.tgz", + "integrity": "sha512-JaSDAPWuk4RTzG5BYRQm8YZbERUxTfTDVouWgHMisS2to4E5fotMS9F2zPFNOIJyEFTTQDDKPpsgZVThKU3pXA==" + }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -1378,6 +1397,18 @@ } } }, + "node_modules/vue-3d-model": { + "version": "2.0.0-alpha.4", + "resolved": "https://registry.npmjs.org/vue-3d-model/-/vue-3d-model-2.0.0-alpha.4.tgz", + "integrity": "sha512-/dGP7YTAK5e7o8i9592PS9S0mbUStRl26OeeC2Qz4XePrG9BU/Q1GkETqPSMJPWgNa8TkqrxXP9ItYgcmxuSqw==", + "dependencies": { + "@types/three": "^0.141.0", + "three": "^0.141.0" + }, + "peerDependencies": { + "vue": ">=3.0.0" + } + }, "node_modules/vue-template-compiler": { "version": "2.7.16", "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.16.tgz", diff --git a/front/package.json b/front/package.json index 43db79e..9f667f9 100644 --- a/front/package.json +++ b/front/package.json @@ -11,7 +11,8 @@ "dependencies": { "pinia": "^2.1.7", "reset-css": "^5.0.2", - "vue": "^3.4.21" + "vue": "^3.4.21", + "vue-3d-model": "^2.0.0-alpha.4" }, "devDependencies": { "@vitejs/plugin-vue": "^5.0.4", diff --git a/front/src/App.vue b/front/src/App.vue index 38e62cb..ca5ee27 100644 --- a/front/src/App.vue +++ b/front/src/App.vue @@ -1,6 +1,8 @@ - - - -