diff --git a/src/assets/images/bigLogo.svg b/src/assets/images/bigLogo.svg
deleted file mode 100644
index 3f8236e..0000000
--- a/src/assets/images/bigLogo.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
diff --git a/src/assets/images/dots.svg b/src/assets/images/dots.svg
deleted file mode 100644
index 0f48d04..0000000
--- a/src/assets/images/dots.svg
+++ /dev/null
@@ -1,359 +0,0 @@
-
diff --git a/src/assets/images/ellipseBottom.svg b/src/assets/images/ellipseBottom.svg
deleted file mode 100644
index b589276..0000000
--- a/src/assets/images/ellipseBottom.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
diff --git a/src/assets/images/ellipseTop.svg b/src/assets/images/ellipseTop.svg
deleted file mode 100644
index 45d3ba0..0000000
--- a/src/assets/images/ellipseTop.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
diff --git a/src/assets/images/loginBG.svg b/src/assets/images/loginBG.svg
new file mode 100644
index 0000000..05c322c
--- /dev/null
+++ b/src/assets/images/loginBG.svg
@@ -0,0 +1,399 @@
+
diff --git a/src/assets/images/logoText.svg b/src/assets/images/logoMark.svg
similarity index 100%
rename from src/assets/images/logoText.svg
rename to src/assets/images/logoMark.svg
diff --git a/src/assets/sass/variables.sass b/src/assets/sass/variables.sass
index bc5089d..19e65c6 100644
--- a/src/assets/sass/variables.sass
+++ b/src/assets/sass/variables.sass
@@ -33,3 +33,4 @@
--btn-light-green-color: rgba(60, 217, 75, 0.2)
--border-light-grey-color-1: rgba(211, 212, 220, 0.5)
--bg-white-color-0: rgba(255, 255, 255, 0.3)
+ --border-red-color: #ff6565
diff --git a/src/components/TheHeader.vue b/src/components/TheHeader.vue
index 175556f..635e07b 100644
--- a/src/components/TheHeader.vue
+++ b/src/components/TheHeader.vue
@@ -47,6 +47,9 @@ export default {
methods: {
closeFormCreate() {
this.isOpenCreate = false;
+ logout() {
+ localStorage.clear();
+ this.$router.push("/login");
},
},
};
diff --git a/src/components/base/BaseInput.vue b/src/components/base/BaseInput.vue
index 0ea01f5..380720f 100644
--- a/src/components/base/BaseInput.vue
+++ b/src/components/base/BaseInput.vue
@@ -1,7 +1,17 @@
- .input-wrapper.flex.gap-x-2.px-4.box-border(class="py-2.5" :style="{ minWidth: widthInput + 'px' }")
- input.input.w-full.outline-0.not-italic(:class="{date:type === 'date'}" :value="value" :type="type" @input="$emit('update:value', $event.target.value)" :placeholder="placeholder" :maxlength="maxLength")
- .slot(v-if="withIcon" :class="iconPosition")
+ .input-wrapper.flex.gap-x-2.px-4.box-border.py-10px(
+ :class="{'border-none': borderNone}"
+ :style="{ minWidth: widthInput + 'px' }"
+ )
+ input.input.w-full.outline-0.not-italic(
+ :class="{date:type === 'date'}"
+ :value="value"
+ :type="type"
+ @input="$emit('update:value', $event.target.value)"
+ :placeholder="placeholder"
+ :maxlength="maxLength"
+ )
+ .slot(v-if="withIcon", :class="iconPosition")
slot.cursor-pointer
@@ -24,6 +34,7 @@ export default {
default: "Поиск",
},
widthInput: Number,
+ borderNone: Boolean,
},
};
@@ -42,4 +53,6 @@ export default {
background: url("../../assets/icons/calendar-input.svg") no-repeat 100% 50%
&::-webkit-calendar-picker-indicator
opacity: 0
+.border-none
+ border: none
diff --git a/src/components/base/BaseInputDate.vue b/src/components/base/BaseInputDate.vue
new file mode 100644
index 0000000..2c85678
--- /dev/null
+++ b/src/components/base/BaseInputDate.vue
@@ -0,0 +1,50 @@
+
+ .input-wrapper.flex.gap-x-2.px-4.box-border(
+ class="py-2.5"
+ :style="{ minWidth: widthInput + 'px' }"
+ )
+ input.input.w-full.outline-0.not-italic.date(
+ :value="value"
+ type="date"
+ @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/BaseInputTime.vue b/src/components/base/BaseInputTime.vue
new file mode 100644
index 0000000..8b8fefe
--- /dev/null
+++ b/src/components/base/BaseInputTime.vue
@@ -0,0 +1,46 @@
+
+ .input-wrapper.flex.gap-x-2.px-4.box-border(
+ class="py-2.5"
+ :style="{ minWidth: widthInput + 'px' }"
+ )
+ input.input.w-full.outline-0.not-italic(
+ :value="value"
+ type="time"
+ @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/OldBaseSelect.vue b/src/components/base/OldBaseSelect.vue
index 13f51a4..a1638e1 100644
--- a/src/components/base/OldBaseSelect.vue
+++ b/src/components/base/OldBaseSelect.vue
@@ -72,7 +72,7 @@ export default {
}
return elem.match(reg);
});
- filteredList.length === 0 ? this.closeSelect() : this.openSelect();
+ if (filteredList.length === 0) this.closeSelect();
return filteredList;
}
return this.listData;
@@ -100,7 +100,7 @@ export default {
border-radius: 4px
width: fit-content
color: var(--font-dark-blue-color)
- background-color: var(--bg-ligth-blue-color)
+ background-color: var(--default-white)
&.border
background-color: var(--default-white)
border: 2px solid var(--border-light-grey-color)
diff --git a/src/pages/calendar/components/CalendarFormAddEvent.vue b/src/pages/calendar/components/CalendarFormAddEvent.vue
index f83b08a..c42f457 100644
--- a/src/pages/calendar/components/CalendarFormAddEvent.vue
+++ b/src/pages/calendar/components/CalendarFormAddEvent.vue
@@ -17,32 +17,19 @@
.flex.flex-col.gap-y-2
span.text-xs.opacity-40.font-bold.leading-3 Основная информация
.flex.gap-x-4.items-center
- .icon-time.text-xl.icon
.flex.gap-x-2.items-center
- .time-input.flex.px-4.py-2.items-center
- input.item-input.text-base.cursor-text(
- v-model="startTime"
- placeholder ="11:00"
- )
- span —
- .time-input.flex.px-4.py-2.items-center
- input.item-input.text-base.cursor-text(
- v-model="endTime"
- placeholder ="12:30"
- )
- .flex.items-center.ml-10
+ base-input-date(v-model:value="eventDate")
+ .flex.items-center
.flex.gap-x-2.items-center
- .date-input.flex.px-4.py-2.items-center
- input.item-input.text-base.cursor-text(
- v-model="startDate"
- placeholder ="2022-10-01"
- )
+ base-input-time.item-input.text-base.cursor-text(
+ v-model:value="startTime",
+ :width-input="72"
+ )
span —
- .date-input.flex.px-4.py-2.items-center
- input.item-input.text-base.cursor-text(
- v-model="endDate"
- placeholder ="2022-10-01"
- )
+ base-input-time.item-input.text-base.cursor-text(
+ v-model:value="endTime",
+ :width-input="72"
+ )
.flex.gap-x-4.items-center
.icon-person.text-xl.icon
base-select(
@@ -71,22 +58,24 @@
.flex.gap-x-4.items-center
span.text-xs.opacity-40.font-bold.leading-3 Контакты
base-button(
- left-icon="icon-plus"
- rounded secondary
- :size="24"
- :icon-left-size="10"
- id="addContact"
- @click="(e)=>addContact(e)")
+ left-icon="icon-plus"
+ rounded secondary
+ :size="24"
+ :icon-left-size="10"
+ id="addContact"
+ @click="(e)=>addContact(e)"
+ )
.flex.gap-x-4.items-center(
v-for="(contact, index) in listContacts"
:key="index"
)
.icon-mail.text-xl.icon
- .form-item.cursor-pointer.flex.gap-x-2.px-4.py-2.items-center
- input.item-input.cursor-text.text-base(
+ .form-item.flex.gap-x-2.items-center
+ base-input(
+ border-none
v-model="contacts"
- type="text"
placeholder="E-mail"
+ :width-input="72"
)
base-button.styled-button.text-base.font-semibold(
:size="40"
@@ -97,10 +86,20 @@
@@ -316,7 +324,7 @@ export default {
.event-form
height: fit-content
min-width: 448px
- background-color: var(--default-white)
+ background-color: var(--bg-ligth-blue-color)
box-shadow: -4px -4px 16px rgba(9, 10, 21, 0.25), 4px 4px 16px rgba(9, 10, 21, 0.25)
border-radius: 4px
z-index: 5
@@ -324,14 +332,13 @@ export default {
.form-item
border-radius: 4px
width: 344px
- background-color: var(--bg-ligth-blue-color)
+ background-color: var(--default-white)
.item-input
appearance: none
border: none
outline: none
- color: var(--font-black-color)
- background-color: var(--font-black-color-0)
+ height: 40px
&::-webkit-calendar-picker-indicator
display: none
-webkit-appearance: none
@@ -341,12 +348,12 @@ export default {
.time-input
width: 72px
border-radius: 4px
- background-color: var(--bg-ligth-blue-color)
+ background-color: var(--default-white)
.date-input
- width: 120px
+ width: 174px
border-radius: 4px
- background-color: var(--bg-ligth-blue-color)
+ background-color: var(--default-white)
.icon
width: 24px
diff --git a/src/pages/calendar/components/CalendarSchedule.vue b/src/pages/calendar/components/CalendarSchedule.vue
index e047a5e..0b15d0f 100644
--- a/src/pages/calendar/components/CalendarSchedule.vue
+++ b/src/pages/calendar/components/CalendarSchedule.vue
@@ -120,10 +120,12 @@ export default {
employees: {
employee: null,
role: "owner",
+ id: null,
},
members: {
- member: null,
+ person: null,
role: null,
+ id: null,
},
},
};
diff --git a/src/pages/clients/components/ClientsTable.vue b/src/pages/clients/components/ClientsTable.vue
index 92ceeb9..767b476 100644
--- a/src/pages/clients/components/ClientsTable.vue
+++ b/src/pages/clients/components/ClientsTable.vue
@@ -17,6 +17,7 @@