From f55f673c3f95fa9e6824a937e55f12d7a324f4ad Mon Sep 17 00:00:00 2001 From: Zh3nyaZh3nya Date: Thu, 19 Dec 2024 17:20:47 +0500 Subject: [PATCH] small fixes in header erg & refactor stories --- src/runtime/components/Pages/TestVuetify.vue | 1 + src/runtime/components/Parts/Header/Erg.vue | 9 +++++---- src/stories/{Page.stories.js => pageTest.stories.js} | 2 +- .../{vacancies.stories.js => pageVacancies.stories.js} | 2 +- src/stories/{Card.stories.js => partsCard.stories.js} | 0 .../{CardScale.stories.js => partsCardScale.stories.js} | 2 +- ...Vacancies.stories.js => partsErgVacancies.stories.js} | 2 +- ...les.stories.js => partsFilesDownloadFiles.stories.js} | 2 +- .../{Footer.stories.js => partsFooterDefault.stories.js} | 0 src/stories/{Forms.stories.js => partsForms.stories.js} | 0 .../{Header.stories.js => partsHeaderDefault.stories.js} | 0 .../{HeaderErg.stories.js => partsHeaderErg.stories.js} | 2 +- src/stories/{Modal.stories.js => partsModal.stories.js} | 0 .../{slider.stories.js => partsSlider.stories.js} | 0 .../{vacancy.stories.js => partsVacancy.stories.js} | 0 15 files changed, 12 insertions(+), 10 deletions(-) rename src/stories/{Page.stories.js => pageTest.stories.js} (93%) rename src/stories/{vacancies.stories.js => pageVacancies.stories.js} (99%) rename src/stories/{Card.stories.js => partsCard.stories.js} (100%) rename src/stories/{CardScale.stories.js => partsCardScale.stories.js} (97%) rename src/stories/{ErgVacancies.stories.js => partsErgVacancies.stories.js} (99%) rename src/stories/{downloadFiles.stories.js => partsFilesDownloadFiles.stories.js} (97%) rename src/stories/{Footer.stories.js => partsFooterDefault.stories.js} (100%) rename src/stories/{Forms.stories.js => partsForms.stories.js} (100%) rename src/stories/{Header.stories.js => partsHeaderDefault.stories.js} (100%) rename src/stories/{HeaderErg.stories.js => partsHeaderErg.stories.js} (98%) rename src/stories/{Modal.stories.js => partsModal.stories.js} (100%) rename src/stories/{slider.stories.js => partsSlider.stories.js} (100%) rename src/stories/{vacancy.stories.js => partsVacancy.stories.js} (100%) diff --git a/src/runtime/components/Pages/TestVuetify.vue b/src/runtime/components/Pages/TestVuetify.vue index 06b1f57..d86df8d 100644 --- a/src/runtime/components/Pages/TestVuetify.vue +++ b/src/runtime/components/Pages/TestVuetify.vue @@ -8,6 +8,7 @@ :text-btn="'Получить консультацию'" :class-menu-select="'asd'" :word-button-mobile="'asdsadsadsa'" + :show-button="false" :set-lang="[ { code: 'ru', diff --git a/src/runtime/components/Parts/Header/Erg.vue b/src/runtime/components/Parts/Header/Erg.vue index 0ced293..6ddb9bf 100644 --- a/src/runtime/components/Parts/Header/Erg.vue +++ b/src/runtime/components/Parts/Header/Erg.vue @@ -62,8 +62,8 @@ item-value="code" hide-details="true" variant="solo" - class="mr-2 mr-sm-4 bg-none erg-header-select" - :class="burger ? 'control-select' : ''" + class="bg-none erg-header-select" + :class="[showButton ? 'mr-2 mr-sm-4' : '', burger ? 'control-select' : '']" :menu-props="{ class: classMenuSelect }" v-bind="selectAttrs" @update:model-value="updateSelectLang" @@ -71,7 +71,7 @@ @@ -250,6 +250,7 @@ const props = defineProps({ bgClassHeader: { type: String, default: () => '' }, colorClassMenu: { type: String, default: () => '' }, burger: { type: Boolean, default: true }, + showButton: { type: Boolean, default: true }, columnGapList: { type: Number, default: 32 }, classMenuSelect: { type: String, default: () => 'select-lang-header-menu' }, wordButtonMobile: { type: String, default: () => '' }, @@ -416,7 +417,7 @@ function buttonClick() { color: inherit; } - .erg-header-link { + &-item { transition: background 0.3s ease; border-radius: 50px; padding: 8px 10px; diff --git a/src/stories/Page.stories.js b/src/stories/pageTest.stories.js similarity index 93% rename from src/stories/Page.stories.js rename to src/stories/pageTest.stories.js index e87f1d1..f7c2517 100644 --- a/src/stories/Page.stories.js +++ b/src/stories/pageTest.stories.js @@ -2,7 +2,7 @@ import MyPage from '../runtime/components/Pages/TestVuetify.vue'; export default { - title: 'Example/Page', + title: 'Page/Test', component: MyPage, parameters: { // More on how to position stories at: https://storybook.js.org/docs/vue/configure/story-layout diff --git a/src/stories/vacancies.stories.js b/src/stories/pageVacancies.stories.js similarity index 99% rename from src/stories/vacancies.stories.js rename to src/stories/pageVacancies.stories.js index 05f5a9f..48f4507 100644 --- a/src/stories/vacancies.stories.js +++ b/src/stories/pageVacancies.stories.js @@ -2,7 +2,7 @@ import Vacancies from '../runtime/components/Pages/Vacancies.vue' // More on how to set up stories at: https://storybook.js.org/docs/vue/writing-stories/introduction export default { - title: 'Parts/Vacancies', + title: 'Page/Vacancies', component: Vacancies, tags: ['autodocs'], }; diff --git a/src/stories/Card.stories.js b/src/stories/partsCard.stories.js similarity index 100% rename from src/stories/Card.stories.js rename to src/stories/partsCard.stories.js diff --git a/src/stories/CardScale.stories.js b/src/stories/partsCardScale.stories.js similarity index 97% rename from src/stories/CardScale.stories.js rename to src/stories/partsCardScale.stories.js index 60a3d7d..591f675 100644 --- a/src/stories/CardScale.stories.js +++ b/src/stories/partsCardScale.stories.js @@ -2,7 +2,7 @@ import CardScale from '../runtime/components/Parts/Card/Scale.vue' // More on how to set up stories at: https://storybook.js.org/docs/vue/writing-stories/introduction export default { - title: 'Parts/CardScale', + title: 'Parts/Card Scale', component: CardScale, tags: ['autodocs'], }; diff --git a/src/stories/ErgVacancies.stories.js b/src/stories/partsErgVacancies.stories.js similarity index 99% rename from src/stories/ErgVacancies.stories.js rename to src/stories/partsErgVacancies.stories.js index 1a8d6e4..5d42acf 100644 --- a/src/stories/ErgVacancies.stories.js +++ b/src/stories/partsErgVacancies.stories.js @@ -2,7 +2,7 @@ import Vacancies from '../runtime/components/Parts/ErgVacancies.vue' // More on how to set up stories at: https://storybook.js.org/docs/vue/writing-stories/introduction export default { - title: 'Parts/ErgVacancies', + title: 'Parts/Erg Vacancies', component: Vacancies, tags: ['autodocs'], }; diff --git a/src/stories/downloadFiles.stories.js b/src/stories/partsFilesDownloadFiles.stories.js similarity index 97% rename from src/stories/downloadFiles.stories.js rename to src/stories/partsFilesDownloadFiles.stories.js index 61f04c9..56c6a42 100644 --- a/src/stories/downloadFiles.stories.js +++ b/src/stories/partsFilesDownloadFiles.stories.js @@ -2,7 +2,7 @@ import downloadFile from '../runtime/components/Parts/Files/DownloadFiles.vue' // More on how to set up stories at: https://storybook.js.org/docs/vue/writing-stories/introduction export default { - title: 'Parts/files/downloadFiles', + title: 'Parts/Files/Download Files', component: downloadFile, tags: ['autodocs'], argTypes: { diff --git a/src/stories/Footer.stories.js b/src/stories/partsFooterDefault.stories.js similarity index 100% rename from src/stories/Footer.stories.js rename to src/stories/partsFooterDefault.stories.js diff --git a/src/stories/Forms.stories.js b/src/stories/partsForms.stories.js similarity index 100% rename from src/stories/Forms.stories.js rename to src/stories/partsForms.stories.js diff --git a/src/stories/Header.stories.js b/src/stories/partsHeaderDefault.stories.js similarity index 100% rename from src/stories/Header.stories.js rename to src/stories/partsHeaderDefault.stories.js diff --git a/src/stories/HeaderErg.stories.js b/src/stories/partsHeaderErg.stories.js similarity index 98% rename from src/stories/HeaderErg.stories.js rename to src/stories/partsHeaderErg.stories.js index 3eecc46..770fce7 100644 --- a/src/stories/HeaderErg.stories.js +++ b/src/stories/partsHeaderErg.stories.js @@ -1,7 +1,7 @@ import Header from '../runtime/components/Parts/Header/Erg.vue'; export default { - title: 'Parts/HeaderERG', + title: 'Parts/Header ERG', component: Header, tags: ['autodocs'], argTypes: { diff --git a/src/stories/Modal.stories.js b/src/stories/partsModal.stories.js similarity index 100% rename from src/stories/Modal.stories.js rename to src/stories/partsModal.stories.js diff --git a/src/stories/slider.stories.js b/src/stories/partsSlider.stories.js similarity index 100% rename from src/stories/slider.stories.js rename to src/stories/partsSlider.stories.js diff --git a/src/stories/vacancy.stories.js b/src/stories/partsVacancy.stories.js similarity index 100% rename from src/stories/vacancy.stories.js rename to src/stories/partsVacancy.stories.js