Production #13

Merged
ksenia_mikhailova merged 22 commits from dev into main 2024-07-08 09:23:32 +03:00
5 changed files with 20 additions and 17 deletions
Showing only changes of commit 0d354d7aff - Show all commits

View File

@ -3,8 +3,8 @@ const config = useRuntimeConfig()
const apiBase = config.public.apiBase const apiBase = config.public.apiBase
import k_logo from '@/assets/icons/logo.svg' import k_logo from '@/assets/icons/logo.svg'
const { data: footerData } = await useFetch<ApiFooterType[]>(`${apiBase}/footer/?ordering=small_text`) const { data: footerData } = await useFetch<ApiFooterType[]>(`${apiBase}/footer/?ordering=small_text`, { headers: useRequestHeaders(['referer']) })
const { data: social_networkData } = await useFetch<ApiSocial_networkType[]>(`${apiBase}/social_network/`) const { data: social_networkData } = await useFetch<ApiSocial_networkType[]>(`${apiBase}/social_network/`, { headers: useRequestHeaders(['referer']) })
</script> </script>
<template> <template>
<div class="footer" id="contacts"> <div class="footer" id="contacts">

View File

@ -2,7 +2,7 @@
const config = useRuntimeConfig() const config = useRuntimeConfig()
const apiBase = config.public.apiBase const apiBase = config.public.apiBase
const { data: pagesData } = await useFetch<ApiPagesType[]>(`${apiBase}/pages/?ordering=order`) const { data: pagesData } = await useFetch<ApiPagesType[]>(`${apiBase}/pages/?ordering=order`, { headers: useRequestHeaders(['referer']) })
const route = useRoute() const route = useRoute()
</script> </script>
<template> <template>

View File

@ -4,7 +4,7 @@ import type { ralTypes } from '@/components/ral'
const config = useRuntimeConfig() const config = useRuntimeConfig()
const apiBase = config.public.apiBase const apiBase = config.public.apiBase
const { data: calculatorData } = await useFetch<ApiCalcType>(`${apiBase}/calculator/5/`) const { data: calculatorData } = await useFetch<ApiCalcType>(`${apiBase}/calculator/5/`, { headers: useRequestHeaders(['referer']) })
const isModalOpen = useState('modal_open', () => false) const isModalOpen = useState('modal_open', () => false)
const lamelle_height = useState<number>('lamelle_height') const lamelle_height = useState<number>('lamelle_height')

View File

