diff --git a/server.js b/server.js index c94b967..84d67da 100644 --- a/server.js +++ b/server.js @@ -458,9 +458,9 @@ export function clientsServer() { previous: null, results: [ { - id: "6faa6bb6-1de6-422c-a401-1b35cd455303", - start: "2022-10-27T11:15:49Z", - end: "2022-10-27T12:00:53Z", + id: "6fgg6bb6-1de6-422c-a401-1b35cd455303", + start: "2022-10-28T11:15:49Z", + end: "2022-10-28T12:00:53Z", kind: "call", subkind: null, description: "", @@ -502,8 +502,8 @@ export function clientsServer() { }, { id: "6faa6bb6-1de6-422c-a401-1b35cd455303", - start: "2022-10-27T13:00:49Z", - end: "2022-10-27T13:30:53Z", + start: "2022-10-28T13:00:49Z", + end: "2022-10-28T13:30:53Z", kind: "call", subkind: null, description: "", @@ -545,8 +545,8 @@ export function clientsServer() { }, { id: "2faa7bb2-2de6-422c-a401-1b35cd455223", - start: "2022-10-27T15:00:00Z", - end: "2022-10-27T16:10:00Z", + start: "2022-10-28T15:00:00Z", + end: "2022-10-28T16:10:00Z", kind: "call", subkind: null, description: "", @@ -588,8 +588,8 @@ export function clientsServer() { }, { id: "2faa5ff2-2de6-422c-a401-1b35cd455223", - start: "2022-10-25T17:10:00Z", - end: "2022-10-25T18:00:00Z", + start: "2022-10-28T17:10:00Z", + end: "2022-10-28T18:00:00Z", kind: "call", subkind: null, description: "", @@ -631,8 +631,8 @@ export function clientsServer() { }, { id: "2faa5ff2-2de6-422c-a401-1b35cd455223", - start: "2022-10-27T20:10:00Z", - end: "2022-10-27T21:00:00Z", + start: "2022-10-28T20:10:00Z", + end: "2022-10-28T21:00:00Z", kind: "call", subkind: null, description: "", @@ -672,6 +672,49 @@ export function clientsServer() { }, ], }, + { + id: "3faa5ff3-3de6-422c-a401-1b35cd455333", + start: "2022-10-28T12:30:00Z", + end: "2022-10-28T15:30: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: "f941a0c6-c750-4f79-92c0-d7a19354e422", + employee: { + id: "db541a67-e836-481f-a653-6325de7c567e", + last_name: "Захарова", + first_name: "Ольга", + patronymic: "Александровна", + }, + role: "owner", + }, + ], + }, ], })); this.passthrough("http://45.84.227.122:8080/**"); diff --git a/src/components/HeaderAddClientButton.vue b/src/components/HeaderAddClientButton.vue deleted file mode 100644 index 0b21dbf..0000000 --- a/src/components/HeaderAddClientButton.vue +++ /dev/null @@ -1,28 +0,0 @@ - - - - - diff --git a/src/components/TheHeader.vue b/src/components/TheHeader.vue index 0f1ec92..9627d22 100644 --- a/src/components/TheHeader.vue +++ b/src/components/TheHeader.vue @@ -6,11 +6,11 @@ //- .charge-person-container //- header-active-client-panel(:info="chargePersonInfo") .flex.ml-auto - header-add-client-button.mr-9 + base-button.mr-9(left-icon="icon-plus", :icon-left-size="10", :size="40", right-icon="icon-person", :icon-right-size="18") button.header-buttons.flex.justify-center.items-center.mr-8.p-0 .icon-bell.text-xxl .flex.justify-centflexer.items-center - BaseAvatar(:size="32").mr-2 + base-avatar(:size="32").mr-2 img(:src="avatarSrc") button.header-buttons .icon-down-arrow.text-xxs.flex.justify-center.items-center.p-0 @@ -20,11 +20,11 @@ import img from "@/assets/images/avatar.svg"; import chargePersonAvatar from "@/assets/images/charge-person-avatar.svg"; import HeaderInputs from "./HeaderInputs.vue"; -import HeaderAddClientButton from "./HeaderAddClientButton.vue"; import BaseAvatar from "@/components/base/BaseAvatar"; +import BaseButton from "@/components/base/BaseButton.vue"; export default { name: "TheHeader", - components: { HeaderInputs, HeaderAddClientButton, BaseAvatar }, + components: { HeaderInputs, BaseAvatar, BaseButton }, data() { return { avatarSrc: img, @@ -64,10 +64,6 @@ export default { height: 24px color: var(--font-dark-blue-color) -.avatar-img - width: 32px - height: 32px - .charge-person-container position: absolute diff --git a/src/components/base/buttons/BaseArrowButton.vue b/src/components/base/buttons/BaseArrowButton.vue deleted file mode 100644 index 151b278..0000000 --- a/src/components/base/buttons/BaseArrowButton.vue +++ /dev/null @@ -1,20 +0,0 @@ - - - - - diff --git a/src/pages/calendar/TheCalendar.vue b/src/pages/calendar/TheCalendar.vue index 300368a..ca8c7ee 100644 --- a/src/pages/calendar/TheCalendar.vue +++ b/src/pages/calendar/TheCalendar.vue @@ -25,8 +25,8 @@ export default { calendarLayout: "", currentDate: moment(), timeInformation: { - dayStartTime: "8:00", - dayEndTime: "24:00", + dayStartTime: "0:00", + dayEndTime: "20:00", }, eventsData: [], teamData: [], diff --git a/src/pages/calendar/components/CalendarBackground.vue b/src/pages/calendar/components/CalendarBackground.vue index e201b61..b23d672 100644 --- a/src/pages/calendar/components/CalendarBackground.vue +++ b/src/pages/calendar/components/CalendarBackground.vue @@ -1,9 +1,8 @@