Merge branch 'main' into development

.github/FUNDING.yml

@@ -0,0 +1,15 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: BrigadaSOS
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+polar: # Replace with a single Polar username
+buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
+thanks_dev: # Replace with a single thanks.dev username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

backend/docker-compose.yaml

@@ -81,7 +81,7 @@ services:
       - elasticsearch
 
   pgsync:
-    image: natsume197/pgsync:3.1.0
+    image: natsume197/pgsync:3.2.1
     networks:
     - nadedb-network
     depends_on:

frontend_v2/components/search/modal/ModalBatch.vue

@@ -217,10 +217,14 @@ watch(inputText, (newValue) => {
                       <tr v-for="(item, index) in sortedWordsMatch">
                         <td
                           class="y-4 whitespace-nowrap text-base text-center font-medium text-gray-800 dark:text-gray-200">
-                          <a v-if="item.is_match" :href="'search/sentence?query=' + item.word + '&exact_match=true'"
+                          <NuxtLink v-if="item.is_match" 
+                          :to="{
+                            path: '/search/sentence',
+                            query: { query: item.word }
+                          }"
                             class="text-blue-500 underline-offset-2 underline" target="_blank">
                             {{ item.word }}
-                          </a>
+                          </NuxtLink>
                           <span v-else>
                             {{ item.word }}
                           </span>

frontend_v2/components/search/segment/SegmentActionsContainer.vue

@@ -31,18 +31,12 @@ const openAnkiModal = () => {
     <template #content>
       <SearchDropdownContent>
         <!-- Anki by last added -->
-        <SearchDropdownItem
-          text="Añadir a Anki (Ultima carta añadida)" 
-          :iconPath="mdiStarShootingOutline"
-          @click="addSentenceToAnki(content)"
-        />
+        <SearchDropdownItem text="Añadir a Anki (Ultima carta añadida)" :iconPath="mdiStarShootingOutline"
+          @click="addSentenceToAnki(content)" />
 
         <!-- Anki by ID -->
-        <SearchDropdownItem 
-          text="Añadir a Anki (Busca en tu collección)"
-          :iconPath="mdiStarShootingOutline" 
-          @click="openAnkiModal"
-        />
+        <SearchDropdownItem text="Añadir a Anki (Busca en tu colección)" @click="openAnkiModal()"
+          :iconPath="mdiStarShootingOutline" data-hs-overlay="#hs-vertically-centered-scrollable-anki-collection" />
       </SearchDropdownContent>
     </template>
   </SearchDropdownContainer>
@@ -111,7 +105,8 @@ const openAnkiModal = () => {
     </template>
     <template #content>
       <SearchDropdownContent>
-        <SearchDropdownItem :text="$t('searchpage.main.buttons.share')" :iconPath="mdiShare" @click="getSharingURL(content.segment_info.uuid)" />
+        <SearchDropdownItem :text="$t('searchpage.main.buttons.share')" :iconPath="mdiShare"
+          @click="getSharingURL(content.segment_info.uuid)" />
       </SearchDropdownContent>
     </template>
   </SearchDropdownContainer>

frontend_v2/components/search/segment/SegmentContainer.vue

@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import { mdiTranslate, mdiVolumeHigh } from '@mdi/js'
-import ModalAnkiNotes from '../modal/ModalAnkiNotes.vue';
 
 type Props = {
   searchData: any;
@@ -13,7 +12,6 @@ const props = defineProps<Props>();
 let locale = ref('en');
 
 let selectedSentence = ref(null);
-let showNotesSearch = ref(false);
 let searchNoteSentence: Ref<Sentence | null> = ref(null);
 
 // Order segment according to website language
@@ -40,26 +38,24 @@ const orderedSegments = computed(() => {
 // @ts-ignore
 const openModal = (content) => {
   selectedSentence.value = content;
-  console.log(content);
 };
 
 const openAnkiModal = (sentence: Sentence) => {
-  showNotesSearch.value = true;
   searchNoteSentence.value = sentence;
 };
 
 
 </script>
 <template>
   <div v-if="searchData?.sentences?.length > 0 && searchData">
-    
+
     <SearchModalContext :sentence="selectedSentence" />
 
-    <ModalAnkiNotes v-if="showNotesSearch" :sentence="searchNoteSentence" :onClose="() => showNotesSearch = false"
+    <SearchModalAnkiNotes :sentence="searchNoteSentence"
       :onClick="(sentence: Sentence, id: number) => addSentenceToAnki(sentence, id)" />
 
     <GeneralLazy v-for="(sentence, index) in searchData.sentences" :key="sentence.segment_info.position"
-      :id="sentence.segment_info.position" :unrender="true" :min-height="300" 
+      :id="sentence.segment_info.position" :unrender="true" :min-height="300"
       class="hover:bg-neutral-800/20 items-center b-2 transition-all rounded-lg flex flex-col lg:flex-row py-2"
       :class="{ 'bg-neutral-800 hover:bg-neutral-800': sentence.segment_info.position === currentSentenceIndex }">
       <!-- Image -->