diff --git a/server.js b/server.js index 5b68003..2019c53 100644 --- a/server.js +++ b/server.js @@ -459,8 +459,8 @@ export function clientsServer() { results: [ { id: "6faa6bb6-1de6-422c-a401-1b35cd455303", - start: "2022-10-24T20:23:49Z", - end: "2022-10-24T21:23:53Z", + start: "2022-10-25T11:15:49Z", + end: "2022-10-25T12:00:53Z", kind: "call", subkind: null, description: "", @@ -486,7 +486,7 @@ export function clientsServer() { first_name: "Ольга", patronymic: "Александровна", }, - role: null, + role: "owner", }, { id: "f941a0c6-c750-4f79-92c0-d7a19354e422", @@ -496,14 +496,14 @@ export function clientsServer() { first_name: "Егор", patronymic: "Сергеевич", }, - role: "owner", + role: null, }, ], }, { id: "6faa6bb6-1de6-422c-a401-1b35cd455303", - start: "2022-10-24T15:23:49Z", - end: "2022-10-24T16:23:53Z", + start: "2022-10-25T13:00:49Z", + end: "2022-10-25T13:30:53Z", kind: "call", subkind: null, description: "", @@ -543,63 +543,10 @@ export function clientsServer() { }, ], }, - { - id: "7faa7bb7-2de6-422c-a401-1b35cd455303", - start: "2022-10-23T10:00:00Z", - end: "2022-10-23T11:10:00Z", - kind: "call", - subkind: null, - description: "", - location: null, - members: [ - { - id: "b0509f9a-e824-4bb3-a260-2b32dae9bc81", - person: { - id: "14ff401c-2b7b-4d9a-9159-720c74d8b23c", - last_name: "Гагарин", - first_name: "Юрий", - patronymic: "Алексеевич", - }, - role: null, - }, - { - id: "a9239f9a-e824-4bb3-a260-2b32dae9bc76", - person: { - id: "15ff465c-2b7b-4d9a-9159-720c74d8b56d", - last_name: "Елесеевская", - first_name: "Татьяна", - patronymic: "Ивановна", - }, - role: "primary", - }, - ], - employees: [ - { - id: "f941a0c6-c734-4f79-92c2-d7a5674459e422", - employee: { - id: "db831a15-e876-481f-a658-6325de7c311e", - last_name: "Константинопольская", - first_name: "Юлия", - patronymic: "Викторовна", - }, - role: null, - }, - { - id: "f941a0c6-c750-4f79-92c0-d7a19354e422", - employee: { - id: "db541a67-e836-481f-a653-6325de7c567e", - last_name: "Захарова", - first_name: "Ольга", - patronymic: "Александровна", - }, - role: "owner", - }, - ], - }, { id: "2faa7bb2-2de6-422c-a401-1b35cd455223", - start: "2022-10-24T10:00:00Z", - end: "2022-10-24T11:10:00Z", + start: "2022-10-25T15:00:00Z", + end: "2022-10-25T16:10:00Z", kind: "call", subkind: null, description: "", @@ -640,9 +587,9 @@ export function clientsServer() { ], }, { - id: "2faa7bb2-2de6-422c-a401-1b35cd455223", - start: "2022-10-24T10:00:00Z", - end: "2022-10-24T11:10:00Z", + id: "2faa5ff2-2de6-422c-a401-1b35cd455223", + start: "2022-10-25T17:10:00Z", + end: "2022-10-25T18:00:00Z", kind: "call", subkind: null, description: "", @@ -661,25 +608,68 @@ export function clientsServer() { ], employees: [ { - id: "f451a0c3-c734-4f73-91c2-d7a5674459e422", + id: "f941a0c6-c734-4f79-92c2-d7a5674459e422", employee: { - id: "dv841a15-e867-331f-a658-6325de7c311e", + id: "db831a15-e876-481f-a658-6325de7c311e", + last_name: "Константинопольская", + first_name: "Юлия", + patronymic: "Викторовна", + }, + role: null, + }, + { + id: "f941a0c6-c750-4f79-92c0-d7a19354e422", + employee: { + id: "db541a67-e836-481f-a653-6325de7c567e", + last_name: "Захарова", + first_name: "Ольга", + patronymic: "Александровна", + }, + role: "owner", + }, + ], + }, + { + id: "2faa5ff2-2de6-422c-a401-1b35cd455223", + start: "2022-10-26T20:10:00Z", + end: "2022-10-26T21:00:00Z", + kind: "call", + subkind: null, + description: "", + location: null, + members: [ + { + id: "a9239f9a-e824-4bb3-a260-2b32dae9bc76", + person: { + id: "15ff465c-2b7b-4d9a-9159-720c74d8b56d", + last_name: "Елесеевская", + first_name: "Татьяна", + patronymic: "Ивановна", + }, + role: null, + }, + ], + employees: [ + { + id: "f941a0c6-c734-4f79-92c2-d7a5674459e422", + employee: { + id: "db831a15-e876-481f-a658-6325de7c311e", + last_name: "Константинопольская", + first_name: "Юлия", + patronymic: "Викторовна", + }, + role: null, + }, + { + id: "f541a0c7-c750-4f79-92c0-d7a19354e422", + employee: { + id: "db938a67-e756-481f-a653-6325de7c567e", last_name: "Коломойцев", first_name: "Илья", - patronymic: "Петрович", + patronymic: "Константинович", }, role: "owner", }, - { - id: "f941a0c6-c750-4f79-92c0-d7a19354e422", - employee: { - id: "db541a67-e836-481f-a653-6325de7c567e", - last_name: "Захарова", - first_name: "Ольга", - patronymic: "Александровна", - }, - role: null, - }, ], }, ], diff --git a/src/assets/sass/variables.sass b/src/assets/sass/variables.sass index 3ff0f4a..dee537e 100644 --- a/src/assets/sass/variables.sass +++ b/src/assets/sass/variables.sass @@ -28,3 +28,4 @@ --btn-green-color: rgba(60, 217, 75, 1) --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) diff --git a/src/components/HeaderActiveClientPanel.vue b/src/components/HeaderActiveClientPanel.vue index cab3cdb..bb780ee 100644 --- a/src/components/HeaderActiveClientPanel.vue +++ b/src/components/HeaderActiveClientPanel.vue @@ -4,15 +4,15 @@ img.img-wrapper.mr-2(:src="info.avatarSrc" alt="Charge person avatar") span.font-bold.text-sm.mr-6px {{ info.name }} .dot.mr-4 - .icon-wrapper.icon-down-arrow.flex.items-center.justify-center.text-xxs(@click="changeState") + .icon-wrapper.icon-down-arrow.flex.items-center.justify-center.text-xxs.cursor-pointer(@click="changeState") .options.flex.flex-col.p-4.mt-1.font-medium.text-sm.gap-y-3(v-if="isOpen") - .flex.items-center + .flex.items-center.cursor-pointer .options-icon-wrapper.icon-star-off.flex.items-center.justify-center.text-base.mr-2 span Снять с ведения - .flex.items-center + .flex.items-center.cursor-pointer .options-icon-wrapper.icon-table.flex.items-center.justify-center.text-lg.mr-2.pb-px span Перейти в таблицу - .flex.items-center + .flex.items-center.cursor-pointer .options-icon-wrapper.flex.items-center.justify-center.icon-user-data.text-base.mr-2 span Данные diff --git a/src/components/TheHeader.vue b/src/components/TheHeader.vue index 52349a4..2a9223f 100644 --- a/src/components/TheHeader.vue +++ b/src/components/TheHeader.vue @@ -48,7 +48,7 @@ export default { height: 56px background-color: var(--default-white) position: relative - z-index: 2 + z-index: 11 .logo-img height: 32px diff --git a/src/components/base/BaseInput.vue b/src/components/base/BaseInput.vue index 3e8916b..a86822f 100644 --- a/src/components/base/BaseInput.vue +++ b/src/components/base/BaseInput.vue @@ -24,8 +24,6 @@ export default { default: "Поиск", }, widthInput: Number, - backgroundInput: String, - fontSizeInput: String, }, }; diff --git a/src/components/base/buttons/BaseCreateButton.vue b/src/components/base/buttons/BaseCreateButton.vue index e68ddd2..5e671ac 100644 --- a/src/components/base/buttons/BaseCreateButton.vue +++ b/src/components/base/buttons/BaseCreateButton.vue @@ -1,8 +1,8 @@ @@ -30,4 +39,16 @@ export default { &:active opacity: 1 background-color: var(--font-dark-blue-color) +.left + order: -1 +.right + order: 1 + padding-top: 1px + border-left: 1px solid var(--bg-white-color-0) + padding-left: 14px + height: 24px + align-items: center +.createEvent + font-weight: 500 + padding-right: 2px diff --git a/src/pages/calendar/TheCalendar.vue b/src/pages/calendar/TheCalendar.vue index 80b3176..ca8c7ee 100644 --- a/src/pages/calendar/TheCalendar.vue +++ b/src/pages/calendar/TheCalendar.vue @@ -1,6 +1,6 @@