From 4f53c162ca3714153e2526c837dcfb8ca7fa55e5 Mon Sep 17 00:00:00 2001 From: Kseninia Mikhaylova Date: Fri, 16 Aug 2024 14:14:56 +0300 Subject: [PATCH] add host --- .vscode/PythonImportHelper-v2-Completion.json | 12 ++--- back/back/settings.py | 18 ++++---- front/.env.development | 2 +- front/components.d.ts | 1 + front/src/components/Promo/load_models.vue | 4 +- front/src/components/Promo/post_pocessing.vue | 46 ------------------- .../src/components/Promo/post_processing.vue | 28 +++++++++++ 7 files changed, 48 insertions(+), 63 deletions(-) delete mode 100644 front/src/components/Promo/post_pocessing.vue create mode 100644 front/src/components/Promo/post_processing.vue diff --git a/.vscode/PythonImportHelper-v2-Completion.json b/.vscode/PythonImportHelper-v2-Completion.json index e6a1740..023dcda 100644 --- a/.vscode/PythonImportHelper-v2-Completion.json +++ b/.vscode/PythonImportHelper-v2-Completion.json @@ -599,7 +599,7 @@ "kind": 5, "importPath": "back.back.settings", "description": "back.back.settings", - "peekOfCode": "SECRET_KEY = \"django-insecure-ly8rk@zb&ne*-063&q-=81!d@8q0hh4$&q!_7mtqc81(rlejqd\"\n# SECURITY WARNING: don't run with debug turned on in production!\nDEBUG = True\nALLOWED_HOSTS = [\n \"localhost\",\n \"localhost:8000\",\n \"127.0.0.1\",\n \"127.0.0.1:8000\",\n \"192.168.103.159\",\n \"192.168.103.159:8000\",", + "peekOfCode": "SECRET_KEY = \"django-insecure-ly8rk@zb&ne*-063&q-=81!d@8q0hh4$&q!_7mtqc81(rlejqd\"\n# SECURITY WARNING: don't run with debug turned on in production!\nDEBUG = True\nALLOWED_HOSTS = [\n \"localhost\",\n \"localhost:8000\",\n \"127.0.0.1\",\n \"127.0.0.1:8000\",\n \"192.168.106.234\",\n \"192.168.106.234:8000\",", "detail": "back.back.settings", "documentation": {} }, @@ -608,7 +608,7 @@ "kind": 5, "importPath": "back.back.settings", "description": "back.back.settings", - "peekOfCode": "DEBUG = True\nALLOWED_HOSTS = [\n \"localhost\",\n \"localhost:8000\",\n \"127.0.0.1\",\n \"127.0.0.1:8000\",\n \"192.168.103.159\",\n \"192.168.103.159:8000\",\n \"back\",\n \"back:8000\",", + "peekOfCode": "DEBUG = True\nALLOWED_HOSTS = [\n \"localhost\",\n \"localhost:8000\",\n \"127.0.0.1\",\n \"127.0.0.1:8000\",\n \"192.168.106.234\",\n \"192.168.106.234:8000\",\n \"back\",\n \"back:8000\",", "detail": "back.back.settings", "documentation": {} }, @@ -617,7 +617,7 @@ "kind": 5, "importPath": "back.back.settings", "description": "back.back.settings", - "peekOfCode": "ALLOWED_HOSTS = [\n \"localhost\",\n \"localhost:8000\",\n \"127.0.0.1\",\n \"127.0.0.1:8000\",\n \"192.168.103.159\",\n \"192.168.103.159:8000\",\n \"back\",\n \"back:8000\",\n \"demo.kustarshina.ru\",", + "peekOfCode": "ALLOWED_HOSTS = [\n \"localhost\",\n \"localhost:8000\",\n \"127.0.0.1\",\n \"127.0.0.1:8000\",\n \"192.168.106.234\",\n \"192.168.106.234:8000\",\n \"back\",\n \"back:8000\",\n \"demo.kustarshina.ru\",", "detail": "back.back.settings", "documentation": {} }, @@ -626,7 +626,7 @@ "kind": 5, "importPath": "back.back.settings", "description": "back.back.settings", - "peekOfCode": "CSRF_TRUSTED_ORIGINS = (\n \"https://demo.kustarshina.ru\",\n \"http://localhost\",\n \"http://localhost:3011\",\n \"http://localhost:4173\",\n \"http://localhost:5173\",\n \"http://192.168.103.159:3011\",\n \"http://192.168.103.159\",\n)\nCORS_ORIGIN_ALLOW_ALL = False", + "peekOfCode": "CSRF_TRUSTED_ORIGINS = (\n \"https://demo.kustarshina.ru\",\n \"http://localhost\",\n \"http://localhost:3011\",\n \"http://localhost:4173\",\n \"http://localhost:5173\",\n \"http://192.168.106.234:3011\",\n \"http://192.168.106.234\",\n)\nCORS_ORIGIN_ALLOW_ALL = False", "detail": "back.back.settings", "documentation": {} }, @@ -635,7 +635,7 @@ "kind": 5, "importPath": "back.back.settings", "description": "back.back.settings", - "peekOfCode": "CORS_ORIGIN_ALLOW_ALL = False\nCORS_ORIGIN_WHITELIST = [\n \"null\",\n \"http://localhost\",\n \"http://localhost:3011\",\n \"http://localhost:4173\",\n \"http://localhost:5173\",\n \"http://localhost:8000\",\n \"http://192.168.103.159:3011\",\n \"http://127.0.0.1\",", + "peekOfCode": "CORS_ORIGIN_ALLOW_ALL = False\nCORS_ORIGIN_WHITELIST = [\n \"null\",\n \"http://localhost\",\n \"http://localhost:3011\",\n \"http://localhost:4173\",\n \"http://localhost:5173\",\n \"http://localhost:8000\",\n \"http://127.0.0.1\",\n \"http://192.168.106.234\",", "detail": "back.back.settings", "documentation": {} }, @@ -644,7 +644,7 @@ "kind": 5, "importPath": "back.back.settings", "description": "back.back.settings", - "peekOfCode": "CORS_ORIGIN_WHITELIST = [\n \"null\",\n \"http://localhost\",\n \"http://localhost:3011\",\n \"http://localhost:4173\",\n \"http://localhost:5173\",\n \"http://localhost:8000\",\n \"http://192.168.103.159:3011\",\n \"http://127.0.0.1\",\n \"http://192.168.103.159\",", + "peekOfCode": "CORS_ORIGIN_WHITELIST = [\n \"null\",\n \"http://localhost\",\n \"http://localhost:3011\",\n \"http://localhost:4173\",\n \"http://localhost:5173\",\n \"http://localhost:8000\",\n \"http://127.0.0.1\",\n \"http://192.168.106.234\",\n \"http://192.168.106.234:3011\",", "detail": "back.back.settings", "documentation": {} }, diff --git a/back/back/settings.py b/back/back/settings.py index 1380c16..99a1237 100644 --- a/back/back/settings.py +++ b/back/back/settings.py @@ -34,8 +34,8 @@ ALLOWED_HOSTS = [ "localhost:8000", "127.0.0.1", "127.0.0.1:8000", - "192.168.103.159", - "192.168.103.159:8000", + "192.168.106.234", + "192.168.106.234:8000", "back", "back:8000", "demo.kustarshina.ru", @@ -46,8 +46,8 @@ CSRF_TRUSTED_ORIGINS = ( "http://localhost:3011", "http://localhost:4173", "http://localhost:5173", - "http://192.168.103.159:3011", - "http://192.168.103.159", + "http://192.168.106.234:3011", + "http://192.168.106.234", ) CORS_ORIGIN_ALLOW_ALL = False CORS_ORIGIN_WHITELIST = [ @@ -57,12 +57,12 @@ CORS_ORIGIN_WHITELIST = [ "http://localhost:4173", "http://localhost:5173", "http://localhost:8000", - "http://192.168.103.159:3011", "http://127.0.0.1", - "http://192.168.103.159", - "http://192.168.103.159:3000", - "http://192.168.103.159:5173", - "http://192.168.103.159:8000", + "http://192.168.106.234", + "http://192.168.106.234:3011", + "http://192.168.106.234:3000", + "http://192.168.106.234:5173", + "http://192.168.106.234:8000", "http://front:4173", "http://front:5173", "http://back:8000", diff --git a/front/.env.development b/front/.env.development index 099ac37..da58c21 100644 --- a/front/.env.development +++ b/front/.env.development @@ -1,4 +1,4 @@ VITE_SERVER_URL='https://demo.kustarshina.ru' VITE_IMAGE_URL='https://demo.kustarshina.ru' VITE_SERVER_URL='https://demo.kustarshina.ru' -VITE_SERVER_URL='http://localhost:8000' \ No newline at end of file +VITE_SERVER_URL='http://192.168.106.234:8000' \ No newline at end of file diff --git a/front/components.d.ts b/front/components.d.ts index 344a0f1..4952ce5 100644 --- a/front/components.d.ts +++ b/front/components.d.ts @@ -27,6 +27,7 @@ declare module 'vue' { ModelItem: typeof import('./src/components/Promo/modelItem.vue')['default'] Models: typeof import('./src/components/Promo/models.vue')['default'] Post_pocessing: typeof import('./src/components/Promo/post_pocessing.vue')['default'] + Post_processing: typeof import('./src/components/Promo/post_processing.vue')['default'] Projects: typeof import('./src/components/Projects.vue')['default'] Promo: typeof import('./src/components/Promo/index.vue')['default'] RandomIcon: typeof import('./src/components/RandomIcon.vue')['default'] diff --git a/front/src/components/Promo/load_models.vue b/front/src/components/Promo/load_models.vue index ef09db2..1a851b3 100644 --- a/front/src/components/Promo/load_models.vue +++ b/front/src/components/Promo/load_models.vue @@ -3,13 +3,14 @@ import { onMounted, onUnmounted, reactive, ref, watch } from 'vue'; import { Box3, Color, DoubleSide, Group, Mesh, PlaneGeometry, MeshStandardMaterial, MeshStandardMaterialParameters, - Vector2, Vector3, Object3D + Vector2, Vector3 } from 'three'; import { useTresContext, useSeek, useTexture, useLoop } from '@tresjs/core'; import { useGLTF } from '@tresjs/cientos' import Env from './env.vue' +import PostProcessing from './post_processing.vue' import { IMAGE_URL, PROMOBG, SERVER_URL, } from '../../constants' import { usePromoSidebar } from '../../stores/promo_sidebar'; @@ -308,6 +309,7 @@ watch(() => sidebar_scene.list, () => {