Merge pull request #75 from IBEC-BOX/slider

small fixes
IBEC-BOX · Feb 20, 2024 · fe7cf17 · fe7cf17
2 parents 6bcdcca + 1fe610a
commit fe7cf17
Show file tree

Hide file tree

Showing 13 changed files with 205 additions and 132 deletions.
diff --git a/src/runtime/components/Pages/TestVuetify.vue b/src/runtime/components/Pages/TestVuetify.vue
@@ -1,37 +1,35 @@
 <template>
   <v-app>
     <partsHeaderErg
+      :burger="false"
     />
     <NuxtPage />
-      <section class="h-100">
-        <v-container id="slider">
-          <client-only>
-            <partsSlider
-              :slides="sliderAbout"
-              :show-buttons="false"
-              slider-direction="vertical"
-              :height="'600px'"
-              :control-scroll="controlScroll"
-            />
-          </client-only>
-
-
-        </v-container>
-
-      </section>
+    <section class="h-100">
+      <v-container id="slider">
+        <client-only>
+          <partsSlider
+            :slides="sliderAbout"
+            :show-buttons="false"
+            slider-direction="vertical"
+            :height="'600px'"
+            :control-scroll="controlScroll"
+          />
+        </client-only>
+      </v-container>
+    </section>
 
     <partsFooterDefault
       id="footer"
       :logo-in-body="true"
       :logo="{ title: 'АО', titleAttrs: {class: 'mb-4 text-h6'} }"
       nav-class="text-h6 text-black"
       :nav="[
-        { id: 1, text: 'Overview', link: '/' },
-        { id: 2, text: 'Features', link: '/' },
-        { id: 3, text: 'Pricing', link: '/' },
-        { id: 4, text: 'Careers', link: '/' },
-        { id: 5, text: 'Help centre', link: '/' },
-        { id: 6, text: 'Privacy', link: '/', image: '/arrow.png' },
+        { id: 1, text: 'Overview', to: '/' },
+        { id: 2, text: 'Features', to: '/' },
+        { id: 3, text: 'Pricing', to: '/' },
+        { id: 4, text: 'Careers', to: '/' },
+        { id: 5, text: 'Help centre', to: '/' },
+        { id: 6, text: 'Privacy', to: '/', image: '/arrow.png' },
       ]"
       :copyright="{
         text: '2023 Untitled UI. All rights reserverd'

diff --git a/src/runtime/components/Parts/Card.vue b/src/runtime/components/Parts/Card.vue
@@ -63,7 +63,7 @@
           v-bind="textImage.attrs"
           class="mr-2"
         />
-        <div v-html="textBody"></div>
+        <div v-html="textBody" />
       </v-card-text>
 
       <v-card-subtitle
@@ -192,29 +192,24 @@ const titleAttrs = {
 const textAttrs = {
   ...mainStore.getObjectPropertiesWithPrefix(attrs, 'text')
 }
-const imageModalAttrs = ref({
-  height: 100 + '%',
-  ...mainStore.getObjectPropertiesWithPrefix(attrs, 'modal-image')
-})
 
 const openModal = ref(false)
 
 const props = defineProps({
   styleCard: { type: String, default: "standard" },
   variantCard: { type: String, default: "elevated"},
   horizontalCard: { type: Boolean, default: false },
-  horizontalWidthImage: { type: Number || String, default: 340 },
   dateAuthorRight: { type: Boolean, default: false },
   positionImageVacancy: { type: String, default: "start" },
 
-  image: Object,
-  gap: Number,
+  image: { type: Object, default: () => ({}) },
+  gap: { type: Number, default: 0 },
   title: { type: String, default: "" },
   subtitle: { type: String, default: "" },
   price: { type: String, default: "" },
   text: { type: String, default: "" },
   textBody: { type: String, default: "" },
-  textImage: Object,
+  textImage: { type: Object, default: () => ({}) },
   hoverText: { type: Boolean, default: false },
   date: { type: String, default: "" },
   author:{ type: String, default: "" },

diff --git a/src/runtime/components/Parts/ErgVacancies.vue b/src/runtime/components/Parts/ErgVacancies.vue
@@ -1,6 +1,11 @@
 <template>
   <v-container class="erg-vacancies position-relative">
-    <v-img :src="backgroundImage.image" cover class="h-100 w-100" v-bind="backgroundImage.attrs" />
+    <v-img
+      :src="backgroundImage.image"
+      cover
+      class="h-100 w-100"
+      v-bind="backgroundImage.attrs"
+    />
     <v-sheet
       v-bind="sheetAttrs"
       class="mb-6 sheet position-absolute bg-none"
@@ -25,41 +30,61 @@
           :style="[leftImage || rightImage ? '' : 'display: contents', bodyAttrs]"
           class="py-0 px-5"
         >
-          <v-chip v-bind="chip.attrs" class="z-index-2" v-if="chip">
+          <v-chip
+            v-if="chip"
+            v-bind="chip.attrs"
+            class="z-index-2"
+          >
             {{ chip.text }}
           </v-chip>
           <div class="vacancies__body position-relative z-index-2">
             <h2
+              v-if="title"
               class="mb-2"
               v-bind="titleAttrs"
-              v-if="title"
             >
               {{ title || 'Станьте частью команды' }}
             </h2>
             <p
+              v-if="subTitle"
               class="mb-4"
               v-bind="subTitleAttrs"
-              v-if="subTitle"
             >
               {{ subTitle || 'Мы предлагаем конкурентные зарплаты, социальные гарантии' }}
             </p>
             <div
-              class="mb-4"
               v-if="textBody"
+              class="mb-4"
             >
-              <div v-html="textBody"></div>
+              <div v-html="textBody" />
             </div>
           </div>
           <v-btn
             v-bind="button.attrs"
             class="text-none z-index-2"
             color="white"
           >
-            <nuxt-link v-if="button.link" :to="button.link" class="text-decoration-none text-black">
-              {{ button.text || 'Связаться с нами'}}
+            <nuxt-link
+              v-if="button.to"
+              :to="button.to"
+              class="text-decoration-none text-black"
+            >
+              {{ button.text || 'Связаться с нами' }}
             </nuxt-link>
-            <span v-else>{{ button.text || 'Связаться с нами' }}</span>
-            <v-img v-if="button.image" :src="button.image" :width="16" :height="16" class="ml-2" />
+            <a
+              v-else-if="button.href"
+              :href="button.href"
+              class="text-decoration-none text-black"
+            >
+              {{ button.text || 'Связаться с нами' }}
+            </a>
+            <v-img
+              v-if="button.image"
+              :src="button.image"
+              :width="16"
+              :height="16"
+              class="ml-2"
+            />
           </v-btn>
         </v-col>
         <v-col
@@ -147,17 +172,15 @@ const props = defineProps({
       }
     })
   },
-  title: String,
-  subTitle: String,
-  button: { type: Object, default: () => ({
-    text: ''
-  })},
-  textBody: String,
-  leftImage: Object,
-  rightImage: Object,
-  gallery: Boolean,
-  galleryImages: Array,
-  galleryHoverEffect: Boolean,
+  title: { type: String, default: '' },
+  subTitle: { type: String, default: '' },
+  button: { type: Object, default: () => ({}) },
+  textBody: { type: String, default: '' },
+  leftImage: { type: Object, default: () => ({}) },
+  rightImage: { type: Object, default: () => ({}) },
+  gallery: { type: Boolean, default: false },
+  galleryImages: { type: Array, default: () => ([]) },
+  galleryHoverEffect: { type: Boolean, default: false },
 })
 
 

