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

feat: унифицировал и обновил модалки

Browse Source
This commit is contained in:
Sergey Karmanov
2026-05-21 19:49:03 +03:00
parent 2e7ce6c2e8
commit 32f28898f5
5 changed files with 182 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/components/layout/AppTopbar.vue
+4 -38
View File
@@ -175,17 +175,13 @@ onBeforeUnmount(() => {
</div>
</div>
<ModalDialog v-model="isCoinDialogOpen">
<div class="coin-dialog-content">
<div class="coin-dialog-title">
<AppIcon class="coin-dialog-icon" icon="coin" :size="22" />
<span>Монеты UniVerse</span>
</div>
<ModalDialog v-model="isCoinDialogOpen" title="Монеты UniVerse" icon="coin" size="sm">
<p>
В будущем монеты можно будет использовать во внутреннем магазине. Сейчас магазин еще не запущен, поэтому монеты просто копятся на вашем балансе.
</p>
<button class="btn-primary coin-dialog-ok" type="button" @click="closeCoinDialog">ОК</button>
</div>
<template #footer>
<button class="btn-primary" type="button" @click="closeCoinDialog">ОК</button>
</template>
</ModalDialog>
</header>
</template>
@@ -232,36 +228,6 @@ onBeforeUnmount(() => {
gap: 12px;
flex-shrink: 0;
}
.coin-dialog-content {
display: flex;
flex-direction: column;
align-items: stretch;
gap: 14px;
}
.coin-dialog-title {
display: flex;
align-items: center;
gap: 9px;
color: var(--color-text);
font-size: 17px;
font-weight: 800;
}
.coin-dialog-icon {
flex: 0 0 auto;
color: var(--color-coin-chip-text);
}
.coin-dialog-content p {
margin: 0;
color: var(--color-text-secondary);
font-size: 14px;
line-height: 1.5;
}
.coin-dialog-ok {
min-width: 92px;
align-self: center;
justify-content: center;
margin-top: 2px;
}
.level-chip {
display: inline-flex;
align-items: center;
frontend/src/components/ui/EnrollmentLimitModal.vue
+9 -25
View File
@@ -20,36 +20,20 @@ function openMyLectures() {
</script>
<template>
<ModalDialog :model-value="modelValue" title="Лимит записей достигнут" @update:model-value="emit('update:modelValue', $event)">
<div class="limit-modal">
<ModalDialog
:model-value="modelValue"
title="Лимит записей достигнут"
icon="alert-triangle"
size="sm"
@update:model-value="emit('update:modelValue', $event)"
>
<p>
Все доступные слоты записи уже заняты. Чтобы записаться на новую лекцию, отмените одну из текущих записей
или повысьте уровень.
</p>
<div class="limit-actions">
<template #footer>
<button class="btn-secondary" type="button" @click="close">Понятно</button>
<button class="btn-primary" type="button" @click="openMyLectures">Мои записи</button>
</div>
</div>
</template>
</ModalDialog>
</template>
<style scoped>
.limit-modal {
display: flex;
flex-direction: column;
gap: 16px;
}
.limit-modal p {
margin: 0;
color: var(--color-text-secondary);
font-size: 14px;
line-height: 1.5;
}
.limit-actions {
display: flex;
justify-content: flex-end;
gap: 10px;
flex-wrap: wrap;
}
</style>
frontend/src/components/ui/ModalDialog.vue
+154 -19
View File
@@ -1,19 +1,75 @@
<script setup lang="ts">
defineProps<{
import { onBeforeUnmount, watch } from 'vue'
import AppIcon from '@/components/ui/AppIcon.vue'
const props = withDefaults(defineProps<{
title?: string
description?: string
icon?: string
modelValue?: boolean
}>()
size?: 'sm' | 'md' | 'lg'
showClose?: boolean
closeOnOverlay?: boolean
closeOnEscape?: boolean
}>(), {
size: 'md',
showClose: true,
closeOnOverlay: true,
closeOnEscape: true,
})
const emit = defineEmits<{ 'update:modelValue': [v: boolean] }>()
function close() {
emit('update:modelValue', false)
}
function closeFromOverlay() {
if (props.closeOnOverlay) close()
}
function handleKeydown(event: KeyboardEvent) {
if (event.key === 'Escape' && props.modelValue && props.closeOnEscape) close()
}
watch(
() => props.modelValue,
(isOpen) => {
if (isOpen) document.addEventListener('keydown', handleKeydown)
else document.removeEventListener('keydown', handleKeydown)
},
{ immediate: true }
)
onBeforeUnmount(() => {
document.removeEventListener('keydown', handleKeydown)
})
</script>
<template>
<Teleport to="body">
<Transition name="modal">
<div v-if="modelValue" class="modal-overlay" @click.self="emit('update:modelValue', false)">
<div class="modal-box">
<div class="modal-header" v-if="title">
<span class="modal-title">{{ title }}</span>
<button class="modal-close" @click="emit('update:modelValue', false)">×</button>
<div v-if="modelValue" class="modal-overlay" @click.self="closeFromOverlay">
<section
class="modal-box"
:class="`modal-box-${size}`"
role="dialog"
aria-modal="true"
:aria-label="title"
>
<div class="modal-header" v-if="title || description || icon || $slots.header || showClose">
<slot name="header">
<div class="modal-heading">
<span v-if="icon" class="modal-icon" :class="{ 'modal-icon-warning': icon === 'alert-triangle' }">
<AppIcon :icon="icon" :size="20" />
</span>
<div class="modal-heading-text">
<h2 v-if="title" class="modal-title">{{ title }}</h2>
<p v-if="description" class="modal-description">{{ description }}</p>
</div>
</div>
</slot>
<button v-if="showClose" class="modal-close" type="button" aria-label="Закрыть" @click="close">×</button>
</div>
<div class="modal-body">
<slot />
@@ -21,7 +77,7 @@ const emit = defineEmits<{ 'update:modelValue': [v: boolean] }>()
<div class="modal-footer" v-if="$slots.footer">
<slot name="footer" />
</div>
</div>
</section>
</div>
</Transition>
</Teleport>
@@ -42,39 +98,118 @@ const emit = defineEmits<{ 'update:modelValue': [v: boolean] }>()
.modal-box {
background: var(--color-surface);
border: 1px solid var(--color-border-glass);
border-radius: var(--radius-lg);
border-radius: var(--radius-md);
box-shadow: 0 24px 64px var(--color-black-a20);
width: 100%;
max-width: 520px;
max-height: 90vh;
overflow-y: auto;
}
.modal-box-sm { max-width: 420px; }
.modal-box-md { max-width: 520px; }
.modal-box-lg { max-width: 680px; }
.modal-header {
display: flex;
align-items: center;
justify-content: space-between;
padding: 18px 22px;
border-bottom: 1px solid var(--color-border-glass);
gap: 14px;
padding: 18px 22px 16px;
}
.modal-heading {
display: flex;
align-items: center;
gap: 10px;
min-width: 0;
}
.modal-icon {
display: inline-flex;
align-items: center;
justify-content: center;
flex: 0 0 34px;
width: 34px;
height: 34px;
color: var(--color-primary-dark);
background: var(--color-primary-a10);
border: 1px solid var(--color-primary-a20);
border-radius: var(--radius-sm);
}
.modal-icon-warning {
color: var(--color-warning);
background: var(--color-warning-bg-a90);
border-color: var(--color-warning-border);
}
.modal-heading-text {
min-width: 0;
}
.modal-title {
margin: 0;
font-size: 17px;
font-weight: 700;
line-height: 1.2;
color: var(--color-text);
}
.modal-description {
margin: 5px 0 0;
color: var(--color-text-secondary);
font-size: 13px;
line-height: 1.45;
}
.modal-title { font-size: 17px; font-weight: 700; color: var(--color-text); }
.modal-close {
background: none;
border: none;
font-size: 22px;
flex: 0 0 auto;
display: inline-flex;
align-items: center;
justify-content: center;
width: 32px;
height: 32px;
background: var(--color-white-a70);
border: 1px solid var(--color-border-glass);
border-radius: var(--radius-sm);
font-size: 20px;
cursor: pointer;
color: var(--color-text-secondary);
line-height: 1;
transition: background-color 0.18s ease, color 0.18s ease, border-color 0.18s ease;
}
.modal-close:hover {
background: var(--color-primary-a10);
border-color: var(--color-primary-a20);
color: var(--color-text);
}
.modal-body {
padding: 20px 22px;
color: var(--color-text-secondary);
font-size: 14px;
line-height: 1.5;
}
.modal-body :deep(p) {
margin: 0;
}
.modal-close:hover { color: var(--color-text); }
.modal-body { padding: 20px 22px; }
.modal-footer {
padding: 14px 22px;
border-top: 1px solid var(--color-border-glass);
display: flex;
gap: 10px;
justify-content: flex-end;
flex-wrap: wrap;
}
.modal-enter-active, .modal-leave-active { transition: all 0.25s ease; }
.modal-enter-from, .modal-leave-to { opacity: 0; }
.modal-enter-from .modal-box, .modal-leave-to .modal-box { transform: scale(0.93); }
@media (max-width: 520px) {
.modal-overlay {
align-items: flex-end;
padding: 12px;
}
.modal-box {
max-height: 88vh;
}
.modal-header,
.modal-body,
.modal-footer {
padding-left: 16px;
padding-right: 16px;
}
.modal-footer > :deep(button) {
flex: 1 1 140px;
}
}
</style>
frontend/src/views/student/CatalogView.vue
+3 -3
View File
@@ -268,7 +268,7 @@ function isRegistered(id: string) {
</GlassCard>
</div>
<ModalDialog v-model="filtersOpen" title="Фильтры">
<ModalDialog v-model="filtersOpen" title="Фильтры" icon="search" size="lg">
<div class="modal-filters">
<label>Дата</label>
<select v-model="dateFilter" class="glass-input">
@@ -303,8 +303,8 @@ function isRegistered(id: string) {
</label>
</div>
<template #footer>
<button class="btn-secondary" @click="filtersOpen = false">Закрыть</button>
<button class="btn-primary" @click="filtersOpen = false">Применить</button>
<button class="btn-secondary" type="button" @click="filtersOpen = false">Закрыть</button>
<button class="btn-primary" type="button" @click="filtersOpen = false">Применить</button>
</template>
</ModalDialog>
frontend/src/views/student/MyLecturesView.vue
+3 -3
View File
@@ -85,11 +85,11 @@ async function confirmCancel() {
</GlassCard>
</div>
<ModalDialog v-model="cancelModal" title="Отменить запись?">
<ModalDialog v-model="cancelModal" title="Отменить запись?" icon="alert-triangle" size="sm">
<p>Вы уверены, что хотите отменить запись на лекцию? Место будет освобождено для других студентов.</p>
<template #footer>
<button class="btn-secondary" @click="cancelModal = false">Нет</button>
<button class="btn-danger" @click="confirmCancel">Да, отменить</button>
<button class="btn-secondary" type="button" @click="cancelModal = false">Нет</button>
<button class="btn-danger" type="button" @click="confirmCancel">Да, отменить</button>
</template>
</ModalDialog>
</div>