From 7cf7a7832657ab0c112c2864816a0ba3e52ed553 Mon Sep 17 00:00:00 2001
From: Dev Server <dev@uchill.online>
Date: Mon, 9 Mar 2026 21:33:48 +0300
Subject: [PATCH] =?UTF-8?q?fix:=20dashboard=20=E2=80=94=20remove=20greetin?=
 =?UTF-8?q?g=20&=20user=20card,=20fix=20weekly=20lessons=20count?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- remove greeting header (mentor & client dashboards)
- remove CourseMyAccount user info block from right panel (mentor)
- lessons_this_week: compute client-side from upcoming_lessons filtered
  to remaining lessons in current Mon–Sun range (was using backend value)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../client/view/overview-client-view.jsx      | 10 -------
 .../course/view/overview-course-view.jsx      | 27 ++++++++++---------
 2 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/front_minimal/src/sections/overview/client/view/overview-client-view.jsx b/front_minimal/src/sections/overview/client/view/overview-client-view.jsx
index 8bd5d5e..6857515 100644
--- a/front_minimal/src/sections/overview/client/view/overview-client-view.jsx
+++ b/front_minimal/src/sections/overview/client/view/overview-client-view.jsx
@@ -237,16 +237,6 @@ export function OverviewClientView({ childId, childName }) {
             borderRight: { lg: `solid 1px ${varAlpha(theme.vars.palette.grey['500Channel'], 0.12)}` },
           }}
         >
-          {/* Greeting */}
-          <Box>
-            <Typography variant="h4" sx={{ mb: 0.5 }}>
-              Привет, {displayName}! 👋
-            </Typography>
-            <Typography sx={{ color: 'text.secondary' }}>
-              Твой прогресс и ближайшие занятия.
-            </Typography>
-          </Box>
-
           {/* Stat widgets */}
           <Box
             sx={{
diff --git a/front_minimal/src/sections/overview/course/view/overview-course-view.jsx b/front_minimal/src/sections/overview/course/view/overview-course-view.jsx
index 736e14d..dd08e5c 100644
--- a/front_minimal/src/sections/overview/course/view/overview-course-view.jsx
+++ b/front_minimal/src/sections/overview/course/view/overview-course-view.jsx
@@ -8,7 +8,6 @@ import Avatar from '@mui/material/Avatar';
 import Stack from '@mui/material/Stack';
 import Divider from '@mui/material/Divider';
 import { useTheme } from '@mui/material/styles';
-import { cardClasses } from '@mui/material/Card';
 import Typography from '@mui/material/Typography';
 import CircularProgress from '@mui/material/CircularProgress';
 
@@ -28,7 +27,6 @@ import { getMentorDashboard, getMentorIncome } from 'src/utils/dashboard-api';
 import { createLiveKitRoom } from 'src/utils/livekit-api';
 
 import { CourseProgress } from '../course-progress';
-import { CourseMyAccount } from '../course-my-account';
 import { CourseHoursSpent } from '../course-hours-spent';
 import { CourseWidgetSummary } from '../course-widget-summary';
 
@@ -176,6 +174,20 @@ export function OverviewCourseView() {
     });
   }, [stats]);
 
+  // Занятий оставшихся на этой неделе (пн–вс)
+  const lessonsThisWeek = useMemo(() => {
+    const upcoming = stats?.upcoming_lessons || [];
+    const now = new Date();
+    const day = now.getDay(); // 0=вс, 1=пн, ..., 6=сб
+    const diffToMon = (day === 0 ? -6 : 1 - day);
+    const mon = new Date(now); mon.setHours(0, 0, 0, 0); mon.setDate(now.getDate() + diffToMon);
+    const sun = new Date(mon); sun.setDate(mon.getDate() + 6); sun.setHours(23, 59, 59, 999);
+    return upcoming.filter((l) => {
+      const t = new Date(l.start_time);
+      return t >= now && t >= mon && t <= sun;
+    }).length;
+  }, [stats]);
+
   // Последние сданные ДЗ
   const recentSubmissions = stats?.recent_submissions || [];
 
@@ -283,14 +295,9 @@ export function OverviewCourseView() {
       <Box sx={{ display: 'flex', flex: '1 1 auto', flexDirection: { xs: 'column', lg: 'row' } }}>
         {/* ЛЕВАЯ ЧАСТЬ */}
         <Box sx={{ gap: 3, display: 'flex', flex: '1 1 auto', flexDirection: 'column', px: { xs: 2, sm: 3, xl: 5 }, py: 3, borderRight: { lg: `solid 1px ${varAlpha(theme.vars.palette.grey['500Channel'], 0.12)}` } }}>
-          <Box sx={{ mb: 2 }}>
-            <Typography variant="h4" sx={{ mb: 1 }}>Привет, {user?.first_name || 'Ментор'}! 🦾</Typography>
-            <Typography sx={{ color: 'text.secondary' }}>Ваша активность и доходы.</Typography>
-          </Box>
-
           <Box sx={{ gap: 3, display: 'grid', gridTemplateColumns: { xs: 'repeat(1, 1fr)', md: 'repeat(3, 1fr)' } }}>
             <CourseWidgetSummary title="Ученики" total={Number(stats?.summary?.total_clients || 0)} icon={`${CONFIG.site.basePath}/assets/icons/courses/ic-courses-progress.svg`} />
-            <CourseWidgetSummary title="Занятий на неделе" total={Number(stats?.summary?.lessons_this_week || 0)} color="info" icon={`${CONFIG.site.basePath}/assets/icons/courses/ic-courses-certificates.svg`} />
+            <CourseWidgetSummary title="Занятий на неделе" total={lessonsThisWeek} color="info" icon={`${CONFIG.site.basePath}/assets/icons/courses/ic-courses-certificates.svg`} />
             <CourseWidgetSummary title="На проверку" total={Number(stats?.summary?.pending_submissions || 0)} color="error" icon={`${CONFIG.site.basePath}/assets/icons/courses/ic-courses-completed.svg`} />
           </Box>
 
@@ -310,10 +317,6 @@ export function OverviewCourseView() {
 
         {/* ПРАВАЯ ЧАСТЬ */}
         <Box sx={{ width: 1, display: 'flex', flexDirection: 'column', px: { xs: 2, sm: 3, xl: 5 }, pt: { lg: 8, xl: 10 }, pb: { xs: 8, xl: 10 }, flexShrink: 0, gap: 5, maxWidth: { lg: 320, xl: 360 }, bgcolor: { lg: 'background.neutral' } }}>
-          <Box sx={{ px: { lg: 0 }, [`& .${cardClasses.root}`]: { p: 0, boxShadow: 'none', bgcolor: 'transparent' } }}>
-             <CourseMyAccount user={user} />
-          </Box>
-
           {/* Ближайшие уроки */}
           <Stack spacing={1.5}>
             <Stack direction="row" alignItems="center" justifyContent="space-between">