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 @@
- .w-full.flex.gap-x-2
- calendar-open-sidebar.close(:class="{'active': isOpen}", :open-sidebar="openSidebar")
- calendar-sidebar.-ml-2(v-if="!isOpen", :open-sidebar="openSidebar")
- calendar-wrapper
+ .w-full.flex
+ calendar-sidebar(v-if="!isOpen", :open-sidebar="openSidebar")
+ calendar-open-sidebar(v-else, :open-sidebar="openSidebar")
+ calendar-wrapper.ml-2(:open-sidebar="isOpen")
+
+
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 @@
+
+ .calendar-clock-column.flex.flex-col.items-end.pb-5.px-3
+ span.text-base(
+ v-for="hour in timeCoil",
+ :key="hour",
+ ) {{ hour }}
+
+
+
+
+
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 @@
- calendar-header.flex-1
+ .schedule.flex-1.flex.gap-y-1.flex-col(
+ :style="{width: openSidebar ? 'calc(100vw - 320px)' : 'calc(100vw - 160px)'}"
+ )
+ calendar-header.w-full
+ .schedule-body.rounded.h-full.bg-white.w-full
+ .w-full(:style="{height: '60px'}")
+ .flex.w-full.relative
+ .time-coil-wrapper.left-0.-mt-12
+ calendar-clock-column(:time-coil="timeCoil")
+ calendar-background
+ // q-scroll-area.rounded(
+ :horizontal-thumb-style="thumbStyle",
+ :horizontal-bar-style="barStyle",
+ visible
+ style="height: 100%; max-width: 100%"
+ //)
+ .flex.bg-red-700.background(:style="{width: '3040px', height: '400px'}")
+ .bar-conteiner.w-full.rounded.bg-white.h-8.absolute.bottom-0
-
+
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 = {};