diff --git a/src/components/TheSidebar.vue b/src/components/TheSidebar.vue
index 4dc157b..c746cd6 100644
--- a/src/components/TheSidebar.vue
+++ b/src/components/TheSidebar.vue
@@ -1,15 +1,11 @@
.sidebar.flex.flex-col.justify-between.flex-auto.py-6.box-border
.flex.flex-col.gap-y-6
- the-button-sidebar(id="home" path="#/")
- .icon-home.icon
- the-button-sidebar(id="calendar" path="#/calendar")
- .icon-calendar-2.icon
- the-button-sidebar(id="user" path="#/clients")
- .icon-person-2.icon
+ the-button-sidebar( v-for="button in pageSettings.filter((el) => el.id !== 'settings')" :path="button.path" :id="button.id" :active="button.active" :change-style-page="changeStylePage")
+ .icon(:class="button.icon")
.flex.text-4xl.flex-col.gap-y-6
- the-button-sidebar(id="settings" path="#/settings")
- .icon-settings.icon
+ the-button-sidebar(:path="getSettings.path" :id="getSettings.id" :active="getSettings.active" :change-style-page="changeStylePage")
+ .icon(:class="getSettings.icon")
diff --git a/src/components/base/BaseAddingNetwork.vue b/src/components/base/BaseAddingNetwork.vue
index 25f15b0..56a2286 100644
--- a/src/components/base/BaseAddingNetwork.vue
+++ b/src/components/base/BaseAddingNetwork.vue
@@ -1,6 +1,6 @@
.flex(class="gap-x-1.5")
- base-select(:for-networks="true" :style-border="true" :list-data="listAddingNetworks" :option-data="value.kind")
+ base-select(:for-networks="true" :style-border="true" :list-data="listAddingNetworks" :option-data="selectedOption" :choose-option="chooseNetwork" :width-select="42")
base-input.input-info.w-full(v-model:value="value.username" :id="value.id" placeholder="Ссылкa")
@@ -11,8 +11,10 @@ export default {
name: "TableAddingNetwork",
components: { BaseInput, BaseSelect },
props: {
+ selectedOption: String,
value: Object,
listAddingNetworks: Array,
+ chooseNetwork: Function,
},
};
diff --git a/src/components/base/BaseInput.vue b/src/components/base/BaseInput.vue
index a86822f..2628665 100644
--- a/src/components/base/BaseInput.vue
+++ b/src/components/base/BaseInput.vue
@@ -1,6 +1,6 @@
.input-wrapper.flex.gap-x-2.px-4.box-border(class="py-2.5" :style="{ minWidth: widthInput + 'px' }")
- input.w-full.outline-0.not-italic(:style="{ backgroundColor: backgroundInput, fontSize: fontSizeInput }" :value="value" :type="type" @input="$emit('update:value', $event.target.value)" :placeholder="placeholder" :maxlength="maxLength")
+ input.w-full.outline-0.not-italic(:value="value" :type="type" @input="$emit('update:value', $event.target.value)" :placeholder="placeholder" :maxlength="maxLength")
.slot(v-if="withIcon" :class="iconPosition")
slot.cursor-pointer
diff --git a/src/components/base/BaseSelect.vue b/src/components/base/BaseSelect.vue
index d0e8699..d57effb 100644
--- a/src/components/base/BaseSelect.vue
+++ b/src/components/base/BaseSelect.vue
@@ -1,12 +1,36 @@
- .flex.justify-between.box-border.px-4.w-full.container.items-center.cursor-pointer(@click="openSelect" class="py-2.5" :class="{border: styleBorder}" :style="{ minWidth : widthSelect + 'px'}")
+ .flex.box-border.w-full.container.items-center.cursor-pointer(
+ @click="openSelect"
+ :class="{border: styleBorder, 'py-2.5 px-4':!forNetworks, 'justify-center':forNetworks, 'justify-between':!forNetworks}"
+ :style="{ minWidth : widthSelect + 'px'}"
+ )
.relative.flex.flex-col
.not-italic.select.cursor-pointer.w-full(v-if="!forNetworks") {{optionData}}
- .absolute.options(v-show="isSelectOpen" :id="id" :style="{ minWidth : widthSelect + 'px'}")
- .not-italic.option.pl-4.py-1(v-for="responsible in listData" @click="(e) => chooseOption(e)" :key="responsible" :id="responsible") {{responsible}}
- .not-italic.select.cursor-pointer.w-full(v-if="forNetworks" :class="optionData")
- .absolute.options(v-show="isSelectOpen" :id="id" :style="{ minWidth : widthSelect + 'px'}")
- .not-italic.option.pl-4.py-1(v-for="responsible in listData" @click="(e) => chooseOption(e)" :key="responsible.network" :id="responsible.network" :class="responsible.icon")
+ .absolute.options(
+ v-show="isSelectOpen"
+ :id="id"
+ class="left-[-18px]"
+ :style="{ minWidth : widthSelect + 'px'}"
+ )
+ .not-italic.option.pl-4.py-1(
+ v-for="responsible in listData"
+ @click="(e) => chooseOption(e)"
+ :key="responsible"
+ :id="responsible"
+ ) {{responsible}}
+ .flex.not-italic.select.cursor-pointer.w-full.text-xl.items-center.networks(v-if="forNetworks" :class="optionData")
+ .absolute.options.top-5(
+ v-show="isSelectOpen"
+ class="left-[-11px]"
+ :id="id"
+ :style="{ minWidth : widthSelect + 'px'}")
+ .flex.not-italic.option.justify-center.py-1.text-xl(
+ v-for="responsible in listData"
+ @click="(e) => chooseOption(e)"
+ :key="responsible.network"
+ :id="responsible.network"
+ :class="responsible.icon"
+ )
.select-form-separator.cursor-pointer(v-if="withSeparator")
.text-sm.ml-2.pt-1.icon-down-arrow.icon.text-center(v-if="!forNetworks" :class="{ open: isSelectOpen}")
@@ -58,6 +82,8 @@ export default {
&::-webkit-calendar-picker-indicator
display: none
-webkit-appearance: none
+ &.networks
+ color: var(--font-dark-blue-color)
.options
z-index: 3
width: max-content
@@ -65,7 +91,6 @@ export default {
border: 2px solid var(--border-light-grey-color)
border-top: none
border-radius: 0 0 4px 4px
- left: -18px
.option
color: var(--font-black-color)
border-bottom: 1px solid var(--border-light-grey-color)
diff --git a/src/components/base/buttons/BaseSidebarButton.vue b/src/components/base/buttons/BaseSidebarButton.vue
index dca70e8..83b5fc5 100644
--- a/src/components/base/buttons/BaseSidebarButton.vue
+++ b/src/components/base/buttons/BaseSidebarButton.vue
@@ -1,6 +1,6 @@
a(:href="path")
- button.button.cursor-pointer.text-4xl.py-3.pr-4.pl-3(:id="id")
+ button.button.cursor-pointer.text-4xl.py-3.pr-4.pl-3(:id="id" :class="{active:active}" @click="(e) => changeStylePage(e)")
slot
@@ -10,7 +10,8 @@ export default {
props: {
path: String,
id: String,
- changeStyle: Function,
+ changeStylePage: Function,
+ active: Boolean,
},
data() {
return {
@@ -31,7 +32,7 @@ export default {
border-top: none
border-bottom: none
border-left-style: solid
-.button:focus
+.active
background-color: var(--btn-blue-color-1)
border-left-color: var(--btn-blue-color)
color: var(--btn-blue-color)
diff --git a/src/pages/clients/components/ClientDetailInfoWrapper.vue b/src/pages/clients/components/ClientDetailInfoWrapper.vue
index 85853f3..612bac3 100644
--- a/src/pages/clients/components/ClientDetailInfoWrapper.vue
+++ b/src/pages/clients/components/ClientDetailInfoWrapper.vue
@@ -1,14 +1,9 @@
.w-full.h-fit.pt-4.flex.gap-x-4(class="px-[52px] pb-[30px]")
client-detail-info-section(v-model:section-info="dataDocument" section="pass")
- .flex.flex-col.gap-y-2
- client-detail-info-section(:section-info="dataDetail.snils" section="snils" )
- client-detail-info-section(:section-info="dataDetail.inn" section="inn" )
.flex.flex-col.gap-y-2
client-detail-info-section(:section-info="dataDetail.birthday" section="birthday")
client-detail-info-section(:section-info="dataDetail.addresses" section="addresses")
- client-detail-info-section(:section-info="dataDetail.docs" section="docs" :save-new-doc="saveNewDoc" :delete-doc="deleteDoc")
- client-detail-info-section(:section-info="dataDetail.additional" section="additional" :save-new-doc="saveNewDoc" :delete-doc="deleteDoc")