From 368490065662e48c85d36a924e69cbd4401c2e7d Mon Sep 17 00:00:00 2001 From: Kseninia Mikhaylova Date: Thu, 6 Jun 2024 10:54:05 +0300 Subject: [PATCH] merge --- app.vue | 50 +------------------------------------------------- 1 file changed, 1 insertion(+), 49 deletions(-) diff --git a/app.vue b/app.vue index 334deeb..52c57af 100644 --- a/app.vue +++ b/app.vue @@ -3,53 +3,6 @@ const config = useRuntimeConfig() const apiBase = config.public.apiBase import k_logo from '@/assets/icons/logo.svg' -<<<<<<< HEAD - -type ApiKpType = { - id: number - title: string - content: string - url: string - meta_title: any - meta_description: string - keywords: any - is_indexed: boolean -} - -type ApiPagesType = { - id: number - title: string - menu_title: string - slug: string - external_link: string - content: string - image: string -} - -type ApiReviewsType = { - id: number - image: string - text: string - comment: string -} - -type ApiFooterType = { - id: number - text: string - small_text: boolean -} - -type ApiSocial_networkType = { - id: number - name: string - link: string - icon: string - -} - - -======= ->>>>>>> 438d53218ae0250dd90d13cc3a67f9d559db2b0c import '@/assets/main.scss' const { data: seoData } = await useFetch(`${apiBase}/kp/1`) @@ -150,11 +103,10 @@ const toggleModal = () => {