diff --git a/src/runtime/components/Parts/Footer/Default.vue b/src/runtime/components/Parts/Footer/Default.vue
@@ -123,13 +123,35 @@
                 :key="item.id"
               >
                 <nuxt-link
-                  :to="item.link"
+                  v-if="item.to"
+                  :to="item.to"
                   class="d-flex align-center"
                   v-bind="navAttrs"
                 >
                   {{ item.text }}
-                  <v-img :src="item.image" :width="13" :height="13" class="ml-2" v-bind="item.imageAttrs" />
+                  <v-img
+                    :src="item.image"
+                    :width="13"
+                    :height="13"
+                    class="ml-2"
+                    v-bind="item.imageAttrs"
+                  />
                 </nuxt-link>
+                <a
+                  v-if="item.href"
+                  :href="item.href"
+                  class="d-flex align-center"
+                  v-bind="navAttrs"
+                >
+                  {{ item.text }}
+                  <v-img
+                    :src="item.image"
+                    :width="13"
+                    :height="13"
+                    class="ml-2"
+                    v-bind="item.imageAttrs"
+                  />
+                </a>
               </li>
             </ul>
           </v-col>
@@ -150,11 +172,19 @@
                 class="mb-2"
               >
                 <nuxt-link
+                  v-if="item.to"
                   class="text-primary"
-                  :to="item.link"
+                  :to="item.to"
                 >
                   {{ item.text }}
                 </nuxt-link>
+                <a
+                  v-else-if="item.href"
+                  class="text-primary"
+                  :href="item.href"
+                >
+                  {{ item.text }}
+                </a>
               </li>
             </ul>
           </v-col>
@@ -252,10 +282,17 @@
                 v-bind="navAttrs"
               >
                 <nuxt-link
-                  :to="item.link"
+                  v-if="item.to"
+                  :to="item.to"
                 >
                   {{ item.text }}
                 </nuxt-link>
+                <a
+                  v-if="item.href"
+                  :href="item.href"
+                >
+                  {{ item.text }}
+                </a>
               </li>
             </ul>
           </v-col>

diff --git a/src/runtime/components/Parts/Forms.vue b/src/runtime/components/Parts/Forms.vue
@@ -408,9 +408,7 @@
 </template>
 
 <script setup>
-import { ref, useAttrs } from 'vue'
-import { useMainStore } from "../../store/mainStore";
-const mainStore = useMainStore()
+import { ref } from 'vue'
 
 const checked = ref(false)
 const comboboxValue = ref([])

diff --git a/src/runtime/components/Parts/Header/Default.vue b/src/runtime/components/Parts/Header/Default.vue
@@ -24,7 +24,7 @@
                   :key="`header-top-menu-item-${menu_item.id}`"
                 >
                   <nuxt-link
-                    :to="menu_item.url"
+                    :to="menu_item.to"
                     class="header-menu-link text-subtitle-2"
                   >
                     {{ menu_item.title }}
@@ -41,7 +41,7 @@
                   :key="tab.id"
                   class="mx-4 py-5 position-relative text-decoration-none text-grey-darken-2"
                   active-class="tab-link-active"
-                  :to="tab.url"
+                  :to="tab.to"
                 >
                   {{ tab.title }}
                 </nuxt-link>
@@ -98,7 +98,7 @@
                 :key="menu_top_link"
                 class="d-inline-block px-3 text-body-2 text-decoration-none"
                 :class="[`text-${menuTopLinksColor}`]"
-                :to="menu_top_link.url"
+                :to="menu_top_link.to"
               >
                 {{ menu_top_link.title }}
               </nuxt-link>
@@ -114,7 +114,7 @@
                     class="header-menu-link"
                     :class="{'align-start' : variant === 'menu-top-bar'} "
                     active-class="header-menu-link-active"
-                    :to="menu_item.url"
+                    :to="menu_item.to"
                   >
                     {{ menu_item.title }}
                   </NuxtLink>