diff --git a/src/assets/icons/basket.svg b/src/assets/icons/basket.svg
new file mode 100644
index 0000000..f986272
--- /dev/null
+++ b/src/assets/icons/basket.svg
@@ -0,0 +1,3 @@
+
diff --git a/src/assets/icons/sort-number.svg b/src/assets/icons/sort-number.svg
new file mode 100644
index 0000000..36eb729
--- /dev/null
+++ b/src/assets/icons/sort-number.svg
@@ -0,0 +1,3 @@
+
diff --git a/src/assets/icons/star.svg b/src/assets/icons/star.svg
new file mode 100644
index 0000000..554c12b
--- /dev/null
+++ b/src/assets/icons/star.svg
@@ -0,0 +1,3 @@
+
diff --git a/src/assets/sass/variables.sass b/src/assets/sass/variables.sass
index 4631acd..848521f 100644
--- a/src/assets/sass/variables.sass
+++ b/src/assets/sass/variables.sass
@@ -1,6 +1,6 @@
\:root
--bg-lavender-color: #e9e9f6
- --bg-white-color: #f8f8ff
+ --bg-white-color: #FFFFFF
--bg-ligth-blue-color: #e6eafc
--font-dark-blue-color: #252850
--font-black-color: #090a15
@@ -10,5 +10,4 @@
--border-light-grey-color: #d3d4dc
--default-shadow: 4px 4px 8px rgba(9, 10, 21, 0.1), -4px -4px 8px rgba(9, 10, 21, 0.1)
--bg-hover-row-table: rgba(215, 217, 255, 0.25)
- --default-white: #FFFFFF
--btn-red-color: #FF6F6F
diff --git a/src/components/TheSidebar.vue b/src/components/TheSidebar.vue
index 2b766ba..193f5b5 100644
--- a/src/components/TheSidebar.vue
+++ b/src/components/TheSidebar.vue
@@ -24,6 +24,7 @@ export default {
diff --git a/src/components/base/BaseSelect.vue b/src/components/base/BaseSelect.vue
index 547cc0f..b53ce4d 100644
--- a/src/components/base/BaseSelect.vue
+++ b/src/components/base/BaseSelect.vue
@@ -1,7 +1,7 @@
- .flex.gap-2.py-2.px-4.w-full.container(@click="selectOpen")
+ .flex.gap-2.py-2.px-4.w-full.container.cursor-pointer(@click="selectOpen")
.relative.flex.flex-col
- .not-italic.text-base.select(:style="{ minWidth : width}") {{optionData}}
+ .not-italic.text-base.select.cursor-pointer(:style="{ minWidth : width}") {{optionData}}
.absolute.options(v-if="isOpen" :id="id" @click="(event)=>chooseOption(event)")
.not-italic.text-base.option(v-for="(responsible, index) in listData" :key="index" :id="index") {{responsible}}
.select-form-separator
@@ -26,7 +26,6 @@ export default {
diff --git a/src/components/base/buttons/BaseSidebarButton.vue b/src/components/base/buttons/BaseSidebarButton.vue
index 72d2e4b..2524361 100644
--- a/src/components/base/buttons/BaseSidebarButton.vue
+++ b/src/components/base/buttons/BaseSidebarButton.vue
@@ -1,6 +1,6 @@
a(:href="path")
- button.button.text-4xl.py-3.pr-4.pl-3(:id="id")
+ button.button.cursor-pointer.text-4xl.py-3.pr-4.pl-3(:id="id")
slot
@@ -23,7 +23,6 @@ export default {
diff --git a/src/pages/calendar/components/CalendarFormAddEvent.vue b/src/pages/calendar/components/CalendarFormAddEvent.vue
index 909e55a..d26ac5f 100644
--- a/src/pages/calendar/components/CalendarFormAddEvent.vue
+++ b/src/pages/calendar/components/CalendarFormAddEvent.vue
@@ -3,7 +3,7 @@
.flex.flex-col.gap-y-2
.flex.justify-between.pt-2
span.not-italic.text-xs.opacity-40.leading-3 Ответственный
- .icon-cancel.close-icon.text-xs(@click="closeEventForm")
+ .icon-cancel.close-icon.cursor-pointer.text-xs(@click="closeEventForm")
base-select(
id="responsible"
width="205px"
@@ -14,27 +14,27 @@
:select-open="openSelectResponsible"
)
.flex.flex-col.gap-y-2
- span.not-italic.text-xs.opacity-40.leading-3 Оновная информация
+ span.not-italic.text-xs.opacity-40.leading-3 Основная информация
.flex.gap-x-4.items-center
.icon-time.text-xl.icon
.flex.gap-x-2.items-center
- .form-item.flex.gap-x-2.px-4.py-2.items-center
- input.item-input.no-italic.text-base(v-model="eventData.timeEvent.firstTime" type="time" min="08:00" max="18:00")
+ .form-item.cursor-pointer.flex.gap-x-2.px-4.py-2.items-center
+ input.item-input.cursor-pointer.no-italic.text-base(v-model="eventData.timeEvent.firstTime" type="time" min="08:00" max="18:00")
span —
- .form-item.flex.gap-x-2.px-4.py-2.items-center
- input.item-input.no-italic.text-base(v-model="eventData.timeEvent.secondTime" type="time" min="08:00" max="18:00")
+ .form-item.cursor-pointer.flex.gap-x-2.px-4.py-2.items-center
+ input.item-input.cursor-pointer.no-italic.text-base(v-model="eventData.timeEvent.secondTime" type="time" min="08:00" max="18:00")
.flex.gap-x-4.items-center
.icon-person.text-xl.icon
- .form-item.flex.gap-x-2.px-4.py-2.items-center
- input.item-input.no-italic.text-base(v-model="eventData.eventClient" type="text" placeholder="ФИО клиента")
+ .form-item.cursor-pointer.flex.gap-x-2.px-4.py-2.items-center
+ input.item-input.cursor-pointer.no-italic.text-base(v-model="eventData.eventClient" type="text" placeholder="ФИО клиента")
.flex.flex-col.gap-y-2(class='additional-information')
.flex.gap-x-4.items-center
span.not-italic.text-xs.opacity-40.leading-3 Дополнительная информация
button-plus(id="addInfo" @click="(e)=>addFriendInfo(e)")
.flex.gap-x-4.items-center(v-for="(info, index) in listFriendInfo" :key="index")
span.ml-1 {{info}}
- .form-item.flex.gap-x-2.px-4.py-2.items-center
- input.item-input.no-italic.text-base(v-model="eventData.friendInfo[info]" type="text" placeholder="Что-то важное")
+ .form-item.cursor-pointer.flex.gap-x-2.px-4.py-2.items-center
+ input.item-input.cursor-pointer.no-italic.text-base(v-model="eventData.friendInfo[info]" type="text" placeholder="Что-то важное")
.flex.flex-col.gap-y-2
span.not-italic.text-xs.opacity-40.leading-3 Вид события
base-select(
@@ -52,8 +52,8 @@
button-plus(id="addContact" @click="(e)=>addFriendInfo(e)")
.flex.gap-x-4.items-center(v-for="(contact, index) in listContacts" :key="index")
.icon-mail.text-xl.icon
- .form-item.flex.gap-x-2.px-4.py-2.items-center
- input.item-input.no-italic.text-base(v-model="eventData.contacts[contact]" type="text" placeholder="E-mail")
+ .form-item.cursor-pointer.flex.gap-x-2.px-4.py-2.items-center
+ input.item-input.cursor-pointer.no-italic.text-base(v-model="eventData.contacts[contact]" type="text" placeholder="E-mail")
add-event-button(@click="createEvent")
@@ -135,7 +135,6 @@ export default {
box-shadow: -4px -4px 16px rgba(9, 10, 21, 0.25), 4px 4px 16px rgba(9, 10, 21, 0.25)
border-radius: 4px
.form-item
- cursor: pointer
border-radius: 4px
width: fit-content
background-color: var(--bg-ligth-blue-color)
@@ -143,7 +142,6 @@ export default {
appearance: none
border: none
outline: none
- cursor: pointer
color: rgba(9, 10, 21, 0.5)
background-color: rgba(9, 10, 21, 0)
&::-webkit-calendar-picker-indicator
@@ -154,7 +152,6 @@ export default {
height: 24px
color: var(--font-dark-blue-color)
.close-icon
- cursor: pointer
color: var(--font-dark-blue-color)
&:hover
color: var(--btn-blue-color)
diff --git a/src/pages/clients/components/ClientsActionPopup.vue b/src/pages/clients/components/ClientsActionPopup.vue
index 67d5918..cd19111 100644
--- a/src/pages/clients/components/ClientsActionPopup.vue
+++ b/src/pages/clients/components/ClientsActionPopup.vue
@@ -1,14 +1,16 @@
- .popup-wrapper.absolute.flex.flex-col.gap-y-3.w-10.h-10.right-2.top-5.p-4
- .keep-redaction.flex.gap-x-3
- .icon-edit.icon-redaction
- span Редактировать
- .keep-redaction.flex.gap-x-3
- .icon-star.icon-redaction
- span На ведение
- .delete.flex.gap-x-3
- .icon-basket
- span Удалить
+ .flex.flex-col.items-end.absolute.right-2.top-5
+ .corner
+ .popup-wrapper.flex.flex-col.gap-y-3.w-10.h-10.p-4
+ .button.keep-redaction.flex.gap-x-3
+ .icon-edit.icon-redaction
+ span Редактировать
+ .button.keep-redaction.flex.gap-x-3
+ img(src="@/assets/icons/star.svg" alt="Star")
+ span На ведение
+ .button.delete.flex.gap-x-3
+ img(src="@/assets/icons/basket.svg" alt="Basket")
+ span Удалить
diff --git a/src/pages/clients/components/ClientsTableCheckbox.vue b/src/pages/clients/components/ClientsTableCheckbox.vue
index 876d62a..94b9147 100644
--- a/src/pages/clients/components/ClientsTableCheckbox.vue
+++ b/src/pages/clients/components/ClientsTableCheckbox.vue
@@ -1,10 +1,15 @@
- input.checkbox(type="checkbox")
+ input.checkbox.cursor-pointer(type="checkbox" :id="id" :checked="isCheck" @change="(e) => check(e)")
diff --git a/src/pages/clients/components/ClientsTableRow.vue b/src/pages/clients/components/ClientsTableRow.vue
index 894a858..1f1c881 100644
--- a/src/pages/clients/components/ClientsTableRow.vue
+++ b/src/pages/clients/components/ClientsTableRow.vue
@@ -1,8 +1,8 @@
tr.row-client.text-ms.cursor-pointer(:id="id")
td.py-5
- .px-4.items-center
- clients-table-checkbox
+ .px-4.items-center.w-fit
+ clients-table-checkbox(:is-check="isCheck" :check="check" :id="id")
td.py-5
.px-4.font-semibold {{fullName}}
td.py-5
@@ -26,8 +26,8 @@
span.meeting-time.text-xs.leading-5 {{meetingTime.time}}
td.py-5
.px-4
- .relative.dots-button.icon-dots.text-center.cursor-pointer.leading-6
- clients-action-popup
+ .relative.dots-button.icon-dots.text-center.cursor-pointer.leading-6(@click="openPopup")
+ clients-action-popup(v-if="isOpenPopup")
@@ -68,5 +80,5 @@ export default {
color: var(--font-grey-color)
&:hover
background-color: var(--btn-blue-color)
- color: var(--default-white)
+ color: var(--bg-white-color)
diff --git a/src/pages/clients/components/ClientsWrapper.vue b/src/pages/clients/components/ClientsWrapper.vue
index efea2e3..be1d1d4 100644
--- a/src/pages/clients/components/ClientsWrapper.vue
+++ b/src/pages/clients/components/ClientsWrapper.vue
@@ -10,5 +10,3 @@ export default {
components: { ClientsTable },
};
-
-