From 8007fe7fa9d5a5c08f1478a02b57a07dcc7cd3ff Mon Sep 17 00:00:00 2001 From: Daria Golova Date: Mon, 5 Jun 2023 13:41:40 +0300 Subject: [PATCH] =?UTF-8?q?WIP=20=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB?= =?UTF-8?q?=D0=B0=20=D1=80=D0=B0=D0=B7=D0=BB=D0=B8=D0=BD=D0=BE=D0=B2=D0=BA?= =?UTF-8?q?=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/newCalendar/TheCalendar.vue | 8 +- .../components/CalendarBackground.vue | 39 ++++++++++ .../components/CalendarClockColumn.vue | 63 ++++++++++++++++ .../components/CalendarOpenSidebar.vue | 4 + .../components/CalendarWrapper.vue | 74 ++++++++++++++++++- src/store/modules/calendar.js | 4 + 6 files changed, 185 insertions(+), 7 deletions(-) create mode 100644 src/pages/newCalendar/components/CalendarBackground.vue create mode 100644 src/pages/newCalendar/components/CalendarClockColumn.vue diff --git a/src/pages/newCalendar/TheCalendar.vue b/src/pages/newCalendar/TheCalendar.vue index f16be9e..4c98bdf 100644 --- a/src/pages/newCalendar/TheCalendar.vue +++ b/src/pages/newCalendar/TheCalendar.vue @@ -1,8 +1,8 @@ + + diff --git a/src/pages/newCalendar/components/CalendarClockColumn.vue b/src/pages/newCalendar/components/CalendarClockColumn.vue new file mode 100644 index 0000000..69cf7ff --- /dev/null +++ b/src/pages/newCalendar/components/CalendarClockColumn.vue @@ -0,0 +1,63 @@ + + + + + diff --git a/src/pages/newCalendar/components/CalendarOpenSidebar.vue b/src/pages/newCalendar/components/CalendarOpenSidebar.vue index 4ad3ed3..11f380c 100644 --- a/src/pages/newCalendar/components/CalendarOpenSidebar.vue +++ b/src/pages/newCalendar/components/CalendarOpenSidebar.vue @@ -211,6 +211,10 @@ export default { .q-expansion-item :deep(.q-item__label) line-height: 135% !important +.q-expansion-item :deep(.q-item) + padding: 10px 16px !important + min-height: 54px + .text color: var(--font-grey-color) diff --git a/src/pages/newCalendar/components/CalendarWrapper.vue b/src/pages/newCalendar/components/CalendarWrapper.vue index ecf2f24..38a5aec 100644 --- a/src/pages/newCalendar/components/CalendarWrapper.vue +++ b/src/pages/newCalendar/components/CalendarWrapper.vue @@ -1,16 +1,84 @@ - + diff --git a/src/store/modules/calendar.js b/src/store/modules/calendar.js index b34864f..8b01bca 100644 --- a/src/store/modules/calendar.js +++ b/src/store/modules/calendar.js @@ -1,6 +1,10 @@ import * as moment from "moment/moment"; const state = () => ({ currentDate: moment(), + workingHours: { + start: "8:00", + end: "18:00", + }, }); const getters = {};