diff --git a/src/pages/calendar/TheCalendar.vue b/src/pages/calendar/TheCalendar.vue
index a08e224..e8b57ec 100644
--- a/src/pages/calendar/TheCalendar.vue
+++ b/src/pages/calendar/TheCalendar.vue
@@ -1,29 +1,23 @@
- .calendar-container.ml-2
- calendar-header(
- :currentDay="currentDate"
+ .calendar-container
+ calendar-schedule(
+ :currentDate="currentDate"
@previous-date="switchPreviousDate"
@next-date="switchNextDate"
- @selectedLayout="changeCalendarLayout")
- calendar-column(:info="columnInfo")
+ @selected-layout="changeCalendarLayout"
+ )
@@ -50,6 +79,8 @@ export default {
.line
border-bottom: 1px solid var(--border-light-grey-color)
height: 62px
+ &:last-child
+ display: none
.middle-line
border-top: 1px dashed var(--border-light-grey-color)
diff --git a/src/pages/calendar/components/CalendarHeader.vue b/src/pages/calendar/components/CalendarHeader.vue
index 930fc1a..7b6b7b7 100644
--- a/src/pages/calendar/components/CalendarHeader.vue
+++ b/src/pages/calendar/components/CalendarHeader.vue
@@ -17,7 +17,7 @@ export default {
name: "CalendarHeader",
components: { BaseArrowButton, CalendarLayoutSwitch },
props: {
- currentDay: Object,
+ currentDate: Object,
},
data() {
return {
@@ -26,7 +26,7 @@ export default {
},
computed: {
dateString() {
- let newStr = this.currentDay.format("D MMMM YYYY");
+ let newStr = this.currentDate.format("D MMMM YYYY");
return newStr
.split(" ")
.map((elem, index) => {
@@ -38,7 +38,7 @@ export default {
},
methods: {
changeSelectedLayout(option) {
- this.$emit("selectedLayout", option);
+ this.$emit("selected-layout", option);
},
previousHandler() {
this.$emit("previous-date");
@@ -48,9 +48,9 @@ export default {
},
},
watch: {
- currentDay: function () {
+ currentDate: function () {
this.isToday =
- this.currentDay.format("DD.MM.YYYY") === moment().format("DD.MM.YYYY");
+ this.currentDate.format("DD.MM.YYYY") === moment().format("DD.MM.YYYY");
},
},
};
diff --git a/src/pages/calendar/components/CalendarSchedule.vue b/src/pages/calendar/components/CalendarSchedule.vue
new file mode 100644
index 0000000..5c799c1
--- /dev/null
+++ b/src/pages/calendar/components/CalendarSchedule.vue
@@ -0,0 +1,51 @@
+
+ .schedule.ml-2
+ calendar-header(
+ :currentDate="currentDate"
+ @previous-date="previousDate"
+ @next-date="nextDate"
+ @selected-layout="selectedLayout")
+ calendar-column(:info="columnInfo")
+
+
+
+
+