@icvdeveloper/common-module 0.0.120 → 0.0.122

package/dist/module.json

@@ -1,5 +1,5 @@
 {
   "name": "v3plus-common-module",
   "configKey": "v3plusCommonModule",
-  "version": "0.0.120"
+  "version": "0.0.122"
 }

package/dist/module.mjs

@@ -97,10 +97,10 @@ const module = defineNuxtModule({
       nuxt.options.css.push(join(runtimeDir, "assets/scss/index.css"));
     }
     if (nuxt.options.vite.optimizeDeps) {
-      nuxt.options.vite.optimizeDeps.include = ["nprogress", "date-fns-tz"];
+      nuxt.options.vite.optimizeDeps.include = ["nprogress"];
     } else {
       nuxt.options.vite.optimizeDeps = {
-        include: ["nprogress", "date-fns-tz"]
+        include: ["nprogress"]
       };
     }
     addImportsDir(join(runtimeDir, "store"));

package/dist/runtime/components/agenda/AgendaList.vue

@@ -1,9 +1,8 @@
 <script lang="ts" setup>
 import { ref, toRefs } from "vue";
-import { add } from "date-fns";
 import type { Conference } from "../../models/conference";
 import { useAgenda } from "../../composables/useAgenda";
-import { useDateFormat } from "../../composables/useDateFormat";
+import { usePresentation } from "../../composables/usePresentation";
 import { usePresenter } from "../../composables/usePresenter";
 import { useClassBinding } from "../../composables/useClassBinding";
 import { Presenter } from "../../models/conference";
@@ -50,10 +49,16 @@ const props = withDefaults(defineProps<Props>(), {
 const { conference } = toRefs(props);
 
 const { days, getCombinedTrackList } = useAgenda(conference);
-const { formatTimezoneToLocal } = useDateFormat();
+const {
+  getPresentationStartTime,
+  getPresentationEndTime
+} = usePresentation(conference);
 const { classBinding } = useClassBinding();
 
 // data
+const expandedPres = ref<number>(0);
+
+// methods
 const presentersToComposables = (presenters: Presenter[]) => {
   const data = [];
 
@@ -67,9 +72,6 @@ const presentersToComposables = (presenters: Presenter[]) => {
   return data;
 };
 
-const expandedPres = ref<number>(0);
-
-// methods
 const setPres = (_expanded: number) => {
   expandedPres.value = _expanded;
 };
@@ -120,23 +122,9 @@ const isPres = (_presId: number): boolean => {
                     classBinding(classObject, 'timeElement', 'time-width')
                   "
                 >
-                  {{
-                    formatTimezoneToLocal(
-                      presentation.date,
-                      "h:mm",
-                      conference.timezone
-                    )
-                  }}
+                  {{ getPresentationStartTime(presentation, "h:mm") }}
                   -
-                  {{
-                    formatTimezoneToLocal(
-                      add(new Date(presentation.date), {
-                        seconds: presentation.duration,
-                      }),
-                      "h:mm",
-                      conference.timezone
-                    )
-                  }}
+                  {{ getPresentationEndTime(presentation, "h:mm") }}
                 </span>
                 <span
                   :class="

package/dist/runtime/components/agenda/AgendaTabbed.vue

@@ -1,9 +1,9 @@
 <script lang="ts" setup>
 import { toRefs, computed } from "vue";
 import { storeToRefs } from "pinia";
+import { DateTime } from "luxon";
 import { useAgenda } from "../../composables/useAgenda";
 import { Conference, Sponsor as SponsorType } from "../../models/conference";
-import { useDateFormat } from "../../composables/useDateFormat";
 import { usePresentation } from "../../composables/usePresentation";
 import { usePresenters } from "../../composables/usePresenters";
 import CommonAccordion from "../layouts/Accordion.vue";
@@ -44,12 +44,11 @@ const {
 const {
   showPresentationTimes,
   showPresentationEndTimes,
+  getPresentationStartTime,
   getPresentationEndTime,
 } = usePresentation(conference);
 const { getPresentersLabel, getSortedPresenters } = usePresenters(conference);
 
-const { formatDate, formatTimezoneToLocal } = useDateFormat();
-
 // computed
 const presentersContainer = computed(() => {
   return useAccordion() ? CommonAccordion : "div";
@@ -77,7 +76,9 @@ const presentersContainer = computed(() => {
             @click="setSelectedDay(day)"
           >
             {{ day.name }}
-            <small v-if="showTabDates(day)">{{ formatDate(day.date) }}</small>
+            <small v-if="showTabDates(day)">{{ 
+              DateTime.fromSQL(day.date, { zone: conference.timezone }).toFormat("MMMM d, yyyy")
+            }}</small>
           </button>
         </div>
 
@@ -215,22 +216,17 @@ const presentersContainer = computed(() => {
                         class="font-light mb-3"
                       >
                         {{
-                          formatTimezoneToLocal(
-                            presentation.date,
-                            "h:mm a",
-                            conference.timezone
-                          )
+                          getPresentationStartTime(presentation, "h:mm a")
                         }}
 
                         <span v-if="showPresentationEndTimes()"
-                          >- {{ getPresentationEndTime(presentation) }}</span
+                          >- {{ getPresentationEndTime(presentation, "h:mm a") }}</span
                         >
                         {{
-                          formatTimezoneToLocal(
+                          DateTime.fromSQL(
                             presentation.date,
-                            "z",
-                            conference.timezone
-                          )
+                            { zone: conference.timezone }
+                          ).toLocal().offsetNameShort
                         }}
                       </h4>
 

package/dist/runtime/components/agenda/components/Calendar.vue

@@ -1,9 +1,8 @@
 <script lang="ts" setup>
 import { ref, toRefs, computed } from "vue";
 import { storeToRefs } from "pinia";
-import { get } from "lodash-es";
-import { DateTime } from "luxon";
 import { useTemplateConfigsStore } from "../../../store";
+import { usePresentation } from "../../../composables/usePresentation";
 import "add-to-calendar-button";
 import { Conference } from "../../../models/conference";
 import { Presentation } from "../../../models/conference";
@@ -14,6 +13,11 @@ type Props = {
 const props = defineProps<Props>();
 const { conference, presentation } = toRefs(props);
 const { pagesConfigValue } = storeToRefs(useTemplateConfigsStore());
+const {
+  getPresentationStartTime,
+  getPresentationEndTime
+} = usePresentation(conference);
+
 // Computed
 const showAddToGoogleCalendar = computed((): boolean => {
   return pagesConfigValue.value("agenda.add_to_google_calendar", false);
@@ -22,24 +26,6 @@ const showAddToGoogleCalendar = computed((): boolean => {
 const showAddToMicrosoftCalendar = computed((): boolean => {
   return pagesConfigValue.value("agenda.add_to_microsoft_calendar", false);
 });
-const presStartDate = computed((): string => {
-  return DateTime.fromSQL(presentation.value.date, {
-    zone: conference.timezone,
-  }).toFormat("yyyy-MM-dd");
-});
-const presStartTime = computed((): string => {
-  return DateTime.fromSQL(presentation.value.date, {
-    zone: conference.timezone,
-  }).toFormat("HH:mm");
-});
-const presEndTime = computed((): string => {
-  let duration: number = get(presentation.value, "duration", 3600); // default to 60 min
-  return DateTime.fromSQL(presentation.value.date, {
-    zone: conference.timezone,
-  })
-    .plus(duration * 1000)
-    .toFormat("HH:mm");
-});
 const calendarOptions = computed((): string => {
   let opts = [];
   if (showAddToGoogleCalendar) {
@@ -62,9 +48,9 @@ const cssPath = computed((): string => {
     <add-to-calendar-button
       :name="presentation.name"
       :description="presentation.description"
-      :startDate="presStartDate"
-      :startTime="presStartTime"
-      :endTime="presEndTime"
+      :startDate="getPresentationStartTime(presentation,'yyyy-MM-dd',false)"
+      :startTime="getPresentationStartTime(presentation,'HH:mm',false)"
+      :endTime="getPresentationEndTime(presentation,'HH:mm',false)"
       :timeZone="conference.timezone"
       :location="conference.location"
       listStyle="dropdown"

package/dist/runtime/components/core/CountdownTimer.vue

@@ -1,16 +1,7 @@
 <script lang="ts" setup>
 import { ref, toRefs, computed, onMounted } from "vue";
 import { storeToRefs } from "pinia";
-import {
-  isBefore,
-  differenceInDays,
-  differenceInHours,
-  differenceInMinutes,
-  differenceInSeconds,
-  addDays,
-  addHours,
-  addMinutes,
-} from "date-fns";
+import { DateTime } from "luxon";
 import { useTemplateConfigsStore } from "../../store";
 import { countdownTimerClassObj } from "../../@types/components";
 import { useClassBinding } from "../../composables/useClassBinding";
@@ -91,34 +82,19 @@ const fontClass = computed(() => {
 
 // methods
 const updateCountdown = () => {
-  if (!isBefore(new Date(), new Date(props.date))) {
+  if (DateTime.fromSQL(props.date).diffNow().milliseconds < 0) {
     isCounting.value = false;
     emit("complete");
     clearInterval(loopTimer.value);
     return;
   }
 
-  days.value = differenceInDays(new Date(props.date), new Date());
-  hours.value = differenceInHours(
-    new Date(props.date),
-    addDays(new Date(), days.value)
-  );
+  let diffObj = DateTime.fromSQL(props.date).diffNow(['days', 'hours', 'minutes', 'seconds', 'milliseconds']);
 
-  minutes.value = differenceInHours(
-    new Date(props.date),
-    addDays(addHours(new Date(), hours.value), days.value)
-  );
-  minutes.value = differenceInMinutes(
-    new Date(props.date),
-    addDays(addHours(new Date(), hours.value), days.value)
-  );
-  seconds.value = differenceInSeconds(
-    new Date(props.date),
-    addDays(
-      addHours(addMinutes(new Date(), minutes.value), hours.value),
-      days.value
-    )
-  );
+  days.value = diffObj.days;
+  hours.value = diffObj.hours;
+  minutes.value = diffObj.minutes;
+  seconds.value = diffObj.seconds;
 };
 
 const startCountdown = () => {
@@ -132,6 +108,9 @@ const startCountdown = () => {
 onMounted(() => {
   startCountdown();
 });
+onUnmounted(() => {
+  clearInterval(loopTimer.value);
+});
 </script>
 
 <template>

package/dist/runtime/components/events/ListEvents.vue

@@ -2,9 +2,9 @@
 import { ref, toRefs, computed } from "vue";
 import { storeToRefs } from "pinia";
 import { get } from "lodash-es";
+import { useRuntimeConfig } from "#app";
 import { useConferencesStore } from "../../store/conferences";
 import { useTemplateConfigsStore } from "../../store/templateConfigs";
-import { useDateFormat } from "../../composables/useDateFormat";
 import { useConferenceHelpers } from "../../composables/useConferenceHelpers";
 import { useEvents } from "../../composables/useEvents";
 import { useClassBinding } from "../../composables/useClassBinding";
@@ -89,15 +89,14 @@ const { pastEvents, upcomingEvents } = storeToRefs(useConferencesStore());
 const { globalConfigValue, pagesConfigValue } = storeToRefs(
   useTemplateConfigsStore()
 );
-const { formatDate } = useDateFormat();
 const {
-  isSingleDayEvent,
   showConferenceViewButton,
   getConferenceWebcastUrl,
   getConferenceWebcastButtonText,
   showViewArchiveButton,
   getViewArchiveUrl,
   getViewArchiveButtonText,
+  getConferenceDisplayDate,
   getConferenceRegUrl,
   getConferenceRegText,
   showConferenceRegButton,
@@ -282,10 +281,7 @@ const showLoginButton = computed((): boolean => {
                   )
                 "
               >
-                {{ formatDate(conference.start_date) }}
-                <span v-if="!isSingleDayEvent(conference)">
-                  - {{ formatDate(conference.end_date) }}</span
-                >
+                {{ getConferenceDisplayDate(conference,true,false,false,true) }}
               </p>
             </div>
             <!-- countdown timer - top-aligned -->

package/dist/runtime/components/media/WebcastVideoPlayer.vue

@@ -1,7 +1,7 @@
 <script lang="ts" setup>
-import { toRefs, computed, watch, onMounted, nextTick } from "vue";
+import { ref, toRefs, computed, watch, onMounted, nextTick } from "vue";
 import { get } from "lodash-es";
-import { getUnixTime } from "date-fns";
+import { DateTime } from "luxon";
 import { Presentation, Stream, PlayerObj } from "../../models/conference";
 import { WebcastPlayerClassObj } from "../../@types/components";
 import { useScripts } from "../../composables/useScripts";
@@ -35,7 +35,7 @@ let icvPlayerObj: PlayerObj = {
   playerDiv: "mediaPlayer",
   loadCustomStream: () => {},
 };
-let timeInterval: NodeJS.Timer | null = null;
+const timeInterval = ref<NodeJS.Timer | null>(null);
 
 // emits
 const emit = defineEmits<{
@@ -79,7 +79,7 @@ const playStream = () => {
 };
 
 const checkStreamTime = () => {
-  const defaultStreamUt = getUnixTime(Date.now()) - 40;
+  const defaultStreamUt = DateTime.now().toUnixInteger() - 40;
   const maxStreamDelay = defaultStreamUt - 20;
   let streamUt = get(icvPlayerObj, "stream_ut", defaultStreamUt);
 
@@ -93,7 +93,7 @@ const cleanup = () => {
   if (icvPlayerObj) {
     icvPlayerObj = <PlayerObj>{};
   }
-  clearInterval(timeInterval);
+  clearInterval(timeInterval.value);
 };
 
 // watchers
@@ -125,10 +125,15 @@ onMounted(() => {
   _script.onload = () => {
     if (get(window, "ICVDMStreamPlayer", false)) {
       setupMediaPlayer();
-      timeInterval = setInterval(checkStreamTime, 1000);
+      timeInterval.value = setInterval(() => {
+        checkStreamTime();
+      }, 1000);
     }
   };
 });
+onUnmounted(() => {
+  cleanup();
+});
 </script>
 
 <template>

package/dist/runtime/composables/index.d.ts

@@ -3,7 +3,6 @@ export * from "./useAnalytics";
 export * from "./useApi";
 export * from "./useAuth";
 export * from "./useConferenceHelpers";
-export * from "./useDateFormat";
 export * from "./useLogin";
 export * from "./usePresentation";
 export * from "./usePresenter";

package/dist/runtime/composables/index.mjs

@@ -3,7 +3,6 @@ export * from "./useAnalytics.mjs";
 export * from "./useApi.mjs";
 export * from "./useAuth.mjs";
 export * from "./useConferenceHelpers.mjs";
-export * from "./useDateFormat.mjs";
 export * from "./useLogin.mjs";
 export * from "./usePresentation.mjs";
 export * from "./usePresenter.mjs";

package/dist/runtime/composables/useAgenda.mjs

@@ -1,7 +1,7 @@
 import { get, remove, cloneDeep, intersectionBy, pullAllBy } from "lodash-es";
 import { ref, computed, onBeforeMount } from "vue";
 import { storeToRefs } from "pinia";
-import { differenceInSeconds } from "date-fns";
+import { DateTime } from "luxon";
 import { useTemplateConfigsStore } from "../store/index.mjs";
 import { useAuthStore } from "../store/auth.mjs";
 import { useAffiliatesStore } from "../store/affiliates.mjs";
@@ -44,10 +44,7 @@ export const useAgenda = (conference) => {
     }
     if (displayTrackGroups === "None") {
       tracks.sort((trackA, trackB) => {
-        return differenceInSeconds(
-          new Date(trackA.date),
-          new Date(trackB.date)
-        );
+        return DateTime.fromSQL(trackA.date).diff(DateTime.fromSQL(trackB.date)).milliseconds;
       });
       return tracks;
     }
@@ -59,10 +56,7 @@ export const useAgenda = (conference) => {
         remove(trackGroup.tracks, ["access", false]);
       }
       trackGroup.tracks.sort((trackA, trackB) => {
-        return differenceInSeconds(
-          new Date(trackA.date),
-          new Date(trackB.date)
-        );
+        return DateTime.fromSQL(trackA.date).diff(DateTime.fromSQL(trackB.date)).milliseconds;
       });
       trackGroup.type = "track_group";
     });
@@ -71,7 +65,7 @@ export const useAgenda = (conference) => {
     });
     const combinedArray = trackGroups.concat(tracks);
     combinedArray.sort((trackA, trackB) => {
-      return differenceInSeconds(new Date(trackA.date), new Date(trackB.date));
+      return DateTime.fromSQL(trackA.date).diff(DateTime.fromSQL(trackB.date)).milliseconds;
     });
     return combinedArray;
   };

package/dist/runtime/composables/useConferenceHelpers.mjs

@@ -3,13 +3,13 @@ import { DateTime } from "luxon";
 import { get, find } from "lodash-es";
 import { storeToRefs } from "pinia";
 import { useRoute } from "vue-router";
+import { useRuntimeConfig } from "#app";
 import { ConferenceState } from "../models/conference.mjs";
 import {
   useTemplateConfigsStore,
   useConferencesStore,
   useAuthStore
 } from "../store";
-import { useDateFormat } from "./useDateFormat.mjs";
 const config = useRuntimeConfig();
 const getConferenceConfigMainValue = (_conference, _name) => {
   const configPages = get(_conference, "template_config.config.pages", []);
@@ -25,7 +25,6 @@ export const useConferenceHelpers = (conference) => {
   const { pagesConfigValue, globalConfigValue } = toRefs(
     useTemplateConfigsStore()
   );
-  const { formatTimezoneToLocal } = useDateFormat();
   const route = useRoute();
   const { user, isLoggedIn } = storeToRefs(useAuthStore());
   const { currentConference } = storeToRefs(useConferencesStore());
@@ -98,7 +97,7 @@ export const useConferenceHelpers = (conference) => {
     const startDate = _selectedConference.start_date;
     const endDate = _selectedConference.end_date;
     let returnDate = "";
-    if (isSingleDayEvent()) {
+    if (isSingleDayEvent(_conference)) {
       const startFormat = "MMMM d, yyyy ";
       if (showDate) {
         returnDate += DateTime.fromSQL(
@@ -136,7 +135,6 @@ export const useConferenceHelpers = (conference) => {
         endDate,
         { zone: _selectedConference.timezone }
       ).toLocal().toFormat(endFormat);
-      returnDate += " " + getTimezoneDisplay(endDate, _selectedConference.timezone, showTwoCharTz);
     }
     return returnDate;
   };

package/dist/runtime/composables/useEvents.mjs

@@ -2,6 +2,7 @@ import { ref, computed } from "vue";
 import { storeToRefs } from "pinia";
 import { useRouter, useRoute } from "vue-router";
 import { get, sortBy, filter } from "lodash-es";
+import { useRuntimeConfig } from "#app";
 import { useAuthStore, useTemplateConfigsStore } from "../store/index.mjs";
 export const useEvents = () => {
   const route = useRoute();

package/dist/runtime/composables/usePresentation.d.ts

@@ -9,10 +9,14 @@ export type UsePresentationMethods = {
      * show presentation end times
      */
     showPresentationEndTimes: () => boolean;
+    /**
+     * get presentation start time
+     */
+    getPresentationStartTime: (presentation: Presentation, format?: string, convertToLocal?: boolean) => string;
     /**
      * get presentation end time
      */
-    getPresentationEndTime: (presentation: Presentation) => string;
+    getPresentationEndTime: (presentation: Presentation, format?: string, convertToLocal?: boolean) => string;
     /**
      * get presentation link target
      */

package/dist/runtime/composables/usePresentation.mjs

@@ -1,12 +1,11 @@
-import { addSeconds, format, parseISO } from "date-fns";
+import { get } from "lodash-es";
+import { DateTime } from "luxon";
 import { useTemplateConfigsStore } from "../store/index.mjs";
 import {
   ConferenceState
 } from "../models/conference";
-import { useDateFormat } from "./useDateFormat.mjs";
 import { useConferenceHelpers } from "./useConferenceHelpers.mjs";
 export const usePresentation = (conference) => {
-  const { formatTimezoneToLocal } = useDateFormat();
   const { pagesConfigValue } = useTemplateConfigsStore();
   const { conferenceIsMixed, getConferenceRegUrl } = useConferenceHelpers(conference);
   const showPresentationTimes = (presentation) => {
@@ -15,17 +14,18 @@ export const usePresentation = (conference) => {
   const showPresentationEndTimes = () => {
     return pagesConfigValue("agenda.session_end_times", false);
   };
-  const getPresentationEndTime = (presentation) => {
-    const presentationDuration = presentation.duration ? presentation.duration : 0;
-    const presentationEndTime = format(
-      addSeconds(parseISO(presentation.date), presentationDuration),
-      "yyyy-MM-dd HH:mm"
-    );
-    return formatTimezoneToLocal(
-      presentationEndTime,
-      "h:mm a",
-      conference.value.timezone
-    );
+  const getPresentationStartTime = (presentation, format = "h:mm a", convertToLocal = true) => {
+    let dt = DateTime.fromSQL(presentation.date, {
+      zone: conference.value.timezone
+    });
+    return convertToLocal ? dt.toLocal().toFormat(format) : dt.toFormat(format);
+  };
+  const getPresentationEndTime = (presentation, format = "h:mm a", convertToLocal = true) => {
+    let duration = get(presentation, "duration", 0);
+    let dt = DateTime.fromSQL(presentation.date, {
+      zone: conference.value.timezone
+    }).plus(duration * 1e3);
+    return convertToLocal ? dt.toLocal().toFormat(format) : dt.toFormat(format);
   };
   const getPresentationLinkTarget = (presentation) => {
     return presentation.type === "link" ? "_blank" : "";
@@ -90,6 +90,7 @@ export const usePresentation = (conference) => {
   return {
     showPresentationTimes,
     showPresentationEndTimes,
+    getPresentationStartTime,
     getPresentationEndTime,
     getPresentationLinkTarget,
     getArchivePresentationLinkDestination,

package/dist/runtime/store/auth.mjs

@@ -9,7 +9,6 @@ export const useAuthStore = defineStore("auth", {
   }),
   getters: {
     isLoggedIn: (state) => {
-      console.log("isLoggedIn method state", state);
       return state.user !== null;
     }
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@icvdeveloper/common-module",
-  "version": "0.0.120",
+  "version": "0.0.122",
   "license": "MIT",
   "type": "module",
   "exports": {
@@ -28,8 +28,6 @@
     "@pinia/nuxt": "^0.3.1",
     "add-to-calendar-button": "^2.1.1",
     "analytics": "^0.8.1",
-    "date-fns": "^2.29.1",
-    "date-fns-tz": "^1.3.6",
     "lodash-es": "^4.17.21",
     "luxon": "^3.2.1",
     "nprogress": "^0.2.0",

package/dist/runtime/composables/useDateFormat.d.ts

@@ -1,12 +0,0 @@
-export type DateFunctions = {
-    /**
-     * Takes a date string and converts it to a formatted date
-     * e.g August 8, 2022
-     */
-    formatDate: (date: string, dateFormat?: string) => string;
-    /**
-     * Takes a date string with its timezone and converts it to the users local time.
-     */
-    formatTimezoneToLocal: (date: string | Date, dateFormat: string, timezone: string) => string;
-};
-export declare const useDateFormat: () => DateFunctions;

package/dist/runtime/composables/useDateFormat.mjs

@@ -1,17 +0,0 @@
-import { format as formatTz } from "date-fns-tz";
-import { format, parseISO } from "date-fns";
-export const useDateFormat = () => {
-  const formatDate = (date, dateFormat = "MMMM d, Y") => {
-    return format(new Date(parseISO(date)), dateFormat);
-  };
-  const formatTimezoneToLocal = (date, dateFormat, timezone) => {
-    const tempDate = typeof date === "string" ? parseISO(date) : date;
-    return formatTz(tempDate, dateFormat, {
-      timeZone: timezone
-    });
-  };
-  return {
-    formatTimezoneToLocal,
-    formatDate
-  };
-};