Skip to content

Commit

Permalink
Merge pull request #139 from IBEC-BOX/feat/footer-erg
Browse files Browse the repository at this point in the history
fix warns from lint & added new rules for lint
  • Loading branch information
Zh3nyaZh3nya authored Dec 9, 2024
2 parents 0143bb5 + ad9202e commit ad76109
Show file tree
Hide file tree
Showing 11 changed files with 75 additions and 62 deletions.
6 changes: 5 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
{
"root": true,
"extends": ["@nuxt/eslint-config"]
"extends": ["@nuxt/eslint-config"],
"rules": {
"vue/no-unused-vars": "warn",
"vue/no-v-html": "off"
}
}
1 change: 0 additions & 1 deletion src/runtime/components/Pages/Error/Erg.vue
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
{{ textButton }}
</v-btn>
</div>

</v-container>
</section>
</v-main>
Expand Down
39 changes: 19 additions & 20 deletions src/runtime/components/Pages/TestVuetify.vue
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@
:slider-background-image-zoom-scale="1.5"
class="main__about__slider"
/>

</client-only>
</v-container>
</section>
Expand All @@ -78,25 +77,25 @@
:contacts="contacts"
:socials="socialsMedia"
/>
<!-- <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', 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'-->
<!-- }"-->
<!-- :social="socialsMedia"-->
<!-- :swap-copyright-and-socials="true"-->
<!-- />-->
<!-- <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', 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'-->
<!-- }"-->
<!-- :social="socialsMedia"-->
<!-- :swap-copyright-and-socials="true"-->
<!-- />-->
</v-app>
</template>

Expand Down
5 changes: 2 additions & 3 deletions src/runtime/components/Parts/Files/Erg.vue
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,10 @@
hide-details
class="report__card-select mb-5 mb-md-10"
:menu-props="{ class: 'report__card-menu' }"
>
</v-select>
/>


<v-sheet class="mb-9 mb-md-10 bg-transparent" >
<v-sheet class="mb-9 mb-md-10 bg-transparent">
<a
v-for="item in select.data"
:key="item.title"
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/components/Parts/Footer/Default.vue
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@
cols="12"
sm="6"
>
<slot name="additionalLinkAtSocial"></slot>
<slot name="additionalLinkAtSocial" />
<ul
class="d-flex flex-wrap justify-end"
style="column-gap: 10px"
Expand Down
59 changes: 38 additions & 21 deletions src/runtime/components/Parts/Footer/Erg.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@
:class="bgClass"
>
<v-container>
<v-row v-if="contacts&&contacts.length" class="mb-10">
<v-row
v-if="contacts&&contacts.length"
class="mb-10"
>
<v-col
v-for="(contact, index) in contacts"
v-for="(contact) in contacts"
:key="contact.title"
cols="12"
class="d-flex footer-contacts"
Expand Down Expand Up @@ -72,7 +75,10 @@
</v-col>
</v-row>
<v-row class="align-center">
<v-col cols="12" lg="2">
<v-col
cols="12"
lg="2"
>
<ul
class="d-flex flex-wrap"
style="column-gap: 10px"
Expand All @@ -96,29 +102,49 @@
</li>
</ul>
</v-col>
<v-col cols="12" lg="5" class="d-flex ps-0">
<v-col
cols="12"
lg="5"
class="d-flex ps-0"
>
<div class="footer-copyright footer-copyright-cert">
<v-dialog max-width="500">
<template v-slot:activator="{ props: activatorProps }">
<template #activator="{ props: activatorProps }">
<div>
<p v-bind="activatorProps" v-html="copyrightCert.title" class="text-decoration-underline"></p>
<p
v-bind="activatorProps"
class="text-decoration-underline"
v-html="copyrightCert.title"
/>
</div>
</template>

<template v-slot:default="{ isActive }">
<v-img :src="copyrightCert.cert" cover class="rounded-md-32" />
<template #default="{ isActive }">
<v-img
:src="copyrightCert.cert"
cover
class="rounded-md-32"
/>
</template>
</v-dialog>
</div>
</v-col>
<v-col cols="12" lg="2" class="d-flex justify-end">
<v-col
cols="12"
lg="2"
class="d-flex justify-end"
>
<div class="footer-copyright footer-copyright-made">
<p v-html="copyrightMade"></p>
<p v-html="copyrightMade" />
</div>
</v-col>
<v-col cols="12" lg="3" class="d-flex justify-end">
<v-col
cols="12"
lg="3"
class="d-flex justify-end"
>
<div class="footer-copyright">
<p v-html="copyright"></p>
<p v-html="copyright" />
</div>
</v-col>
</v-row>
Expand All @@ -127,15 +153,6 @@
</template>

