@@ -124,6 +124,7 @@ const saveHighLight = (color: string) => {
member: user?.data?.name,
highlighted_text: selectedText.value,
color: color,
+ name: '',
},
{
onSuccess(data: Note) {
@@ -148,8 +149,9 @@ const deleteHighlight = () => {
onSuccess() {
resetStates()
document.querySelectorAll('.highlighted-text').forEach((el) => {
- if (el.dataset.name === notesToDelete.name) {
- el.style.backgroundColor = 'transparent'
+ const element = el as HTMLElement
+ if (element.dataset.name === notesToDelete.name) {
+ element.style.backgroundColor = 'transparent'
}
})
},
@@ -179,16 +181,16 @@ const createNote = () => {
member: user?.data?.name,
note: `
${selectedText.value}
`,
color: 'Yellow',
+ name: '',
},
{
onSuccess(data: Note) {
- selectedText.value = ''
- resetStates()
+ emit('updateNotes')
setTimeout(() => {
scrollToText(selectedText.value)
blockQuotesClick()
- }, 0)
- emit('updateNotes')
+ resetStates()
+ }, 100)
},
onError(err: any) {
console.error('Error creating note:', err)
@@ -206,11 +208,12 @@ const updateNote = (noteToUpdate: Note) => {
},
{
onSuccess(data: Note) {
- resetStates()
+ emit('updateNotes')
setTimeout(() => {
scrollToText(selectedText.value)
blockQuotesClick()
- }, 0)
+ resetStates()
+ }, 100)
},
onError(err: any) {
console.error('Error updating note:', err)
@@ -222,9 +225,10 @@ const updateNote = (noteToUpdate: Note) => {
const scrollToText = (text: string) => {
const elements = document.querySelectorAll('blockquote p')
- Array.from(elements).forEach((el: HTMLElement) => {
- if (el.textContent?.toLowerCase().includes(text.toLowerCase())) {
- el.scrollIntoView({ behavior: 'smooth', block: 'center' })
+ Array.from(elements).forEach((el) => {
+ const element = el as HTMLElement
+ if (element.textContent?.toLowerCase().includes(text.toLowerCase())) {
+ element.scrollIntoView({ behavior: 'smooth', block: 'center' })
}
})
}
@@ -233,6 +237,5 @@ const resetStates = () => {
selectedText.value = ''
show.value = false
resetMenuPosition()
- emit('updateNotes')
}
diff --git a/frontend/src/components/Notes/Notes.vue b/frontend/src/components/Notes/Notes.vue
index 2983bc4f..f390f8af 100644
--- a/frontend/src/components/Notes/Notes.vue
+++ b/frontend/src/components/Notes/Notes.vue
@@ -5,7 +5,7 @@
@@ -33,10 +33,13 @@ onMounted(() => {
updateCurrentNote()
})
-watch(notes.value, () => {
- updateCurrentNote()
- blockQuotesClick()
-})
+watch(
+ () => notes.value?.data,
+ () => {
+ updateCurrentNote()
+ blockQuotesClick()
+ }
+)
const updateCurrentNote = () => {
const currentNote = notes.value?.data?.filter((row: Note) => {
@@ -46,9 +49,10 @@ const updateCurrentNote = () => {
note.value = null
currentNoteName.value = null
return
+ } else if (currentNote && currentNote.length > 0) {
+ currentNoteName.value = currentNote[0].name
+ note.value = currentNote[0].note || null
}
- currentNoteName.value = currentNote[0].name
- note.value = currentNote[0].note
}
const updateNoteText = (val: string) => {
@@ -75,6 +79,7 @@ const createNote = () => {
member: user?.data?.name,
note: note.value,
color: 'Yellow',
+ name: '',
},
{
onSuccess(data: Note) {
@@ -89,6 +94,7 @@ const createNote = () => {
}
const updateNote = () => {
+ if (!currentNoteName.value) return
notes.value?.setValue.submit(
{
name: currentNoteName.value,
diff --git a/frontend/src/components/Notes/types.ts b/frontend/src/components/Notes/types.ts
index 6364a506..06182f39 100644
--- a/frontend/src/components/Notes/types.ts
+++ b/frontend/src/components/Notes/types.ts
@@ -2,7 +2,7 @@
export type Note = {
highlighted_text?: string
color?: string
- name?: string
+ name: string
note?: string | null
lesson?: string
member?: string
diff --git a/frontend/src/pages/Lesson.vue b/frontend/src/pages/Lesson.vue
index 553bb3e9..2c48a92c 100644
--- a/frontend/src/pages/Lesson.vue
+++ b/frontend/src/pages/Lesson.vue
@@ -232,6 +232,7 @@
v-if="currentTab === 'Notes'"
:lesson="lesson.data?.name"
v-model:notes="notes"
+ @updateNotes="updateNotes"
/>