diff --git a/.vscode/PythonImportHelper-v2-Completion.json b/.vscode/PythonImportHelper-v2-Completion.json index d88206b..6d69c1a 100644 --- a/.vscode/PythonImportHelper-v2-Completion.json +++ b/.vscode/PythonImportHelper-v2-Completion.json @@ -366,14 +366,6 @@ "detail": "django.shortcuts", "documentation": {} }, - { - "label": "render", - "importPath": "django.shortcuts", - "description": "django.shortcuts", - "isExtraImport": true, - "detail": "django.shortcuts", - "documentation": {} - }, { "label": "parse_image", "importPath": "api.tracer", @@ -513,6 +505,14 @@ "detail": "object.models", "documentation": {} }, + { + "label": "DjangoFilterBackend", + "importPath": "django_filters.rest_framework", + "description": "django_filters.rest_framework", + "isExtraImport": true, + "detail": "django_filters.rest_framework", + "documentation": {} + }, { "label": "sys", "kind": 6, @@ -761,7 +761,7 @@ "kind": 5, "importPath": "back.back.settings", "description": "back.back.settings", - "peekOfCode": "INSTALLED_APPS = [\n \"django.contrib.admin\",\n \"django.contrib.auth\",\n \"django.contrib.contenttypes\",\n \"django.contrib.sessions\",\n \"django.contrib.messages\",\n \"django.contrib.staticfiles\",\n \"corsheaders\",\n \"api\",\n \"rest_framework\",", + "peekOfCode": "INSTALLED_APPS = [\n \"django.contrib.admin\",\n \"django.contrib.auth\",\n \"django.contrib.contenttypes\",\n \"django.contrib.sessions\",\n \"django.contrib.messages\",\n \"django.contrib.staticfiles\",\n \"corsheaders\",\n \"django_filters\",\n \"rest_framework\",", "detail": "back.back.settings", "documentation": {} }, @@ -824,7 +824,7 @@ "kind": 5, "importPath": "back.back.settings", "description": "back.back.settings", - "peekOfCode": "LANGUAGE_CODE = \"en-us\"\nTIME_ZONE = \"UTC\"\nUSE_I18N = True\nUSE_TZ = True\n# Static files (CSS, JavaScript, Images)\n# https://docs.djangoproject.com/en/5.0/howto/static-files/\nSTATIC_URL = \"static/\"\n# Default primary key field type\n# https://docs.djangoproject.com/en/5.0/ref/settings/#default-auto-field\nDEFAULT_AUTO_FIELD = \"django.db.models.BigAutoField\"", + "peekOfCode": "LANGUAGE_CODE = \"en-us\"\nTIME_ZONE = \"UTC\"\nUSE_I18N = True\nUSE_TZ = True\n# Static files (CSS, JavaScript, Images)\n# https://docs.djangoproject.com/en/5.0/howto/static-files/\nSTATIC_URL = \"static/\"\n# Default primary key field type\n# https://docs.djangoproject.com/en/5.0/ref/settings/#default-auto-field\nREST_FRAMEWORK = {", "detail": "back.back.settings", "documentation": {} }, @@ -833,7 +833,7 @@ "kind": 5, "importPath": "back.back.settings", "description": "back.back.settings", - "peekOfCode": "TIME_ZONE = \"UTC\"\nUSE_I18N = True\nUSE_TZ = True\n# Static files (CSS, JavaScript, Images)\n# https://docs.djangoproject.com/en/5.0/howto/static-files/\nSTATIC_URL = \"static/\"\n# Default primary key field type\n# https://docs.djangoproject.com/en/5.0/ref/settings/#default-auto-field\nDEFAULT_AUTO_FIELD = \"django.db.models.BigAutoField\"\nLOGGING = {", + "peekOfCode": "TIME_ZONE = \"UTC\"\nUSE_I18N = True\nUSE_TZ = True\n# Static files (CSS, JavaScript, Images)\n# https://docs.djangoproject.com/en/5.0/howto/static-files/\nSTATIC_URL = \"static/\"\n# Default primary key field type\n# https://docs.djangoproject.com/en/5.0/ref/settings/#default-auto-field\nREST_FRAMEWORK = {\n 'DEFAULT_FILTER_BACKENDS': ['django_filters.rest_framework.DjangoFilterBackend']", "detail": "back.back.settings", "documentation": {} }, @@ -842,7 +842,7 @@ "kind": 5, "importPath": "back.back.settings", "description": "back.back.settings", - "peekOfCode": "USE_I18N = True\nUSE_TZ = True\n# Static files (CSS, JavaScript, Images)\n# https://docs.djangoproject.com/en/5.0/howto/static-files/\nSTATIC_URL = \"static/\"\n# Default primary key field type\n# https://docs.djangoproject.com/en/5.0/ref/settings/#default-auto-field\nDEFAULT_AUTO_FIELD = \"django.db.models.BigAutoField\"\nLOGGING = {\n \"version\": 1,", + "peekOfCode": "USE_I18N = True\nUSE_TZ = True\n# Static files (CSS, JavaScript, Images)\n# https://docs.djangoproject.com/en/5.0/howto/static-files/\nSTATIC_URL = \"static/\"\n# Default primary key field type\n# https://docs.djangoproject.com/en/5.0/ref/settings/#default-auto-field\nREST_FRAMEWORK = {\n 'DEFAULT_FILTER_BACKENDS': ['django_filters.rest_framework.DjangoFilterBackend']\n}", "detail": "back.back.settings", "documentation": {} }, @@ -851,7 +851,7 @@ "kind": 5, "importPath": "back.back.settings", "description": "back.back.settings", - "peekOfCode": "USE_TZ = True\n# Static files (CSS, JavaScript, Images)\n# https://docs.djangoproject.com/en/5.0/howto/static-files/\nSTATIC_URL = \"static/\"\n# Default primary key field type\n# https://docs.djangoproject.com/en/5.0/ref/settings/#default-auto-field\nDEFAULT_AUTO_FIELD = \"django.db.models.BigAutoField\"\nLOGGING = {\n \"version\": 1,\n \"disable_existing_loggers\": False,", + "peekOfCode": "USE_TZ = True\n# Static files (CSS, JavaScript, Images)\n# https://docs.djangoproject.com/en/5.0/howto/static-files/\nSTATIC_URL = \"static/\"\n# Default primary key field type\n# https://docs.djangoproject.com/en/5.0/ref/settings/#default-auto-field\nREST_FRAMEWORK = {\n 'DEFAULT_FILTER_BACKENDS': ['django_filters.rest_framework.DjangoFilterBackend']\n}\nCRISPY_ALLOWED_TEMPLATE_PACKS = \"bootstrap4\"", "detail": "back.back.settings", "documentation": {} }, @@ -860,7 +860,34 @@ "kind": 5, "importPath": "back.back.settings", "description": "back.back.settings", - "peekOfCode": "STATIC_URL = \"static/\"\n# Default primary key field type\n# https://docs.djangoproject.com/en/5.0/ref/settings/#default-auto-field\nDEFAULT_AUTO_FIELD = \"django.db.models.BigAutoField\"\nLOGGING = {\n \"version\": 1,\n \"disable_existing_loggers\": False,\n \"formatters\": {\n \"verbose\": {\n \"format\": \"{levelname} {asctime} {module} {process:d} {thread:d} {message}\",", + "peekOfCode": "STATIC_URL = \"static/\"\n# Default primary key field type\n# https://docs.djangoproject.com/en/5.0/ref/settings/#default-auto-field\nREST_FRAMEWORK = {\n 'DEFAULT_FILTER_BACKENDS': ['django_filters.rest_framework.DjangoFilterBackend']\n}\nCRISPY_ALLOWED_TEMPLATE_PACKS = \"bootstrap4\"\nCRISPY_TEMPLATE_PACK = \"bootstrap4\"\nDEFAULT_AUTO_FIELD = \"django.db.models.BigAutoField\"\nLOGGING = {", + "detail": "back.back.settings", + "documentation": {} + }, + { + "label": "REST_FRAMEWORK", + "kind": 5, + "importPath": "back.back.settings", + "description": "back.back.settings", + "peekOfCode": "REST_FRAMEWORK = {\n 'DEFAULT_FILTER_BACKENDS': ['django_filters.rest_framework.DjangoFilterBackend']\n}\nCRISPY_ALLOWED_TEMPLATE_PACKS = \"bootstrap4\"\nCRISPY_TEMPLATE_PACK = \"bootstrap4\"\nDEFAULT_AUTO_FIELD = \"django.db.models.BigAutoField\"\nLOGGING = {\n \"version\": 1,\n \"disable_existing_loggers\": False,\n \"formatters\": {", + "detail": "back.back.settings", + "documentation": {} + }, + { + "label": "CRISPY_ALLOWED_TEMPLATE_PACKS", + "kind": 5, + "importPath": "back.back.settings", + "description": "back.back.settings", + "peekOfCode": "CRISPY_ALLOWED_TEMPLATE_PACKS = \"bootstrap4\"\nCRISPY_TEMPLATE_PACK = \"bootstrap4\"\nDEFAULT_AUTO_FIELD = \"django.db.models.BigAutoField\"\nLOGGING = {\n \"version\": 1,\n \"disable_existing_loggers\": False,\n \"formatters\": {\n \"verbose\": {\n \"format\": \"{levelname} {asctime} {module} {process:d} {thread:d} {message}\",\n \"style\": \"{\",", + "detail": "back.back.settings", + "documentation": {} + }, + { + "label": "CRISPY_TEMPLATE_PACK", + "kind": 5, + "importPath": "back.back.settings", + "description": "back.back.settings", + "peekOfCode": "CRISPY_TEMPLATE_PACK = \"bootstrap4\"\nDEFAULT_AUTO_FIELD = \"django.db.models.BigAutoField\"\nLOGGING = {\n \"version\": 1,\n \"disable_existing_loggers\": False,\n \"formatters\": {\n \"verbose\": {\n \"format\": \"{levelname} {asctime} {module} {process:d} {thread:d} {message}\",\n \"style\": \"{\",\n },", "detail": "back.back.settings", "documentation": {} }, @@ -1067,7 +1094,7 @@ "kind": 6, "importPath": "back.object.views", "description": "back.object.views", - "peekOfCode": "class ClickableAreaViewSet(viewsets.ModelViewSet):\n queryset = ClickableArea.objects.all()\n serializer_class = ClickableAreaSerializer\nclass Element3DViewSet(viewsets.ModelViewSet):\n queryset = Element3D.objects.all()\n serializer_class = Element3DSerializer", + "peekOfCode": "class ClickableAreaViewSet(viewsets.ModelViewSet):\n queryset = ClickableArea.objects.all()\n serializer_class = ClickableAreaSerializer\nclass Element3DViewSet(viewsets.ModelViewSet):\n queryset = Element3D.objects.all()\n serializer_class = Element3DSerializer\n filterset_fields = ('parent', )\n filter_backends = [DjangoFilterBackend]", "detail": "back.object.views", "documentation": {} }, @@ -1076,7 +1103,7 @@ "kind": 6, "importPath": "back.object.views", "description": "back.object.views", - "peekOfCode": "class Element3DViewSet(viewsets.ModelViewSet):\n queryset = Element3D.objects.all()\n serializer_class = Element3DSerializer", + "peekOfCode": "class Element3DViewSet(viewsets.ModelViewSet):\n queryset = Element3D.objects.all()\n serializer_class = Element3DSerializer\n filterset_fields = ('parent', )\n filter_backends = [DjangoFilterBackend]", "detail": "back.object.views", "documentation": {} }, diff --git a/back/back/settings.py b/back/back/settings.py index d6ae1f1..53ac470 100644 --- a/back/back/settings.py +++ b/back/back/settings.py @@ -77,8 +77,11 @@ INSTALLED_APPS = [ "django.contrib.messages", "django.contrib.staticfiles", "corsheaders", - "api", + "django_filters", "rest_framework", + "crispy_forms", + "crispy_bootstrap4", + "api", "frontImages", "object", ] @@ -172,6 +175,13 @@ STATIC_URL = "static/" # https://docs.djangoproject.com/en/5.0/ref/settings/#default-auto-field +REST_FRAMEWORK = { + 'DEFAULT_FILTER_BACKENDS': ['django_filters.rest_framework.DjangoFilterBackend'] +} + +CRISPY_ALLOWED_TEMPLATE_PACKS = "bootstrap4" +CRISPY_TEMPLATE_PACK = "bootstrap4" + DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField" LOGGING = { "version": 1, diff --git a/back/object/views.py b/back/object/views.py index c77d643..d951c6a 100644 --- a/back/object/views.py +++ b/back/object/views.py @@ -1,7 +1,5 @@ -from django.shortcuts import render - from rest_framework import viewsets - +from django_filters.rest_framework import DjangoFilterBackend from .models import ClickableArea, Element3D from .serializers import ClickableAreaSerializer, Element3DSerializer @@ -12,4 +10,7 @@ class ClickableAreaViewSet(viewsets.ModelViewSet): class Element3DViewSet(viewsets.ModelViewSet): queryset = Element3D.objects.all() - serializer_class = Element3DSerializer \ No newline at end of file + serializer_class = Element3DSerializer + + filterset_fields = ('parent', ) + filter_backends = [DjangoFilterBackend] \ No newline at end of file diff --git a/front/components.d.ts b/front/components.d.ts index 5f8b8a8..580d0b6 100644 --- a/front/components.d.ts +++ b/front/components.d.ts @@ -8,6 +8,7 @@ export {} declare module 'vue' { export interface GlobalComponents { copy: typeof import('./src/components/Promo/modelItem copy.vue')['default'] + Env: typeof import('./src/components/Promo/env.vue')['default'] Floorplan: typeof import('./src/components/Floorplan/index.vue')['default'] Gallery: typeof import('./src/components/Promo/gallery.vue')['default'] Game: typeof import('./src/components/Game.vue')['default'] diff --git a/front/package-lock.json b/front/package-lock.json index c418953..dbd4ed1 100644 --- a/front/package-lock.json +++ b/front/package-lock.json @@ -9,6 +9,7 @@ "version": "0.0.0", "dependencies": { "@fireworks-js/vue": "^2.10.7", + "@monogrid/gainmap-js": "^3.0.5", "@tresjs/cientos": "^3.9.0", "@tresjs/core": "^3.9.0", "@vueuse/components": "^10.9.0", @@ -518,6 +519,17 @@ "node": ">=10" } }, + "node_modules/@monogrid/gainmap-js": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@monogrid/gainmap-js/-/gainmap-js-3.0.5.tgz", + "integrity": "sha512-53sCTG4FaJBaAq/tcufARtVYDMDGqyBT9i7F453pWGhZ5LqubDHDWtYoHo9VhQqMcHTEexdJqSsR58y+9HVmQA==", + "dependencies": { + "promise-worker-transferable": "^1.0.4" + }, + "peerDependencies": { + "three": ">= 0.159.0" + } + }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -1557,12 +1569,12 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -2283,9 +2295,9 @@ "integrity": "sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==" }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "dependencies": { "to-regex-range": "^5.0.1" @@ -2446,6 +2458,11 @@ "node": ">=0.10.0" } }, + "node_modules/immediate": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", + "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==" + }, "node_modules/immutable": { "version": "4.3.5", "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.5.tgz", @@ -2519,6 +2536,11 @@ "node": ">=0.12.0" } }, + "node_modules/is-promise": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz", + "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==" + }, "node_modules/is-stream": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", @@ -2560,6 +2582,14 @@ "integrity": "sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==", "dev": true }, + "node_modules/lie": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", + "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", + "dependencies": { + "immediate": "~3.0.5" + } + }, "node_modules/local-pkg": { "version": "0.5.0", "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.5.0.tgz", @@ -2953,6 +2983,15 @@ "resolved": "https://registry.npmjs.org/potpack/-/potpack-1.0.2.tgz", "integrity": "sha512-choctRBIV9EMT9WGAZHn3V7t0Z2pMQyl0EZE6pFc/6ml3ssw7Dlf/oAOvFwjm1HVsqfQN8GfeFyJ+d8tRzqueQ==" }, + "node_modules/promise-worker-transferable": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/promise-worker-transferable/-/promise-worker-transferable-1.0.4.tgz", + "integrity": "sha512-bN+0ehEnrXfxV2ZQvU2PetO0n4gqBD4ulq3MI1WOPLgr7/Mg9yRQkX5+0v1vagr74ZTsl7XtzlaYDo2EuCeYJw==", + "dependencies": { + "is-promise": "^2.1.0", + "lie": "^3.0.2" + } + }, "node_modules/queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", diff --git a/front/package.json b/front/package.json index 83a668a..8dfe05f 100644 --- a/front/package.json +++ b/front/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "@fireworks-js/vue": "^2.10.7", + "@monogrid/gainmap-js": "^3.0.5", "@tresjs/cientos": "^3.9.0", "@tresjs/core": "^3.9.0", "@vueuse/components": "^10.9.0", diff --git a/front/src/assets/promo/bg/bg_0.jpg b/front/src/assets/promo/bg/bg_0.jpg deleted file mode 100644 index ffb6df7..0000000 Binary files a/front/src/assets/promo/bg/bg_0.jpg and /dev/null differ diff --git a/front/src/assets/promo/bg/bg_1.jpg b/front/src/assets/promo/bg/bg_1.jpg deleted file mode 100644 index 99087a2..0000000 Binary files a/front/src/assets/promo/bg/bg_1.jpg and /dev/null differ diff --git a/front/src/assets/promo/bg/bg_10.jpg b/front/src/assets/promo/bg/bg_10.jpg deleted file mode 100644 index 426c971..0000000 Binary files a/front/src/assets/promo/bg/bg_10.jpg and /dev/null differ diff --git a/front/src/assets/promo/bg/bg_11.jpg b/front/src/assets/promo/bg/bg_11.jpg deleted file mode 100644 index d9646a6..0000000 Binary files a/front/src/assets/promo/bg/bg_11.jpg and /dev/null differ diff --git a/front/src/assets/promo/bg/bg_12.jpg b/front/src/assets/promo/bg/bg_12.jpg deleted file mode 100644 index 8204f52..0000000 Binary files a/front/src/assets/promo/bg/bg_12.jpg and /dev/null differ diff --git a/front/src/assets/promo/bg/bg_13.jpg b/front/src/assets/promo/bg/bg_13.jpg deleted file mode 100644 index d764a58..0000000 Binary files a/front/src/assets/promo/bg/bg_13.jpg and /dev/null differ diff --git a/front/src/assets/promo/bg/bg_14.jpg b/front/src/assets/promo/bg/bg_14.jpg deleted file mode 100644 index 8c4eb7d..0000000 Binary files a/front/src/assets/promo/bg/bg_14.jpg and /dev/null differ diff --git a/front/src/assets/promo/bg/bg_15.jpg b/front/src/assets/promo/bg/bg_15.jpg deleted file mode 100644 index 754b0e7..0000000 Binary files a/front/src/assets/promo/bg/bg_15.jpg and /dev/null differ diff --git a/front/src/assets/promo/bg/bg_16.jpg b/front/src/assets/promo/bg/bg_16.jpg deleted file mode 100644 index 092da35..0000000 Binary files a/front/src/assets/promo/bg/bg_16.jpg and /dev/null differ diff --git a/front/src/assets/promo/bg/bg_17.jpg b/front/src/assets/promo/bg/bg_17.jpg deleted file mode 100644 index 5e3c76c..0000000 Binary files a/front/src/assets/promo/bg/bg_17.jpg and /dev/null differ diff --git a/front/src/assets/promo/bg/bg_2.jpg b/front/src/assets/promo/bg/bg_2.jpg deleted file mode 100644 index bc381cc..0000000 Binary files a/front/src/assets/promo/bg/bg_2.jpg and /dev/null differ diff --git a/front/src/assets/promo/bg/bg_3.jpg b/front/src/assets/promo/bg/bg_3.jpg deleted file mode 100644 index 66b21dc..0000000 Binary files a/front/src/assets/promo/bg/bg_3.jpg and /dev/null differ diff --git a/front/src/assets/promo/bg/bg_4.jpg b/front/src/assets/promo/bg/bg_4.jpg deleted file mode 100644 index 564118e..0000000 Binary files a/front/src/assets/promo/bg/bg_4.jpg and /dev/null differ diff --git a/front/src/assets/promo/bg/bg_5.jpg b/front/src/assets/promo/bg/bg_5.jpg deleted file mode 100644 index 0aa5335..0000000 Binary files a/front/src/assets/promo/bg/bg_5.jpg and /dev/null differ diff --git a/front/src/assets/promo/bg/bg_6.jpg b/front/src/assets/promo/bg/bg_6.jpg deleted file mode 100644 index f7b6495..0000000 Binary files a/front/src/assets/promo/bg/bg_6.jpg and /dev/null differ diff --git a/front/src/assets/promo/bg/bg_7.jpg b/front/src/assets/promo/bg/bg_7.jpg deleted file mode 100644 index a24b1ec..0000000 Binary files a/front/src/assets/promo/bg/bg_7.jpg and /dev/null differ diff --git a/front/src/assets/promo/bg/bg_8.jpg b/front/src/assets/promo/bg/bg_8.jpg deleted file mode 100644 index ba9b830..0000000 Binary files a/front/src/assets/promo/bg/bg_8.jpg and /dev/null differ diff --git a/front/src/assets/promo/bg/bg_9.jpg b/front/src/assets/promo/bg/bg_9.jpg deleted file mode 100644 index 58e9e96..0000000 Binary files a/front/src/assets/promo/bg/bg_9.jpg and /dev/null differ diff --git a/front/src/assets/promo/hdr/hdr-gainmap.webp b/front/src/assets/promo/hdr/hdr-gainmap.webp new file mode 100644 index 0000000..533dd69 Binary files /dev/null and b/front/src/assets/promo/hdr/hdr-gainmap.webp differ diff --git a/front/src/assets/promo/hdr/hdr.json b/front/src/assets/promo/hdr/hdr.json new file mode 100644 index 0000000..040d143 --- /dev/null +++ b/front/src/assets/promo/hdr/hdr.json @@ -0,0 +1,29 @@ +{ + "gainMapMax": [ + -0.08188214896822735, + -0.08188214896822735, + -0.08188214896822735 + ], + "gainMapMin": [ + -0.08188214896822735, + -0.08188214896822735, + -0.08188214896822735 + ], + "gamma": [ + 1, + 1, + 1 + ], + "hdrCapacityMax": -0.08188214896822735, + "hdrCapacityMin": 0, + "offsetHdr": [ + 0.015625, + 0.015625, + 0.015625 + ], + "offsetSdr": [ + 0.015625, + 0.015625, + 0.015625 + ] +} \ No newline at end of file diff --git a/front/src/assets/promo/hdr/hdr.webp b/front/src/assets/promo/hdr/hdr.webp new file mode 100644 index 0000000..5e1df39 Binary files /dev/null and b/front/src/assets/promo/hdr/hdr.webp differ diff --git a/front/src/components/Promo/env.vue b/front/src/components/Promo/env.vue new file mode 100644 index 0000000..09ab965 --- /dev/null +++ b/front/src/components/Promo/env.vue @@ -0,0 +1,28 @@ + \ No newline at end of file diff --git a/front/src/components/Promo/gallery.vue b/front/src/components/Promo/gallery.vue index c4400a3..8c8fe26 100644 --- a/front/src/components/Promo/gallery.vue +++ b/front/src/components/Promo/gallery.vue @@ -39,6 +39,7 @@ onMounted(async () => { x: Math.random() * (width - radius * 2) + radius, y: Math.random() * (height - radius * 2) + radius, })); + if (document.querySelector('.pin')) { const rect = (document.querySelector('.pin') as HTMLElement).getBoundingClientRect() circles[circles.length - 1] = { x: rect.x + rect.width, y: rect.y + rect.height } diff --git a/front/src/components/Promo/main.vue b/front/src/components/Promo/main.vue index b2b439e..edbffbe 100644 --- a/front/src/components/Promo/main.vue +++ b/front/src/components/Promo/main.vue @@ -1,9 +1,12 @@