diff --git a/Dockerfile b/Dockerfile index 3774520..a1f7f0a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,5 +12,5 @@ RUN npm install --omit=dev COPY . /src RUN npm run build -CMD npm run preview -- --host -# CMD node .output/server/index.mjs \ No newline at end of file +# CMD npm run preview -- --host +CMD export $(cat .env | egrep -v '#|^$' | xargs) && node .output/server/index.mjs \ No newline at end of file diff --git a/assets/main.scss b/assets/main.scss index 6c23270..8bf6159 100644 --- a/assets/main.scss +++ b/assets/main.scss @@ -12,6 +12,7 @@ html { body { @apply select-none min-w-80 font-sans; + &.modal-opened { @apply overflow-hidden; } @@ -188,6 +189,10 @@ a[href^="#"] { >.container { @apply items-start; } + + a[href^="tel://"] { + @apply whitespace-nowrap + } } &-content { @@ -235,7 +240,7 @@ a[href^="#"] { } &-close { - @apply absolute right-3 top-3 text-4xl opacity-50; + @apply absolute right-3 top-3 text-4xl opacity-50 cursor-pointer; } &-status { diff --git a/components/calcValues.vue b/components/calcValues.vue index a2306ee..65c4c5b 100644 --- a/components/calcValues.vue +++ b/components/calcValues.vue @@ -66,8 +66,8 @@ const changeParametres = () => { const key_p = key as keyof typeof parametric const key_s = key as keyof typeof form_state if (parametric[key_p].max) { - if (form_state[key_s] > parametric[key_p].max) { - form_state[key_s] = parametric[key_p].max + if ((form_state[key_s] as number) > parametric[key_p].max) { + (form_state[key_s] as number) = parametric[key_p].max } } } @@ -102,9 +102,14 @@ const changeParametres = () => { length = total_length_mm - fence_length - fence_length } } - - if (((full_sections * length) + (full_sections * fence_length) + fence_length) < total_length_mm) { - form_state.extra_section = Math.floor((total_length_mm - fence_length) % length) + const calc_full_section = () => (full_sections * length) + (full_sections * fence_length) + fence_length + let total_length_calc = calc_full_section() + if (Math.round(total_length_mm - total_length_calc) > 0 && Math.round(total_length_mm - total_length_calc) <= fence_length) { + full_sections -= 1 + total_length_calc = calc_full_section() + } + if (Math.round(total_length_mm - total_length_calc) > 0) { + form_state.extra_section = total_length_mm - total_length_calc - fence_length } else { form_state.extra_section = 0 } @@ -140,7 +145,7 @@ const toggleModal = () => { const goal = (target: string, params: object) => { const nuxtApp = useNuxtApp() if (nuxtApp.$metrika) { - nuxtApp.$metrika.reachGoal(target, params || {}) + (nuxtApp.$metrika as any).reachGoal(target, params || {}) } } @@ -230,12 +235,13 @@ const goal = (target: string, params: object) => { diff --git a/components/expDiagram.vue b/components/expDiagram.vue index e5a8cc6..66193a8 100644 --- a/components/expDiagram.vue +++ b/components/expDiagram.vue @@ -30,18 +30,15 @@ const loadAll = async () => { back_light.value = back.children[0] back_light.value.intensity = back_light.value.intensity * k back_light.value.shadow.bias = -0.01 - // back_light.value.intensity = 250 key_light.value = key.children[0] key_light.value.intensity = key_light.value.intensity * k key_light.value.shadow.bias = -0.01 - // key_light.value.intensity = 250 key_light.value.cast_shadow = true secondary_light.value = secondary.children[0] secondary_light.value.intensity = secondary_light.value.intensity * k secondary_light.value.shadow.bias = -0.01 - // secondary_light.value.intensity = 50 } const changeDistance = (v = 1) => { @@ -63,7 +60,7 @@ onMounted(() => { Загрузка 3D модели - + @@ -76,7 +73,7 @@ onMounted(() => { :position="[key_light.position.x, key_light.position.y, key_light.position.z]" /> - +
diff --git a/components/footer.vue b/components/footer.vue index 7797b2f..fbefcc4 100644 --- a/components/footer.vue +++ b/components/footer.vue @@ -26,7 +26,7 @@ const { data: social_networkData } = await apiFetch(`so