<script setup lang="ts">
import { useMainStore } from "../../../store/mainStore";
import { useAttrs } from "vue";
const mainStore = useMainStore();
const attrs = useAttrs();
const navAttrs = {
...mainStore.getObjectPropertiesWithPrefix(attrs, "nav"),
};
const props = defineProps({
contacts: { type: Array, default: () => [] },
socials: { type: Array, default: () => [] },
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/components/Parts/Forms.vue
Original file line number Diff line number Diff line change
Expand Up @@ -446,9 +446,9 @@
</transition>
</v-col>
<v-col
v-if="contacts.length"
cols="12"
lg="6"
v-if="contacts.length"
>
<v-row>
<v-col
Expand Down
14 changes: 6 additions & 8 deletions src/runtime/components/Parts/Header/Erg.vue
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@
>{{ wordButtonMobile }}</span>
</v-btn>
<v-btn
v-if="burger"
icon
@click="menu_open = !menu_open"
class="d-block d-lg-none"
v-if="burger"
@click="menu_open = !menu_open"
>
<v-icon :color="menu_open ? colorBurgerOpen : colorBurger">
{{ menu_open ? 'mdi-close' : 'mdi-menu' }}
Expand Down Expand Up @@ -141,9 +141,9 @@
class="text-h6"
@click="updateSelectLang(lang.code)"
>
<span :class="activeLang === lang.code ? colorActiveLangMobile : colorLangMobile">
{{ lang.name }}
</span>
<span :class="activeLang === lang.code ? colorActiveLangMobile : colorLangMobile">
{{ lang.name }}
</span>
</v-btn>
</div>
</div>
Expand All @@ -154,8 +154,8 @@
block
v-bind="buttonDrawerAttrs"
size="x-large"
@click="buttonClick; menu_open = false"
color="primary"
@click="buttonClick; menu_open = false"
>
<span class="erg-header-btn-text btn-text-full">{{ textBtn || 'Связаться с нами' }}</span>
<span
Expand All @@ -167,8 +167,6 @@
class="erg-header-btn-text btn-text-short"
>{{ wordButtonMobile }}</span>
</v-btn>


</v-navigation-drawer>
</template>

Expand Down
2 changes: 0 additions & 2 deletions src/runtime/components/Parts/Pagination.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,7 @@
</v-btn>
</template>
</v-pagination>

</v-sheet>

</template>

<script setup lang="ts">
Expand Down
6 changes: 3 additions & 3 deletions src/runtime/components/Parts/Slider.vue
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@

<div
v-if="slide.subTitleHTML"
v-html="slide.subTitleHTML"
v-bind="slide.subTitleAttrs"
v-html="slide.subTitleHTML"
/>
</div>

Expand Down Expand Up @@ -318,7 +318,7 @@
import { register } from "swiper/element/bundle";
register();
import { useAttrs, ref, onMounted, onUnmounted, watch, computed } from "vue";
import { useAttrs, ref, onMounted, onUnmounted, watch } from "vue";
import { useMainStore } from "../../store/mainStore";
const mainStore = useMainStore();
Expand Down Expand Up @@ -499,7 +499,7 @@ watch(
{ immediate: true }
);
watch(() => props.slides, (newSlides) => {
watch(() => props.slides, () => {
if (slider.value?.swiper) {
slider.value.swiper.update();
}
Expand Down
1 change: 0 additions & 1 deletion src/runtime/plugins/vuetify/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import * as directives from 'vuetify/directives';
import {aliases as allAliases, mdi} from 'vuetify/iconsets/mdi';
import "@mdi/font/css/materialdesignicons.css"; // Ensure you are using css-loader
import "@fortawesome/fontawesome-free/css/all.css"; // Ensure your project is capable of handling css files
const aliases = allAliases;

const lightTheme: ThemeDefinition = {
dark: false,
Expand Down

0 comments on commit ad76109

Please sign in to comment.