From bc7e82b88e758caaeffbafad3b30b2df880723a3 Mon Sep 17 00:00:00 2001
From: Daria Golova <danalis969@gmail.com>
Date: Mon, 17 Oct 2022 12:45:00 +0300
Subject: [PATCH 1/3] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=D0=B0=20=D0=B8=D0=BD=D0=B4=D0=B8=D0=BA=D0=B0=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=20,=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B8=D0=BB?=
 =?UTF-8?q?=D0=B0=20=D1=82=D0=B0=D0=B9=D0=BC=D0=B5=D1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../calendar/components/CalendarColumn.vue    | 14 ++++---
 .../calendar/components/CalendarSchedule.vue  | 42 ++++++++++++-------
 2 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/src/pages/calendar/components/CalendarColumn.vue b/src/pages/calendar/components/CalendarColumn.vue
index 120697a..ac8648a 100644
--- a/src/pages/calendar/components/CalendarColumn.vue
+++ b/src/pages/calendar/components/CalendarColumn.vue
@@ -6,7 +6,7 @@
         span.member-name.font-medium.text-base.mr-6 {{ info.name }}
         img.icon-wrapper.cursor-pointer(src="@/assets/icons/lock.svg")
       base-doc-ok-button
-    .flex.flex-col
+    .body.flex.flex-col
       span.block.time-indicator(v-if="isShownIndicator" :style="indicatorLocation")
       .line.flex.items-center(v-for="hour in hoursArray" :key="hour")
         .middle-line
