From 462cbb360d1f273a90744f0bca75afe0dd501661 Mon Sep 17 00:00:00 2001 From: Sergey Karmanov Date: Tue, 12 May 2026 00:49:15 +0300 Subject: [PATCH] =?UTF-8?q?fix:=20=D1=81=D0=BA=D1=80=D1=8B=D0=BB=20=D0=B8?= =?UTF-8?q?=D0=BD=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=86=D0=B8=D1=8E=20=D0=BE?= =?UTF-8?q?=20=D1=81=D1=82=D1=83=D0=B4=D0=B5=D0=BD=D1=82=D0=B5=20=D0=B5?= =?UTF-8?q?=D1=81=D0=BB=D0=B8=20=D0=B5=D1=91=20=D0=BD=D0=B5=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/student/DashboardView.vue | 10 +++++++++- frontend/src/views/student/ProfileView.vue | 16 ++++++++++++++-- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/frontend/src/views/student/DashboardView.vue b/frontend/src/views/student/DashboardView.vue index 6ef7893..a6024b6 100644 --- a/frontend/src/views/student/DashboardView.vue +++ b/frontend/src/views/student/DashboardView.vue @@ -19,6 +19,14 @@ const userStore = useUserStore() const router = useRouter() const user = computed(() => auth.user!) + +const userMetaLine = computed(() => { + const parts: string[] = [] + if (user.value.institute) parts.push(user.value.institute) + if (user.value.direction) parts.push(user.value.direction) + if (user.value.year !== null && user.value.year !== undefined) parts.push(`${user.value.year} курс`) + return parts.join(' · ') +}) const nextLecture = computed(() => lectures.registeredLectures[0] ?? lectures.all[0]) const recommended = computed(() => lectures.all.filter(l => !lectures.registeredIds.includes(l.id)).slice(0, 3) @@ -45,7 +53,7 @@ onMounted(async () => { Добрый день, {{ formatUserName(user.name) }}! -

{{ user.institute }} · {{ user.direction }} · {{ user.year }} курс

+

{{ userMetaLine }}

diff --git a/frontend/src/views/student/ProfileView.vue b/frontend/src/views/student/ProfileView.vue index a30421b..b2f4d2a 100644 --- a/frontend/src/views/student/ProfileView.vue +++ b/frontend/src/views/student/ProfileView.vue @@ -12,6 +12,18 @@ import EmptyState from '@/components/ui/EmptyState.vue' const auth = useAuthStore() const userStore = useUserStore() const user = computed(() => auth.user!) + +const userMetaLine = computed(() => { + const parts: string[] = [] + if (user.value.institute) parts.push(user.value.institute) + if (user.value.direction) parts.push(user.value.direction) + return parts.join(' · ') +}) + +const userYearLine = computed(() => { + const year = user.value.year + return year === null || year === undefined ? '' : `${year} курс` +}) const interestTags = ref([ { label: '#ML', active: true }, { label: '#ИИ', active: true }, @@ -48,8 +60,8 @@ onMounted(() => {
{{ user.name }}
-
{{ user.institute }} · {{ user.direction }}
-
{{ user.year }} курс
+
{{ userMetaLine }}
+
{{ userYearLine }}