serega404/UniVerse
1
0
Fork 0
Code Issues Pull Requests 10 Actions Packages Projects Releases Wiki Activity

fix: ui fixes
🚀 Create and publish a Docker image / Detect changes in backend and frontend (push) Successful in 11s
Details
🚀 Create and publish a Docker image / Build & publish backend image (push) Successful in 1m24s
Details
🚀 Create and publish a Docker image / Build & publish frontend image (push) Failing after 29s
Details
🚀 Create and publish a Docker image / Update stack on Portainer (push) Successful in 9s
Details

Browse Source
This commit is contained in:
Sergey Karmanov
2026-05-14 02:02:02 +03:00
parent d29b52f824
commit 5a1ddb82e6
10 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/api/mappers.ts
+1 -1
View File
@@ -73,7 +73,7 @@ export function mapApiLecture(lecture: LectureDto): Lecture {
time: startsAt.toLocaleTimeString('ru-RU', { hour: '2-digit', minute: '2-digit' }),
duration,
building: lecture.format === 'Online' ? 'Онлайн' : locationName,
room: lecture.format === 'Online' ? undefined : locationName,
room: undefined,
format: lecture.format === 'Online' ? 'online' : 'offline',
totalSeats,
enrolledSeats: enrolled,
frontend/src/assets/main.css
+1 -1
View File
@@ -217,7 +217,7 @@ input, textarea, select {
font-weight: 600;
white-space: nowrap;
}
.badge-green { color: #15803D; border: 1.5px solid rgba(34,197,94,0.3); }
.badge-green { color: #15803D; border: 1.3px solid rgba(34,197,94,0.3); }
.badge-blue { background: rgba(6,182,212,0.15); color: #0E7490; border: 1px solid rgba(6,182,212,0.3); }
.badge-orange { background: rgba(251,146,60,0.15); color: #C2410C; border: 1px solid rgba(251,146,60,0.3); }
.badge-gray { background: rgba(100,116,139,0.1); color: #64748B; border: 1px solid rgba(100,116,139,0.2); }
frontend/src/components/ui/LectureCard.vue
+7 -1
View File
@@ -50,9 +50,15 @@ function goDetail() {
<h3 class="card-title">{{ lecture.title }}</h3>
<div class="card-teacher">
<template v-if="lecture.teacher && lecture.teacher !== 'Преподаватель уточняется'">
<AppIcon class="teacher-icon" icon="user" :size="16" />
<span>{{ lecture.teacher }}</span>
<span class="text-secondary">· {{ lecture.institute }}</span>
<span class="text-secondary">{{ lecture.institute }}</span>
</template>
<template v-else>
<AppIcon class="teacher-icon" icon="building" :size="16" />
<span class="text-secondary">{{ lecture.institute }}</span>
</template>
</div>
<div class="card-meta">
frontend/src/views/student/CatalogView.vue
+3 -3
View File
@@ -222,10 +222,10 @@ function isRegistered(id: string) {
<div class="text-secondary text-sm">{{ row.tags.join(' ') }}</div>
</template>
<template #date="{ row }">
{{ new Date(row.date).toLocaleDateString('ru-RU') }} · {{ row.time }}
{{ new Date(row.date).toLocaleDateString('ru-RU') }} {{ row.time }}
</template>
<template #place="{ row }">
{{ row.building }} {{ row.room ? `· ауд. ${row.room}` : '' }}
{{ row.building }} {{ row.room ? `ауд. ${row.room}` : '' }}
</template>
<template #seats="{ row }">
<span :class="row.freeSeats === 0 ? 'badge badge-gray' : 'badge badge-green'">
@@ -251,7 +251,7 @@ function isRegistered(id: string) {
<div class="calendar-items">
<div v-for="l in items" :key="l.id" class="calendar-item">
<div class="calendar-title">{{ l.title }}</div>
<div class="calendar-meta">{{ l.time }} · {{ l.building }} {{ l.room ? `· ауд. ${l.room}` : '' }}</div>
<div class="calendar-meta">{{ l.time }} {{ l.building }} {{ l.room ? `ауд. ${l.room}` : '' }}</div>
<button class="btn-secondary btn-sm">Подробнее</button>
</div>
</div>
frontend/src/views/student/DashboardView.vue
+1 -1
View File
@@ -24,7 +24,7 @@ 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} курс`)
if (Number.isFinite(user.value.year) && (user.value.year as number) > 0) parts.push(`${user.value.year} курс`)
return parts.join(' · ')
})
const nextLecture = computed(() => lectures.registeredLectures[0] ?? lectures.all[0])
frontend/src/views/student/LectureDetailView.vue
+5 -5
View File
@@ -63,14 +63,14 @@ onMounted(async () => {
<GlassCard>
<div class="info-section">
<h3>Преподаватель</h3>
<div class="info-value">{{ lecture.teacher }} · {{ lecture.teacherTitle }}</div>
<div class="info-sub">{{ lecture.department }}, {{ lecture.institute }}</div>
<div class="info-value">{{ lecture.teacher }}<span v-if="lecture.teacherTitle"> {{ lecture.teacherTitle }}</span></div>
<div class="info-sub">{{ [lecture.department, lecture.institute].filter(Boolean).join(', ') }}</div>
</div>
<div class="info-section">
<h3>Детали занятия</h3>
<div class="info-value">📅 {{ new Date(lecture.date).toLocaleDateString('ru-RU') }} · {{ lecture.time }}</div>
<div class="info-value">{{ new Date(lecture.date).toLocaleDateString('ru-RU') }} {{ lecture.time }}</div>
<div class="info-sub">Длительность: {{ lecture.duration }} мин</div>
<div class="info-sub">Локация: {{ lecture.building }} {{ lecture.room ? `· ауд. ${lecture.room}` : '' }}</div>
<div class="info-sub">Локация: {{ lecture.building }} {{ lecture.room ? `ауд. ${lecture.room}` : '' }}</div>
</div>
<div class="info-section">
<h3>Места</h3>
@@ -93,7 +93,7 @@ onMounted(async () => {
</p>
<div class="reviews" v-if="reviews.length">
<div v-for="review in reviews" :key="review.id" class="review">
<div class="review-head">{{ review.userName }} · {{ review.sentiment }}</div>
<div class="review-head">{{ review.userName }} {{ review.sentiment }}</div>
<div class="review-body">{{ review.text }}</div>
</div>
</div>
frontend/src/views/student/MyLecturesView.vue
+4 -4
View File
@@ -57,8 +57,8 @@ async function confirmCancel() {
<GlassCard v-for="item in upcoming" :key="item.id" class="lecture-row">
<div>
<div class="lecture-title">{{ item.title }}</div>
<div class="lecture-meta">📅 {{ new Date(item.date).toLocaleDateString('ru-RU') }} · {{ item.time }}</div>
<div class="lecture-meta">🏛 {{ item.building }} {{ item.room ? `· ауд. ${item.room}` : '' }}</div>
<div class="lecture-meta">{{ new Date(item.date).toLocaleDateString('ru-RU') }} {{ item.time }}</div>
<div class="lecture-meta">{{ item.building }} {{ item.room ? `ауд. ${item.room}` : '' }}</div>
</div>
<div class="lecture-actions">
<StatusBadge status="registered" />
@@ -73,8 +73,8 @@ async function confirmCancel() {
<GlassCard v-for="item in history" :key="item.id" class="lecture-row">
<div>
<div class="lecture-title">{{ item.title }}</div>
<div class="lecture-meta">📅 {{ new Date(item.date).toLocaleDateString('ru-RU') }} · {{ item.time }}</div>
<div class="lecture-meta">🏛 {{ item.building }} {{ item.room ? `· ауд. ${item.room}` : '' }}</div>
<div class="lecture-meta">{{ new Date(item.date).toLocaleDateString('ru-RU') }} {{ item.time }}</div>
<div class="lecture-meta">{{ item.building }} {{ item.room ? `ауд. ${item.room}` : '' }}</div>
</div>
<div class="lecture-actions">
<StatusBadge :status="item.status ?? 'completed'" />
frontend/src/views/student/ProfileView.vue
+2 -2
View File
@@ -17,12 +17,12 @@ 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(' · ')
return parts.join(' ')
})
const userYearLine = computed(() => {
const year = user.value.year
return year === null || year === undefined ? '' : `${year} курс`
return Number.isFinite(year) && year > 0 ? `${year} курс` : ''
})
const interestTags = ref([
{ label: '#ML', active: true },
frontend/src/views/teacher/TeacherDashboardView.vue
+2 -2
View File
@@ -46,7 +46,7 @@ onMounted(() => {
<div class="section-title">Заметность за пределами направления</div>
<div class="visibility">
<div class="visibility-meta">
{{ visibility }}% студентов из других институтов · Цель 50%
{{ visibility }}% студентов из других институтов Цель 50%
</div>
<ProgressBar :value="visibility" :max="100" />
</div>
@@ -59,7 +59,7 @@ onMounted(() => {
<div class="upcoming-item" v-for="l in upcoming" :key="l.id">
<div>
<div class="upcoming-title">{{ l.title }}</div>
<div class="upcoming-meta">📅 {{ new Date(l.date).toLocaleDateString('ru-RU') }} · {{ l.time }}</div>
<div class="upcoming-meta">{{ new Date(l.date).toLocaleDateString('ru-RU') }} {{ l.time }}</div>
<div class="upcoming-meta">Записалось {{ l.enrolledSeats }} студентов</div>
</div>
<button class="btn-secondary btn-sm" @click="router.push('/teacher/lectures')">Управлять</button>
frontend/src/views/teacher/TeacherLecturesView.vue
+1 -1
View File
@@ -22,7 +22,7 @@ const rows = computed(() => {
return (owned.length ? owned : lecturesStore.all).map(l => ({
id: l.id,
title: l.title,
date: `${new Date(l.date).toLocaleDateString('ru-RU')} · ${l.time}`,
date: `${new Date(l.date).toLocaleDateString('ru-RU')} ${l.time}`,
status: l.status ?? 'upcoming',
stats: `${l.enrolledSeats} / — / ${l.reviewCount}`,
}))