@ -6,7 +6,7 @@ import '@/assets/main.scss'
import type { NuxtError } from '#app' import type { NuxtError } from '#app'
import og_img from '/og_img.png' import og_img from '/og_img.png'
const { data: seoData } = await useFetch<ApiKpType>(`${apiBase}/kp/2`) const { data: seoData } = await useFetch<ApiKpType>(`${apiBase}/kp/2`, { headers: useRequestHeaders(['referer']) })
useSeoMeta({ useSeoMeta({
title: seoData.value?.title, title: seoData.value?.title,
ogTitle: seoData.value?.title, ogTitle: seoData.value?.title,

View File

@ -7,7 +7,7 @@ import { marked } from 'marked';
import og_img from '/og_img.png' import og_img from '/og_img.png'
const { data: seoData } = await useFetch<ApiKpType>(`${apiBase}/kp/1`) const { data: seoData } = await useFetch<ApiKpType>(`${apiBase}/kp/1`, { headers: useRequestHeaders(['referer']) })
useSeoMeta({ useSeoMeta({
title: seoData.value?.title, title: seoData.value?.title,
ogTitle: seoData.value?.title, ogTitle: seoData.value?.title,
@ -16,15 +16,16 @@ useSeoMeta({
ogImage: config.public.baseUrl + og_img, ogImage: config.public.baseUrl + og_img,
// twitterCard: 'summary_large_image', // twitterCard: 'summary_large_image',
}) })
const { data: pagesData } = await useFetch<ApiPagesType[]>(`${apiBase}/pages/?ordering=order`)
const { data: reviewsData } = await useFetch<ApiReviewsType[]>(`${apiBase}/review/`) const { data: pagesData } = await useFetch<ApiPagesType[]>(`${apiBase}/pages/?ordering=order`, { headers: useRequestHeaders(['referer']) })
const { data: calculatorData } = await useFetch(`${apiBase}/calculator/5/`)
const about = (pagesData.value as ApiPagesType[]).find(el => el.slug == 'about') const { data: reviewsData } = await useFetch<ApiReviewsType[]>(`${apiBase}/review/`, { headers: useRequestHeaders(['referer']) })
const reviews = (pagesData.value as ApiPagesType[]).find(el => el.slug == 'clients') const { data: calculatorData } = await useFetch(`${apiBase}/calculator/5/`, { headers: useRequestHeaders(['referer']) })
const delivery = (pagesData.value as ApiPagesType[]).find(el => el.slug == 'how_to')
const advantages = (pagesData.value as ApiPagesType[]).find(el => el.slug == 'advantages') const about = (pagesData.value as ApiPagesType[]).find(el => el.slug == 'about', { headers: useRequestHeaders(['referer']) })
const reviews = (pagesData.value as ApiPagesType[]).find(el => el.slug == 'clients', { headers: useRequestHeaders(['referer']) })
const delivery = (pagesData.value as ApiPagesType[]).find(el => el.slug == 'how_to', { headers: useRequestHeaders(['referer']) })
const advantages = (pagesData.value as ApiPagesType[]).find(el => el.slug == 'advantages', { headers: useRequestHeaders(['referer']) })
const roubleSign = new Intl.NumberFormat('ru-RU', { const roubleSign = new Intl.NumberFormat('ru-RU', {
style: 'currency', style: 'currency',
@ -41,7 +42,7 @@ const advantagesText = computed(() => {
return marked.parse(c) return marked.parse(c)
}) })
const { data: advData } = await useFetch<ApiAdvantageType[]>(`${apiBase}/advantage/`) const { data: advData } = await useFetch<ApiAdvantageType[]>(`${apiBase}/advantage/`, { headers: useRequestHeaders(['referer']) })
</script> </script>
<template> <template>
<div> <div>
@ -68,14 +69,16 @@ const { data: advData } = await useFetch<ApiAdvantageType[]>(`${apiBase}/advanta
</div> </div>
<div class="siteblock siteblock_imgbg bg-slate-500" <div class="siteblock siteblock_imgbg bg-slate-500"
:style="[{ backgroundImage: `url(${[imgBase, reviews?.image].join('/')})` }]" v-if="reviews"> :style="[{ backgroundImage: `url(${[imgBase, reviews?.image].join('/')})` }]" v-if="reviews">
<NuxtImg :src="[imgBase, reviews?.image].join('/')" class="invisible" alt="отзыв" title="" format="webp" loading="lazy" /> <NuxtImg :src="[imgBase, reviews?.image].join('/')" class="invisible" alt="отзыв" title="" format="webp"
loading="lazy" />
</div> </div>
<div class="siteblock bg-white" :id="reviews?.slug" v-if="reviews"> <div class="siteblock bg-white" :id="reviews?.slug" v-if="reviews">
<div class="container"> <div class="container">
<template v-for="item in reviewsData?.slice(0, 3)"> <template v-for="item in reviewsData?.slice(0, 3)">
<div class="review"> <div class="review">
<div class="review-image"> <div class="review-image">
<NuxtImg :src="[imgBase, item.image].join('/')" :alt="item.text" title="" format="webp" loading="lazy" /> <NuxtImg :src="[imgBase, item.image].join('/')" :alt="item.text" title="" format="webp"
loading="lazy" />
</div> </div>
<div class="review-content"> <div class="review-content">
{{ item.comment }} {{ item.comment }}