refactoring the date utils

Author: vuvincent

apps/desktop-v2/components/start-time-widget.tsx

@@ -1,17 +1,16 @@
 import moment from "moment";
 import { ClockCyanIcon } from "./icons";
-import { getEnglishDay, getUsefulDateBooleans } from "@/utils/date";
+import { getEnglishDay, isOverdue } from "@/utils/date";
 
 export const StartTimeWidget = (props: { startTime: Date }) => {
-  const { isOverdue } = getUsefulDateBooleans(props.startTime);
   const dateSection = getEnglishDay(props.startTime);
 
   return (
     <div className="px-[5px] rounded-[5px] justify-center items-center gap-1 inline-flex">
       <ClockCyanIcon />
       <p
         className={`text-center text-xs font-normal ${
-          isOverdue
+          isOverdue(props.startTime)
             ? "text-red-600 dark:text-red-400"
             : "text-cyan-600 dark:text-cyan-400"
         }`}

apps/desktop-v2/utils/date.ts

@@ -1,26 +1,31 @@
 import moment from "moment";
 
-/**
- * Gets some useful date booleans for a given date
- * @param date the date
- * @returns some useful date booleans like isTomorrow, isNextWeek, etc.
- */
-export function getUsefulDateBooleans(date: Date) {
-  const isOverdue = moment().isAfter(date);
-  const isToday = moment(date).isBetween(
-    moment().startOf("day"),
-    moment().endOf("day")
-  );
+export function isTomorrow(date: Date) {
+  const beginningOfTmr = moment().add(1, "day").startOf("day");
+  const endOfTmr = moment().add(1, "day").endOf("day");
+  return moment(date).isBetween(beginningOfTmr, endOfTmr);
+}
+
+export function isToday(date: Date) {
+  return moment(date).isBetween(moment().startOf("day"), moment().endOf("day"));
+}
+
+export function isOverdue(date: Date) {
+  return moment().isAfter(date);
+}
+
+export function isThisWeek(date: Date) {
+  const lastDayOfWeek = moment().endOf("isoWeek");
+  return moment(date).isBefore(lastDayOfWeek);
+}
+
+export function isNextWeek(date: Date) {
   const lastDayOfWeek = moment().endOf("isoWeek");
   const lastDayOfNextWeek = moment().add(1, "week").endOf("isoWeek");
-  const isThisWeek = moment(date).isBefore(lastDayOfWeek);
-  const isNextWeek =
+  return (
     moment(date).isAfter(lastDayOfWeek) &&
-    moment(date).isBefore(lastDayOfNextWeek);
-  const beginningOfTmr = moment().add(1, "day").startOf("day");
-  const endOfTmr = moment().add(1, "day").endOf("day");
-  const isTomorrow = moment(date).isBetween(beginningOfTmr, endOfTmr);
-  return { isOverdue, isToday, isThisWeek, isNextWeek, isTomorrow };
+    moment(date).isBefore(lastDayOfNextWeek)
+  );
 }
 
 /**
@@ -29,18 +34,15 @@ export function getUsefulDateBooleans(date: Date) {
  * @returns string of the relative time
  */
 export function getEnglishDay(date: Date): string {
-  const { isThisWeek, isToday, isOverdue, isTomorrow, isNextWeek } =
-    getUsefulDateBooleans(date);
-
-  const dateSection = isToday
+  const dateSection = isToday(date)
     ? "Today"
-    : isOverdue
+    : isOverdue(date)
     ? moment(date).fromNow()
-    : isTomorrow
+    : isTomorrow(date)
     ? "Tomorrow"
-    : isThisWeek
+    : isThisWeek(date)
     ? moment(date).format("dddd")
-    : isNextWeek
+    : isNextWeek(date)
     ? "Next " + moment(date).format("dddd")
     : moment(date).format("MMM D");
   return dateSection;