add full dashboard: activity chart, recent entries, group photos, quick actions, active groups, top students

public/admin.css

@@ -233,4 +233,56 @@ body{font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,sans-serif;b
 .save-bar{position:fixed;left:calc(var(--sidebar) + 24px);right:24px;bottom:24px;z-index:60;display:none;align-items:center;justify-content:space-between;gap:16px;background:var(--card);border:1px solid var(--border);border-radius:14px;padding:12px 20px;box-shadow:0 10px 30px rgba(0,0,0,.14)}
 .save-bar.show{display:flex}
 .save-bar .hint{color:var(--muted);font-size:.85rem;display:inline-flex;align-items:center;gap:8px}
-@media(max-width:640px){.save-bar{left:16px;right:16px}}
+@media(max-width:640px){.save-bar{left:16px;right:16px}}
+
+/* --- Дашборд --- */
+.dash-grid{display:grid;grid-template-columns:minmax(0,2fr) minmax(0,1fr);gap:20px;align-items:start}
+.dash-col{display:flex;flex-direction:column;gap:20px;min-width:0}
+.dash-card{background:var(--card);border:1px solid var(--border);border-radius:14px;padding:20px;display:flex;flex-direction:column;gap:16px}
+.dash-card h3{font-size:1rem;font-weight:700;display:flex;align-items:center;gap:9px;margin:0}
+.dash-card h3 .ic{width:30px;height:30px;border-radius:9px;background:rgba(37,99,235,.08);display:flex;align-items:center;justify-content:center;font-size:.95rem;flex-shrink:0}
+.dash-empty{color:var(--muted);font-size:.82rem;padding:8px 0}
+.dash-link-row{margin-top:2px;text-align:right}
+.dash-link-row a{color:var(--accent);text-decoration:none;font-size:.8rem;font-weight:600}
+.dash-link-row a:hover{text-decoration:underline}
+.chart{display:flex;align-items:flex-end;gap:6px;height:150px}
+.bar-col{flex:1;display:flex;flex-direction:column;align-items:center;justify-content:flex-end;height:100%;gap:6px;min-width:0}
+.bar{width:100%;max-width:28px;background:var(--accent);opacity:.35;border-radius:4px 4px 0 0;min-height:2px;transition:opacity .15s}
+.bar:hover{opacity:1}
+.bar.today{opacity:1}
+.bar-day{font-size:.62rem;color:var(--muted);white-space:nowrap}
+.recent{display:flex;flex-direction:column;gap:2px}
+.recent-item{display:flex;align-items:center;gap:12px;padding:8px 6px;border-radius:10px;transition:background .15s}
+.recent-item:hover{background:var(--bg)}
+.recent-item img{width:44px;height:44px;border-radius:8px;object-fit:cover;flex-shrink:0;cursor:pointer}
+.recent-item .thumb{width:44px;height:44px;border-radius:8px;background:var(--bg);display:flex;align-items:center;justify-content:center;color:var(--muted);flex-shrink:0}
+.recent-item .r-info{flex:1;min-width:0}
+.recent-item .r-name{font-weight:600;font-size:.88rem;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+.recent-item .r-meta{color:var(--muted);font-size:.75rem;margin-top:2px}
+.recent-item .r-link{color:var(--accent);text-decoration:none;font-size:1.1rem;opacity:0;transition:opacity .15s}
+.recent-item:hover .r-link{opacity:1}
+.photos-grid-dash{display:grid;grid-template-columns:repeat(4,1fr);gap:8px}
+.dash-photo{position:relative;border-radius:8px;overflow:hidden}
+.dash-photo img{width:100%;aspect-ratio:4/3;object-fit:cover;display:block;cursor:pointer;transition:opacity .15s}
+.dash-photo img:hover{opacity:.85}
+.dash-photo .pcap{position:absolute;left:0;right:0;bottom:0;padding:14px 6px 5px;font-size:.62rem;font-weight:600;color:#fff;background:linear-gradient(transparent,rgba(0,0,0,.55));white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
+.actions-grid{display:grid;grid-template-columns:repeat(2,1fr);gap:10px}
+.action-btn{display:flex;flex-direction:column;align-items:center;gap:8px;padding:16px 10px;background:var(--bg);border:1px solid var(--border);border-radius:12px;color:var(--text);text-decoration:none;font-size:.8rem;font-weight:600;transition:all .15s}
+.action-btn .aic{font-size:1.3rem}
+.action-btn:hover{border-color:var(--accent);color:var(--accent);transform:translateY(-2px)}
+.active-list{display:flex;flex-direction:column;gap:8px}
+.active-item{display:flex;justify-content:space-between;align-items:center;gap:8px;background:var(--bg);border:1px solid var(--border);border-radius:10px;padding:9px 12px}
+.active-item .a-name{font-weight:600;font-size:.86rem}
+.active-item .a-right{display:flex;align-items:center;gap:10px;flex-wrap:wrap;justify-content:flex-end}
+.active-item .a-time{color:var(--muted);font-size:.76rem}
+.active-item .a-now{font-size:.68rem;font-weight:700;color:#16a34a;background:rgba(22,163,74,.12);border-radius:999px;padding:3px 9px}
+.top-list{display:flex;flex-direction:column;gap:6px}
+.top-item{display:flex;align-items:center;gap:10px;background:var(--bg);border:1px solid var(--border);border-radius:10px;padding:8px 12px}
+.top-rank{width:22px;height:22px;border-radius:7px;background:var(--accent);color:#fff;font-size:.7rem;font-weight:700;display:flex;align-items:center;justify-content:center;flex-shrink:0}
+.top-rank.alt{background:var(--border);color:var(--muted)}
+.top-name{flex:1;min-width:0;font-size:.85rem;font-weight:600;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+.top-count{font-size:.8rem;font-weight:700;color:var(--accent)}
+.stat .label a{color:var(--accent);text-decoration:none;font-weight:600}
+.stat .label a:hover{text-decoration:underline}
+@media(max-width:1100px){.dash-grid{grid-template-columns:1fr}}
+@media(max-width:640px){.photos-grid-dash{grid-template-columns:repeat(2,1fr)}}

public/dashboard.html

@@ -10,24 +10,164 @@
 <div class="layout">
   <div class="sidebar" id="sidebar"></div>
   <div class="main">
-    <h2>Дашборд</h2>
+    <div class="page-head">
+      <h2>Дашборд</h2>
+      <p class="page-sub">Сводка по журналу и группам</p>
+    </div>
     <div class="stats" id="stats"></div>
+
+    <div class="dash-grid">
+      <div class="dash-col">
+        <div class="dash-card">
+          <h3><span class="ic">📊</span> Динамика записей (14 дней)</h3>
+          <div class="chart" id="activityChart" title=""></div>
+          <div class="dash-link-row"><a href="journal.html">Открыть журнал →</a></div>
+        </div>
+        <div class="dash-card">
+          <h3><span class="ic">🕒</span> Последние записи</h3>
+          <div class="recent" id="recentList"></div>
+          <div class="dash-link-row"><a href="journal.html">Все записи →</a></div>
+        </div>
+        <div class="dash-card">
+          <h3><span class="ic">📸</span> Фото групп</h3>
+          <div class="photos-grid-dash" id="dashPhotos"></div>
+          <div class="dash-link-row"><a href="groups.html">Фото групп →</a></div>
+        </div>
+      </div>
+
+      <div class="dash-col">
+        <div class="dash-card">
+          <h3><span class="ic">⚡</span> Быстрые действия</h3>
+          <div class="actions-grid">
+            <a class="action-btn" href="journal.html"><span class="aic">📖</span>Журнал</a>
+            <a class="action-btn" href="files.html"><span class="aic">📎</span>Файлы</a>
+            <a class="action-btn" href="groups.html"><span class="aic">👥</span>Группы</a>
+            <a class="action-btn" href="links.html"><span class="aic">🔗</span>Ссылки</a>
+            <a class="action-btn" href="trash.html"><span class="aic">🗑️</span>Корзина</a>
+            <a class="action-btn" href="settings.html"><span class="aic">🛡️</span>Бэкап</a>
+          </div>
+        </div>
+        <div class="dash-card">
+          <h3><span class="ic">🟢</span> Активные сейчас группы</h3>
+          <div class="active-list" id="activeList"></div>
+        </div>
+        <div class="dash-card">
+          <h3><span class="ic">🏆</span> Топ учеников</h3>
+          <div class="top-list" id="topList"></div>
+        </div>
+      </div>
+    </div>
   </div>
 </div>
+
+<div class="modal-overlay" id="imgModal" onclick="this.classList.remove('open')">
+  <img id="imgModalSrc" alt="">
+</div>
 <div class="toast" id="toast"></div>
 <script src="admin.js"></script>
 <script>
-async function loadDashboard() {
+function plural(n, one, few, many) {
-  const res = await fetch(`${API}/api/stats`, { headers: hdr() });
+  n = Math.abs(n) % 100; const n1 = n % 10;
-  const s = await res.json();
+  if (n > 10 && n < 20) return many;
+  if (n1 > 1 && n1 < 5) return few;
+  if (n1 === 1) return one;
+  return many;
+}
+
+function renderStats(s) {
   document.getElementById('stats').innerHTML = `
     <div class="stat"><div class="num">${s.entries}</div><div class="label">Всего записей</div></div>
-    <div class="stat"><div class="num">${s.students}</div><div class="label">Студентов</div></div>
+    <div class="stat"><div class="num">${s.students}</div><div class="label">Учеников</div></div>
     <div class="stat"><div class="num">${s.groups}</div><div class="label">Групп</div></div>
     <div class="stat"><div class="num">${s.today}</div><div class="label">Сегодня</div></div>
+    <div class="stat"><div class="num" style="color:${s.trash ? '#ef4444' : 'var(--muted)'}">${s.trash}</div><div class="label"><a href="trash.html">В корзине →</a></div></div>
   `;
 }
 
+function last14days() {
+  const out = [];
+  for (let i = 13; i >= 0; i--) { const d = new Date(); d.setDate(d.getDate() - i); out.push(d); }
+  return out;
+}
+
+function renderActivity(activity) {
+  const map = {};
+  activity.forEach(a => { map[a.d] = a.n; });
+  const days = last14days().map(d => {
+    const iso = d.toISOString().slice(0, 10);
+    return { iso, label: d.toLocaleDateString('ru', { day: '2-digit', month: '2-digit' }), n: map[iso] || 0 };
+  });
+  const max = Math.max(1, ...days.map(x => x.n));
+  const todayIso = new Date().toISOString().slice(0, 10);
+  document.getElementById('activityChart').innerHTML = days.map(x => `
+    <div class="bar-col" title="${x.iso} — ${x.n} ${plural(x.n, 'запись', 'записи', 'записей')}">
+      <div class="bar ${x.iso === todayIso ? 'today' : ''}" style="height:${Math.round(x.n / max * 100)}%"></div>
+      <div class="bar-day">${x.label}</div>
+    </div>`).join('');
+}
+
+function renderRecent(rows) {
+  const el = document.getElementById('recentList');
+  if (!rows.length) { el.innerHTML = '<div class="dash-empty">Записей пока нет</div>'; return; }
+  el.innerHTML = rows.map(e => `
+    <div class="recent-item">
+      ${e.photo_path
+        ? `<img src="${API}${e.photo_path}" onclick="showImg('${API}${e.photo_path}')" alt="">`
+        : `<div class="thumb">🎓</div>`}
+      <div class="r-info">
+        <div class="r-name">${esc(e.student_name)}</div>
+        <div class="r-meta">${esc(e.group_name)} · ${new Date(e.created_at).toLocaleString('ru', { day: '2-digit', month: '2-digit', hour: '2-digit', minute: '2-digit' })}</div>
+      </div>
+      <a class="r-link" href="journal.html" title="В журнал">→</a>
+    </div>`).join('');
+}
+
+function renderActive(rows) {
+  const el = document.getElementById('activeList');
+  if (!rows.length) { el.innerHTML = '<div class="dash-empty">Сейчас нет идущих групп</div>'; return; }
+  el.innerHTML = rows.map(g => `
+    <div class="active-item">
+      <span class="a-name">${esc(g.name)}</span>
+      <span class="a-right">
+        <span class="a-time">${g.day_label} ${g.time_start}–${g.time_end}</span>
+        <span class="a-now">сейчас</span>
+      </span>
+    </div>`).join('');
+}
+
+function renderTop(rows) {
+  const el = document.getElementById('topList');
+  if (!rows.length) { el.innerHTML = '<div class="dash-empty">Пока нет данных</div>'; return; }
+  el.innerHTML = rows.map((x, i) => `
+    <div class="top-item">
+      <span class="top-rank ${i > 2 ? 'alt' : ''}">${i + 1}</span>
+      <span class="top-name">${esc(x.student_name)}</span>
+      <span class="top-count">${x.n}</span>
+    </div>`).join('');
+}
+
+function renderPhotos(rows) {
+  const el = document.getElementById('dashPhotos');
+  if (!rows.length) { el.innerHTML = '<div class="dash-empty">Фото групп пока нет</div>'; return; }
+  el.innerHTML = rows.map(p => `
+    <div class="dash-photo" title="${esc(p.group_name)}">
+      <img src="${API}${p.photo_path}" onclick="showImg('${API}${p.photo_path}')" alt="">
+      ${p.caption ? `<div class="pcap">${esc(p.caption)}</div>` : ''}
+    </div>`).join('');
+}
+
+async function loadDashboard() {
+  const res = await fetch(`${API}/api/dashboard`, { headers: hdr() });
+  if (!res.ok) { document.getElementById('stats').innerHTML = '<div class="dash-empty">Не удалось загрузить данные</div>'; return; }
+  const d = await res.json();
+  renderStats(d.stats);
+  renderActivity(d.activity);
+  renderRecent(d.recent_entries);
+  renderActive(d.active_groups);
+  renderTop(d.top_students);
+  renderPhotos(d.photos);
+}
+
 (async () => {
   if (await checkAuth()) {
     buildSidebar(document.body.dataset.page);

server.js

@@ -695,6 +695,70 @@ app.get('/api/stats', requireAdmin, async (_, res) => {
   });
 });
 
+app.get('/api/dashboard', requireAdmin, async (req, res) => {
+  const DAYS = ['Вс', 'Пн', 'Вт', 'Ср', 'Чт', 'Пт', 'Сб'];
+  const [stats, activity, active, recent, top, photos, latestPhotos] = await Promise.all([
+    (async () => {
+      const [entries, trash, groups, students, today] = await Promise.all([
+        pool.query('SELECT count(*)::int AS n FROM entries WHERE deleted_at IS NULL'),
+        pool.query('SELECT count(*)::int AS n FROM entries WHERE deleted_at IS NOT NULL'),
+        pool.query('SELECT count(*)::int AS n FROM groups'),
+        pool.query('SELECT count(DISTINCT student_name)::int AS n FROM entries WHERE deleted_at IS NULL'),
+        pool.query("SELECT count(*)::int AS n FROM entries WHERE deleted_at IS NULL AND created_at >= now()::date"),
+      ]);
+      return { entries: entries.rows[0].n, trash: trash.rows[0].n, groups: groups.rows[0].n, students: students.rows[0].n, today: today.rows[0].n };
+    })(),
+    pool.query(
+      `SELECT to_char(created_at, 'YYYY-MM-DD') AS d, count(*)::int AS n
+       FROM entries WHERE deleted_at IS NULL
+         AND created_at >= (now() - interval '13 days')::date
+       GROUP BY 1 ORDER BY 1`
+    ),
+    pool.query(
+      `SELECT * FROM groups
+       WHERE day_of_week IS NOT NULL AND time_start IS NOT NULL AND time_end IS NOT NULL
+         AND day_of_week = EXTRACT(DOW FROM (now() AT TIME ZONE 'Europe/Moscow'))::int
+         AND (now() AT TIME ZONE 'Europe/Moscow')::time BETWEEN time_start AND time_end
+       ORDER BY id`
+    ),
+    pool.query(
+      `SELECT e.id, e.student_name, e.photo_path, e.created_at, g.name AS group_name
+       FROM entries e JOIN groups g ON g.id = e.group_id
+       WHERE e.deleted_at IS NULL
+       ORDER BY e.created_at DESC LIMIT 7`
+    ),
+    pool.query(
+      `SELECT student_name, count(*)::int AS n FROM entries
+       WHERE deleted_at IS NULL GROUP BY student_name ORDER BY n DESC, student_name LIMIT 5`
+    ),
+    pool.query(
+      `SELECT gp.id, gp.photo_path, gp.caption, gp.taken_at, g.name AS group_name
+       FROM group_photos gp JOIN groups g ON g.id = gp.group_id
+       ORDER BY gp.taken_at DESC NULLS LAST, gp.created_at DESC LIMIT 8`
+    ),
+    pool.query(
+      `SELECT photo_path, taken_at FROM group_photos
+       ORDER BY taken_at DESC NULLS LAST, created_at DESC LIMIT 1`
+    ),
+  ]);
+  const activeGroups = active.rows.map(g => ({
+    id: g.id,
+    name: g.name,
+    day_label: DAYS[g.day_of_week],
+    time_start: (g.time_start || '').slice(0, 5),
+    time_end: (g.time_end || '').slice(0, 5),
+  }));
+  res.json({
+    stats: stats,
+    activity: activity.rows,
+    active_groups: activeGroups,
+    recent_entries: recent.rows,
+    top_students: top.rows,
+    photos: photos.rows,
+    latest_photo_taken: (latestPhotos.rows[0] || {}).taken_at || null,
+  });
+});
+
 app.post('/api/entries', upload.fields([{ name: 'photo', maxCount: 1 }, { name: 'files', maxCount: 10 }]), async (req, res) => {
   const { student_name, group_id, description } = req.body;
   const photo = req.files?.photo?.[0] || null;