);
@@ -175,16 +188,20 @@ function RemoteParticipantPiP({ chatOpen }) {
// ----------------------------------------------------------------------
-function WhiteboardIframe({ boardId, showingBoard }) {
- const excalidrawUrl = process.env.NEXT_PUBLIC_EXCALIDRAW_URL || '';
+function WhiteboardIframe({ boardId, showingBoard, user }) {
const iframeRef = useRef(null);
+ const excalidrawConfigured = !!(
+ process.env.NEXT_PUBLIC_EXCALIDRAW_URL ||
+ process.env.NEXT_PUBLIC_EXCALIDRAW_PATH
+ );
+
useEffect(() => {
- if (!excalidrawUrl || !boardId) return undefined;
+ if (!excalidrawConfigured || !boardId) return undefined;
const container = iframeRef.current;
if (!container) return undefined;
const iframe = document.createElement('iframe');
- iframe.src = `${excalidrawUrl}?boardId=${boardId}`;
+ iframe.src = buildExcalidrawSrc(boardId, user);
iframe.style.cssText = 'width:100%;height:100%;border:none;';
iframe.allow = 'camera; microphone; fullscreen';
container.innerHTML = '';
@@ -192,9 +209,9 @@ function WhiteboardIframe({ boardId, showingBoard }) {
return () => {
container.innerHTML = '';
};
- }, [boardId, excalidrawUrl]);
+ }, [boardId, excalidrawConfigured, user]);
- if (!excalidrawUrl) {
+ if (!excalidrawConfigured) {
return (
Доска не настроена (NEXT_PUBLIC_EXCALIDRAW_URL)
@@ -227,7 +244,7 @@ function PreJoinScreen({ onJoin, onCancel }) {
if (!videoEnabled) return undefined;
let stream = null;
navigator.mediaDevices
- .getUserMedia({ video: { width: { ideal: 2560 }, height: { ideal: 1440 }, frameRate: { ideal: 30 } }, audio: false })
+ .getUserMedia({ video: { width: { ideal: 640 }, height: { ideal: 480 } }, audio: false })
.then((s) => {
stream = s;
if (videoRef.current) videoRef.current.srcObject = s;
@@ -246,42 +263,64 @@ function PreJoinScreen({ onJoin, onCancel }) {
onJoin(audioEnabled, videoEnabled);
};
+ const S = {
+ page: { display: 'flex', alignItems: 'center', justifyContent: 'center', height: '100vh', background: '#0d0d0d', overflow: 'hidden' },
+ card: { background: 'rgba(255,255,255,0.05)', border: '1px solid rgba(255,255,255,0.10)', borderRadius: 22, width: '100%', maxWidth: 480, overflow: 'hidden', boxShadow: '0 24px 64px rgba(0,0,0,0.6)' },
+ header: { padding: '24px 28px 20px', borderBottom: '1px solid rgba(255,255,255,0.08)' },
+ title: { fontSize: 20, fontWeight: 700, color: '#fff', margin: 0 },
+ sub: { fontSize: 13, color: 'rgba(255,255,255,0.5)', margin: '4px 0 0' },
+ body: { padding: 24, display: 'flex', flexDirection: 'column', gap: 16 },
+ preview: { background: '#111', borderRadius: 14, aspectRatio: '16/9', overflow: 'hidden', position: 'relative' },
+ previewOff: { position: 'absolute', inset: 0, display: 'flex', flexDirection: 'column', alignItems: 'center', justifyContent: 'center', gap: 10, color: 'rgba(255,255,255,0.35)' },
+ toggleRow: { display: 'flex', alignItems: 'center', justifyContent: 'space-between', padding: '12px 16px', background: 'rgba(255,255,255,0.04)', border: '1px solid rgba(255,255,255,0.07)', borderRadius: 12 },
+ toggleLabel: { display: 'flex', alignItems: 'center', gap: 10, color: 'rgba(255,255,255,0.85)', fontSize: 14 },
+ toggleBtn: (on) => ({ padding: '7px 18px', borderRadius: 9, border: 'none', background: on ? 'rgba(25,118,210,0.25)' : 'rgba(255,255,255,0.08)', color: on ? '#60a5fa' : 'rgba(255,255,255,0.5)', fontSize: 13, fontWeight: 600, cursor: 'pointer', transition: 'all 0.15s' }),
+ actions: { display: 'flex', gap: 10 },
+ cancelBtn: { flex: 1, padding: '13px', borderRadius: 12, border: '1px solid rgba(255,255,255,0.12)', background: 'transparent', color: 'rgba(255,255,255,0.6)', fontSize: 14, cursor: 'pointer' },
+ joinBtn: { flex: 2, padding: '13px', borderRadius: 12, border: 'none', background: 'linear-gradient(135deg, #1976d2 0%, #1565c0 100%)', color: '#fff', fontSize: 14, fontWeight: 700, cursor: 'pointer', letterSpacing: '0.02em', boxShadow: '0 4px 16px rgba(25,118,210,0.35)' },
+ };
+
+ const devices = [
+ { key: 'mic', label: 'Микрофон', icon: audioEnabled ? 'solar:microphone-bold' : 'solar:microphone-slash-bold', enabled: audioEnabled, toggle: () => setAudioEnabled((v) => !v) },
+ { key: 'cam', label: 'Камера', icon: videoEnabled ? 'solar:camera-bold' : 'solar:camera-slash-bold', enabled: videoEnabled, toggle: () => setVideoEnabled((v) => !v) },
+ ];
+
return (
-
-
-
-
Настройки перед входом
-
Настройте камеру и микрофон
+
+
+
+
Настройки перед входом
+
Проверьте камеру и микрофон
-
-
- {videoEnabled ? (
-
- ) : (
-
- )}
+
+
+ {videoEnabled
+ ?
+ : (
+
+
+ Камера выключена
+
+ )}
-
- {[
- { label: 'Микрофон', enabled: audioEnabled, toggle: () => setAudioEnabled((v) => !v) },
- { label: 'Камера', enabled: videoEnabled, toggle: () => setVideoEnabled((v) => !v) },
- ].map(({ label, enabled, toggle }) => (
-
-
{label}
-
@@ -291,13 +330,113 @@ function PreJoinScreen({ onJoin, onCancel }) {
// ----------------------------------------------------------------------
-function RoomContent({ lessonId, boardId, boardLoading, showBoard, setShowBoard }) {
+// Panel width constant already defined at top
+// ----------------------------------------------------------------------
+
+function VideoCallChatPanel({ lesson, currentUser, onClose }) {
+ const [chat, setChat] = useState(null);
+ const [loading, setLoading] = useState(true);
+ const [error, setError] = useState(null);
+
+ useEffect(() => {
+ if (!lesson || !currentUser) return;
+ const getOtherUserId = () => {
+ if (currentUser.role === 'mentor') {
+ const client = lesson.client;
+ if (!client) return null;
+ if (typeof client === 'object') return client.user?.id ?? client.id ?? null;
+ return client;
+ }
+ const mentor = lesson.mentor;
+ if (!mentor) return null;
+ if (typeof mentor === 'object') return mentor.id ?? null;
+ return mentor;
+ };
+
+ const otherId = getOtherUserId();
+ if (!otherId) {
+ setError('Не удалось определить собеседника');
+ setLoading(false);
+ return;
+ }
+
+ setLoading(true);
+ createChat(otherId)
+ .then((raw) => {
+ const enriched = { ...raw };
+ if (!enriched.other_participant) {
+ // fallback: determine name from lesson data
+ const other = currentUser.role === 'mentor' ? lesson.client : lesson.mentor;
+ if (other && typeof other === 'object') {
+ const u = other.user || other;
+ enriched.other_participant = {
+ id: otherId,
+ first_name: u.first_name,
+ last_name: u.last_name,
+ avatar_url: u.avatar_url || u.avatar || null,
+ };
+ }
+ }
+ setChat(normalizeChat(enriched));
+ })
+ .catch((e) => setError(e?.response?.data?.detail || e?.message || 'Ошибка загрузки чата'))
+ .finally(() => setLoading(false));
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [lesson?.id, currentUser?.id]);
+
+ return (
+
+ {/* Header */}
+
+
+ {loading && (
+
+
+ Загрузка чата…
+
+ )}
+ {error && (
+
+ {error}
+
+ )}
+ {!loading && !error && (
+
+ )}
+
+ );
+}
+
+// ----------------------------------------------------------------------
+
+function RoomContent({ lessonId, lesson, boardId, boardLoading, showBoard, setShowBoard, postDisconnectRef }) {
const room = useRoomContext();
const router = useRouter();
const { user } = useAuthContext();
const [showPlatformChat, setShowPlatformChat] = useState(false);
- const [showExitModal, setShowExitModal] = useState(false);
+ const [showExitMenu, setShowExitMenu] = useState(false);
const [showNavMenu, setShowNavMenu] = useState(false);
+ const [terminatingAll, setTerminatingAll] = useState(false);
+ const [exitBtnRect, setExitBtnRect] = useState(null);
+ const exitBtnRef = useRef(null);
+ const isMentor = user?.role === 'mentor';
+
+ const handleToggleExitMenu = () => {
+ if (!showExitMenu && exitBtnRef.current) {
+ setExitBtnRect(exitBtnRef.current.getBoundingClientRect());
+ }
+ setShowExitMenu((v) => !v);
+ };
useEffect(() => {
const onConnected = () => {
@@ -335,7 +474,7 @@ function RoomContent({ lessonId, boardId, boardLoading, showBoard, setShowBoard
btn.className = 'lk-button lk-custom-exit-button';
btn.title = 'Выйти';
btn.textContent = '🚪';
- btn.addEventListener('click', () => window.dispatchEvent(new CustomEvent('livekit-exit-click')));
+ btn.addEventListener('click', (ev) => window.dispatchEvent(new CustomEvent('livekit-exit-click', { detail: { target: ev.currentTarget } })));
bar.appendChild(btn);
}
}, 800);
@@ -349,16 +488,61 @@ function RoomContent({ lessonId, boardId, boardLoading, showBoard, setShowBoard
}, []);
useEffect(() => {
- const handler = () => {
- if (user?.role === 'mentor') {
- setShowExitModal(true);
- } else {
- room.disconnect();
- }
+ // Control bar button click: capture its rect for popup positioning
+ const handler = (e) => {
+ const btn = e?.detail?.target ?? document.querySelector('.lk-custom-exit-button');
+ if (btn) setExitBtnRect(btn.getBoundingClientRect());
+ setShowExitMenu(true);
};
window.addEventListener('livekit-exit-click', handler);
return () => window.removeEventListener('livekit-exit-click', handler);
- }, [user?.role, room]);
+ }, []);
+
+ const handleJustExit = () => {
+ setShowExitMenu(false);
+ room.disconnect();
+ };
+
+ const handleTerminateForAll = async () => {
+ setShowExitMenu(false);
+ setTerminatingAll(true);
+ if (lessonId != null) {
+ try { sessionStorage.setItem('complete_lesson_id', String(lessonId)); } catch { /* ignore */ }
+ if (postDisconnectRef) postDisconnectRef.current = paths.dashboard.calendar;
+
+ // 1. Broadcast terminate signal via LiveKit DataChannel so clients
+ // disconnect immediately (fallback if backend call is slow/fails).
+ try {
+ await room.localParticipant.publishData(
+ new TextEncoder().encode(TERMINATE_MSG),
+ { reliable: true }
+ );
+ } catch { /* ignore */ }
+
+ // 2. Backend: terminate LiveKit room + mark lesson as completed.
+ try { await terminateRoom(lessonId); } catch { /* ignore */ }
+
+ // 3. Ensure lesson status is "completed" on backend even if
+ // terminateRoom doesn't handle it.
+ try { await completeLesson(String(lessonId), '', undefined, undefined, undefined, false, undefined); } catch { /* ignore */ }
+ }
+ room.disconnect();
+ };
+
+ // Listen for terminate broadcast from mentor (runs on client side).
+ useEffect(() => {
+ if (isMentor) return undefined;
+ const onData = (payload) => {
+ try {
+ const msg = JSON.parse(new TextDecoder().decode(payload));
+ if (msg?.type === 'room_terminate') {
+ room.disconnect();
+ }
+ } catch { /* ignore */ }
+ };
+ room.on(RoomEvent.DataReceived, onData);
+ return () => { room.off(RoomEvent.DataReceived, onData); };
+ }, [room, isMentor]);
// Save audio/video state on track events
useEffect(() => {
@@ -401,103 +585,159 @@ function RoomContent({ lessonId, boardId, boardLoading, showBoard, setShowBoard
};
}, [room]);
- const sidebarStyle = {
- position: 'fixed',
- right: showPlatformChat ? CHAT_PANEL_WIDTH + 16 : 16,
- top: '50%',
- transform: 'translateY(-50%)',
- display: 'flex',
- flexDirection: 'column',
- gap: 8,
- padding: 8,
- background: 'rgba(0,0,0,0.7)',
- borderRadius: 12,
- zIndex: 10001,
- };
+ const sidebarRight = showPlatformChat ? CHAT_PANEL_WIDTH + 12 : 12;
- const iconBtn = (active, disabled, title, icon, onClick) => (
+ const SideBtn = ({ active, disabled: dis, title, icon, onClick: handleClick }) => (
);
return (
-
+
-
-
-
- message} />
-
-
+
+
+ message} />
+
{typeof document !== 'undefined' &&
createPortal(
<>
{showBoard &&
}
+
+ {/* Board burger button */}
{showBoard && (
)}
- {showNavMenu && (
- // eslint-disable-next-line jsx-a11y/no-static-element-interactions
-
setShowNavMenu(false)}
- onKeyDown={(e) => e.key === 'Escape' && setShowNavMenu(false)}
- style={{ position: 'fixed', inset: 0, background: 'rgba(0,0,0,0.4)', zIndex: 10003, backdropFilter: 'blur(4px)', display: 'flex', alignItems: 'center', justifyContent: 'center' }}
+
+ {/* Nav menu — existing NavMobile, all links open in new tab */}
+
setShowNavMenu(false)}
+ data={getNavData(user?.role).map((section) => ({
+ ...section,
+ items: section.items.map((item) => ({ ...item, externalLink: true })),
+ }))}
+ sx={{ bgcolor: 'grey.900', width: 300 }}
+ />
+
+ {/* Right sidebar */}
+
+
setShowBoard(false)} />
+ boardId && !boardLoading && setShowBoard(true)}
+ />
+ {lessonId != null && (
+ setShowPlatformChat((v) => !v)} />
+ )}
+ {/* Divider */}
+
+ {/* Exit button */}
+
- {iconBtn(!showBoard, false, 'Камера', '📹', () => setShowBoard(false))}
- {iconBtn(showBoard, !boardId || boardLoading, boardLoading ? 'Загрузка доски...' : !boardId ? 'Доска недоступна' : 'Доска', boardLoading ? '⏳' : '🎨', () => boardId && !boardLoading && setShowBoard(true))}
- {lessonId != null && iconBtn(showPlatformChat, false, 'Чат', '💬', () => setShowPlatformChat((v) => !v))}
+
+
+
+ {/* Exit menu popup — anchored to the exit button rect */}
+ {showExitMenu && exitBtnRect && (
+ <>
+ {/* Backdrop */}
+ setShowExitMenu(false)}
+ />
+ {/* Popup: right edge aligned with exit button right edge, bottom edge at exit button top - 8px */}
+
+
+ {isMentor && (
+
+ )}
+
+
+ )}
+
+ {showPlatformChat && lesson && (
+
setShowPlatformChat(false)}
+ />
+ )}
,
document.body
)}
-
- setShowExitModal(false)}
- onExit={() => room.disconnect()}
- />
)}
router.push('/dashboard')}
+ onDisconnected={() => router.push(postDisconnectRef.current)}
style={{ height: '100vh' }}
data-lk-theme="default"
options={{
@@ -697,10 +951,12 @@ export function VideoCallView() {
>
diff --git a/front_minimal/src/styles/livekit-theme.css b/front_minimal/src/styles/livekit-theme.css
index 334162f..217c794 100644
--- a/front_minimal/src/styles/livekit-theme.css
+++ b/front_minimal/src/styles/livekit-theme.css
@@ -1,429 +1,369 @@
/**
- * Кастомизация LiveKit через CSS переменные.
- * Все стили и скрипты LiveKit отдаются с нашего сервера (бандл + этот файл).
+ * LiveKit custom theme — platform edition
*/
-@keyframes lk-spin {
- to { transform: rotate(360deg); }
-}
+/* ─── No scroll on video-call page (applied via useEffect in VideoCallView) ── */
+/* ─── CSS Variables ─────────────────────────────────────────────────────────── */
:root {
- /* Цвета фона */
- --lk-bg: #1a1a1a;
- --lk-bg2: #2a2a2a;
- --lk-bg3: #3a3a3a;
-
- /* Цвета текста */
- --lk-fg: #ffffff;
- --lk-fg2: rgba(255, 255, 255, 0.7);
-
- /* Основные цвета */
- --lk-control-bg: var(--md-sys-color-primary);
- --lk-control-hover-bg: var(--md-sys-color-primary-container);
- --lk-button-bg: rgba(255, 255, 255, 0.15);
- --lk-button-hover-bg: rgba(255, 255, 255, 0.25);
-
- /* Границы */
- --lk-border-color: rgba(255, 255, 255, 0.1);
- --lk-border-radius: 12px;
-
- /* Фокус */
- --lk-focus-ring: var(--md-sys-color-primary);
-
- /* Ошибки */
- --lk-danger: var(--md-sys-color-error);
-
- /* Размеры */
- --lk-control-bar-height: 80px;
- --lk-participant-tile-gap: 12px;
+ --vc-bg: #0d0d0d;
+ --vc-surface: rgba(255, 255, 255, 0.06);
+ --vc-surface-hover: rgba(255, 255, 255, 0.12);
+ --vc-border: rgba(255, 255, 255, 0.10);
+ --vc-accent: #1976d2;
+ --vc-accent-hover: #1565c0;
+ --vc-danger: #ef5350;
+ --vc-text: #ffffff;
+ --vc-text-dim: rgba(255, 255, 255, 0.55);
+ --vc-radius: 14px;
+ --vc-blur: blur(18px);
+
+ /* LiveKit CSS vars */
+ --lk-bg: #0d0d0d;
+ --lk-bg2: #1a1a1a;
+ --lk-bg3: #262626;
+ --lk-fg: #ffffff;
+ --lk-fg2: rgba(255, 255, 255, 0.7);
+ --lk-control-bg: rgba(255, 255, 255, 0.08);
+ --lk-control-hover-bg: rgba(255, 255, 255, 0.16);
+ --lk-button-bg: rgba(255, 255, 255, 0.08);
+ --lk-border-color: rgba(255, 255, 255, 0.10);
+ --lk-border-radius: 12px;
+ --lk-danger: #ef5350;
+ --lk-accent-bg: #1976d2;
+ --lk-accent-fg: #ffffff;
+ --lk-control-bar-height: 76px;
+ --lk-grid-gap: 10px;
}
-/* Панель управления — без ограничения по ширине */
+/* ─── Room root ─────────────────────────────────────────────────────────────── */
+.lk-room-container {
+ background: var(--vc-bg) !important;
+ overflow: hidden !important;
+}
+
+/* ─── Control bar ───────────────────────────────────────────────────────────── */
.lk-control-bar {
- background: rgba(0, 0, 0, 0.8) !important;
- backdrop-filter: blur(20px) !important;
- border-radius: 16px !important;
- padding: 12px 16px !important;
- margin: 16px !important;
- box-shadow: 0 8px 32px rgba(0, 0, 0, 0.4) !important;
- max-width: none !important;
+ position: fixed !important;
+ bottom: 20px !important;
+ left: 50% !important;
+ transform: translateX(-50%) !important;
width: auto !important;
+ max-width: calc(100vw - 40px) !important;
+ background: rgba(15, 15, 15, 0.85) !important;
+ backdrop-filter: var(--vc-blur) !important;
+ -webkit-backdrop-filter: var(--vc-blur) !important;
+ border: 1px solid var(--vc-border) !important;
+ border-radius: 20px !important;
+ padding: 10px 16px !important;
+ gap: 6px !important;
+ box-shadow: 0 8px 40px rgba(0, 0, 0, 0.6), 0 2px 8px rgba(0, 0, 0, 0.4) !important;
+ z-index: 9000 !important;
}
.lk-control-bar .lk-button-group,
.lk-control-bar .lk-button-group-menu {
max-width: none !important;
- width: auto !important;
}
-/* Кнопки управления — ширина по контенту, без жёсткого ограничения */
-.lk-control-bar .lk-button {
- min-width: 48px !important;
- width: auto !important;
- height: 48px !important;
+/* ─── All buttons ───────────────────────────────────────────────────────────── */
+.lk-button,
+.lk-start-audio-button,
+.lk-chat-toggle,
+.lk-disconnect-button {
+ min-width: 46px !important;
+ height: 46px !important;
border-radius: 12px !important;
- transition: all 0.2s ease !important;
- padding-left: 12px !important;
- padding-right: 12px !important;
+ transition: background 0.18s ease, transform 0.12s ease !important;
+ padding: 0 14px !important;
+ font-size: 13px !important;
+ font-weight: 500 !important;
+ letter-spacing: 0.01em !important;
+ gap: 7px !important;
}
-/* Русские подписи: скрываем английский текст, показываем свой */
-.lk-control-bar .lk-button[data-lk-source="microphone"],
-.lk-control-bar .lk-button[data-lk-source="camera"],
-.lk-control-bar .lk-button[data-lk-source="screen_share"],
+.lk-button:not(:disabled):hover {
+ transform: translateY(-1px) !important;
+ background: var(--vc-surface-hover) !important;
+}
+
+.lk-button:active { transform: scale(0.96) !important; }
+
+/* Active (enabled) state */
+.lk-button[data-lk-enabled="true"] {
+ background: rgba(25, 118, 210, 0.25) !important;
+ color: #60a5fa !important;
+}
+.lk-button[data-lk-enabled="true"]:hover {
+ background: rgba(25, 118, 210, 0.35) !important;
+}
+
+/* Screen share active */
+.lk-button[data-lk-source="screen_share"][data-lk-enabled="true"] {
+ background: rgba(25, 118, 210, 0.3) !important;
+ color: #60a5fa !important;
+}
+
+/* ─── Russian labels ────────────────────────────────────────────────────────── */
+.lk-control-bar .lk-button[data-lk-source],
.lk-control-bar .lk-chat-toggle,
.lk-control-bar .lk-disconnect-button,
.lk-control-bar .lk-start-audio-button {
font-size: 0 !important;
}
-.lk-control-bar .lk-button[data-lk-source="microphone"] > svg,
-.lk-control-bar .lk-button[data-lk-source="camera"] > svg,
-.lk-control-bar .lk-button[data-lk-source="screen_share"] > svg,
+.lk-control-bar .lk-button > svg,
.lk-control-bar .lk-chat-toggle > svg,
.lk-control-bar .lk-disconnect-button > svg {
- width: 16px !important;
- height: 16px !important;
+ width: 18px !important;
+ height: 18px !important;
flex-shrink: 0 !important;
}
-.lk-control-bar .lk-button[data-lk-source="microphone"]::after {
- content: "Микрофон";
- font-size: 1rem;
-}
+.lk-control-bar .lk-button[data-lk-source="microphone"]::after { content: "Микрофон"; font-size: 13px; }
+.lk-control-bar .lk-button[data-lk-source="camera"]::after { content: "Камера"; font-size: 13px; }
+.lk-control-bar .lk-button[data-lk-source="screen_share"]::after { content: "Экран"; font-size: 13px; }
+.lk-control-bar .lk-button[data-lk-source="screen_share"][data-lk-enabled="true"]::after { content: "Стоп"; }
+.lk-control-bar .lk-chat-toggle::after { content: "Чат"; font-size: 13px; }
-.lk-control-bar .lk-button[data-lk-source="camera"]::after {
- content: "Камера";
- font-size: 1rem;
-}
-
-.lk-control-bar .lk-button[data-lk-source="screen_share"]::after {
- content: "Поделиться экраном";
- font-size: 1rem;
-}
-
-.lk-control-bar .lk-button[data-lk-source="screen_share"][data-lk-enabled="true"]::after {
- content: "Остановить демонстрацию";
-}
-
-.lk-control-bar .lk-chat-toggle::after {
- content: "Чат";
- font-size: 1rem;
-}
-
-/* Кнопка бургер слева от микрофона — в панели LiveKit */
+/* ─── Burger & custom exit (injected via JS) ────────────────────────────────── */
.lk-burger-button {
- background: rgba(255, 255, 255, 0.15) !important;
- color: #fff !important;
+ background: var(--vc-surface) !important;
+ color: var(--vc-text) !important;
+ border-radius: 12px !important;
+}
+.lk-burger-button:hover {
+ background: var(--vc-surface-hover) !important;
}
-/* Скрываем стандартную кнопку «Выйти» — используем свою внутри панели (модалка: Выйти / Выйти и завершить занятие) */
-.lk-control-bar .lk-disconnect-button {
- display: none !important;
-}
-.lk-control-bar .lk-disconnect-button::after {
- content: "Выйти";
- font-size: 1rem;
-}
+/* Hide default disconnect — we use our own */
+.lk-control-bar .lk-disconnect-button { display: none !important; }
-/* Наша кнопка «Выйти» — внутри панели, рядом с «Поделиться экраном» */
+/* Our exit button */
.lk-control-bar .lk-custom-exit-button {
font-size: 0 !important;
- background: var(--md-sys-color-error) !important;
- color: #fff !important;
- border: none;
- cursor: pointer;
+ background: rgba(239, 83, 80, 0.18) !important;
+ color: #fc8181 !important;
+ border: 1px solid rgba(239, 83, 80, 0.30) !important;
+ border-radius: 12px !important;
+ cursor: pointer !important;
display: inline-flex !important;
- align-items: center;
- justify-content: center;
+ align-items: center !important;
+ justify-content: center !important;
+ gap: 7px !important;
+ padding: 0 14px !important;
+ min-width: 46px !important;
+ height: 46px !important;
+ transition: background 0.18s ease !important;
}
.lk-control-bar .lk-custom-exit-button::after {
content: "Выйти";
- font-size: 1rem;
+ font-size: 13px;
+ font-weight: 500;
}
-.lk-control-bar .lk-custom-exit-button > .material-symbols-outlined {
- color: #fff !important;
+.lk-control-bar .lk-custom-exit-button:hover {
+ background: rgba(239, 83, 80, 0.30) !important;
}
-/* Скрываем кнопку «Начать видео» — у нас свой StartAudioOverlay */
-.lk-control-bar .lk-start-audio-button {
- display: none !important;
-}
+/* Hide audio start button (we handle it ourselves) */
+.lk-control-bar .lk-start-audio-button { display: none !important; }
+/* Hide LiveKit chat toggle (we use our own) */
+.lk-control-bar .lk-chat-toggle { display: none !important; }
-/* Кнопки без текста (только иконка) — минимальный размер */
-.lk-button {
- min-width: 48px !important;
- width: auto !important;
- height: 48px !important;
- border-radius: 12px !important;
- transition: all 0.2s ease !important;
-}
-
-.lk-button:hover {
- transform: scale(1.05);
-}
-
-.lk-button:active {
- transform: scale(0.95);
-}
-
-/* Активная кнопка */
-.lk-button[data-lk-enabled="true"] {
- background: var(--md-sys-color-primary) !important;
-}
-
-/* Кнопка отключения — белые иконка и текст */
-.lk-disconnect-button {
- background: var(--md-sys-color-error) !important;
- color: #fff !important;
-}
-.lk-disconnect-button > svg {
- color: #fff !important;
- fill: currentColor;
-}
-
-/* Плитки участников */
+/* ─── Participant tiles ──────────────────────────────────────────────────────── */
.lk-participant-tile {
- border-radius: 12px !important;
+ border-radius: 14px !important;
overflow: hidden !important;
- box-shadow: 0 4px 12px rgba(0, 0, 0, 0.2) !important;
+ background: #111 !important;
}
-/* Плейсхолдер без камеры: скрываем дефолтную SVG, показываем аватар из API */
-.lk-participant-tile .lk-participant-placeholder svg {
- display: none !important;
+.lk-participant-tile[data-lk-speaking="true"]:not([data-lk-source="screen_share"])::after {
+ border-width: 2px !important;
+ border-color: #60a5fa !important;
+ transition-delay: 0s !important;
+ transition-duration: 0.15s !important;
}
-/* Контейнер для аватара — нужен для container queries */
.lk-participant-tile .lk-participant-placeholder {
- container-type: size;
+ background: linear-gradient(135deg, #1a1a2e 0%, #16213e 100%) !important;
}
-
+.lk-participant-tile .lk-participant-placeholder svg { display: none !important; }
+.lk-participant-tile .lk-participant-placeholder { container-type: size; }
.lk-participant-tile .lk-participant-placeholder img.lk-participant-avatar-img {
- /* Квадрат: меньшая сторона контейнера, максимум 400px */
- --avatar-size: min(min(80cqw, 80cqh), 400px);
+ --avatar-size: min(min(70cqw, 70cqh), 360px);
width: var(--avatar-size);
height: var(--avatar-size);
- aspect-ratio: 1 / 1;
- object-fit: cover;
- object-position: center;
border-radius: 50%;
+ object-fit: cover;
+ box-shadow: 0 0 0 3px rgba(255,255,255,0.12);
}
-
-/* Fallback для браузеров без container queries */
@supports not (width: 1cqw) {
.lk-participant-tile .lk-participant-placeholder img.lk-participant-avatar-img {
- width: 200px;
- height: 200px;
+ width: 180px; height: 180px;
}
}
-/* Имя участника — белый текст (Камера, PiP) */
-.lk-participant-name {
- background: rgba(0, 0, 0, 0.7) !important;
- backdrop-filter: blur(10px) !important;
+/* Participant name badge */
+.lk-participant-metadata { bottom: 10px !important; left: 10px !important; right: 10px !important; }
+.lk-participant-metadata-item {
+ background: rgba(0, 0, 0, 0.55) !important;
+ backdrop-filter: blur(8px) !important;
border-radius: 8px !important;
- padding: 6px 12px !important;
+ padding: 4px 10px !important;
+}
+.lk-participant-name {
+ font-size: 12px !important;
font-weight: 600 !important;
color: #fff !important;
+ letter-spacing: 0.02em !important;
}
-/* Чат LiveKit скрыт — используем чат сервиса (платформы) */
-.lk-video-conference .lk-chat {
- display: none !important;
-}
-
-.lk-control-bar .lk-chat-toggle {
- display: none !important;
-}
-
-/* Стили чата платформы оставляем для других страниц */
-.lk-chat {
- background: var(--md-sys-color-surface) !important;
- border-left: 1px solid var(--md-sys-color-outline) !important;
-}
-
-.lk-chat-entry {
- background: var(--md-sys-color-surface-container) !important;
- border-radius: 12px !important;
- padding: 12px !important;
- margin-bottom: 12px !important;
-}
-
-/* Сетка участников */
+/* ─── Video layouts ──────────────────────────────────────────────────────────── */
.lk-grid-layout {
- gap: 12px !important;
- padding: 12px !important;
+ gap: var(--lk-grid-gap) !important;
+ padding: var(--lk-grid-gap) !important;
+ min-height: 0 !important;
}
+.lk-grid-layout .lk-participant-tile { min-height: 200px; }
-/* Меню выбора устройств — без ограничения по ширине */
-.lk-device-menu,
-.lk-media-device-select {
- max-width: none !important;
- width: max-content !important;
- min-width: 0 !important;
-}
-
-.lk-media-device-select {
- background: rgba(0, 0, 0, 0.95) !important;
- backdrop-filter: blur(20px) !important;
- border-radius: 12px !important;
- padding: 8px !important;
- box-shadow: 0 8px 32px rgba(0, 0, 0, 0.4) !important;
- border: 1px solid rgba(255, 255, 255, 0.1) !important;
-}
-
-.lk-media-device-select button {
- border-radius: 8px !important;
- padding: 10px 14px !important;
- transition: background 0.2s ease !important;
- width: 100% !important;
- min-width: 0 !important;
- white-space: normal !important;
- text-align: left !important;
-}
-
-.lk-media-device-select button:hover {
- background: rgba(255, 255, 255, 0.1) !important;
-}
-
-.lk-media-device-select button[data-lk-active="true"] {
- background: var(--md-sys-color-primary) !important;
-}
-
-/* Индикатор говорящего */
-.lk-participant-tile[data-lk-speaking="true"] {
- box-shadow: 0 0 0 3px var(--md-sys-color-primary) !important;
-}
-
-/* Layout для 1-на-1: собеседник на весь экран, своя камера в углу */
-/* Карусель position:absolute выходит из flow — остаётся только основной контент. */
-/* Сетка 5fr 1fr: единственный grid-ребёнок (основное видео) получает 5fr (расширяется). */
+/* Focus layout: remote fills screen, local in PiP */
.lk-focus-layout {
position: relative !important;
grid-template-columns: 5fr 1fr !important;
}
-
-/* Основное видео (собеседник) на весь экран */
.lk-focus-layout .lk-focus-layout-wrapper {
width: 100% !important;
height: 100% !important;
}
-
.lk-focus-layout .lk-focus-layout-wrapper .lk-participant-tile {
width: 100% !important;
height: 100% !important;
border-radius: 0 !important;
}
-/* Демонстрация экрана — на весь экран только в режиме фокуса (после клика на раскрытие) */
-/* Структура: .lk-focus-layout-wrapper > .lk-focus-layout > .lk-participant-tile */
-.lk-focus-layout > .lk-participant-tile[data-lk-source="screen_share"] {
- position: absolute !important;
- width: 100% !important;
- height: 100% !important;
- top: 0 !important;
- left: 0 !important;
- border-radius: 0 !important;
- z-index: 50 !important;
-}
-
-/* Карусель с локальным видео (своя камера) */
+/* Carousel (local camera) — bottom-right PiP */
.lk-focus-layout .lk-carousel {
position: absolute !important;
- bottom: 80px !important;
+ bottom: 96px !important;
right: 16px !important;
- width: 280px !important;
+ width: 240px !important;
height: auto !important;
z-index: 100 !important;
pointer-events: auto !important;
}
-
.lk-focus-layout .lk-carousel .lk-participant-tile {
- width: 280px !important;
- height: 158px !important;
+ width: 240px !important;
+ height: 135px !important;
border-radius: 12px !important;
- box-shadow: 0 8px 32px rgba(0, 0, 0, 0.6) !important;
- border: 2px solid rgba(255, 255, 255, 0.2) !important;
+ box-shadow: 0 8px 32px rgba(0, 0, 0, 0.7), 0 0 0 1px rgba(255,255,255,0.10) !important;
}
-
-/* Скрыть стрелки карусели (они не нужны для 1 участника) */
.lk-focus-layout .lk-carousel button[aria-label*="Previous"],
-.lk-focus-layout .lk-carousel button[aria-label*="Next"] {
- display: none !important;
-}
+.lk-focus-layout .lk-carousel button[aria-label*="Next"] { display: none !important; }
-/* Если используется grid layout (фоллбэк) */
-.lk-grid-layout {
- position: relative !important;
-}
-
-/* Для 2 участников: первый на весь экран, второй в углу */
+/* Grid 2-person: first full, second PiP */
.lk-grid-layout[data-lk-participants="2"] {
display: block !important;
position: relative !important;
}
-
.lk-grid-layout[data-lk-participants="2"] .lk-participant-tile:first-child {
position: absolute !important;
- top: 0 !important;
- left: 0 !important;
+ inset: 0 !important;
width: 100% !important;
height: 100% !important;
border-radius: 0 !important;
}
-
.lk-grid-layout[data-lk-participants="2"] .lk-participant-tile:last-child {
position: absolute !important;
- bottom: 80px !important;
+ bottom: 96px !important;
right: 16px !important;
- width: 280px !important;
- height: 158px !important;
+ width: 240px !important;
+ height: 135px !important;
border-radius: 12px !important;
- box-shadow: 0 8px 32px rgba(0, 0, 0, 0.6) !important;
- border: 2px solid rgba(255, 255, 255, 0.2) !important;
+ box-shadow: 0 8px 32px rgba(0, 0, 0, 0.7), 0 0 0 1px rgba(255,255,255,0.10) !important;
z-index: 100 !important;
}
-/* Адаптивность */
-@media (max-width: 768px) {
- .lk-control-bar {
- border-radius: 12px !important;
- padding: 8px 12px !important;
- }
-
- .lk-control-bar .lk-button,
- .lk-button {
- min-width: 44px !important;
- width: auto !important;
- height: 44px !important;
- }
-
- /* Уменьшаем размер локального видео на мобильных */
- .lk-focus-layout .lk-carousel,
- .lk-grid-layout[data-lk-participants="2"] .lk-participant-tile:last-child {
- width: 160px !important;
- height: 90px !important;
- bottom: 70px !important;
- right: 12px !important;
- }
-}
-
-/* Качество отображения видео в контейнере LiveKit */
-.lk-participant-media-video {
- background: #000 !important;
-}
-/* Демонстрация экрана: contain чтобы не обрезать, чёткое отображение */
+/* Screen share */
+.lk-participant-media-video { background: #000 !important; }
.lk-participant-media-video[data-lk-source="screen_share"] {
object-fit: contain !important;
- object-position: center !important;
image-rendering: -webkit-optimize-contrast;
image-rendering: crisp-edges;
}
-/* Сетка: минимальная высота плиток для крупного видео */
-.lk-grid-layout {
- min-height: 0;
+.lk-focus-layout > .lk-participant-tile[data-lk-source="screen_share"] {
+ position: absolute !important;
+ inset: 0 !important;
+ border-radius: 0 !important;
+ z-index: 50 !important;
}
-.lk-grid-layout .lk-participant-tile {
- min-height: 240px;
+
+/* ─── Device menu ───────────────────────────────────────────────────────────── */
+.lk-device-menu,
+.lk-media-device-select {
+ max-width: none !important;
+ width: max-content !important;
+}
+.lk-media-device-select {
+ background: rgba(18, 18, 18, 0.97) !important;
+ backdrop-filter: var(--vc-blur) !important;
+ border-radius: 14px !important;
+ padding: 8px !important;
+ box-shadow: 0 16px 48px rgba(0, 0, 0, 0.6) !important;
+ border: 1px solid var(--vc-border) !important;
+}
+.lk-media-device-select button {
+ border-radius: 9px !important;
+ padding: 9px 14px !important;
+ transition: background 0.15s ease !important;
+ width: 100% !important;
+ text-align: left !important;
+ white-space: nowrap !important;
+ font-size: 13px !important;
+}
+.lk-media-device-select button:hover {
+ background: rgba(255, 255, 255, 0.09) !important;
+}
+.lk-media-device-select [data-lk-active="true"] > .lk-button {
+ background: rgba(25, 118, 210, 0.25) !important;
+ color: #60a5fa !important;
+}
+
+/* ─── Toast ─────────────────────────────────────────────────────────────────── */
+.lk-toast {
+ background: rgba(18, 18, 18, 0.92) !important;
+ backdrop-filter: var(--vc-blur) !important;
+ border: 1px solid var(--vc-border) !important;
+ border-radius: 12px !important;
+ font-size: 13px !important;
+}
+
+/* ─── Hide LiveKit built-in chat ────────────────────────────────────────────── */
+.lk-video-conference .lk-chat { display: none !important; }
+
+/* ─── Mobile ────────────────────────────────────────────────────────────────── */
+@media (max-width: 768px) {
+ .lk-control-bar {
+ border-radius: 16px !important;
+ padding: 8px 12px !important;
+ bottom: 12px !important;
+ }
+ .lk-button,
+ .lk-start-audio-button,
+ .lk-chat-toggle,
+ .lk-disconnect-button {
+ min-width: 42px !important;
+ height: 42px !important;
+ padding: 0 10px !important;
+ }
+ .lk-control-bar .lk-button[data-lk-source]::after,
+ .lk-control-bar .lk-chat-toggle::after,
+ .lk-control-bar .lk-custom-exit-button::after { display: none; }
+
+ .lk-focus-layout .lk-carousel,
+ .lk-grid-layout[data-lk-participants="2"] .lk-participant-tile:last-child {
+ width: 140px !important;
+ height: 79px !important;
+ bottom: 76px !important;
+ right: 12px !important;
+ }
}
diff --git a/front_minimal/src/utils/axios.js b/front_minimal/src/utils/axios.js
index aa7f1d3..e4cb062 100644
--- a/front_minimal/src/utils/axios.js
+++ b/front_minimal/src/utils/axios.js
@@ -13,6 +13,20 @@ axiosInstance.interceptors.response.use(
export default axiosInstance;
+// ----------------------------------------------------------------------
+// Resolve a relative or absolute media URL, always upgrading http → https
+// to avoid mixed-content errors on HTTPS pages.
+
+export function resolveMediaUrl(href) {
+ if (!href) return '';
+ let url = href;
+ if (!url.startsWith('http://') && !url.startsWith('https://')) {
+ const base = CONFIG.site.serverUrl?.replace('/api', '') || '';
+ url = base + (url.startsWith('/') ? url : `/${url}`);
+ }
+ return url.replace(/^http:\/\//i, 'https://');
+}
+
// ----------------------------------------------------------------------
export const fetcher = async (args) => {
diff --git a/front_minimal/src/utils/board-api.js b/front_minimal/src/utils/board-api.js
index 0b96b9a..6f980db 100644
--- a/front_minimal/src/utils/board-api.js
+++ b/front_minimal/src/utils/board-api.js
@@ -1,4 +1,46 @@
import axios from 'src/utils/axios';
+import { CONFIG } from 'src/config-global';
+
+// ----------------------------------------------------------------------
+
+/**
+ * Build the Excalidraw iframe URL with all required params (boardId, token, apiUrl, yjsPort, isMentor).
+ */
+export function buildExcalidrawSrc(boardId, user) {
+ const token =
+ typeof window !== 'undefined'
+ ? localStorage.getItem('jwt_access_token') || localStorage.getItem('access_token') || ''
+ : '';
+
+ const serverUrl = CONFIG.site.serverUrl || '';
+ const apiUrl = serverUrl.replace(/\/api\/?$/, '') || '';
+ const isMentor = user?.role === 'mentor';
+
+ const excalidrawUrl = (process.env.NEXT_PUBLIC_EXCALIDRAW_URL || '').trim().replace(/\/?$/, '');
+ const excalidrawPath = process.env.NEXT_PUBLIC_EXCALIDRAW_PATH || '';
+ const excalidrawPort = process.env.NEXT_PUBLIC_EXCALIDRAW_PORT || '3001';
+ const yjsPort = process.env.NEXT_PUBLIC_YJS_PORT || '1236';
+
+ if (excalidrawUrl && excalidrawUrl.startsWith('http')) {
+ const url = new URL(`${excalidrawUrl}/`);
+ url.searchParams.set('boardId', boardId);
+ url.searchParams.set('apiUrl', apiUrl);
+ url.searchParams.set('yjsPort', yjsPort);
+ if (token) url.searchParams.set('token', token);
+ if (isMentor) url.searchParams.set('isMentor', '1');
+ return url.toString();
+ }
+
+ const origin = excalidrawPath
+ ? (typeof window !== 'undefined' ? window.location.origin : '')
+ : `${typeof window !== 'undefined' ? window.location.protocol : 'https:'}//${typeof window !== 'undefined' ? window.location.hostname : ''}:${excalidrawPort}`;
+ const pathname = excalidrawPath ? `/${excalidrawPath.replace(/^\//, '')}/` : '/';
+ const params = new URLSearchParams({ boardId, apiUrl });
+ params.set('yjsPort', yjsPort);
+ if (token) params.set('token', token);
+ if (isMentor) params.set('isMentor', '1');
+ return `${origin}${pathname}?${params.toString()}`;
+}
// ----------------------------------------------------------------------
@@ -26,13 +68,30 @@ export async function getOrCreateMentorStudentBoard(mentorId, studentId) {
return res.data;
}
+/**
+ * GET /board/boards/get-or-create-group/?group=G
+ */
+export async function getOrCreateGroupBoard(groupId) {
+ const res = await axios.get(`/board/boards/get-or-create-group/?group=${groupId}`);
+ return res.data;
+}
+
/**
* GET or create board for a lesson.
- * Resolves lesson → mentor/student IDs → getOrCreateMentorStudentBoard
+ * For group lessons → getOrCreateGroupBoard
+ * For individual lessons → getOrCreateMentorStudentBoard
*/
export async function getOrCreateLessonBoard(lessonId) {
const lessonRes = await axios.get(`/schedule/lessons/${lessonId}/`);
const lesson = lessonRes.data;
+
+ // Групповое занятие
+ const groupId = lesson.group?.id ?? (typeof lesson.group === 'number' ? lesson.group : null);
+ if (groupId) {
+ return getOrCreateGroupBoard(groupId);
+ }
+
+ // Индивидуальное занятие
const mentorId = typeof lesson.mentor === 'object' ? lesson.mentor?.id : lesson.mentor;
const client = lesson.client;
let studentId;
diff --git a/front_minimal/src/utils/chat-api.js b/front_minimal/src/utils/chat-api.js
index 8342e82..473dddb 100644
--- a/front_minimal/src/utils/chat-api.js
+++ b/front_minimal/src/utils/chat-api.js
@@ -3,17 +3,21 @@ import axios from 'src/utils/axios';
// ----------------------------------------------------------------------
export function normalizeChat(c) {
+ const isGroup = c?.chat_type === 'group';
const other = c?.other_participant ?? {};
- const name =
- other.full_name ||
- [other.first_name, other.last_name].filter(Boolean).join(' ') ||
- c?.participant_name ||
- 'Чат';
+ const name = isGroup
+ ? (c?.name || 'Группа')
+ : (other.full_name ||
+ [other.first_name, other.last_name].filter(Boolean).join(' ') ||
+ c?.participant_name ||
+ 'Чат');
const lastText = c?.last_message?.content || c?.last_message?.text || c?.last_message || '';
return {
...c,
participant_name: name,
- participant_id: other.id ?? c?.other_user_id ?? c?.participant_id ?? null,
+ participant_id: isGroup ? null : (other.id ?? c?.other_user_id ?? c?.participant_id ?? null),
+ // Тип роли собеседника для прямых чатов
+ other_role: isGroup ? null : (other.role ?? c?.other_role ?? null),
avatar_url: other.avatar_url || other.avatar || c?.avatar_url || null,
last_message: lastText,
unread_count: c?.my_participant?.unread_count ?? c?.unread_count ?? 0,
@@ -80,6 +84,13 @@ export async function markMessagesAsRead(chatUuid, messageUuids) {
);
}
+export async function createGroupChat(groupId) {
+ const res = await axios.post('/chat/chats/create_group/', { group_id: groupId });
+ const { data } = res;
+ if (data && typeof data === 'object' && 'data' in data && typeof data.data === 'object') return data.data;
+ return data;
+}
+
export async function searchUsers(query) {
const res = await axios.get('/users/search/', { params: { q: query } });
const {data} = res;
diff --git a/front_minimal/src/utils/dashboard-api.js b/front_minimal/src/utils/dashboard-api.js
index 5a34a1c..d2fc4d6 100644
--- a/front_minimal/src/utils/dashboard-api.js
+++ b/front_minimal/src/utils/dashboard-api.js
@@ -57,8 +57,11 @@ export async function getParentDashboard(options) {
/**
* GET /schedule/lessons/calendar/?start_date=&end_date=
*/
-export async function getCalendarLessons(startDate, endDate, options) {
+export async function getCalendarLessons(startDate, endDate, extraParams, options) {
const params = new URLSearchParams({ start_date: startDate, end_date: endDate });
+ if (extraParams) {
+ Object.entries(extraParams).forEach(([k, v]) => { if (v != null) params.append(k, v); });
+ }
const config = options?.signal ? { signal: options.signal } : undefined;
const res = await axios.get(`/schedule/lessons/calendar/?${params}`, config);
return res.data;
@@ -152,6 +155,21 @@ export async function completeLesson(id, notes, mentorGrade, schoolGrade, homewo
return res.data;
}
+/**
+ * GET /schedule/lesson-files/?lesson={id}
+ */
+export async function getLessonFiles(lessonId) {
+ const res = await axios.get(`/schedule/lesson-files/?lesson=${lessonId}`);
+ return res.data;
+}
+
+/**
+ * DELETE /schedule/lesson-files/{id}/
+ */
+export async function deleteLessonFile(fileId) {
+ await axios.delete(`/schedule/lesson-files/${fileId}/`);
+}
+
/**
* POST /schedule/lesson-files/ (multipart)
*/
diff --git a/front_minimal/src/utils/homework-api.js b/front_minimal/src/utils/homework-api.js
index 68c2299..c156a29 100644
--- a/front_minimal/src/utils/homework-api.js
+++ b/front_minimal/src/utils/homework-api.js
@@ -7,6 +7,7 @@ export async function getHomework(params) {
if (params?.status) q.append('status', params.status);
if (params?.page_size) q.append('page_size', String(params.page_size || 1000));
if (params?.child_id) q.append('child_id', params.child_id);
+ if (params?.lesson_id) q.append('lesson', params.lesson_id);
const query = q.toString();
const url = `/homework/homeworks/${query ? `?${query}` : ''}`;
const res = await axios.get(url);
@@ -106,6 +107,8 @@ export async function uploadHomeworkFile(homeworkId, file) {
formData.append('homework', String(homeworkId));
formData.append('file_type', 'assignment');
formData.append('file', file);
+ formData.append('filename', file.name);
+ formData.append('file_size', String(file.size));
const res = await axios.post('/homework/files/', formData);
return res.data;
}
diff --git a/front_minimal/src/utils/livekit-api.js b/front_minimal/src/utils/livekit-api.js
index eb6fce8..ffecfb6 100644
--- a/front_minimal/src/utils/livekit-api.js
+++ b/front_minimal/src/utils/livekit-api.js
@@ -26,3 +26,12 @@ export async function participantConnected({ roomName, lessonId }) {
if (lessonId != null) body.lesson_id = lessonId;
await axios.post('/video/livekit/participant-connected/', body);
}
+
+/**
+ * POST /video/livekit/terminate-room/
+ * Terminates the LiveKit room and disconnects all participants.
+ */
+export async function terminateRoom(lessonId) {
+ const res = await axios.post('/video/livekit/terminate-room/', { lesson_id: lessonId });
+ return res.data;
+}
diff --git a/front_minimal/src/utils/profile-api.js b/front_minimal/src/utils/profile-api.js
index e415f7b..c51da2c 100644
--- a/front_minimal/src/utils/profile-api.js
+++ b/front_minimal/src/utils/profile-api.js
@@ -27,13 +27,12 @@ export async function updateProfile(data) {
const formData = new FormData();
if (data.first_name !== undefined) formData.append('first_name', data.first_name);
if (data.last_name !== undefined) formData.append('last_name', data.last_name);
- if (data.phone !== undefined) formData.append('phone', data.phone);
if (data.bio !== undefined) formData.append('bio', data.bio);
formData.append('avatar', data.avatar);
- const res = await axios.patch('/profile/me/', formData);
+ const res = await axios.patch('/profile/update_profile/', formData);
return res.data;
}
- const res = await axios.patch('/profile/me/', data);
+ const res = await axios.patch('/profile/update_profile/', data);
return res.data;
}
diff --git a/front_minimal/src/utils/referrals-api.js b/front_minimal/src/utils/referrals-api.js
index 3808959..65c220e 100644
--- a/front_minimal/src/utils/referrals-api.js
+++ b/front_minimal/src/utils/referrals-api.js
@@ -1,7 +1,5 @@
import axios from 'src/utils/axios';
-// ----------------------------------------------------------------------
-
export async function getReferralProfile() {
try {
const res = await axios.get('/referrals/my_profile/');
@@ -21,10 +19,51 @@ export async function getReferralStats() {
}
export async function getMyReferrals() {
- const res = await axios.get('/referrals/my_referrals/');
- return res.data;
+ try {
+ const res = await axios.get('/referrals/my_referrals/');
+ return res.data;
+ } catch {
+ return null;
+ }
+}
+
+export async function getReferralLevels() {
+ try {
+ const res = await axios.get('/referrals/levels/');
+ return res.data;
+ } catch {
+ return [];
+ }
+}
+
+export async function getBonusBalance() {
+ try {
+ const res = await axios.get('/bonus/balance/');
+ return res.data;
+ } catch {
+ return null;
+ }
+}
+
+export async function getBonusTransactions() {
+ try {
+ const res = await axios.get('/bonus/transactions/');
+ return res.data;
+ } catch {
+ return [];
+ }
+}
+
+export async function getReferralEarnings() {
+ try {
+ const res = await axios.get('/bonus/earnings/');
+ return res.data;
+ } catch {
+ return [];
+ }
}
export async function setReferrer(referralCode) {
- await axios.post('/referrals/set_referrer/', { referral_code: referralCode.trim() });
+ const res = await axios.post('/referrals/set_referrer/', { referral_code: referralCode.trim() });
+ return res.data;
}
diff --git a/front_minimal/src/utils/students-api.js b/front_minimal/src/utils/students-api.js
index 039a84b..4b385f2 100644
--- a/front_minimal/src/utils/students-api.js
+++ b/front_minimal/src/utils/students-api.js
@@ -50,6 +50,12 @@ export async function getMyMentors() {
return res.data;
}
+// Client: my outgoing requests to mentors
+export async function getMyRequests() {
+ const res = await axios.get('/mentorship-requests/my-requests/');
+ return res.data;
+}
+
// Client: incoming invitations from mentors
export async function getMyInvitations() {
const res = await axios.get('/invitation/my-invitations/');
@@ -66,6 +72,18 @@ export async function rejectInvitationAsStudent(invitationId) {
return res.data;
}
+// Mentor: remove student
+export async function removeStudent(clientId) {
+ const res = await axios.delete(`/manage/clients/${clientId}/remove_client/`);
+ return res.data;
+}
+
+// Student: remove mentor
+export async function removeMentor(mentorId) {
+ const res = await axios.delete(`/student/mentors/${mentorId}/remove/`);
+ return res.data;
+}
+
// Public: get mentor info by invite link token (no auth required)
export async function getInviteLinkInfo(token) {
const res = await axios.get('/invitation/info-by-token/', { params: { token } });