From 43e796e6120d4a305c217f424c228c56062d50d9 Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Tue, 11 Jun 2024 16:45:51 +0300
Subject: [PATCH] calc

---
 components/calcModels.vue | 12 +-----------
 components/calcValues.vue |  6 +++---
 components/expDiagram.vue |  4 ++--
 components/loader.vue     | 16 ++++++++++++++++
 4 files changed, 22 insertions(+), 16 deletions(-)
 create mode 100644 components/loader.vue

diff --git a/components/calcModels.vue b/components/calcModels.vue
index 6e30f6e..3ba6ea0 100644
--- a/components/calcModels.vue
+++ b/components/calcModels.vue
@@ -11,20 +11,10 @@ const controlsState = reactive({
     // maxZoom: 2,
     // minZoom: 1,
 })
-const { hasFinishLoading, progress, items } = await useProgress()
 </script>
 <template>
     <div class="container min-w-full relative">
-        <Transition name="fade-overlay" enter-active-class="opacity-1 transition-opacity duration-200"
-            leave-active-class="opacity-0 transition-opacity duration-200">
-            <div v-show="!hasFinishLoading"
-                class="absolute bg-neutral-600 t-0 l-0 w-full h-full z-20 flex justify-center items-center text-black font-mono">
-                <div class="w-200px">
-                    Идет загрузка... {{ progress }} %
-                    <i class="i-ic-twotone-catching-pokemon animate-rotate-in"></i>
-                </div>
-            </div>
-        </Transition>
+        <Loader />
         <TresCanvas shadows>
             <TresPerspectiveCamera :position="[8, 2, -4]" />
             <OrbitControls v-bind="controlsState" make-default />
diff --git a/components/calcValues.vue b/components/calcValues.vue
index 6b8f8d4..915c569 100644
--- a/components/calcValues.vue
+++ b/components/calcValues.vue
@@ -183,9 +183,9 @@ const toggleModal = () => {
                     <textarea id="calculation" disabled class="w-full">{{ calc_text }}</textarea>
                 </div>
             </div>
-            <p>
-                <button @click="toggleModal">Купить прямо сейчас</button>
-            </p>
+            <div class="form-row justify-center">
+                <button @click.prevent="toggleModal">Купить прямо сейчас</button>
+            </div>
         </form>
     </div>
 </template>
\ No newline at end of file
diff --git a/components/expDiagram.vue b/components/expDiagram.vue
index 71569e7..02f3264 100644
--- a/components/expDiagram.vue
+++ b/components/expDiagram.vue
@@ -42,11 +42,11 @@ const targetExplosion = useState('targetExplosion', () => {
                 <input type="number" v-for="(item, n) in value" v-model="targetExplosion[key][n]" step="0.25">
             </div>
         </template>
-        <TresCanvas shadows>
+        <TresCanvas preset="realistic">
             <TresPerspectiveCamera :position="[-7, 2, 4]" />
             <OrbitControls v-bind="controlsState" make-default />
             <Suspense>
-                <Environment files='/hdrmaps/kiara_1_dawn_4k.hdr' :background="true" />
+                <Environment files='/hdrmaps/kiara_1_dawn_4k.hdr' :background="false" />
             </Suspense>
             <ModelDiagram />
 
diff --git a/components/loader.vue b/components/loader.vue
new file mode 100644
index 0000000..f0f7d31
--- /dev/null
+++ b/components/loader.vue
@@ -0,0 +1,16 @@
+<script setup lang="ts">
+const { hasFinishLoading, progress, items } = await useProgress()
+console.log(progress)
+</script>
+<template>
+    <Transition name="fade-overlay" enter-active-class="opacity-1 transition-opacity duration-200"
+        leave-active-class="opacity-0 transition-opacity duration-200">
+        <div v-show="!hasFinishLoading"
+            class="absolute bg-neutral-600 t-0 l-0 w-full h-full z-20 flex justify-center items-center text-black font-mono">
+            <div class="w-200px">
+                Идет загрузка... {{ progress }} %
+                <i class="i-ic-twotone-catching-pokemon animate-rotate-in"></i>
+            </div>
+        </div>
+    </Transition>
+</template>
\ No newline at end of file