From e25f1619805cd5a2db44cf62fc2ad9b0eab5f498 Mon Sep 17 00:00:00 2001 From: Ejaaz Khan Date: Sun, 10 Nov 2024 17:48:26 +0530 Subject: [PATCH 01/29] feat: allow same date live class creation --- .../src/components/Modals/LiveClassModal.vue | 21 +++++++++++++------ frontend/src/utils/dayjs.js | 4 ++++ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/frontend/src/components/Modals/LiveClassModal.vue b/frontend/src/components/Modals/LiveClassModal.vue index 71f5e9ab..05918851 100644 --- a/frontend/src/components/Modals/LiveClassModal.vue +++ b/frontend/src/components/Modals/LiveClassModal.vue @@ -161,21 +161,30 @@ const submitLiveClass = (close) => { if (!liveClass.date) { return 'Please select a date.' } - if (dayjs(liveClass.date).isSameOrBefore(dayjs(), 'day')) { - return 'Please select a future date.' - } if (!liveClass.time) { return 'Please select a time.' } + if (!liveClass.timezone) { + return 'Please select a timezone.' + } if (!valideTime()) { return 'Please enter a valid time in the format HH:mm.' } + const liveClassDateTime = dayjs(`${liveClass.date}T${liveClass.time}`).tz( + liveClass.timezone, + true + ) + if ( + liveClassDateTime.isSameOrBefore( + dayjs().tz(liveClass.timezone, false), + 'minute' + ) + ) { + return 'Please select a future date and time.' + } if (!liveClass.duration) { return 'Please select a duration.' } - if (!liveClass.timezone) { - return 'Please select a timezone.' - } }, onSuccess() { liveClasses.value.reload() diff --git a/frontend/src/utils/dayjs.js b/frontend/src/utils/dayjs.js index b5cecdc0..d7057b12 100644 --- a/frontend/src/utils/dayjs.js +++ b/frontend/src/utils/dayjs.js @@ -5,6 +5,8 @@ import updateLocale from 'dayjs/esm/plugin/updateLocale' import isToday from 'dayjs/esm/plugin/isToday' import isSameOrBefore from 'dayjs/esm/plugin/isSameOrBefore' import isSameOrAfter from 'dayjs/esm/plugin/isSameOrAfter' +import utc from 'dayjs/esm/plugin/utc' +import timezone from 'dayjs/esm/plugin/timezone' dayjs.extend(updateLocale) dayjs.extend(relativeTime) @@ -12,5 +14,7 @@ dayjs.extend(localizedFormat) dayjs.extend(isToday) dayjs.extend(isSameOrBefore) dayjs.extend(isSameOrAfter) +dayjs.extend(utc) +dayjs.extend(timezone) export default dayjs From 92c380c74bdfb4bfa3d30e7c5ada7b3214ce045a Mon Sep 17 00:00:00 2001 From: Ejaaz Khan Date: Sun, 10 Nov 2024 21:12:08 +0530 Subject: [PATCH 02/29] feat: search functionality in jobs --- frontend/src/pages/Jobs.vue | 63 +++++++++++++++++++++++++++++++++---- 1 file changed, 57 insertions(+), 6 deletions(-) diff --git a/frontend/src/pages/Jobs.vue b/frontend/src/pages/Jobs.vue index 1e32d291..ba01b4f9 100644 --- a/frontend/src/pages/Jobs.vue +++ b/frontend/src/pages/Jobs.vue @@ -7,7 +7,22 @@ class="h-7" :items="[{ label: __('Jobs'), route: { name: 'Jobs' } }]" /> -
+
+
+ +
+
+ + + +
+
-
+
+ + 2"> + +