Dev #11

Merged
serega404 merged 87 commits from dev into main 2026-05-25 03:22:55 +03:00
3 changed files with 77 additions and 31 deletions
Showing only changes of commit 2f32df0b1a - Show all commits
+17 -1
View File
@@ -20,5 +20,21 @@ const emit = defineEmits<{ toggle: [value: string] }>()
</template> </template>
<style scoped> <style scoped>
.filter-chips { display: flex; flex-wrap: wrap; gap: 6px; } .filter-chips {
display: flex;
flex-wrap: wrap;
gap: 6px;
min-width: 0;
max-width: 100%;
}
.tag-chip {
max-width: 100%;
min-width: 0;
white-space: normal;
overflow-wrap: anywhere;
word-break: break-word;
text-align: left;
line-height: 1.25;
}
</style> </style>
+48 -19
View File
@@ -30,14 +30,18 @@ function goDetail() {
<div class="lecture-card" @click="goDetail"> <div class="lecture-card" @click="goDetail">
<div class="card-header"> <div class="card-header">
<span class="badge" :class="lecture.format === 'online' ? 'badge-blue' : 'badge-green'"> <span class="badge" :class="lecture.format === 'online' ? 'badge-blue' : 'badge-green'">
<AppIcon class="badge-icon" :icon="lecture.format === 'online' ? 'world' : 'map-pin'" :size="14" /> <AppIcon
class="badge-icon"
:icon="lecture.format === 'online' ? 'world' : 'map-pin'"
:size="14"
/>
{{ lecture.format === 'online' ? 'Онлайн' : 'Офлайн' }} {{ lecture.format === 'online' ? 'Онлайн' : 'Офлайн' }}
</span> </span>
<span <span
class="seats" class="seats"
:class="{ :class="{
'seats-low': lecture.freeSeats <= 3 && lecture.freeSeats > 0, 'seats-low': lecture.freeSeats <= 3 && lecture.freeSeats > 0,
'seats-zero': lecture.freeSeats === 0 || lecture.registrationClosed 'seats-zero': lecture.freeSeats === 0 || lecture.registrationClosed,
}" }"
> >
<template v-if="lecture.registrationClosed">Запись закрыта</template> <template v-if="lecture.registrationClosed">Запись закрыта</template>
@@ -90,14 +94,7 @@ function goDetail() {
<span class="rating-value">{{ lecture.rating }}</span> <span class="rating-value">{{ lecture.rating }}</span>
<span class="text-secondary text-sm">({{ lecture.reviewCount }})</span> <span class="text-secondary text-sm">({{ lecture.reviewCount }})</span>
</div> </div>
<button <button v-if="registered" class="btn-registered" disabled @click.stop> Записан</button>
v-if="registered"
class="btn-registered"
disabled
@click.stop
>
Записан
</button>
<button <button
v-else-if="lecture.freeSeats > 0 && !lecture.registrationClosed" v-else-if="lecture.freeSeats > 0 && !lecture.registrationClosed"
class="btn-primary btn-sm" class="btn-primary btn-sm"
@@ -125,12 +122,16 @@ function goDetail() {
flex-direction: column; flex-direction: column;
gap: 10px; gap: 10px;
cursor: pointer; cursor: pointer;
transition: transform 0.2s, box-shadow 0.2s; transition:
transform 0.2s,
box-shadow 0.2s;
min-width: 0; min-width: 0;
} }
.lecture-card:hover { .lecture-card:hover {
transform: translateY(-3px); transform: translateY(-3px);
box-shadow: 0 12px 40px var(--color-black-a12), 0 0 0 1px var(--color-primary-a20); box-shadow:
0 12px 40px var(--color-black-a12),
0 0 0 1px var(--color-primary-a20);
} }
.card-header { .card-header {
display: flex; display: flex;
@@ -138,15 +139,25 @@ function goDetail() {
justify-content: space-between; justify-content: space-between;
gap: 8px; gap: 8px;
} }
.badge { display: inline-flex; align-items: center; gap: 4px; } .badge {
.badge-icon { color: currentColor; } display: inline-flex;
align-items: center;
gap: 4px;
}
.badge-icon {
color: currentColor;
}
.seats { .seats {
font-size: 12px; font-size: 12px;
font-weight: 600; font-weight: 600;
color: var(--color-primary-dark); color: var(--color-primary-dark);
} }
.seats-low { color: var(--color-orange-deep); } .seats-low {
.seats-zero { color: var(--color-error-dark); } color: var(--color-orange-deep);
}
.seats-zero {
color: var(--color-error-dark);
}
.card-title { .card-title {
font-size: 15px; font-size: 15px;
font-weight: 700; font-weight: 700;
@@ -164,7 +175,9 @@ function goDetail() {
font-size: 13px; font-size: 13px;
color: var(--color-text-secondary); color: var(--color-text-secondary);
} }
.teacher-icon { color: var(--color-text-secondary); } .teacher-icon {
color: var(--color-text-secondary);
}
.card-meta { .card-meta {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
@@ -172,12 +185,28 @@ function goDetail() {
font-size: 12px; font-size: 12px;
color: var(--color-text-secondary); color: var(--color-text-secondary);
} }
.meta-item { display: inline-flex; align-items: center; gap: 4px; } .meta-item {
.meta-icon { color: var(--color-text-secondary); } display: inline-flex;
align-items: center;
gap: 4px;
}
.meta-icon {
color: var(--color-text-secondary);
}
.card-tags { .card-tags {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
gap: 5px; gap: 5px;
min-width: 0;
max-width: 100%;
}
.card-tags .tag-chip {
max-width: 100%;
min-width: 0;
white-space: normal;
overflow-wrap: anywhere;
word-break: break-word;
line-height: 1.25;
} }
.card-footer { .card-footer {
display: flex; display: flex;
+12 -11
View File
@@ -316,7 +316,14 @@ function isRegistered(id: string) {
grid-template-columns: repeat(auto-fit, minmax(180px, 1fr)); grid-template-columns: repeat(auto-fit, minmax(180px, 1fr));
gap: 16px; gap: 16px;
} }
.filter-label { font-size: 12px; font-weight: 600; color: var(--color-text-secondary); margin-bottom: 6px; display: block; } .filters-grid > * { min-width: 0; }
.filter-label {
font-size: 12px;
font-weight: 600;
color: var(--color-text-secondary);
margin-bottom: 6px;
display: block;
}
.segmented { .segmented {
display: inline-flex; display: inline-flex;
border: 1px solid var(--color-border-glass); border: 1px solid var(--color-border-glass);
@@ -339,7 +346,8 @@ function isRegistered(id: string) {
.free-toggle { display: flex; flex-direction: column; gap: 6px; } .free-toggle { display: flex; flex-direction: column; gap: 6px; }
.switch { display: flex; align-items: center; gap: 8px; font-size: 13px; color: var(--color-text-secondary); } .switch { display: flex; align-items: center; gap: 8px; font-size: 13px; color: var(--color-text-secondary); }
.view-row { display: flex; align-items: center; justify-content: space-between; gap: 12px; flex-wrap: wrap; } .view-row { display: flex; align-items: center; justify-content: space-between; gap: 12px; flex-wrap: wrap; }
.applied { display: flex; align-items: center; gap: 6px; flex-wrap: wrap; } .applied { display: flex; align-items: center; gap: 6px; flex-wrap: wrap; min-width: 0; }
.applied .tag-chip { max-width: 100%; min-width: 0; white-space: normal; overflow-wrap: anywhere; word-break: break-word; line-height: 1.25; }
.cards-grid { .cards-grid {
display: grid; display: grid;
grid-template-columns: repeat(auto-fill, minmax(280px, 1fr)); grid-template-columns: repeat(auto-fill, minmax(280px, 1fr));
@@ -351,18 +359,11 @@ function isRegistered(id: string) {
.calendar-day { padding: 16px; } .calendar-day { padding: 16px; }
.calendar-date { font-weight: 700; margin-bottom: 8px; } .calendar-date { font-weight: 700; margin-bottom: 8px; }
.calendar-items { display: flex; flex-direction: column; gap: 10px; } .calendar-items { display: flex; flex-direction: column; gap: 10px; }
.calendar-item { .calendar-item { display: flex; align-items: center; justify-content: space-between; gap: 12px; border-bottom: 1px solid var(--color-border-glass); padding-bottom: 8px; }
display: flex;
align-items: center;
justify-content: space-between;
gap: 12px;
border-bottom: 1px solid var(--color-border-glass);
padding-bottom: 8px;
}
.calendar-item:last-child { border-bottom: none; padding-bottom: 0; } .calendar-item:last-child { border-bottom: none; padding-bottom: 0; }
.calendar-title { font-weight: 600; } .calendar-title { font-weight: 600; }
.calendar-meta { font-size: 12px; color: var(--color-text-secondary); } .calendar-meta { font-size: 12px; color: var(--color-text-secondary); }
.modal-filters { display: flex; flex-direction: column; gap: 12px; } .modal-filters { display: flex; flex-direction: column; gap: 12px; min-width: 0; }
@media (max-width: 768px) { @media (max-width: 768px) {
.filters-grid { display: none; } .filters-grid { display: none; }