mns/mns-mini-zabor
mns
/
mns-mini-zabor
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'add baseurl' (#9) from bx-843-testing into dev
Deploy / build_and_push_images (push) Successful in 1m28s Details
Deploy / deploy_to_server_dev (push) Successful in 37s Details 

Reviewed-on: #9
This commit is contained in:
ksenia_mikhailova 2024-07-05 10:21:02 +03:00
parent 50265f3c7a 754d587bcc
commit cc98326d7f
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/footer.vue
View File

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

2
components/header.vue
View File

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

2
error.vue
View File

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

18
pages/index.vue
View File

@ -7,7 +7,7 @@ import { marked } from 'marked';
import og_img from '/og_img.png'
const { data: seoData } = await useFetch<ApiKpType>(`${apiBase}/kp/1`, { headers: useRequestHeaders(['referer']) })
const { data: seoData } = await useFetch<ApiKpType>(`${apiBase}/kp/1`, { baseURL: config.public.baseUrl, headers: useRequestHeaders(['referer']) })
useSeoMeta({
title: seoData.value?.title,
ogTitle: seoData.value?.title,
@ -17,15 +17,15 @@ useSeoMeta({
// twitterCard: 'summary_large_image',
})
const { data: pagesData } = await useFetch<ApiPagesType[]>(`${apiBase}/pages/?ordering=order`, { headers: useRequestHeaders(['referer']) })
const { data: pagesData } = await useFetch<ApiPagesType[]>(`${apiBase}/pages/?ordering=order`, { baseURL: config.public.baseUrl, headers: useRequestHeaders(['referer']) })
const { data: reviewsData } = await useFetch<ApiReviewsType[]>(`${apiBase}/review/`, { headers: useRequestHeaders(['referer']) })
const { data: calculatorData } = await useFetch(`${apiBase}/calculator/5/`, { headers: useRequestHeaders(['referer']) })
const { data: reviewsData } = await useFetch<ApiReviewsType[]>(`${apiBase}/review/`, { baseURL: config.public.baseUrl, headers: useRequestHeaders(['referer']) })
const { data: calculatorData } = await useFetch(`${apiBase}/calculator/5/`, { baseURL: config.public.baseUrl, headers: useRequestHeaders(['referer']) })
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 about = (pagesData.value as ApiPagesType[]).find(el => el.slug == 'about', { baseURL: config.public.baseUrl, headers: useRequestHeaders(['referer']) })
const reviews = (pagesData.value as ApiPagesType[]).find(el => el.slug == 'clients', { baseURL: config.public.baseUrl, headers: useRequestHeaders(['referer']) })
const delivery = (pagesData.value as ApiPagesType[]).find(el => el.slug == 'how_to', { baseURL: config.public.baseUrl, headers: useRequestHeaders(['referer']) })
const advantages = (pagesData.value as ApiPagesType[]).find(el => el.slug == 'advantages', { baseURL: config.public.baseUrl, headers: useRequestHeaders(['referer']) })
const roubleSign = new Intl.NumberFormat('ru-RU', {
style: 'currency',
@ -42,7 +42,7 @@ const advantagesText = computed(() => {
return marked.parse(c)
})
const { data: advData } = await useFetch<ApiAdvantageType[]>(`${apiBase}/advantage/`, { headers: useRequestHeaders(['referer']) })
const { data: advData } = await useFetch<ApiAdvantageType[]>(`${apiBase}/advantage/`, { baseURL: config.public.baseUrl, headers: useRequestHeaders(['referer']) })
</script>
<template>
<div>