merge

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<ApiKpType>(`${apiBase}/kp/1`)
@@ -150,11 +103,10 @@ const toggleModal = () => {
       </div>
       <div class="social">
         <div class="container prose">
-          <Icon name="uil:github" />
           <template v-for="item in social_networkData">
             <div class="social_network-name" :class="[{ 'social_network-name-small': item.link }]">
-            <Icon :name="item.icon" />
               <a href="#" target="_blank">
+                <Icon :name="item.icon" />
                 {{ item.name }}
               </a>
             </div>