merged parseDate and date utils

Author: e11sy

src/infrastructure/utils/date.ts

@@ -1,13 +1,27 @@
 import dayjs from 'dayjs';
 import relativeTime from 'dayjs/plugin/relativeTime';
 /**
- * Formats the date in a human-readable format
+ * Returns time, that has been passed from updated at timestamp
  * @param updatedAt - the date the note was last updated
  * @returns the last updated time
  */
-export function formatShortDate(updatedAt: string): string {
+export function getTimeFromNow(updatedAt: string): string {
   dayjs.extend(relativeTime);
   const formattedUpdatedAt = dayjs(updatedAt).fromNow();
 
   return formattedUpdatedAt;
 }
+
+/**
+ * Converts timestamp to readable time format
+ * @param date - date instance from timestamp
+ * @returns - string with formatted date and time
+ */
+export function parseDate(date: Date): string {
+  return new Intl.DateTimeFormat('en-GB', {
+    month: 'short',
+    day: 'numeric',
+    hour: 'numeric',
+    minute: 'numeric',
+  }).format(date);
+}

src/infrastructure/utils/parseDate.ts

@@ -41,7 +41,7 @@
 <script setup lang="ts">
 import useNoteList from '@/application/services/useNoteList';
 import type { Note } from '@/domain/entities/Note';
-import { formatShortDate } from '@/infrastructure/utils/date';
+import { getTimeFromNow } from '@/infrastructure/utils/date';
 import { getTitle } from '@/infrastructure/utils/note';
 import { useI18n } from 'vue-i18n';
 import { Card, CardSkeleton, Button } from 'codex-ui/vue';
@@ -66,7 +66,7 @@ function getSubtitle(note: Note): string | undefined {
     return;
   }
 
-  return `${t('home.updated')} ${formatShortDate(note.updatedAt)}`;
+  return `${t('home.updated')} ${getTimeFromNow(note.updatedAt)}`;
 }
 
 </script>

src/presentation/components/note-list/NoteList.vue

@@ -55,7 +55,7 @@ import ThreeColsLayout from '../layouts/ThreeColsLayout.vue';
 import useNoteHistory from '@/application/services/useNoteHistory';
 import useHeader from '@/application/services/useHeader';
 import useNote from '@/application/services/useNote';
-import { parseDate } from '@/infrastructure/utils/parseDate';
+import { parseDate } from '@/infrastructure/utils/date';
 import { watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import type { NoteId } from '@/domain/entities/Note';

src/presentation/pages/History.vue

@@ -6,7 +6,7 @@
       <template #left>
         {{
           note && 'updatedAt' in note && note.updatedAt
-            ? t('note.lastEdit') + ' ' + formatShortDate(note.updatedAt)
+            ? t('note.lastEdit') + ' ' + getTimeFromNow(note.updatedAt)
             : t('note.lastEdit') + ' ' + 'a few seconds ago'
         }}
       </template>
@@ -47,7 +47,7 @@ import { useRouter } from 'vue-router';
 import { NoteContent } from '@/domain/entities/Note';
 import { useHead } from 'unhead';
 import { useI18n } from 'vue-i18n';
-import { formatShortDate } from '@/infrastructure/utils/date';
+import { getTimeFromNow } from '@/infrastructure/utils/date';
 import { makeElementScreenshot } from '@/infrastructure/utils/screenshot';
 import useNoteSettings from '@/application/services/useNoteSettings';
 import { useNoteEditor } from '@/application/services/useNoteEditor';

src/presentation/pages/Note.vue

@@ -36,7 +36,7 @@
             <Card
               v-if="parentNote"
               :title="parentNoteTitle"
-              :subtitle="formatShortDate(parentNote.createdAt!)"
+              :subtitle="getTimeFromNow(parentNote.createdAt!)"
               orientation="horizontal"
             >
               <Button
@@ -108,7 +108,7 @@ import Team from '@/presentation/components/team/Team.vue';
 import { Section, Row, Switch, Button, Heading, Fieldset, Input, Card } from 'codex-ui/vue';
 import ThreeColsLayout from '@/presentation/layouts/ThreeColsLayout.vue';
 import { getTitle } from '@/infrastructure/utils/note';
-import { formatShortDate } from '@/infrastructure/utils/date';
+import { getTimeFromNow } from '@/infrastructure/utils/date';
 import InviteLink from '@/presentation/components/noteSettings/InviteLink.vue';
 
 const { t } = useI18n();