@@ -44,8 +44,8 @@ export default {
       let newTime = this.currentTime
         .split(":")
         .map((elem) => parseInt(elem, 10));
-      let result = (newTime[0] - 7) * 60.5 + newTime[1];
-      if (result > 666) {
+      let result = (newTime[0] - 8) * 62 + newTime[1] * 1.03;
+      if (result > 620) {
         this.isShownIndicator = false;
         return 0;
       }
@@ -58,11 +58,12 @@ export default {
 <style lang="sass" scoped>
 .calendar-column-wrapper
   width: 100%
-  position: relative
 
 .header
   height: 48px
-  border-bottom: 1px solid var(--border-light-grey-color)
+
+.body
+  position: relative
 
 .avatar-wrapper
   width: 32px
@@ -78,6 +79,9 @@ export default {
 .line
   border-bottom: 1px solid var(--border-light-grey-color)
   height: 62px
+  &:nth-child(2)
+    height: 63px
+    border-top: 1px solid var(--border-light-grey-color)
   &:last-child
     display: none
 
diff --git a/src/pages/calendar/components/CalendarSchedule.vue b/src/pages/calendar/components/CalendarSchedule.vue
index 05deb49..0adcd1e 100644
--- a/src/pages/calendar/components/CalendarSchedule.vue
+++ b/src/pages/calendar/components/CalendarSchedule.vue
@@ -39,6 +39,12 @@ export default {
     };
   },
   methods: {
+    hours() {
+      return parseInt(this.currentTime.slice(0, -6), 10);
+    },
+    hoursMinutes() {
+      return this.currentTime.slice(0, -3);
+    },
     previousDate() {
       this.$emit("previous-date");
     },
@@ -48,43 +54,51 @@ export default {
     selectedLayout(option) {
       this.$emit("selected-layout", option);
     },
-    updateTime() {
-      let currentHour = parseInt(this.currentTime.slice(0, -6), 10);
-      if (currentHour < 20 && currentHour > 8) {
+    startTimer() {
+      if (this.hours() <= 18 && this.hours() >= 8) {
         this.timer = setInterval(() => {
           this.changeCurrentTime();
           this.changeHoursArray();
         }, 30000);
       }
     },
+    stopTimer() {
+      clearInterval(this.timer);
+      this.timer = null;
+    },
     changeCurrentTime() {
       this.currentTime = moment().format("HH:mm:ss");
     },
     hoursArrayInitialization() {
       for (let i = 8; i <= 18; i++) {
-        let startTime = this.currentTime.slice(0, -3);
-        let currentHour = parseInt(startTime.slice(0, -3), 10);
-        if (i === currentHour) {
-          this.hoursArray.push(startTime);
+        if (i === this.hours()) {
+          this.hoursArray.push(this.hoursMinutes());
         } else this.hoursArray.push(`${i}:00`);
       }
     },
     changeHoursArray() {
-      let newCurrentTime = this.currentTime.slice(0, -3);
-      let currentHour = parseInt(newCurrentTime.slice(0, -3), 10);
-      let newHoursArray = this.hoursArray.map((elem) => {
-        if (parseInt(elem.slice(0, -3), 10) === currentHour) {
-          return this.currentTime.slice(0, -3);
+      this.hoursArray = this.hoursArray.map((elem) => {
+        if (parseInt(elem.slice(0, -3), 10) === this.hours()) {
+          return this.hoursMinutes();
         }
         return elem;
       });
-      this.hoursArray = newHoursArray;
+    },
+  },
+  watch: {
+    currentTime() {
+      if (this.hours() >= 18) {
+        this.stopTimer();
+      }
     },
   },
   mounted() {
     this.changeCurrentTime();
     this.hoursArrayInitialization();
-    this.updateTime();
+    this.startTimer();
+  },
+  beforeUnmount() {
+    this.stopTimer();
   },
 };
 </script>

From fbbe2778d748c2c9337dd9a9b7991341e079cef4 Mon Sep 17 00:00:00 2001
From: Daria Golova <danalis969@gmail.com>
Date: Mon, 17 Oct 2022 17:04:59 +0300
Subject: [PATCH 2/3] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?=
 =?UTF-8?q?=D0=B0=20=D0=BF=D0=BE=D0=B4=D1=81=D0=B2=D0=B5=D1=82=D0=BA=D1=83?=
 =?UTF-8?q?=20=D1=82=D0=B5=D0=BA=D1=83=D1=88=D0=B5=D0=B3=D0=BE=20=D0=B2?=
 =?UTF-8?q?=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...endarColumn.vue => CalendarBackground.vue} | 51 ++++++++-----------
 .../components/CalendarClockColumn.vue        | 24 ++++++++-
 .../calendar/components/CalendarSchedule.vue  | 30 +++++------
 tailwind.config.js                            |  3 ++
 4 files changed, 59 insertions(+), 49 deletions(-)
 rename src/pages/calendar/components/{CalendarColumn.vue => CalendarBackground.vue} (60%)

diff --git a/src/pages/calendar/components/CalendarColumn.vue b/src/pages/calendar/components/CalendarBackground.vue
similarity index 60%
rename from src/pages/calendar/components/CalendarColumn.vue
rename to src/pages/calendar/components/CalendarBackground.vue
index ac8648a..8f70a54 100644
--- a/src/pages/calendar/components/CalendarColumn.vue
+++ b/src/pages/calendar/components/CalendarBackground.vue
@@ -1,29 +1,17 @@
 <template lang="pug">
-  .calendar-column-wrapper.flex.flex-col
+  .calendar-background-wrapper.flex.flex-col
     .header.flex.items-center.justify-between.py-2.px-6
-      .flex.items-center
-        img.avatar-wrapper.mr-2(:src="info.avatar" alt="Team member")
-        span.member-name.font-medium.text-base.mr-6 {{ info.name }}
-        img.icon-wrapper.cursor-pointer(src="@/assets/icons/lock.svg")
-      base-doc-ok-button
     .body.flex.flex-col
-      span.block.time-indicator(v-if="isShownIndicator" :style="indicatorLocation")
+      .time-circle-indicator.-left-6(v-if="isShownIndicator" :style="circleIndicatorLocation")
+      span.time-line-indicator.block(v-if="isShownIndicator" :style="lineIndicatorLocation")
       .line.flex.items-center(v-for="hour in hoursArray" :key="hour")
         .middle-line
 </template>
 
 <script>
-import BaseDocOkButton from "@/components/base/buttons/BaseDocOkButton.vue";
 export default {
-  name: "CalendarColumn",
-  components: { BaseDocOkButton },
+  name: "CalendarBackground",
   props: {
-    info: {
-      type: Object,
-      default() {
-        return {};
-      },
-    },
     hoursArray: Array,
     currentTime: String,
   },
@@ -33,11 +21,16 @@ export default {
     };
   },
   computed: {
-    indicatorLocation() {
+    lineIndicatorLocation() {
       return {
         top: `${this.calculateIndicatorLocation()}px`,
       };
     },
+    circleIndicatorLocation() {
+      return {
+        top: `${this.calculateIndicatorLocation() - 6}px`,
+      };
+    },
   },
   methods: {
     calculateIndicatorLocation() {
@@ -56,7 +49,7 @@ export default {
 </script>
 
 <style lang="sass" scoped>
-.calendar-column-wrapper
+.calendar-background-wrapper
   width: 100%
 
 .header
@@ -65,21 +58,10 @@ export default {
 .body
   position: relative
 
-.avatar-wrapper
-  width: 32px
-  height: 32px
-
-.icon-wrapper
-  width: 24px
-  height: 24px
-
-.member-name
-  color: var(--font-dark-blue-color)
-
 .line
   border-bottom: 1px solid var(--border-light-grey-color)
   height: 62px
-  &:nth-child(2)
+  &:nth-child(3)
     height: 63px
     border-top: 1px solid var(--border-light-grey-color)
   &:last-child
@@ -89,8 +71,15 @@ export default {
   border-top: 1px dashed var(--border-light-grey-color)
   width: 100%
 
-.time-indicator
+.time-line-indicator
   width: 100%
   border-top: 1px solid var(--time-indicator-color)
   position: absolute
+
+.time-circle-indicator
+  width: 12px
+  height: 12px
+  background-color: var(--time-indicator-color)
+  border-radius: 50%
+  position: absolute
 </style>
diff --git a/src/pages/calendar/components/CalendarClockColumn.vue b/src/pages/calendar/components/CalendarClockColumn.vue
index d166fb1..203cc72 100644
--- a/src/pages/calendar/components/CalendarClockColumn.vue
+++ b/src/pages/calendar/components/CalendarClockColumn.vue
@@ -1,6 +1,6 @@
 <template lang="pug">
   .calendar-clock-column.flex.flex-col.items-end.gap-y-43.pt-9.pb-12.px-3
-    span.font-medium.text-base(v-for="hour in hoursArray") {{ hour }}
+    span.font-medium.text-base(v-for="hour in hoursArray" :key="hour" :class="currentHourStyle(hour)") {{ hour }}
 </template>
 
 <script>
@@ -8,11 +8,33 @@ export default {
   name: "CalendarClockColumn",
   props: {
     hoursArray: Array,
+    currentTime: String,
+  },
+  computed: {
+    currentHour() {
+      return parseInt(this.currentTime.slice(0, -6), 10);
+    },
+  },
+  methods: {
+    currentHourStyle(elem) {
+      if (parseInt(elem.slice(0, 3), 10) === this.currentHour) {
+        return {
+          "current-time": true,
+          "font-bold": true,
+        };
+      }
+      return {
+        "current-time": false,
+      };
+    },
   },
 };
 </script>
 
 <style lang="sass" scoped>
+.current-time
+  color: var(--time-indicator-color)
+
 .calendar-clock-column
   width: 80px
   height: 100%
diff --git a/src/pages/calendar/components/CalendarSchedule.vue b/src/pages/calendar/components/CalendarSchedule.vue
index 0adcd1e..4547964 100644
--- a/src/pages/calendar/components/CalendarSchedule.vue
+++ b/src/pages/calendar/components/CalendarSchedule.vue
@@ -6,19 +6,18 @@
       @next-date="nextDate"
       @selected-layout="selectedLayout")
     .schedule-body.flex
-      calendar-clock-column(:hoursArray="hoursArray")
-      calendar-column(:info="columnInfo" :hoursArray="hoursArray" :currentTime="currentTime")
+      calendar-clock-column(:hoursArray="hoursArray" :currentTime="currentTime")
+      calendar-background(:hoursArray="hoursArray" :currentTime="currentTime")
 </template>
 
 <script>
 import * as moment from "moment/moment";
 import CalendarHeader from "./CalendarHeader.vue";
-import CalendarColumn from "./CalendarColumn.vue";
+import CalendarBackground from "./CalendarBackground.vue";
 import CalendarClockColumn from "./CalendarClockColumn.vue";
-import teamMemberAvatar from "@/assets/images/team-member.svg";
 export default {
   name: "CalendarSchedule",
-  components: { CalendarHeader, CalendarColumn, CalendarClockColumn },
+  components: { CalendarHeader, CalendarBackground, CalendarClockColumn },
   props: {
     currentDate: {
       type: Object,
@@ -29,22 +28,20 @@ export default {
   },
   data() {
     return {
-      columnInfo: {
-        name: "Захарова А.О.",
-        avatar: teamMemberAvatar,
-      },
       currentTime: "",
       hoursArray: [],
       timer: null,
     };
   },
-  methods: {
+  computed: {
     hours() {
       return parseInt(this.currentTime.slice(0, -6), 10);
     },
     hoursMinutes() {
       return this.currentTime.slice(0, -3);
     },
+  },
+  methods: {
     previousDate() {
       this.$emit("previous-date");
     },
@@ -55,7 +52,7 @@ export default {
       this.$emit("selected-layout", option);
     },
     startTimer() {
-      if (this.hours() <= 18 && this.hours() >= 8) {
+      if (this.hours >= 8 && this.hours < 18) {
         this.timer = setInterval(() => {
           this.changeCurrentTime();
           this.changeHoursArray();
@@ -71,15 +68,15 @@ export default {
     },
     hoursArrayInitialization() {
       for (let i = 8; i <= 18; i++) {
-        if (i === this.hours()) {
-          this.hoursArray.push(this.hoursMinutes());
+        if (i === this.hours) {
+          this.hoursArray.push(this.hoursMinutes);
         } else this.hoursArray.push(`${i}:00`);
       }
     },
     changeHoursArray() {
       this.hoursArray = this.hoursArray.map((elem) => {
-        if (parseInt(elem.slice(0, -3), 10) === this.hours()) {
-          return this.hoursMinutes();
+        if (parseInt(elem.slice(0, -3), 10) === this.hours) {
+          return this.hoursMinutes;
         }
         return elem;
       });
@@ -87,7 +84,7 @@ export default {
   },
   watch: {
     currentTime() {
-      if (this.hours() >= 18) {
+      if (this.hours >= 18) {
         this.stopTimer();
       }
     },
@@ -105,6 +102,5 @@ export default {
 
 <style lang="sass" scoped>
 .schedule
-  width: 100%
   background-color: var(--default-white)
 </style>
diff --git a/tailwind.config.js b/tailwind.config.js
index d32734c..162cc69 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -23,6 +23,9 @@ module.exports = {
       gap: {
         43: "43px",
       },
+      spacing: {
+        6: "6px",
+      },
     },
   },
   plugins: [],

From 399f07ee6e448040166d2f9d299dc89133e984de Mon Sep 17 00:00:00 2001
From: Daria Golova <danalis969@gmail.com>
Date: Mon, 17 Oct 2022 17:14:13 +0300
Subject: [PATCH 3/3] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=BB=D0=B0=20tailwind.config?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/calendar/components/CalendarBackground.vue | 2 +-
 tailwind.config.js                                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/calendar/components/CalendarBackground.vue b/src/pages/calendar/components/CalendarBackground.vue
index 8f70a54..429a388 100644
--- a/src/pages/calendar/components/CalendarBackground.vue
+++ b/src/pages/calendar/components/CalendarBackground.vue
@@ -2,7 +2,7 @@
   .calendar-background-wrapper.flex.flex-col
     .header.flex.items-center.justify-between.py-2.px-6
     .body.flex.flex-col
-      .time-circle-indicator.-left-6(v-if="isShownIndicator" :style="circleIndicatorLocation")
+      .time-circle-indicator.-left-6px(v-if="isShownIndicator" :style="circleIndicatorLocation")
       span.time-line-indicator.block(v-if="isShownIndicator" :style="lineIndicatorLocation")
       .line.flex.items-center(v-for="hour in hoursArray" :key="hour")
         .middle-line
diff --git a/tailwind.config.js b/tailwind.config.js
index 162cc69..2380927 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -24,7 +24,7 @@ module.exports = {
         43: "43px",
       },
       spacing: {
-        6: "6px",
+        "6px": "6px",
       },
     },
   },