diff --git a/server.js b/server.js index 84bfc92..8bb4594 100644 --- a/server.js +++ b/server.js @@ -35,6 +35,46 @@ export function clientsServer() { }, ], })); + this.get("/registry/event/", () => ({ + count: 1, + next: null, + previous: null, + results: [ + { + id: "6faa6bb6-1de6-422c-a401-1b35cd455303", + start: "2022-10-20T20:23:49Z", + end: "2022-10-20T21:23:53Z", + 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, + }, + ], + employees: [ + { + id: "f941a0c6-c750-4f79-92c0-d7a19354e422", + employee: { + id: "db831a14-e836-481f-a653-6325de7c311e", + last_name: "Жмыхов", + first_name: "Егор", + patronymic: "Сергеевич", + }, + role: "owner", + }, + ], + }, + ], + })); this.passthrough("http://45.84.227.122:8080/**"); }, }); diff --git a/src/pages/calendar/TheCalendar.vue b/src/pages/calendar/TheCalendar.vue index 02797ec..a43bee5 100644 --- a/src/pages/calendar/TheCalendar.vue +++ b/src/pages/calendar/TheCalendar.vue @@ -3,6 +3,7 @@ calendar-schedule( :current-date="currentDate" :time-information="timeInformation" + :column-information="columnInformation" @previous-date="switchPreviousDate" @next-date="switchNextDate" @selected-layout="changeCalendarLayout" @@ -24,6 +25,15 @@ export default { dayEndTime: "18:00", }, eventsData: [], + columnInformation: { + owners: [ + "Захарова А.О.", + "Константинопольская Ю.В.", + "Коломойцев И.К.", + "Ситников А.Г.", + null, + ], + }, }; }, methods: { @@ -40,7 +50,7 @@ export default { this.eventsData = res.results; }, fetchEventsData() { - fetch("http://45.84.227.122:8080/registry/event/") + fetch("/registry/event/") .then((res) => res.json()) .then((res) => this.saveEventsData(res)); }, diff --git a/src/pages/calendar/components/CalendarBackground.vue b/src/pages/calendar/components/CalendarBackground.vue index 9af397b..b668ef0 100644 --- a/src/pages/calendar/components/CalendarBackground.vue +++ b/src/pages/calendar/components/CalendarBackground.vue @@ -1,6 +1,12 @@ @@ -30,7 +31,11 @@ import CalendarBackground from "./CalendarBackground.vue"; import CalendarClockColumn from "./CalendarClockColumn.vue"; export default { name: "CalendarSchedule", - components: { CalendarHeader, CalendarBackground, CalendarClockColumn }, + components: { + CalendarHeader, + CalendarBackground, + CalendarClockColumn, + }, props: { currentDate: { type: Object, @@ -44,6 +49,12 @@ export default { return {}; }, }, + columnInformation: { + type: Object, + default() { + return {}; + }, + }, }, data() { return {