From 6f7ef5e670b3aa248dcc5c58a5a5069cc6b67bf0 Mon Sep 17 00:00:00 2001
From: Oscar <khamitov_oskar@alfabit.org>
Date: Mon, 8 Jun 2026 21:33:44 +0300
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(src/components/feed/FeedCard.v?=
 =?UTF-8?q?ue):=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D1=8F=D0=B5=D1=82?=
 =?UTF-8?q?=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D1=83=20?=
 =?UTF-8?q?=D1=81=D0=BE=D0=B1=D1=8B=D1=82=D0=B8=D1=8F=20=D0=BA=D0=BB=D0=B8?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D0=B4=D0=BB=D1=8F=20=D0=BA=D0=BD=D0=BE=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=BA=20=D0=BB=D0=B0=D0=B9=D0=BA=D0=B0=20=D0=B8=20=D0=B4?=
 =?UTF-8?q?=D0=B8=D0=B7=D0=BB=D0=B0=D0=B9=D0=BA=D0=B0=20=E2=9C=A8=20feat(s?=
 =?UTF-8?q?rc/views/matches/MatchesView.vue):=20=D0=BE=D0=B1=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=BB=D1=8F=D0=B5=D1=82=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B0=D0=B2=D0=B0=D1=82?=
 =?UTF-8?q?=D0=B0=D1=80=D0=B0=20=D0=B8=20=D0=B2=D0=BE=D0=B7=D1=80=D0=B0?=
 =?UTF-8?q?=D1=81=D1=82=D0=B0=20=D0=BF=D0=B0=D1=80=D1=82=D0=BD=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B0=20=D0=B2=20=D0=BA=D0=B0=D1=80=D1=82=D0=BE=D1=87=D0=BA?=
 =?UTF-8?q?=D0=B5=20=D1=81=D0=BE=D0=B2=D0=BF=D0=B0=D0=B4=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/feed/FeedCard.vue  |  4 +--
 src/views/matches/MatchesView.vue | 50 +++++++++++++++++--------------
 2 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/src/components/feed/FeedCard.vue b/src/components/feed/FeedCard.vue
index f195112..7ac2c32 100644
--- a/src/components/feed/FeedCard.vue
+++ b/src/components/feed/FeedCard.vue
@@ -65,12 +65,12 @@
 
     <!-- Action buttons (visible on non-drag mode) -->
     <div v-if="isTop" class="feed-card__actions" @click.stop>
-      <button class="feed-card__btn feed-card__btn--dislike" aria-label="Пропустить" @click="handleDislike">
+      <button class="feed-card__btn feed-card__btn--dislike" aria-label="Пропустить" @click.stop="handleDislike">
         <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" width="24" height="24">
           <path d="M18 6L6 18M6 6l12 12" />
         </svg>
       </button>
-      <button class="feed-card__btn feed-card__btn--like" aria-label="Лайк" @click="handleLike">
+      <button class="feed-card__btn feed-card__btn--like" aria-label="Лайк" @click.stop="handleLike">
         <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" width="24" height="24">
           <path d="M20.84 4.61a5.5 5.5 0 0 0-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 0 0-7.78 7.78l1.06 1.06L12 21.23l7.78-7.78 1.06-1.06a5.5 5.5 0 0 0 0-7.78z" />
         </svg>
diff --git a/src/views/matches/MatchesView.vue b/src/views/matches/MatchesView.vue
index 405469f..6ff2e08 100644
--- a/src/views/matches/MatchesView.vue
+++ b/src/views/matches/MatchesView.vue
@@ -26,8 +26,8 @@
       >
         <RouterLink :to="`/profile/${match.partnerProfile.id}`" class="match-card__avatar-wrap">
           <img
-            v-if="match.partnerProfile.avatarUrl"
-            :src="match.partnerProfile.avatarUrl"
+            v-if="match.partnerProfile.media[0]?.path"
+            :src="match.partnerProfile.media[0].path"
             :alt="match.partnerProfile.name"
             class="match-card__avatar"
           >
@@ -41,10 +41,10 @@
         <div class="match-card__info">
           <RouterLink :to="`/profile/${match.partnerProfile.id}`" class="match-card__name">
             {{ match.partnerProfile.name }}
-            <span v-if="match.partnerProfile.age" class="match-card__age">, {{ match.partnerProfile.age }}</span>
+            <span v-if="match.partnerProfile.birthDate" class="match-card__age">, {{ calcAge(match.partnerProfile.birthDate) }}</span>
           </RouterLink>
-          <span v-if="match.partnerProfile.cityName" class="meta match-card__city">
-            {{ match.partnerProfile.cityName }}
+          <span v-if="match.partnerProfile.city?.name" class="meta match-card__city">
+            {{ match.partnerProfile.city.name }}
           </span>
         </div>
 
@@ -63,6 +63,7 @@
 <script setup lang="ts">
 import { onMounted, ref } from 'vue'
 import { useRouter } from 'vue-router'
+import type { MatchDto, ProfileResponseDto } from '@/api/api'
 import { apiClient } from '@/api/client'
 import AppButton from '@/components/common/AppButton.vue'
 import EmptyState from '@/components/common/EmptyState.vue'
@@ -71,36 +72,41 @@ import { useAuth } from '@/composables/useAuth'
 import { useChat } from '@/composables/useChat'
 import { useUi } from '@/composables/useUi'
 
-interface Match {
-  id: string
-  profileId: string
-  partnerProfile: {
-    id: string
-    name: string
-    avatarUrl?: string
-    cityName?: string
-    age?: number
-  }
-  createdAt: string
-  hasChat: boolean
-}
+type EnrichedMatch = MatchDto & { partnerProfile: ProfileResponseDto }
 
 const authStore = useAuth()
 const chatStore = useChat()
 const uiStore = useUi()
 const router = useRouter()
 
-const matches = ref<Match[]>([])
+const matches = ref<EnrichedMatch[]>([])
 const loading = ref(false)
 
+function calcAge(birthDate: string): number | undefined {
+  const birth = new Date(birthDate)
+  if (Number.isNaN(birth.getTime()))
+    return undefined
+  const today = new Date()
+  let age = today.getFullYear() - birth.getFullYear()
+  if (today.getMonth() < birth.getMonth() || (today.getMonth() === birth.getMonth() && today.getDate() < birth.getDate()))
+    age--
+  return age
+}
+
 onMounted(async () => {
   const profileId = authStore.activeProfile?.id
   if (!profileId)
     return
   loading.value = true
   try {
-    const res = await apiClient.api.likesControllerGetMyMatches({ profileId }) as unknown as Match[]
-    matches.value = res
+    const matchDtos = await apiClient.api.likesControllerGetMyMatches({ profileId })
+    matches.value = await Promise.all(
+      matchDtos.map(async (m) => {
+        const partnerProfileId = m.profile1Id === profileId ? m.profile2Id : m.profile1Id
+        const partnerProfile = await apiClient.api.profilesControllerFindOne(partnerProfileId)
+        return { ...m, partnerProfile }
+      }),
+    )
   }
   catch {
     uiStore.addToast('Не удалось загрузить совпадения', 'error')
@@ -110,7 +116,7 @@ onMounted(async () => {
   }
 })
 
-async function openChat(match: Match) {
+async function openChat(match: EnrichedMatch) {
   const profileId = authStore.activeProfile?.id
   if (!profileId)
     return