diff --git a/server.js b/server.js
index 5b68003..2019c53 100644
--- a/server.js
+++ b/server.js
@@ -459,8 +459,8 @@ export function clientsServer() {
results: [
{
id: "6faa6bb6-1de6-422c-a401-1b35cd455303",
- start: "2022-10-24T20:23:49Z",
- end: "2022-10-24T21:23:53Z",
+ start: "2022-10-25T11:15:49Z",
+ end: "2022-10-25T12:00:53Z",
kind: "call",
subkind: null,
description: "",
@@ -486,7 +486,7 @@ export function clientsServer() {
first_name: "Ольга",
patronymic: "Александровна",
},
- role: null,
+ role: "owner",
},
{
id: "f941a0c6-c750-4f79-92c0-d7a19354e422",
@@ -496,14 +496,14 @@ export function clientsServer() {
first_name: "Егор",
patronymic: "Сергеевич",
},
- role: "owner",
+ role: null,
},
],
},
{
id: "6faa6bb6-1de6-422c-a401-1b35cd455303",
- start: "2022-10-24T15:23:49Z",
- end: "2022-10-24T16:23:53Z",
+ start: "2022-10-25T13:00:49Z",
+ end: "2022-10-25T13:30:53Z",
kind: "call",
subkind: null,
description: "",
@@ -543,63 +543,10 @@ export function clientsServer() {
},
],
},
- {
- id: "7faa7bb7-2de6-422c-a401-1b35cd455303",
- start: "2022-10-23T10:00:00Z",
- end: "2022-10-23T11:10:00Z",
- 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,
- },
- {
- id: "a9239f9a-e824-4bb3-a260-2b32dae9bc76",
- person: {
- id: "15ff465c-2b7b-4d9a-9159-720c74d8b56d",
- last_name: "Елесеевская",
- first_name: "Татьяна",
- patronymic: "Ивановна",
- },
- role: "primary",
- },
- ],
- employees: [
- {
- id: "f941a0c6-c734-4f79-92c2-d7a5674459e422",
- employee: {
- id: "db831a15-e876-481f-a658-6325de7c311e",
- last_name: "Константинопольская",
- first_name: "Юлия",
- patronymic: "Викторовна",
- },
- role: null,
- },
- {
- id: "f941a0c6-c750-4f79-92c0-d7a19354e422",
- employee: {
- id: "db541a67-e836-481f-a653-6325de7c567e",
- last_name: "Захарова",
- first_name: "Ольга",
- patronymic: "Александровна",
- },
- role: "owner",
- },
- ],
- },
{
id: "2faa7bb2-2de6-422c-a401-1b35cd455223",
- start: "2022-10-24T10:00:00Z",
- end: "2022-10-24T11:10:00Z",
+ start: "2022-10-25T15:00:00Z",
+ end: "2022-10-25T16:10:00Z",
kind: "call",
subkind: null,
description: "",
@@ -640,9 +587,9 @@ export function clientsServer() {
],
},
{
- id: "2faa7bb2-2de6-422c-a401-1b35cd455223",
- start: "2022-10-24T10:00:00Z",
- end: "2022-10-24T11:10:00Z",
+ id: "2faa5ff2-2de6-422c-a401-1b35cd455223",
+ start: "2022-10-25T17:10:00Z",
+ end: "2022-10-25T18:00:00Z",
kind: "call",
subkind: null,
description: "",
@@ -661,25 +608,68 @@ export function clientsServer() {
],
employees: [
{
- id: "f451a0c3-c734-4f73-91c2-d7a5674459e422",
+ id: "f941a0c6-c734-4f79-92c2-d7a5674459e422",
employee: {
- id: "dv841a15-e867-331f-a658-6325de7c311e",
+ id: "db831a15-e876-481f-a658-6325de7c311e",
+ last_name: "Константинопольская",
+ first_name: "Юлия",
+ patronymic: "Викторовна",
+ },
+ role: null,
+ },
+ {
+ id: "f941a0c6-c750-4f79-92c0-d7a19354e422",
+ employee: {
+ id: "db541a67-e836-481f-a653-6325de7c567e",
+ last_name: "Захарова",
+ first_name: "Ольга",
+ patronymic: "Александровна",
+ },
+ role: "owner",
+ },
+ ],
+ },
+ {
+ id: "2faa5ff2-2de6-422c-a401-1b35cd455223",
+ start: "2022-10-26T20:10:00Z",
+ end: "2022-10-26T21:00:00Z",
+ kind: "call",
+ subkind: null,
+ description: "",
+ location: null,
+ members: [
+ {
+ id: "a9239f9a-e824-4bb3-a260-2b32dae9bc76",
+ person: {
+ id: "15ff465c-2b7b-4d9a-9159-720c74d8b56d",
+ last_name: "Елесеевская",
+ first_name: "Татьяна",
+ patronymic: "Ивановна",
+ },
+ role: null,
+ },
+ ],
+ employees: [
+ {
+ id: "f941a0c6-c734-4f79-92c2-d7a5674459e422",
+ employee: {
+ id: "db831a15-e876-481f-a658-6325de7c311e",
+ last_name: "Константинопольская",
+ first_name: "Юлия",
+ patronymic: "Викторовна",
+ },
+ role: null,
+ },
+ {
+ id: "f541a0c7-c750-4f79-92c0-d7a19354e422",
+ employee: {
+ id: "db938a67-e756-481f-a653-6325de7c567e",
last_name: "Коломойцев",
first_name: "Илья",
- patronymic: "Петрович",
+ patronymic: "Константинович",
},
role: "owner",
},
- {
- id: "f941a0c6-c750-4f79-92c0-d7a19354e422",
- employee: {
- id: "db541a67-e836-481f-a653-6325de7c567e",
- last_name: "Захарова",
- first_name: "Ольга",
- patronymic: "Александровна",
- },
- role: null,
- },
],
},
],
diff --git a/src/assets/sass/variables.sass b/src/assets/sass/variables.sass
index 3ff0f4a..dee537e 100644
--- a/src/assets/sass/variables.sass
+++ b/src/assets/sass/variables.sass
@@ -28,3 +28,4 @@
--btn-green-color: rgba(60, 217, 75, 1)
--btn-light-green-color: rgba(60, 217, 75, 0.2)
--border-light-grey-color-1: rgba(211, 212, 220, 0.5)
+ --bg-white-color-0: rgba(255, 255, 255, 0.3)
diff --git a/src/components/HeaderActiveClientPanel.vue b/src/components/HeaderActiveClientPanel.vue
index cab3cdb..bb780ee 100644
--- a/src/components/HeaderActiveClientPanel.vue
+++ b/src/components/HeaderActiveClientPanel.vue
@@ -4,15 +4,15 @@
img.img-wrapper.mr-2(:src="info.avatarSrc" alt="Charge person avatar")
span.font-bold.text-sm.mr-6px {{ info.name }}
.dot.mr-4
- .icon-wrapper.icon-down-arrow.flex.items-center.justify-center.text-xxs(@click="changeState")
+ .icon-wrapper.icon-down-arrow.flex.items-center.justify-center.text-xxs.cursor-pointer(@click="changeState")
.options.flex.flex-col.p-4.mt-1.font-medium.text-sm.gap-y-3(v-if="isOpen")
- .flex.items-center
+ .flex.items-center.cursor-pointer
.options-icon-wrapper.icon-star-off.flex.items-center.justify-center.text-base.mr-2
span Снять с ведения
- .flex.items-center
+ .flex.items-center.cursor-pointer
.options-icon-wrapper.icon-table.flex.items-center.justify-center.text-lg.mr-2.pb-px
span Перейти в таблицу
- .flex.items-center
+ .flex.items-center.cursor-pointer
.options-icon-wrapper.flex.items-center.justify-center.icon-user-data.text-base.mr-2
span Данные
diff --git a/src/components/TheHeader.vue b/src/components/TheHeader.vue
index 52349a4..2a9223f 100644
--- a/src/components/TheHeader.vue
+++ b/src/components/TheHeader.vue
@@ -48,7 +48,7 @@ export default {
height: 56px
background-color: var(--default-white)
position: relative
- z-index: 2
+ z-index: 11
.logo-img
height: 32px
diff --git a/src/components/base/BaseInput.vue b/src/components/base/BaseInput.vue
index 3e8916b..a86822f 100644
--- a/src/components/base/BaseInput.vue
+++ b/src/components/base/BaseInput.vue
@@ -24,8 +24,6 @@ export default {
default: "Поиск",
},
widthInput: Number,
- backgroundInput: String,
- fontSizeInput: String,
},
};
diff --git a/src/components/base/buttons/BaseCreateButton.vue b/src/components/base/buttons/BaseCreateButton.vue
index e68ddd2..5e671ac 100644
--- a/src/components/base/buttons/BaseCreateButton.vue
+++ b/src/components/base/buttons/BaseCreateButton.vue
@@ -1,8 +1,8 @@
button.button.flex.w-fit.gap-x-2.text-base.pt-3.pb-2.px-6
- .flex.text-xs.w-fit.pt-1(v-if="withIcon")
- span.icon-plus
- span.text-base.font-semibold {{text}}
+ .flex.text-xs.w-fit.pt-1(v-if="withIcon" :class="iconPosition")
+ span.icon-plus(:style="{fontSize:iconSize + 'px'}")
+ span.text-base.font-semibold(:class="textStyled") {{text}}
@@ -30,4 +39,16 @@ export default {
&:active
opacity: 1
background-color: var(--font-dark-blue-color)
+.left
+ order: -1
+.right
+ order: 1
+ padding-top: 1px
+ border-left: 1px solid var(--bg-white-color-0)
+ padding-left: 14px
+ height: 24px
+ align-items: center
+.createEvent
+ font-weight: 500
+ padding-right: 2px
diff --git a/src/pages/calendar/TheCalendar.vue b/src/pages/calendar/TheCalendar.vue
index 80b3176..ca8c7ee 100644
--- a/src/pages/calendar/TheCalendar.vue
+++ b/src/pages/calendar/TheCalendar.vue
@@ -1,6 +1,6 @@
.calendar-container.flex
- calendar-sidebar(@width="changeWidth" :team="team")
+ calendar-sidebar(@width="changeWidth" :team-data="teamData")
calendar-schedule(
:current-date="currentDate"
:time-information="timeInformation"
@@ -16,7 +16,6 @@
import * as moment from "moment/moment";
import CalendarSchedule from "./components/CalendarSchedule.vue";
import CalendarSidebar from "./components/CalendarSidebar.vue";
-import img from "../../assets/images/team-member.svg";
export default {
name: "TheCalendar",
components: { CalendarSchedule, CalendarSidebar },
@@ -26,40 +25,11 @@ export default {
calendarLayout: "",
currentDate: moment(),
timeInformation: {
- dayStartTime: "8:00",
- dayEndTime: "18:00",
+ dayStartTime: "0:00",
+ dayEndTime: "20:00",
},
eventsData: [],
- team: [
- {
- id: 1,
- last_name: "Гагарин",
- first_name: "Юрий",
- patronymic: "Алексеевич",
- avatar: img,
- },
- {
- id: 2,
- last_name: "Константинопольская",
- first_name: "Юлия",
- patronymic: "Витальевна",
- avatar: img,
- },
- {
- id: 3,
- last_name: "Коломойцев",
- first_name: "Игорь",
- patronymic: "Константинович",
- avatar: img,
- },
- {
- id: 4,
- last_name: "Зайцев",
- first_name: "Валерий",
- patronymic: "Сергеевич",
- avatar: img,
- },
- ],
+ teamData: [],
};
},
methods: {
@@ -75,10 +45,16 @@ export default {
saveEventsData(res) {
this.eventsData = res.results;
},
+ saveTeamData(res) {
+ this.teamData = res.results;
+ },
fetchEventsData() {
fetch("/registry/event/")
.then((res) => res.json())
.then((res) => this.saveEventsData(res));
+ fetch("http://45.84.227.122:8080/general/employee/")
+ .then((res) => res.json())
+ .then((res) => this.saveTeamData(res));
},
changeWidth(value) {
this.sidebarWidth = value;
diff --git a/src/pages/calendar/components/CalendarBackground.vue b/src/pages/calendar/components/CalendarBackground.vue
index 8f8521b..9b036ce 100644
--- a/src/pages/calendar/components/CalendarBackground.vue
+++ b/src/pages/calendar/components/CalendarBackground.vue
@@ -1,22 +1,25 @@
.calendar-background-wrapper.flex.flex-col(
ref="backgroundWrapper"
- :class="scrollPresence"
+ :class="horizontalScrollPresence"
)
+ .header-wrapper
+ .header(:style="backgroundExtendedWidth")
calendar-column(
v-for="(owner, index) in filteredOwners"
:key="owner.id"
:owner-data="owner"
:style="calculateColumnPosition(index)"
:day-events="filterEventsByOwner(owner)"
+ :day-start-time="dayStartTime"
+ :day-end-time="dayEndTime"
)
- .header(:style="backgroundExtendedWidth")
.body.flex.flex-col(
:style="backgroundExtendedWidth"
)
.line-wrapper
.line.flex.items-center(
- v-for="hour in hoursArray"
+ v-for="hour in timeCoil"
:key="hour"
)
.middle-line
@@ -28,10 +31,13 @@ export default {
name: "CalendarBackground",
components: { CalendarColumn },
props: {
- hoursArray: Array,
+ timeCoil: Array,
+ filteredOwners: Array,
eventsData: Array,
currentDate: Object,
sidebarWidth: String,
+ dayStartTime: Number,
+ dayEndTime: Number,
},
data() {
return {
@@ -56,43 +62,7 @@ export default {
};
},
backgroundHeight() {
- return (this.hoursArray.length - 1) * this.pixelsPerHour + 48;
- },
- scrollPresence() {
- return {
- scroll: this.ownersArrayLength > 3,
- };
- },
- filteredOwners() {
- let filteredArray = [];
- let ownerAbsence = {
- id: null,
- last_name: null,
- first_name: null,
- patronymic: null,
- };
- this.eventsData.forEach(({ employees }) => {
- let findedElement = employees.find((elem) => elem.role === "owner");
- let emptyObjectPresence = this.findObjectInArray(
- filteredArray,
- ownerAbsence
- );
- if (!findedElement && !emptyObjectPresence) {
- filteredArray.push(ownerAbsence);
- }
- if (findedElement) {
- let ownerPresence = this.findObjectInArray(
- filteredArray,
- findedElement.employee
- );
- if (!ownerPresence) {
- filteredArray.push(findedElement.employee);
- }
- }
- });
- return filteredArray.sort(
- (previous, subsequent) => Boolean(subsequent.id) - Boolean(previous.id)
- );
+ return (this.timeCoil.length - 1) * this.pixelsPerHour + 48;
},
filteredEventsByDate() {
return this.eventsData.filter(
@@ -100,6 +70,11 @@ export default {
start.slice(0, 10) === this.currentDate.format("YYYY-MM-DD")
);
},
+ horizontalScrollPresence() {
+ return {
+ "scroll-x": this.ownersArrayLength > 3,
+ };
+ },
},
methods: {
calculateColumnPosition(elemIndex) {
@@ -120,12 +95,7 @@ export default {
};
},
calculateBackgroundWidth() {
- this.backgroundWidth = this.$refs.backgroundWrapper.offsetWidth;
- },
- findObjectInArray(array, object) {
- return array.find(
- (item) => JSON.stringify(item) === JSON.stringify(object)
- );
+ this.backgroundWidth = this.$refs.backgroundWrapper.scrollWidth;
},
filterEventsByOwner(owner) {
let filteredArray = [];
@@ -147,13 +117,16 @@ export default {
diff --git a/src/pages/calendar/components/CalendarColumn.vue b/src/pages/calendar/components/CalendarColumn.vue
index 70f5148..732f9f8 100644
--- a/src/pages/calendar/components/CalendarColumn.vue
+++ b/src/pages/calendar/components/CalendarColumn.vue
@@ -1,16 +1,17 @@
.calendar-column-wrapper.flex.flex-col
- .header.flex.items-center.justify-between.py-2.px-6
+ .header.flex.items-center.justify-between.py-2.px-6.top-0
.flex.items-center
img.avatar-wrapper.mr-2(src="@/assets/images/team-member.svg" alt="Team member")
span.owner-name.font-medium.text-base.mr-6 {{ ownerName }}
img.icon-wrapper.cursor-pointer(src="@/assets/icons/lock.svg")
base-doc-ok-button
- .px-1
+ .body
calendar-event-card(
v-for="event in dayEvents"
:key="event.id"
:ownerEvent="event"
+ :style="eventCardPosition(event.start, event.end)"
)
@@ -23,6 +24,13 @@ export default {
props: {
ownerData: Object,
dayEvents: Array,
+ dayEndTime: Number,
+ dayStartTime: Number,
+ },
+ data() {
+ return {
+ pixelsPerHour: 62,
+ };
},
computed: {
ownerName() {
@@ -34,6 +42,33 @@ export default {
}
return null;
},
+ pixelsPerMinute() {
+ return this.pixelsPerHour / 60;
+ },
+ },
+ methods: {
+ eventCardPosition(startTime, endTime) {
+ let start = startTime
+ .slice(11, -4)
+ .split(":")
+ .map((elem) => parseInt(elem, 10));
+ let end = endTime.slice(11, -6);
+ let position =
+ (start[0] - this.dayStartTime) * this.pixelsPerHour +
+ start[1] * this.pixelsPerMinute;
+ if (
+ parseInt(start[0], 10) < this.dayStartTime ||
+ parseInt(end, 10) >= this.dayEndTime
+ ) {
+ return {
+ top: "0px",
+ visibility: "hidden",
+ };
+ }
+ return {
+ top: `${position}px`,
+ };
+ },
},
};
@@ -42,9 +77,22 @@ export default {
.calendar-column-wrapper
position: absolute
border-right: 1px solid var(--border-light-grey-color)
+ &:nth-last-child(2) .header
+ border-right: none
+ &:nth-last-child(2)
+ border-right: none
.header
height: 48px
+ position: sticky
+ z-index: 5
+ width: inherit
+ border-right: 1px solid var(--border-light-grey-color)
+ background-color: var(--default-white)
+
+.body
+ position: relative
+ z-index: 3
.avatar-wrapper
width: 32px
diff --git a/src/pages/calendar/components/CalendarEventCard.vue b/src/pages/calendar/components/CalendarEventCard.vue
index f68a318..b698740 100644
--- a/src/pages/calendar/components/CalendarEventCard.vue
+++ b/src/pages/calendar/components/CalendarEventCard.vue
@@ -47,8 +47,8 @@ export default {
border-radius: 4px
background-color: var(--bg-event-yellow-color)
color: var(--font-black-color)
- position: relative
- z-index: 2
+ position: absolute
+ z-index: 3
.header
width: 100%
diff --git a/src/pages/calendar/components/CalendarHeader.vue b/src/pages/calendar/components/CalendarHeader.vue
index 0c7a328..cf49d22 100644
--- a/src/pages/calendar/components/CalendarHeader.vue
+++ b/src/pages/calendar/components/CalendarHeader.vue
@@ -1,5 +1,5 @@
- .calendar-header-wrapper.flex.items-center.justify-between.py-3.pl-5.pr-6
+ .calendar-header-wrapper.flex.items-center.justify-between.py-3.pl-5.pr-6.top-0
.flex
base-arrow-button.left-arrow.mr-4(@click="previousHandler")
base-arrow-button.right-arrow.mr-6(@click="nextHandler")
@@ -51,6 +51,8 @@ export default {
background-color: var(--default-white)
height: 56px
border-radius: 4px
+ position: sticky
+ z-index: 10
.left-arrow
transform: rotate(90deg)
diff --git a/src/pages/calendar/components/CalendarSchedule.vue b/src/pages/calendar/components/CalendarSchedule.vue
index ccf047e..fd23b45 100644
--- a/src/pages/calendar/components/CalendarSchedule.vue
+++ b/src/pages/calendar/components/CalendarSchedule.vue
@@ -1,5 +1,8 @@
- .schedule.ml-2.w-full(:style="scheduleWidth")
+ .schedule.ml-2(
+ :style="scheduleWidth"
+ ref="shedule"
+ )
calendar-header(
:current-date="currentDate"
:is-current-date="isCurrentDate"
@@ -7,19 +10,23 @@
@next-date="nextDate"
@selected-layout="selectedLayout"
)
- .schedule-body.flex
+ .schedule-body.flex(
+ )
div
calendar-clock-column(
- :hours-array="hoursArray"
+ :timeCoil="timeCoil"
:current-time="currentTime"
:is-current-date="isCurrentDate"
:day-end-time="validateEndTime"
)
calendar-background(
:current-date="currentDate"
- :hours-array="hoursArray"
+ :time-coil="timeCoil"
:events-data="eventsData"
+ :filtered-owners="filteredOwners"
:sidebar-width="sidebarWidth"
+ :day-start-time="validateStartTime"
+ :day-end-time="validateEndTime"
)
.time-circle-indicator.left-74px(
v-if="isShownIndicator"
@@ -67,12 +74,14 @@ export default {
data() {
return {
currentTime: "",
- hoursArray: [],
+ timeCoil: [],
timer: null,
isCurrentDate: true,
isShownIndicator: true,
pixelsPerHour: 62,
columnHeaderHeight: 48,
+ defaultColumnWidth: 470,
+ sheduleHeight: 0,
};
},
computed: {
@@ -92,6 +101,12 @@ export default {
return this.verifyTime(this.timeInformation.dayEndTime);
},
lineIndicatorLocation() {
+ if (this.filteredOwners.length > 3 && this.timeCoil.length - 1 > 13) {
+ return {
+ width: `${this.filteredOwners.length * this.defaultColumnWidth}px`,
+ top: `${this.calculateIndicatorLocation()}px`,
+ };
+ }
return {
top: `${this.calculateIndicatorLocation()}px`,
};
@@ -115,6 +130,37 @@ export default {
"--sidebar-width": this.sidebarWidth,
};
},
+ filteredOwners() {
+ let filteredArray = [];
+ let ownerAbsence = {
+ id: null,
+ last_name: null,
+ first_name: null,
+ patronymic: null,
+ };
+ this.eventsData.forEach(({ employees }) => {
+ let findedElement = employees.find((elem) => elem.role === "owner");
+ let emptyDataPresence = this.findObjectInArray(
+ filteredArray,
+ ownerAbsence
+ );
+ if (!findedElement && !emptyDataPresence) {
+ filteredArray.push(ownerAbsence);
+ }
+ if (findedElement) {
+ let ownerPresence = this.findObjectInArray(
+ filteredArray,
+ findedElement.employee
+ );
+ if (!ownerPresence) {
+ filteredArray.push(findedElement.employee);
+ }
+ }
+ });
+ return filteredArray.sort(
+ (previous, subsequent) => Boolean(subsequent.id) - Boolean(previous.id)
+ );
+ },
},
methods: {
previousDate() {
@@ -133,7 +179,7 @@ export default {
) {
this.timer = setInterval(() => {
this.changeCurrentTime();
- this.changeHoursArray();
+ this.changeTimeCoil();
}, 5000);
}
},
@@ -144,20 +190,20 @@ export default {
changeCurrentTime() {
this.currentTime = moment().format("HH:mm:ss");
},
- hoursArrayInitialization() {
- this.hoursArray = [];
+ timeCoilInitialization() {
+ this.timeCoil = [];
for (let i = this.validateStartTime; i <= this.validateEndTime; i++) {
if (
i === this.hours &&
this.hours !== this.validateEndTime &&
this.isCurrentDate
) {
- this.hoursArray.push(this.hoursMinutes);
- } else this.hoursArray.push(`${i}:00`);
+ this.timeCoil.push(this.hoursMinutes);
+ } else this.timeCoil.push(`${i}:00`);
}
},
- changeHoursArray() {
- this.hoursArray = this.hoursArray.map((elem) => {
+ changeTimeCoil() {
+ this.timeCoil = this.timeCoil.map((elem) => {
if (this.convertTime(elem, 0, -3) === this.hours) {
return this.hoursMinutes;
}
@@ -186,6 +232,11 @@ export default {
}
return result;
},
+ findObjectInArray(array, object) {
+ return array.find(
+ (item) => JSON.stringify(item) === JSON.stringify(object)
+ );
+ },
},
watch: {
currentTime() {
@@ -195,7 +246,7 @@ export default {
this.timer
) {
this.stopTimer();
- this.hoursArrayInitialization();
+ this.timeCoilInitialization();
}
},
currentDate: function () {
@@ -204,18 +255,18 @@ export default {
this.isShownIndicator = this.isCurrentDate;
if (this.timer) {
this.stopTimer();
- this.hoursArrayInitialization();
+ this.timeCoilInitialization();
}
if (this.isCurrentDate) {
this.changeCurrentTime();
- this.hoursArrayInitialization();
+ this.timeCoilInitialization();
this.startTimer();
}
},
},
mounted() {
this.changeCurrentTime();
- this.hoursArrayInitialization();
+ this.timeCoilInitialization();
this.startTimer();
},
beforeUnmount() {
@@ -226,8 +277,12 @@ export default {
diff --git a/tailwind.config.js b/tailwind.config.js
index 07a3bc0..dbccef5 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -32,6 +32,7 @@ module.exports = {
"13px": "13px",
"15px": "15px",
"19px": "19px",
+ "23px": "23px",
"45px": "45px",
"74px": "74px",
"148px": "148px",