update note display

2023-04-29 19:10:25 +02:00
parent 4cc7c01365
commit 96e3bed77d
11 changed files with 250 additions and 61 deletions
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,9 +15,9 @@
        "@vueuse/core": "^10.1.0",
        "bootstrap-icons": "^1.10.5",
        "daisyui": "^2.51.6",
+        "date-fns": "^2.29.3",
        "dompurify": "^3.0.2",
        "firebase": "^9.20.0",
-        "font-awesome": "^4.7.0",
        "hamburgers": "^1.2.1",
        "marked": "^4.3.0",
        "shortid": "^2.2.16",
@@ -1760,6 +1760,18 @@
        "postcss": "^8.1.6"
      }
    },
+    "node_modules/date-fns": {
+      "version": "2.29.3",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.29.3.tgz",
+      "integrity": "sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==",
+      "engines": {
+        "node": ">=0.11"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/date-fns"
+      }
+    },
    "node_modules/de-indent": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
@@ -1924,14 +1936,6 @@
        "@firebase/util": "1.9.3"
      }
    },
-    "node_modules/font-awesome": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz",
-      "integrity": "sha512-U6kGnykA/6bFmg1M/oT9EkFeIYv7JlX3bozwQJWiiLz6L0w3F5vBVPxHlwyX/vtNq1ckcpRKOB9f2Qal/VtFpg==",
-      "engines": {
-        "node": ">=0.10.3"
-      }
-    },
    "node_modules/fraction.js": {
      "version": "4.2.0",
      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
@@ -4416,6 +4420,11 @@
        "tailwindcss": "^3"
      }
    },
+    "date-fns": {
+      "version": "2.29.3",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.29.3.tgz",
+      "integrity": "sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA=="
+    },
    "de-indent": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
@@ -4561,11 +4570,6 @@
        "@firebase/util": "1.9.3"
      }
    },
-    "font-awesome": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz",
-      "integrity": "sha512-U6kGnykA/6bFmg1M/oT9EkFeIYv7JlX3bozwQJWiiLz6L0w3F5vBVPxHlwyX/vtNq1ckcpRKOB9f2Qal/VtFpg=="
-    },
    "fraction.js": {
      "version": "4.2.0",
      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
--- a/package.json
+++ b/package.json
@@ -16,9 +16,9 @@
    "@vueuse/core": "^10.1.0",
    "bootstrap-icons": "^1.10.5",
    "daisyui": "^2.51.6",
+    "date-fns": "^2.29.3",
    "dompurify": "^3.0.2",
    "firebase": "^9.20.0",
-    "font-awesome": "^4.7.0",
    "hamburgers": "^1.2.1",
    "marked": "^4.3.0",
    "shortid": "^2.2.16",
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,14 +3,14 @@ import { ref } from 'vue'
 import TopBar from '@/components/TopBar.vue'
 import SideBar from '@/components/SideBar.vue'
 import Note from '@/components/Note.vue'
-import { activeNote } from '@/composables/useNotes'
+import { activeNote, updateNote } from '@/composables/useNotes'

 const sideBarCollapsed = ref(false)

 const viewModes: ViewMode[] = [
-  { name: 'Note', icon: 'card-text' },
-  { name: 'List', icon: 'list-task' },
-  { name: 'Mindmap', icon: 'diagram-3' },
+  { name: 'Note', icon: 'fas fa-sticky-note fa-fw' },
+  { name: 'List', icon: 'fas fa-list fa-fw' },
+  { name: 'Mindmap', icon: 'fas fa-project-diagram fa-fw' },
 ]
 const activeViewMode = ref(viewModes[0])
 </script>
@@ -31,7 +31,13 @@ const activeViewMode = ref(viewModes[0])
      class="transition[margin-left] absolute bottom-0 left-0 right-0 top-[50px] flex overflow-auto border-x-[1px] bg-white px-10 py-6 duration-200 ease-out"
      :class="sideBarCollapsed ? 'ml-0' : 'ml-sidebar'"
    >
-      <Note v-if="activeNote" :note="activeNote" class="w-full" />
+      <Note
+        v-if="activeNote"
+        :key="activeNote.id"
+        :note="activeNote"
+        class="w-full"
+        @update="(note) => updateNote(note.id, note)"
+      />
    </main>
  </div>
 </template>
--- a/src/components/Note.vue
+++ b/src/components/Note.vue
@@ -1,17 +1,69 @@
 <script setup lang="ts">
-defineProps<{
+import { ref, watch, computed } from 'vue'
+import { formatDate } from '@/utils/helpers'
+import { notes, activeNote } from '@/composables/useNotes'
+import { notesRelations } from '@/composables/useNotes'
+
+const props = defineProps<{
  note: Note
 }>()
+
+const emit = defineEmits<{
+  (e: 'update', note: Note): void
+}>()
+
+const noteTitle = ref(props.note.title)
+watch(noteTitle, () => {
+  const updatedNote: Note = {
+    ...props.note,
+    title: noteTitle.value,
+  }
+  emit('update', updatedNote)
+})
+
+const references = computed<Note[]>(() => {
+  return notesRelations.value[props.note.id].from
+    .map((noteId) => {
+      return notes.value.find((note) => note.id === noteId)
+    })
+    .filter((note): note is Note => note !== undefined)
+})
 </script>
 <template>
-  <div>
-    <h1 class="flex items-center pb-2 text-3xl">
+  <div class="flex flex-col">
+    <h1 class="mb-2 flex items-center rounded-md text-3xl hover:bg-gray-200">
      <i
        class="bi bi-house mr-2 text-base text-secondary"
-        v-if="note.isRoot"
+        v-if="props.note.isRoot"
      ></i
-      >{{ note.title }}
+      ><input
+        type="text"
+        class="flex-1 bg-transparent py-1 outline-none"
+        v-model="noteTitle"
+      />
    </h1>
-    <div>{{ note.content }}</div>
+    <div class="flex-1">{{ note.content }}</div>
+    <div class="card mt-3 border-[1px]" v-if="references.length > 0">
+      <div class="card-body px-3 py-3">
+        <ul class="menu rounded-md">
+          <li class="menu-title !opacity-100">
+            <span class="card-title text-secondary"
+              >References
+              <div class="badge-outline badge">{{ references.length }}</div>
+            </span>
+          </li>
+          <li v-for="reference in references">
+            <a class="rounded-md" @click="activeNote = reference"
+              ><i class="far fa-file-alt fa-fw" />{{ reference.title }}</a
+            >
+          </li>
+        </ul>
+      </div>
+    </div>
+    <hr class="my-3" />
+    <div class="flex text-sm text-secondary">
+      <span>{{ note.wordCount }} words</span>
+      <span class="ml-auto">Last modified {{ formatDate(note.modified) }}</span>
+    </div>
  </div>
 </template>
--- a/src/components/SearchBar.vue
+++ b/src/components/SearchBar.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { ref, watch, computed } from 'vue'
 import { notes, findNotes, activeNote } from '@/composables/useNotes'
+import { formatDate } from '@/utils/helpers'

 const active = ref(false)
 watch(active, () => {
@@ -12,10 +13,12 @@ const results = computed<Note[]>(() => {
  return query.value ? findNotes(query.value) : notes.value
 })

-const click = (note: Note) => {
+const goToNote = (note: Note) => {
  activeNote.value = note
  active.value = false
+  if (queryElem.value) queryElem.value.blur()
 }
+const queryElem = ref<HTMLInputElement | null>(null)
 </script>
 <template>
  <div id="search-container" class="relative h-full flex-1">
@@ -27,6 +30,7 @@ const click = (note: Note) => {
      @mousedown="active = true"
      @blur="active = false"
      v-model="query"
+      ref="queryElem"
    />
    <div
      class="z-1000 dropdown absolute left-0 right-0 top-[100%]"
@@ -40,11 +44,10 @@ const click = (note: Note) => {
          v-for="note in results"
          v-if="results.length > 0"
          class="flex flex-row"
-          :class="{ disabled: activeNote?.id === note.id }"
        >
          <a
            class="flex-1 items-center px-2 py-1"
-            @click.stop.prevent="() => click(note)"
+            @click.stop.prevent="() => goToNote(note)"
            @mousedown.prevent
            :class="{ disabled: activeNote?.id === note.id }"
          >
@@ -53,7 +56,8 @@ const click = (note: Note) => {
              v-if="activeNote?.id === note.id"
              >current</span
            >
-            {{ note.title }}</a
+            <span class="flex-1">{{ note.title }}</span>
+            <span>{{ formatDate(note.modified) }}</span></a
          >
        </li>
        <li v-else><a>No notes found</a></li>
--- a/src/components/SideBar.vue
+++ b/src/components/SideBar.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { rootNote } from '@/composables/useNotes'
+import { rootNote, notes, activeNote } from '@/composables/useNotes'
 import SideBarMenu from '@/components/SideBar/SideBarMenu.vue'
 import SideBarMenuItem from '@/components/SideBar/SideBarMenuItem.vue'

@@ -15,12 +15,16 @@ const emit = defineEmits<{
 <template>
  <div
    id="sidebar"
-    class="relative flex w-sidebar flex-col gap-4 overflow-y-auto px-2 py-3"
+    class="relative flex w-sidebar flex-col gap-4 overflow-y-auto px-2 py-3 text-[90%]"
  >
    <SideBarMenu>
      <template #header>Root note</template>
      <template #items>
-        <SideBarMenuItem icon="house">{{ rootNote?.title }}</SideBarMenuItem>
+        <SideBarMenuItem
+          icon="fas fa-fw fa-home"
+          @click="activeNote = rootNote"
+          >{{ rootNote?.title }}</SideBarMenuItem
+        >
      </template>
    </SideBarMenu>
    <SideBarMenu>
@@ -36,9 +40,16 @@ const emit = defineEmits<{
      </template>
    </SideBarMenu>
    <SideBarMenu>
-      <template #header>Recent notes</template>
+      <template #header
+        ><i class="far fa-clock fa-fw mr-2" />Recent notes</template
+      >
      <template #items>
-        <SideBarMenuItem>{{ rootNote?.title }}</SideBarMenuItem>
+        <SideBarMenuItem
+          v-for="note in notes"
+          icon="far fa-file-alt fa-fw"
+          @click="activeNote = note"
+          >{{ note.title }}</SideBarMenuItem
+        >
      </template>
    </SideBarMenu>
  </div>
--- a/src/components/SideBar/SideBarMenuItem.vue
+++ b/src/components/SideBar/SideBarMenuItem.vue
@@ -6,10 +6,9 @@ const props = defineProps<{
 </script>
 <template>
  <a
-    class="mt-1 block w-full cursor-pointer rounded hover:bg-gray-200"
+    class="mt-1 block w-full cursor-pointer rounded hover:bg-gray-200 active:bg-primary active:text-primary-content"
    :class="props.active ? 'font-bold text-primary' : 'text-secondary'"
  >
-    <i :class="`bi bi-${props.icon}`" class="mr-2" v-if="props.icon"></i
-    ><slot></slot>
+    <i :class="props.icon" class="mr-2" v-if="props.icon"></i><slot></slot>
  </a>
 </template>
--- a/src/components/TopBar.vue
+++ b/src/components/TopBar.vue
@@ -2,6 +2,7 @@
 import Hamburger from '@/components/Hamburger.vue'
 import SearchBar from '@/components/SearchBar.vue'
 import Logo from './Logo.vue'
+import { addNote } from '@/composables/useNotes'
 const props = defineProps<{
  sideBarCollapsed: boolean
 }>()
@@ -13,21 +14,26 @@ const emit = defineEmits<{
 <template>
  <div class="absolute left-0 right-0 top-0 z-[500] flex h-[50px] bg-primary">
    <div
-      class="w-in mx-auto flex w-full max-w-app items-center gap-3 text-white"
+      class="w-in mx-auto flex w-full max-w-app items-center py-2.5 text-white"
    >
      <div
-        class="flex w-sidebar items-center pl-3"
-        :class="sideBarCollapsed && 'w-fit'"
+        class="flex pl-3"
+        :class="sideBarCollapsed ? 'w-fit' : 'w-sidebar pr-3'"
      >
        <Hamburger
          :side-bar-collapsed="props.sideBarCollapsed"
          @toggle-side-bar="emit('toggleSideBar')"
        />
-        <Logo class="ml-auto px-3 text-2xl" />
+        <Logo class="ml-auto pl-5 text-2xl" />
      </div>
-      <div class="mr-3 flex h-full flex-1 items-center gap-2 py-2.5">
+      <div class="flex h-full flex-1 flex-row items-center gap-2 pl-5 pr-3">
        <SearchBar />
-        <button class="btn-outline btn-sm btn h-full text-white">+</button>
+        <button
+          class="btn-outline btn-sm btn h-full text-white"
+          @click="addNote('Untitled new note', '', true)"
+        >
+          <i class="fas fa-plus-circle text-[1.1rem]" />
+        </button>
        <button class="btn-outline btn-sm btn h-full text-white">
          Sign in
        </button>
--- a/src/composables/useNotes.ts
+++ b/src/composables/useNotes.ts
@@ -1,11 +1,24 @@
-import { ref, computed, watch } from 'vue'
+import { ref, reactive, computed, watch } from 'vue'
 import { useTitle } from '@vueuse/core'
 import { mdToHtml } from '@/utils/markdown'
+import { getAllMatches } from '@/utils/helpers'
+import shortid from 'shortid'
+
+const contextedPrefix = 'c@'
+
+const baseNotes = reactive<{ [noteId: string]: BaseNote }>({})

-const baseNotes = ref<BaseNote[]>([])
 export const notes = computed<Note[]>(() => {
-  // extract links and add word count
-  return baseNotes.value as Note[]
+  return Object.entries(baseNotes)
+    .map(([_, note]) => ({
+      ...note,
+      wordCount: note.content.split(' ').length,
+    }))
+    .sort((a, b) => b.modified - a.modified) as Note[]
+})
+watch(notes, () => {
+  if (notes.value.length > 0 && !activeNote.value)
+    activeNote.value = rootNote.value
 })

 export const activeNote = ref<Note>()
@@ -16,16 +29,11 @@ watch(activeNote, () => {
 export const rootNote = computed<Note | undefined>(() =>
  notes.value.find((note: Note) => note.isRoot)
 )
-watch(
-  rootNote,
-  () => {
-    if (rootNote.value) activeNote.value = rootNote.value
-  },
-  { immediate: true }
-)

 export const setDefaultNotes = (defaultNotes: BaseNote[]) => {
-  baseNotes.value = defaultNotes
+  defaultNotes.forEach((defaultNote) => {
+    baseNotes[defaultNote.id] = defaultNote
+  })
 }

 export const getNoteById = (noteId: string) => {
@@ -35,7 +43,7 @@ export const getNoteById = (noteId: string) => {
 export const findNotes = (query: string): Note[] => {
  const removeMdFromText = (mdText: string): string => {
    const div = document.createElement('div')
-    div.innerHTML = mdToHtml(mdText, 'c@', getNoteById)
+    div.innerHTML = mdToHtml(mdText, contextedPrefix, getNoteById)
    const textWithoutMd = div.textContent || div.innerText || ''
    return textWithoutMd
  }
@@ -47,3 +55,80 @@ export const findNotes = (query: string): Note[] => {
    return matchTitle || matchContent
  })
 }
+
+export const updateNote = (noteId: string, note: Note) => {
+  const updatedNote: Note = {
+    ...note,
+    modified: new Date().getTime(),
+  }
+  baseNotes[noteId] = updatedNote
+}
+
+export const addNote = (
+  title: string,
+  content: string,
+  goToNote: boolean = false
+) => {
+  const id = shortid.generate()
+  const newNote: BaseNote = {
+    id,
+    title,
+    content,
+    created: new Date().getTime(),
+    modified: new Date().getTime(),
+  }
+  baseNotes[id] = newNote
+  if (goToNote)
+    activeNote.value = notes.value.find((note) => note.id === newNote.id)
+}
+
+const getNoteLinksByNoteId = (noteId: string): string[] => {
+  const note = baseNotes[noteId]
+  const regex = /\[\[(.*?)\]\]/g
+  const links = getAllMatches(regex, note.content || '')
+    .map((to) => notes.value.find((note) => note.title === to[1])?.id || '')
+    .filter((noteId) => Object.keys(baseNotes).includes(noteId))
+  return [...links]
+}
+
+interface NoteRelations {
+  id: string
+  to: string[]
+  from: string[]
+}
+
+interface NotesRelations {
+  [noteId: string]: {
+    to: string[]
+    from: string[]
+  }
+}
+export const notesRelations = computed(() => {
+  const noteIds = Object.keys(baseNotes)
+  const relations = noteIds
+    .filter((id) => id !== undefined)
+    .map((id) => {
+      const to = getNoteLinksByNoteId(id)
+      return { id, to }
+    })
+    .map((noteRelations, _, notesRelations): NoteRelations => {
+      const from = [...notesRelations]
+        .map((noteRelation) =>
+          noteRelation.to
+            .filter((toId) => toId === noteRelations.id)
+            .map(() => noteRelation.id)
+        )
+        .reduce((arr, elem) => arr.concat(elem), [])
+        .filter((value, index, self) => self.indexOf(value) === index)
+      return {
+        id: noteRelations.id,
+        to: noteRelations.to,
+        from,
+      }
+    })
+    .reduce((notes, { id, to, from }) => {
+      notes[id] = { to, from }
+      return notes
+    }, {} as NotesRelations)
+  return relations
+})
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -10,10 +10,6 @@ declare global {

  interface Note extends BaseNote {
    wordCount: number
-    links: {
-      to: string[]
-      from: string[]
-    }
  }

  interface ViewMode {
--- a/src/utils/helpers.ts
+++ b/src/utils/helpers.ts
@@ -0,0 +1,26 @@
+import { formatDistance, format, isToday } from 'date-fns'
+
+export const formatDate = (date: Date | number): string => {
+  const dateToFormat = ['number', 'string'].includes(typeof date)
+    ? new Date(date)
+    : date
+  const dateDistanceInWords = formatDistance(dateToFormat, new Date()) + ' ago'
+
+  return isToday(date)
+    ? dateDistanceInWords
+    : format(date, 'D MMMM [at] HH:mm ')
+}
+
+export const getAllMatches = (
+  regex: RegExp,
+  input: string
+): RegExpExecArray[] => {
+  const matches = []
+  let m
+  do {
+    m = regex.exec(input)
+    // console.log(m)
+    if (m) matches.push(m)
+  } while (m)
+  return matches
+}