Compare commits

..

2 Commits

Author SHA1 Message Date
LakG dea268d975 v1.7: overlay carga, baneos, carrito persistente, fix upload
Lista negra:
- Migración 0007: tabla baneos con historial (soporta expires_at futuro)
- Helper is_banned() usado por middleware
- Middleware guard: user baneado → rewrite /banned (admin exento)
- Página /banned con razón/fecha/expires + botón signout
- Panel /admin/usuarios con banear/desbanear (razón obligatoria, self-ban bloqueado)
- Nav admin nueva entrada Usuarios + icono users

Fix upload de fotos (bug definitivo):
- Root cause: browserClient no autentica al Storage (cookies httpOnly no legibles desde JS)
- Nuevos endpoints proxy /api/upload/material-foto/[id] y /avatar
- Validan sesión con cookie httpOnly, suben con service_role (bypass RLS)
- Refactor MaterialForm y PerfilForm para usar fetch multipart
- Cookies httpOnly intactas (cero riesgo XSS)

Overlay de carga:
- Layout.astro con #page-loader (backdrop-filter blur + spinner mono)
- Script inline captura clicks en <a href> y submits de <form> mismo origen
- Filtros: modifier keys, target=_blank, anchor#, cross-origin, defaultPrevented
- Respeta prefers-reduced-motion; pageshow limpia por bfcache

Carrito persistente + vaciar:
- SolicitudCart: useEffect hidrata/persiste labre:cart:v1 en localStorage
- Guard cartHydrated evita pisar en montaje inicial
- Botón "Vaciar" en checkout con window.confirm (solo con perfilCompleto)

Filtro inventario sin auto-submit:
- Removido script debounced que hacía form.submit() en cada tecla
- Botón "Filtrar" existente sigue funcionando
2026-08-27 10:18:04 -07:00
LakG c43f45eca1 Migración 0007 v1.7: tabla baneos + helper is_banned() 2026-08-27 10:18:04 -07:00
16 changed files with 933 additions and 67 deletions
@@ -1,5 +1,4 @@
import { useEffect, useRef, useState } from 'react'; import { useEffect, useRef, useState } from 'react';
import { browserClient } from '@/lib/supabase';
import { imgUrl } from '@/lib/materialImg'; import { imgUrl } from '@/lib/materialImg';
import { toast } from '@/lib/toast'; import { toast } from '@/lib/toast';
import UnidadesManager from './UnidadesManager'; import UnidadesManager from './UnidadesManager';
@@ -25,8 +24,6 @@ type Props = {
compact?: boolean; compact?: boolean;
}; };
const BUCKET = 'materiales-fotos';
export default function MaterialForm({ mode, material, categorias, compact }: Props) { export default function MaterialForm({ mode, material, categorias, compact }: Props) {
const dialogRef = useRef<HTMLDialogElement | null>(null); const dialogRef = useRef<HTMLDialogElement | null>(null);
const firstFieldRef = useRef<HTMLInputElement | null>(null); const firstFieldRef = useRef<HTMLInputElement | null>(null);
@@ -99,18 +96,16 @@ export default function MaterialForm({ mode, material, categorias, compact }: Pr
if (error) errorRef.current?.focus(); if (error) errorRef.current?.focus();
}, [error]); }, [error]);
async function uploadFotoFor(id: number): Promise<string | null> { async function uploadFotoFor(materialId: number, f: File): Promise<string | null> {
if (!file) return null; const fd = new FormData();
const ext = (file.name.split('.').pop() ?? 'jpg').toLowerCase().replace(/[^a-z0-9]/g, ''); fd.append('file', f);
const path = `${id}/${Date.now()}.${ext || 'jpg'}`; const res = await fetch(`/api/upload/material-foto/${materialId}`, { method: 'POST', body: fd });
const { error: upErr } = await browserClient() const json = await res.json().catch(() => ({}));
.storage.from(BUCKET) if (!res.ok) {
.upload(path, file, { upsert: true, contentType: file.type || undefined }); toast({ kind: 'error', title: 'La foto no se subió', description: json?.error ?? 'El material se guardó sin foto.' });
if (upErr) {
toast({ kind: 'error', title: 'La foto no se subió', description: 'El material se guardó sin foto.' });
return null; return null;
} }
return path; return json.path as string;
} }
const submit = async (e: React.FormEvent) => { const submit = async (e: React.FormEvent) => {
@@ -151,26 +146,14 @@ export default function MaterialForm({ mode, material, categorias, compact }: Pr
const json = await res.json().catch(() => ({})); const json = await res.json().catch(() => ({}));
if (!res.ok) throw new Error(json?.error ?? 'No se pudo crear'); if (!res.ok) throw new Error(json?.error ?? 'No se pudo crear');
// 2) subir foto (si hay) y PATCH imagen_path // 2) subir foto (si hay) — el endpoint ya persiste imagen_path
if (file && json.id) { if (file && json.id) {
const path = await uploadFotoFor(json.id); await uploadFotoFor(json.id, file);
if (path) {
const p = await fetch(`/api/admin/materiales/${json.id}`, {
method: 'PATCH',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ imagen_path: path }),
});
if (!p.ok) {
toast({ kind: 'error', title: 'Foto subida pero no vinculada', description: 'Recarga y vuelve a intentar.' });
}
}
} }
} else { } else {
// edit — sube nueva foto primero (si hay) y luego PATCH con el path incluido // edit — sube nueva foto primero (si hay); el endpoint persiste imagen_path
let newImagenPath: string | null | undefined = undefined;
if (file && material) { if (file && material) {
const path = await uploadFotoFor(material.id); await uploadFotoFor(material.id, file);
if (path) newImagenPath = path;
} }
const patch: Record<string, unknown> = { const patch: Record<string, unknown> = {
nombre: nombreT, nombre: nombreT,
@@ -181,7 +164,7 @@ export default function MaterialForm({ mode, material, categorias, compact }: Pr
trackeado_por_unidad: trackeado, trackeado_por_unidad: trackeado,
}; };
if (!trackeado) patch.cantidad_total = cantidad; if (!trackeado) patch.cantidad_total = cantidad;
if (newImagenPath !== undefined) patch.imagen_path = newImagenPath; // ponytail: si el user quitó la foto (imagenPath=null y sin file), no lo PATCHeamos aquí — ese flow ya está fuera de scope de este fix
const res = await fetch(`/api/admin/materiales/${material!.id}`, { const res = await fetch(`/api/admin/materiales/${material!.id}`, {
method: 'PATCH', method: 'PATCH',
headers: { 'Content-Type': 'application/json' }, headers: { 'Content-Type': 'application/json' },
@@ -0,0 +1,175 @@
import { useEffect, useRef, useState } from 'react';
import { toastAfterReload } from '@/lib/toast';
type Props = {
profile: { id: string; nombre?: string | null; email: string };
adminSelf: boolean;
};
export default function BanearForm({ profile, adminSelf }: Props) {
const dialogRef = useRef<HTMLDialogElement | null>(null);
const firstFieldRef = useRef<HTMLTextAreaElement | null>(null);
const errorRef = useRef<HTMLParagraphElement | null>(null);
const [razon, setRazon] = useState('');
const [loading, setLoading] = useState(false);
const [error, setError] = useState<string | null>(null);
const titleId = `banear-${profile.id}`;
const label = profile.nombre?.trim() || profile.email;
const open = () => {
if (adminSelf) return;
setError(null);
setRazon('');
dialogRef.current?.showModal();
queueMicrotask(() => firstFieldRef.current?.focus());
};
const close = () => {
if (loading) return;
dialogRef.current?.close();
};
useEffect(() => {
const dlg = dialogRef.current;
if (!dlg) return;
const onClick = (e: MouseEvent) => {
if (e.target === dlg) close();
};
dlg.addEventListener('click', onClick);
return () => dlg.removeEventListener('click', onClick);
});
useEffect(() => {
if (error) errorRef.current?.focus();
}, [error]);
const submit = async (e: React.FormEvent) => {
e.preventDefault();
if (loading) return;
const trimmed = razon.trim();
if (trimmed.length < 5) {
setError('La razón debe tener al menos 5 caracteres');
return;
}
setLoading(true);
setError(null);
try {
const res = await fetch('/api/admin/baneos', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ profile_id: profile.id, razon: trimmed }),
});
const json = await res.json().catch(() => ({}));
if (!res.ok) throw new Error(json?.error ?? 'No se pudo banear');
toastAfterReload({
title: 'Usuario baneado',
description: label,
kind: 'success',
});
dialogRef.current?.close();
location.reload();
} catch (err) {
setError(err instanceof Error ? err.message : 'Error inesperado');
} finally {
setLoading(false);
}
};
return (
<>
<button
type="button"
className="btn btn-ghost"
style={{
minHeight: '36px',
paddingBlock: '0.25rem',
color: adminSelf ? undefined : 'var(--color-danger-text)',
opacity: adminSelf ? 0.5 : 1,
cursor: adminSelf ? 'not-allowed' : undefined,
}}
onClick={open}
disabled={adminSelf}
title={adminSelf ? 'No puedes banearte a ti mismo' : undefined}
aria-label={adminSelf ? 'No puedes banearte a ti mismo' : `Banear a ${label}`}
>
Banear
</button>
<dialog
ref={dialogRef}
aria-labelledby={titleId}
className="rounded-lg p-0 bg-white text-[color:var(--color-ink)] border-2 border-[color:var(--color-ink)] shadow-[var(--shadow-hard)] backdrop:bg-black/40 w-[min(92vw,28rem)]"
>
<form onSubmit={submit} className="p-5 sm:p-6 flex flex-col gap-4" autoComplete="off">
<div className="flex items-start justify-between gap-3">
<h2 id={titleId} className="text-lg font-semibold">
Banear a {label}
</h2>
<button
type="button"
onClick={close}
aria-label="Cerrar"
className="rounded-lg p-1 hover:bg-black/5 transition-colors leading-none text-xl"
>
<span aria-hidden="true">×</span>
</button>
</div>
<p className="text-sm" style={{ color: 'var(--color-pencil)' }}>
El usuario no podrá acceder al sistema hasta ser desbaneado.
</p>
<div>
<label className="label" htmlFor={`${titleId}-razon`}>
Razón del baneo
</label>
<textarea
ref={firstFieldRef}
id={`${titleId}-razon`}
className="input"
rows={4}
value={razon}
onChange={(e) => setRazon(e.target.value)}
required
minLength={5}
maxLength={500}
aria-invalid={error ? true : undefined}
aria-describedby={error ? `${titleId}-err` : undefined}
placeholder="Explica el motivo — el usuario lo verá en su pantalla de bloqueo."
/>
<p className="text-xs mt-1" style={{ color: 'var(--color-pencil)' }}>
{razon.length}/500
</p>
</div>
{error && (
<p
ref={errorRef}
id={`${titleId}-err`}
role="alert"
tabIndex={-1}
className="text-sm"
style={{ color: 'var(--color-danger-text)' }}
>
{error}
</p>
)}
<div className="flex gap-2 justify-end pt-2">
<button type="button" className="btn btn-ghost" onClick={close} disabled={loading}>
Cancelar
</button>
<button
type="submit"
className="btn"
style={{ background: 'var(--color-danger)', color: 'var(--color-ink)' }}
disabled={loading}
>
{loading ? 'Baneando…' : 'Banear'}
</button>
</div>
</form>
</dialog>
</>
);
}
@@ -0,0 +1,43 @@
import { useState } from 'react';
import { toastAfterReload } from '@/lib/toast';
type Props = {
baneoId: number;
nombre: string;
};
export default function DesbanearButton({ baneoId, nombre }: Props) {
const [loading, setLoading] = useState(false);
const submit = async () => {
if (loading) return;
if (!window.confirm(`¿Desbanear a ${nombre}? Recuperará acceso inmediato.`)) return;
setLoading(true);
try {
const res = await fetch(`/api/admin/baneos/${baneoId}/desbanear`, { method: 'POST' });
const json = await res.json().catch(() => ({}));
if (!res.ok) throw new Error(json?.error ?? 'No se pudo desbanear');
toastAfterReload({
title: 'Usuario desbaneado',
description: nombre,
kind: 'success',
});
location.reload();
} catch (err) {
alert(err instanceof Error ? err.message : 'Error inesperado');
setLoading(false);
}
};
return (
<button
type="button"
className="btn btn-primary"
style={{ minHeight: '36px', paddingBlock: '0.25rem' }}
onClick={submit}
disabled={loading}
>
{loading ? 'Desbaneando…' : 'Desbanear'}
</button>
);
}
+49 -1
View File
@@ -55,6 +55,7 @@ export default function CartProvider({
maestros?: MaestroOpt[]; maestros?: MaestroOpt[];
}) { }) {
const [cart, setCart] = useState<Map<number, CartItem>>(new Map()); const [cart, setCart] = useState<Map<number, CartItem>>(new Map());
const cartHydrated = useRef(false);
const dialogRef = useRef<HTMLDialogElement | null>(null); const dialogRef = useRef<HTMLDialogElement | null>(null);
const firstFieldRef = useRef<HTMLSelectElement | null>(null); const firstFieldRef = useRef<HTMLSelectElement | null>(null);
const [maestroId, setMaestroId] = useState<string>(''); const [maestroId, setMaestroId] = useState<string>('');
@@ -130,6 +131,43 @@ export default function CartProvider({
dialogRef.current?.close(); dialogRef.current?.close();
}; };
// Hidrata carrito desde localStorage al montar
useEffect(() => {
if (typeof window === 'undefined') return;
try {
const raw = window.localStorage.getItem('labre:cart:v1');
if (raw) {
const arr = JSON.parse(raw);
if (Array.isArray(arr)) {
const next = new Map<number, CartItem>();
for (const i of arr) {
if (i && typeof i.material_id === 'number' && typeof i.nombre === 'string') {
next.set(i.material_id, {
material_id: i.material_id,
nombre: i.nombre,
cantidad: clamp(Number(i.cantidad) || 1, Number(i.cantidad_disponible) || 1),
cantidad_disponible: Number(i.cantidad_disponible) || 1,
descripcion: typeof i.descripcion === 'string' ? i.descripcion : '',
});
}
}
if (next.size > 0) setCart(next);
}
}
} catch { /* localStorage bloqueado o JSON inválido */ }
cartHydrated.current = true;
}, []);
// Persiste carrito a localStorage cuando cambia (después de la hidratación inicial)
useEffect(() => {
if (typeof window === 'undefined') return;
if (!cartHydrated.current) return;
try {
if (cart.size === 0) window.localStorage.removeItem('labre:cart:v1');
else window.localStorage.setItem('labre:cart:v1', JSON.stringify(Array.from(cart.values())));
} catch { /* localStorage bloqueado */ }
}, [cart]);
// Cerrar al click en backdrop // Cerrar al click en backdrop
useEffect(() => { useEffect(() => {
const dlg = dialogRef.current; const dlg = dialogRef.current;
@@ -385,7 +423,16 @@ export default function CartProvider({
<a href="/perfil" className="btn btn-primary">Completar perfil</a> <a href="/perfil" className="btn btn-primary">Completar perfil</a>
</div> </div>
) : ( ) : (
<div className="flex gap-2 justify-end pt-2"> <div className="flex gap-2 justify-between items-center pt-2">
<button
type="button"
className="btn btn-ghost"
onClick={() => { if (window.confirm('¿Vaciar todo el carrito?')) setCart(new Map()); }}
disabled={loading || items.length === 0}
>
Vaciar
</button>
<div className="flex gap-2">
<button type="button" className="btn btn-ghost" onClick={closeCheckout} disabled={loading}> <button type="button" className="btn btn-ghost" onClick={closeCheckout} disabled={loading}>
Cancelar Cancelar
</button> </button>
@@ -393,6 +440,7 @@ export default function CartProvider({
{loading ? 'Enviando…' : 'Enviar solicitud'} {loading ? 'Enviando…' : 'Enviar solicitud'}
</button> </button>
</div> </div>
</div>
)} )}
</form> </form>
</dialog> </dialog>
+12 -16
View File
@@ -1,5 +1,4 @@
import { useEffect, useRef, useState } from 'react'; import { useEffect, useRef, useState } from 'react';
import { browserClient } from '@/lib/supabase';
import { avatarInfo } from '@/lib/avatar'; import { avatarInfo } from '@/lib/avatar';
import { toast, toastAfterReload } from '@/lib/toast'; import { toast, toastAfterReload } from '@/lib/toast';
import Avatar from './Avatar'; import Avatar from './Avatar';
@@ -22,7 +21,6 @@ type Props = {
mode?: 'edit' | 'onboarding'; mode?: 'edit' | 'onboarding';
}; };
const BUCKET = 'avatares';
const SEM_OPTS = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12']; const SEM_OPTS = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'];
export default function PerfilForm({ export default function PerfilForm({
@@ -69,18 +67,16 @@ export default function PerfilForm({
? { ...info, src: previewUrl } ? { ...info, src: previewUrl }
: info; : info;
async function uploadAvatar(): Promise<string | null> { async function uploadAvatar(f: File): Promise<boolean> {
if (!file) return null; const fd = new FormData();
const ext = (file.name.split('.').pop() ?? 'jpg').toLowerCase().replace(/[^a-z0-9]/g, '') || 'jpg'; fd.append('file', f);
const path = `${userId}/${Date.now()}.${ext}`; const res = await fetch('/api/upload/avatar', { method: 'POST', body: fd });
const { error: upErr } = await browserClient() const json = await res.json().catch(() => ({}));
.storage.from(BUCKET) if (!res.ok) {
.upload(path, file, { upsert: true, contentType: file.type || undefined }); toast({ kind: 'error', title: 'La foto no se subió', description: json?.error ?? 'Intenta de nuevo.' });
if (upErr) { return false;
toast({ kind: 'error', title: 'La foto no se subió', description: upErr.message });
return null;
} }
return path; return true;
} }
const submit = async (e: React.FormEvent) => { const submit = async (e: React.FormEvent) => {
@@ -89,9 +85,10 @@ export default function PerfilForm({
setLoading(true); setLoading(true);
setError(null); setError(null);
try { try {
let nuevoPath: string | null | undefined = undefined; // La foto se sube por su propio endpoint (que ya persiste foto_path).
// El PATCH /api/profile solo maneja matricula/semestre/tutor.
if (file) { if (file) {
nuevoPath = await uploadAvatar(); await uploadAvatar(file);
} }
const body: Record<string, string | number | null> = { const body: Record<string, string | number | null> = {
matricula: matricula.trim() || null, matricula: matricula.trim() || null,
@@ -100,7 +97,6 @@ export default function PerfilForm({
body.semestre = semestre || null; body.semestre = semestre || null;
body.tutor_id = tutorId ? Number(tutorId) : null; body.tutor_id = tutorId ? Number(tutorId) : null;
} }
if (nuevoPath !== undefined) body.foto_path = nuevoPath;
const res = await fetch('/api/profile', { const res = await fetch('/api/profile', {
method: 'PATCH', method: 'PATCH',
+2
View File
@@ -57,6 +57,7 @@ const ICONS = {
chart: 'M3 13.125C3 12.504 3.504 12 4.125 12h2.25c.621 0 1.125.504 1.125 1.125v6.75C7.5 20.496 6.996 21 6.375 21h-2.25A1.125 1.125 0 013 19.875v-6.75zM9.75 8.625c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125v11.25c0 .621-.504 1.125-1.125 1.125h-2.25a1.125 1.125 0 01-1.125-1.125V8.625zM16.5 4.125c0-.621.504-1.125 1.125-1.125h2.25C20.496 3 21 3.504 21 4.125v15.75c0 .621-.504 1.125-1.125 1.125h-2.25a1.125 1.125 0 01-1.125-1.125V4.125z', chart: 'M3 13.125C3 12.504 3.504 12 4.125 12h2.25c.621 0 1.125.504 1.125 1.125v6.75C7.5 20.496 6.996 21 6.375 21h-2.25A1.125 1.125 0 013 19.875v-6.75zM9.75 8.625c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125v11.25c0 .621-.504 1.125-1.125 1.125h-2.25a1.125 1.125 0 01-1.125-1.125V8.625zM16.5 4.125c0-.621.504-1.125 1.125-1.125h2.25C20.496 3 21 3.504 21 4.125v15.75c0 .621-.504 1.125-1.125 1.125h-2.25a1.125 1.125 0 01-1.125-1.125V4.125z',
logout: 'M15.75 9V5.25A2.25 2.25 0 0013.5 3h-6a2.25 2.25 0 00-2.25 2.25v13.5A2.25 2.25 0 007.5 21h6a2.25 2.25 0 002.25-2.25V15M12 9l-3 3m0 0l3 3m-3-3h12.75', logout: 'M15.75 9V5.25A2.25 2.25 0 0013.5 3h-6a2.25 2.25 0 00-2.25 2.25v13.5A2.25 2.25 0 007.5 21h6a2.25 2.25 0 002.25-2.25V15M12 9l-3 3m0 0l3 3m-3-3h12.75',
dashboard: 'M3.75 3v11.25A2.25 2.25 0 006 16.5h2.25M3.75 3h-1.5m1.5 0h16.5m0 0h1.5m-1.5 0v11.25A2.25 2.25 0 0118 16.5h-2.25m-7.5 0h7.5m-7.5 0l-1 3m8.5-3l1 3m0 0l.5 1.5m-.5-1.5h-9.5m0 0l-.5 1.5m.75-9l3-3 2.148 2.148A12.061 12.061 0 0116.5 7.605', dashboard: 'M3.75 3v11.25A2.25 2.25 0 006 16.5h2.25M3.75 3h-1.5m1.5 0h16.5m0 0h1.5m-1.5 0v11.25A2.25 2.25 0 0118 16.5h-2.25m-7.5 0h7.5m-7.5 0l-1 3m8.5-3l1 3m0 0l.5 1.5m-.5-1.5h-9.5m0 0l-.5 1.5m.75-9l3-3 2.148 2.148A12.061 12.061 0 0116.5 7.605',
users: 'M15 19.128a9.38 9.38 0 002.625.372 9.337 9.337 0 004.121-.952 4.125 4.125 0 00-7.533-2.493M15 19.128v-.003c0-1.113-.285-2.16-.786-3.07M15 19.128v.106A12.318 12.318 0 018.624 21c-2.331 0-4.512-.645-6.374-1.766l-.001-.109a6.375 6.375 0 0111.964-3.07M12 6.375a3.375 3.375 0 11-6.75 0 3.375 3.375 0 016.75 0zm8.25 2.25a2.625 2.625 0 11-5.25 0 2.625 2.625 0 015.25 0z',
}; };
const alumnoNav: NavItem[] = [ const alumnoNav: NavItem[] = [
@@ -70,6 +71,7 @@ const adminNav: NavItem[] = [
{ href: '/admin/inventario', label: 'Inventario', icon: 'box' }, { href: '/admin/inventario', label: 'Inventario', icon: 'box' },
{ href: '/admin/estadisticas', label: 'Estadísticas', icon: 'stats' }, { href: '/admin/estadisticas', label: 'Estadísticas', icon: 'stats' },
{ href: '/admin/reportes', label: 'Reportes', icon: 'chart' }, { href: '/admin/reportes', label: 'Reportes', icon: 'chart' },
{ href: '/admin/usuarios', label: 'Usuarios', icon: 'users' },
]; ];
const nav = isAdmin ? adminNav : alumnoNav; const nav = isAdmin ? adminNav : alumnoNav;
+65
View File
@@ -38,5 +38,70 @@ const { title = 'Sistema de Préstamos — Laboratorio UABC' } = Astro.props;
Saltar al contenido Saltar al contenido
</a> </a>
<slot /> <slot />
<div id="page-loader" hidden aria-hidden="true" aria-live="polite">
<div class="page-loader-inner">
<svg class="page-loader-spinner" viewBox="0 0 24 24" width="40" height="40" aria-hidden="true" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round">
<path d="M12 3a9 9 0 1 0 9 9" />
</svg>
</div>
</div>
<style is:global>
#page-loader {
position: fixed; inset: 0; z-index: 9999;
background: color-mix(in oklab, var(--color-surface) 60%, transparent);
backdrop-filter: blur(8px);
-webkit-backdrop-filter: blur(8px);
display: grid; place-items: center;
}
#page-loader[hidden] { display: none; }
.page-loader-spinner {
color: var(--color-ink);
animation: labre-spin 0.9s linear infinite;
}
@keyframes labre-spin { to { transform: rotate(360deg); } }
@media (prefers-reduced-motion: reduce) {
.page-loader-spinner { animation: none; }
}
</style>
<script is:inline>
(() => {
const overlay = document.getElementById('page-loader');
if (!overlay) return;
const show = () => { overlay.hidden = false; };
document.addEventListener('click', (e) => {
const a = (e.target instanceof Element) ? e.target.closest('a[href]') : null;
if (!a) return;
if (e.defaultPrevented) return;
if (e.button !== 0) return;
if (e.ctrlKey || e.metaKey || e.shiftKey || e.altKey) return;
if (a.target && a.target !== '_self') return;
const href = a.getAttribute('href') || '';
if (!href || href.startsWith('#') || href.startsWith('javascript:') || href.startsWith('mailto:') || href.startsWith('tel:')) return;
try {
const url = new URL(a.href, location.href);
if (url.origin !== location.origin) return;
if (url.pathname === location.pathname && url.search === location.search) return;
} catch { return; }
show();
}, true);
document.addEventListener('submit', (e) => {
if (e.defaultPrevented) return;
const form = e.target;
if (!(form instanceof HTMLFormElement)) return;
try {
const action = form.getAttribute('action');
if (action) {
const url = new URL(action, location.href);
if (url.origin !== location.origin) return;
}
} catch { return; }
show();
}, true);
window.addEventListener('pageshow', () => { overlay.hidden = true; });
})();
</script>
</body> </body>
</html> </html>
+11
View File
@@ -3,6 +3,8 @@ import { serverClient } from '@/lib/supabase';
const UABC_DOMAIN = '@uabc.edu.mx'; const UABC_DOMAIN = '@uabc.edu.mx';
const PUBLIC_ROUTES = ['/login', '/api/auth/signin', '/api/auth/callback', '/api/auth/signout']; const PUBLIC_ROUTES = ['/login', '/api/auth/signin', '/api/auth/callback', '/api/auth/signout'];
// Rutas siempre accesibles para un user baneado (sino, loop de rewrite)
const BANNED_ALLOWED = ['/banned', '/api/auth/signout'];
export const onRequest = defineMiddleware(async (context, next) => { export const onRequest = defineMiddleware(async (context, next) => {
const supabase = serverClient(context.cookies); const supabase = serverClient(context.cookies);
@@ -56,6 +58,15 @@ export const onRequest = defineMiddleware(async (context, next) => {
return context.redirect('/'); return context.redirect('/');
} }
// Ban guard: si el user está baneado (y no es admin), toda ruta cae a /banned
// salvo la propia /banned y el signout. RPC is_banned respeta expires_at.
if (user && context.locals.profile && context.locals.profile.rol !== 'admin') {
const { data: banned } = await supabase.rpc('is_banned', { p_uid: user.id });
if (banned === true && !BANNED_ALLOWED.includes(pathname)) {
return context.rewrite('/banned');
}
}
if (pathname.startsWith('/admin') && context.locals.profile?.rol !== 'admin') { if (pathname.startsWith('/admin') && context.locals.profile?.rol !== 'admin') {
return context.rewrite('/403'); return context.rewrite('/403');
} }
-15
View File
@@ -109,21 +109,6 @@ const estadoBadge = (e: Material['estado']) => {
</div> </div>
</form> </form>
<script is:inline>
(() => {
const form = document.getElementById('inv-filter-form');
if (!form) return;
const q = form.querySelector('input[name="q"]');
const selects = form.querySelectorAll('select');
let t;
q && q.addEventListener('input', () => {
clearTimeout(t);
t = setTimeout(() => form.submit(), 250);
});
selects.forEach((s) => s.addEventListener('change', () => form.submit()));
})();
</script>
{matError && ( {matError && (
<div class="card mb-6" role="alert" style="border-color: color-mix(in oklab, var(--color-danger) 30%, transparent);"> <div class="card mb-6" role="alert" style="border-color: color-mix(in oklab, var(--color-danger) 30%, transparent);">
<p class="text-sm" style="color: var(--color-danger-text);"> <p class="text-sm" style="color: var(--color-danger-text);">
+188
View File
@@ -0,0 +1,188 @@
---
import AppLayout from '@/layouts/AppLayout.astro';
import BanearForm from '@/components/admin/usuarios/BanearForm.tsx';
import DesbanearButton from '@/components/admin/usuarios/DesbanearButton.tsx';
type ProfileRow = {
id: string;
nombre: string | null;
email: string;
matricula: string | null;
rol: 'alumno' | 'docente' | 'admin';
};
type BaneoRow = {
id: number;
profile_id: string;
razon: string;
banned_at: string;
};
const meId = Astro.locals.user?.id ?? null;
const [{ data: profiles, error: perr }, { data: baneos }] = await Promise.all([
Astro.locals.supabase
.from('profiles')
.select('id, nombre, email, matricula, rol')
.order('nombre'),
Astro.locals.supabase
.from('baneos')
.select('id, profile_id, razon, banned_at')
.is('unbanned_at', null),
]);
const baneosByProfile = new Map<string, BaneoRow>();
for (const b of (baneos ?? []) as BaneoRow[]) baneosByProfile.set(b.profile_id, b);
const usuarios = ((profiles ?? []) as ProfileRow[]).map((p) => ({
...p,
baneo: baneosByProfile.get(p.id) ?? null,
}));
const rolLabel = (r: ProfileRow['rol']) =>
r === 'admin' ? 'Admin' : r === 'docente' ? 'Docente' : 'Alumno';
const fmtDate = (iso: string) =>
new Intl.DateTimeFormat('es-MX', {
dateStyle: 'medium',
timeZone: 'America/Tijuana',
}).format(new Date(iso));
const trunc = (s: string, n = 80) => (s.length > n ? s.slice(0, n - 1) + '…' : s);
---
<AppLayout title="Usuarios — Admin">
<div class="max-w-5xl">
<header class="mb-6">
<h1 class="text-2xl md:text-3xl font-semibold">Usuarios</h1>
<p class="text-sm opacity-70 mt-1">Perfiles de todos los usuarios. Banea a quien haga mal uso del sistema.</p>
</header>
{perr && (
<div class="card mb-6" role="alert" style="border-color: color-mix(in oklab, var(--color-danger) 30%, transparent);">
<p class="text-sm" style="color: var(--color-danger-text);">
No se pudieron cargar los usuarios. Recarga la página.
</p>
</div>
)}
{!perr && usuarios.length === 0 && (
<div class="card text-center">
<h2 class="text-lg font-semibold mb-1">Sin usuarios aún</h2>
<p class="text-sm opacity-70">Se listarán aquí en cuanto alguien inicie sesión.</p>
</div>
)}
{!perr && usuarios.length > 0 && (
<>
{/* Desktop */}
<div class="hidden md:block card p-0 overflow-hidden">
<table class="w-full text-sm">
<thead class="text-left" style="background: color-mix(in oklab, var(--color-ink) 4%, transparent);">
<tr>
<th class="px-4 py-3 font-medium">Nombre</th>
<th class="px-4 py-3 font-medium">Email</th>
<th class="px-4 py-3 font-medium">Rol</th>
<th class="px-4 py-3 font-medium">Estado</th>
<th class="px-4 py-3 font-medium text-right">Acciones</th>
</tr>
</thead>
<tbody>
{usuarios.map((u) => {
const isSelf = u.id === meId;
return (
<tr class="border-t align-top" style="border-color: color-mix(in oklab, var(--color-ink) 8%, transparent);">
<td class="px-4 py-3">
<div class="font-medium break-words">{u.nombre ?? '—'}</div>
{u.matricula && <div class="text-xs opacity-60 mt-0.5" style="font-variant-numeric: tabular-nums;">{u.matricula}</div>}
</td>
<td class="px-4 py-3 break-all text-xs">{u.email}</td>
<td class="px-4 py-3">
<span
class="text-xs uppercase tracking-wide px-2 py-0.5 rounded-[2px]"
style={`border: 1.5px solid var(--color-ink); ${u.rol === 'admin' ? 'background: var(--color-secondary);' : ''}`}
>{rolLabel(u.rol)}</span>
</td>
<td class="px-4 py-3">
{u.baneo ? (
<div class="flex flex-col gap-1">
<span
class="text-xs uppercase tracking-wide px-2 py-0.5 rounded-[2px] w-fit"
style="background: var(--color-danger); color: var(--color-ink); border: 1.5px solid var(--color-ink);"
>Baneado</span>
<span class="text-xs opacity-70 break-words">{trunc(u.baneo.razon)}</span>
<span class="text-[11px] opacity-50">desde {fmtDate(u.baneo.banned_at)}</span>
</div>
) : (
<span class="text-xs uppercase tracking-wide" style="color: var(--color-primary);">Activo</span>
)}
</td>
<td class="px-4 py-3">
<div class="flex gap-2 justify-end">
{u.baneo ? (
<DesbanearButton baneoId={u.baneo.id} nombre={u.nombre ?? u.email} client:load />
) : (
<BanearForm
profile={{ id: u.id, nombre: u.nombre, email: u.email }}
adminSelf={isSelf}
client:load
/>
)}
</div>
</td>
</tr>
);
})}
</tbody>
</table>
</div>
{/* Mobile */}
<div class="md:hidden flex flex-col gap-3">
{usuarios.map((u) => {
const isSelf = u.id === meId;
return (
<article class="card flex flex-col gap-3">
<div class="flex items-start justify-between gap-3">
<div class="min-w-0">
<h3 class="font-semibold break-words">{u.nombre ?? '—'}</h3>
<p class="text-xs opacity-70 break-all">{u.email}</p>
<p class="text-xs opacity-60 mt-1">
{rolLabel(u.rol)}{u.matricula ? ` · ${u.matricula}` : ''}
</p>
</div>
{u.baneo ? (
<span
class="text-xs uppercase tracking-wide px-2 py-0.5 rounded-[2px] shrink-0"
style="background: var(--color-danger); color: var(--color-ink); border: 1.5px solid var(--color-ink);"
>Baneado</span>
) : (
<span class="text-xs uppercase tracking-wide shrink-0" style="color: var(--color-primary);">Activo</span>
)}
</div>
{u.baneo && (
<div class="text-xs opacity-80 break-words">
<strong>Razón:</strong> {trunc(u.baneo.razon, 120)}
<div class="opacity-60 mt-1">desde {fmtDate(u.baneo.banned_at)}</div>
</div>
)}
<div class="flex gap-2 justify-end">
{u.baneo ? (
<DesbanearButton baneoId={u.baneo.id} nombre={u.nombre ?? u.email} client:load />
) : (
<BanearForm
profile={{ id: u.id, nombre: u.nombre, email: u.email }}
adminSelf={isSelf}
client:load
/>
)}
</div>
</article>
);
})}
</div>
</>
)}
</div>
</AppLayout>
@@ -0,0 +1,30 @@
import type { APIRoute } from 'astro';
export const prerender = false;
export const POST: APIRoute = async ({ locals, params }) => {
if (locals.profile?.rol !== 'admin') {
return Response.json({ error: 'No autorizado' }, { status: 403 });
}
const id = Number(params.id);
if (!Number.isInteger(id) || id <= 0) {
return Response.json({ error: 'ID inválido' }, { status: 400 });
}
const { data, error } = await locals.supabase
.from('baneos')
.update({ unbanned_at: new Date().toISOString(), unbanned_by: locals.user!.id })
.eq('id', id)
.is('unbanned_at', null)
.select('id');
if (error) {
return Response.json({ error: 'No se pudo desbanear' }, { status: 500 });
}
if (!data || data.length === 0) {
return Response.json({ error: 'Baneo no encontrado o ya inactivo' }, { status: 404 });
}
return Response.json({ ok: true });
};
+67
View File
@@ -0,0 +1,67 @@
import type { APIRoute } from 'astro';
export const prerender = false;
export const POST: APIRoute = async ({ request, locals }) => {
if (locals.profile?.rol !== 'admin') {
return Response.json({ error: 'No autorizado' }, { status: 403 });
}
let body: { profile_id?: unknown; razon?: unknown; expires_at?: unknown };
try {
body = await request.json();
} catch {
return Response.json({ error: 'JSON inválido' }, { status: 400 });
}
const profile_id = typeof body.profile_id === 'string' ? body.profile_id.trim() : '';
if (!profile_id) {
return Response.json({ error: 'profile_id es obligatorio' }, { status: 400 });
}
if (profile_id === locals.user!.id) {
return Response.json({ error: 'No puedes banearte a ti mismo' }, { status: 400 });
}
const razon = typeof body.razon === 'string' ? body.razon.trim().slice(0, 500) : '';
if (razon.length < 5) {
return Response.json({ error: 'La razón debe tener al menos 5 caracteres' }, { status: 400 });
}
let expires_at: string | null = null;
if (body.expires_at != null && body.expires_at !== '') {
if (typeof body.expires_at !== 'string') {
return Response.json({ error: 'expires_at debe ser string ISO' }, { status: 400 });
}
const d = new Date(body.expires_at);
if (Number.isNaN(d.getTime())) {
return Response.json({ error: 'expires_at inválido' }, { status: 400 });
}
if (d <= new Date()) {
return Response.json({ error: 'expires_at debe ser futuro' }, { status: 400 });
}
expires_at = d.toISOString();
}
const { data, error } = await locals.supabase
.from('baneos')
.insert({
profile_id,
razon,
expires_at,
banned_by: locals.user!.id,
})
.select('id')
.single();
if (error) {
if ((error as { code?: string }).code === '23505') {
return Response.json(
{ error: 'El usuario ya tiene un baneo activo — desbaneálo primero' },
{ status: 409 },
);
}
return Response.json({ error: 'No se pudo crear el baneo' }, { status: 500 });
}
return Response.json({ id: data.id }, { status: 201 });
};
+58
View File
@@ -0,0 +1,58 @@
import type { APIRoute } from 'astro';
import { serviceClient } from '@/lib/supabase';
export const prerender = false;
const BUCKET = 'avatares';
const MAX_BYTES = 2 * 1024 * 1024;
const extFrom = (file: File): string => {
const fromName = file.name?.split('.').pop()?.toLowerCase().replace(/[^a-z0-9]/g, '');
if (fromName) return fromName;
const fromMime = file.type?.split('/')[1]?.toLowerCase().replace(/[^a-z0-9]/g, '');
return fromMime || 'jpg';
};
export const POST: APIRoute = async ({ request, locals }) => {
const user = locals.user;
if (!user) return Response.json({ error: 'no autorizado' }, { status: 401 });
let form: FormData;
try {
form = await request.formData();
} catch {
return Response.json({ error: 'form-data inválido' }, { status: 400 });
}
const file = form.get('file');
if (!(file instanceof File)) {
return Response.json({ error: 'Archivo faltante' }, { status: 400 });
}
if (!/^image\//.test(file.type)) {
return Response.json({ error: 'Solo se permiten imágenes' }, { status: 400 });
}
if (file.size > MAX_BYTES) {
return Response.json({ error: 'La imagen supera 2 MB' }, { status: 400 });
}
const path = `${user.id}/${Date.now()}.${extFrom(file)}`;
const { error: upErr } = await serviceClient()
.storage.from(BUCKET)
.upload(path, file, { upsert: true, contentType: file.type });
if (upErr) {
return Response.json({ error: upErr.message || 'No se pudo subir' }, { status: 500 });
}
const { error: patchErr } = await locals.supabase
.from('profiles')
.update({ foto_path: path })
.eq('id', user.id);
if (patchErr) {
return Response.json({ error: 'Foto subida pero no vinculada' }, { status: 500 });
}
return Response.json({ ok: true, path });
};
@@ -0,0 +1,67 @@
import type { APIRoute } from 'astro';
import { serviceClient } from '@/lib/supabase';
export const prerender = false;
const BUCKET = 'materiales-fotos';
const MAX_BYTES = 2 * 1024 * 1024;
const parseId = (raw: string | undefined) => {
const id = Number(raw);
return Number.isInteger(id) && id > 0 ? id : null;
};
const extFrom = (file: File): string => {
const fromName = file.name?.split('.').pop()?.toLowerCase().replace(/[^a-z0-9]/g, '');
if (fromName) return fromName;
const fromMime = file.type?.split('/')[1]?.toLowerCase().replace(/[^a-z0-9]/g, '');
return fromMime || 'jpg';
};
export const POST: APIRoute = async ({ request, locals, params }) => {
if (locals.profile?.rol !== 'admin') {
return Response.json({ error: 'No autorizado' }, { status: 403 });
}
const materialId = parseId(params.id);
if (!materialId) return Response.json({ error: 'ID inválido' }, { status: 400 });
let form: FormData;
try {
form = await request.formData();
} catch {
return Response.json({ error: 'form-data inválido' }, { status: 400 });
}
const file = form.get('file');
if (!(file instanceof File)) {
return Response.json({ error: 'Archivo faltante' }, { status: 400 });
}
if (!/^image\//.test(file.type)) {
return Response.json({ error: 'Solo se permiten imágenes' }, { status: 400 });
}
if (file.size > MAX_BYTES) {
return Response.json({ error: 'La imagen supera 2 MB' }, { status: 400 });
}
const path = `${materialId}/${Date.now()}.${extFrom(file)}`;
const { error: upErr } = await serviceClient()
.storage.from(BUCKET)
.upload(path, file, { upsert: true, contentType: file.type });
if (upErr) {
return Response.json({ error: upErr.message || 'No se pudo subir' }, { status: 500 });
}
const { error: patchErr } = await locals.supabase
.from('materiales')
.update({ imagen_path: path })
.eq('id', materialId);
if (patchErr) {
return Response.json({ error: 'Foto subida pero no vinculada' }, { status: 500 });
}
return Response.json({ ok: true, path });
};
+85
View File
@@ -0,0 +1,85 @@
---
import Layout from '@/layouts/Layout.astro';
import BrandMark from '@/components/BrandMark.astro';
const user = Astro.locals.user;
if (!user) return Astro.redirect('/login');
type BanRow = {
razon: string;
banned_at: string;
expires_at: string | null;
banned_by: { nombre: string | null } | null;
};
const { data } = await Astro.locals.supabase
.from('baneos')
.select('razon, banned_at, expires_at, banned_by:profiles!banned_by(nombre)')
.eq('profile_id', user.id)
.is('unbanned_at', null)
.maybeSingle();
const ban = data as BanRow | null;
if (!ban) return Astro.redirect('/');
const fmtDate = (iso: string) =>
new Intl.DateTimeFormat('es-MX', {
dateStyle: 'long',
timeStyle: 'short',
timeZone: 'America/Tijuana',
}).format(new Date(iso));
const bannedAtStr = fmtDate(ban.banned_at);
const expiresStr = ban.expires_at ? fmtDate(ban.expires_at) : null;
const byName = ban.banned_by?.nombre ?? null;
Astro.response.status = 403;
---
<Layout title="Cuenta bloqueada — LabPréstamos">
<main id="main" class="min-h-screen grid place-items-center p-4">
<div class="w-full max-w-lg">
<div class="text-center mb-6">
<div class="inline-grid place-items-center w-16 h-16 rounded-[2px] p-4 mb-4" style="background: var(--color-danger); border: 2px solid var(--color-ink); box-shadow: var(--shadow-hard);">
<BrandMark class="w-full h-full" style="color: var(--color-ink);" />
</div>
<h1 class="text-2xl md:text-3xl font-semibold uppercase tracking-wide">Cuenta bloqueada</h1>
<p class="text-sm mt-2" style="color: var(--color-pencil);">Tu acceso al sistema de préstamos fue suspendido.</p>
</div>
<div class="card-raised">
<dl class="flex flex-col gap-4 text-sm">
<div>
<dt class="text-xs uppercase tracking-wide mb-1" style="color: var(--color-pencil);">Motivo</dt>
<dd class="whitespace-pre-wrap break-words">{ban.razon}</dd>
</div>
<div class="grid sm:grid-cols-2 gap-4">
<div>
<dt class="text-xs uppercase tracking-wide mb-1" style="color: var(--color-pencil);">Fecha del bloqueo</dt>
<dd>{bannedAtStr}</dd>
</div>
{expiresStr && (
<div>
<dt class="text-xs uppercase tracking-wide mb-1" style="color: var(--color-pencil);">Expira</dt>
<dd>{expiresStr}</dd>
</div>
)}
{byName && (
<div>
<dt class="text-xs uppercase tracking-wide mb-1" style="color: var(--color-pencil);">Bloqueado por</dt>
<dd>{byName}</dd>
</div>
)}
</div>
</dl>
<p class="text-sm mt-6" style="color: var(--color-pencil);">
Si crees que esto es un error, contacta al Laboratorio de Sistemas Computacionales.
</p>
<form method="POST" action="/api/auth/signout" class="mt-6">
<button type="submit" class="btn btn-primary w-full">Cerrar sesión</button>
</form>
</div>
</div>
</main>
</Layout>
+63
View File
@@ -0,0 +1,63 @@
-- 0007_baneos.sql
-- Lista negra de cuentas: tabla prestamos.baneos con historial
-- (soporta baneos permanentes y temporales via expires_at, aunque la UI
-- de esta ronda solo expone permanentes). Helper is_banned() para middleware.
begin;
create table if not exists prestamos.baneos (
id bigserial primary key,
profile_id uuid not null references prestamos.profiles(id) on delete cascade,
razon text not null,
banned_at timestamptz not null default now(),
banned_by uuid references prestamos.profiles(id),
expires_at timestamptz,
unbanned_at timestamptz,
unbanned_by uuid references prestamos.profiles(id)
);
-- Un solo baneo activo por profile (unbanned_at IS NULL) — partial unique index
create unique index if not exists baneos_profile_activo_uniq
on prestamos.baneos (profile_id)
where unbanned_at is null;
create index if not exists baneos_banned_at_idx
on prestamos.baneos (banned_at desc);
alter table prestamos.baneos enable row level security;
-- Admin lee/escribe todo
drop policy if exists baneos_admin_all on prestamos.baneos;
create policy baneos_admin_all on prestamos.baneos
for all to authenticated
using (prestamos.is_admin())
with check (prestamos.is_admin());
-- User autenticado lee los suyos (para /banned mostrar la razón)
drop policy if exists baneos_read_self on prestamos.baneos;
create policy baneos_read_self on prestamos.baneos
for select to authenticated
using (profile_id = auth.uid());
grant select, insert, update, delete on prestamos.baneos to authenticated, service_role;
grant usage, select on prestamos.baneos_id_seq to authenticated, service_role;
-- Helper: baneo activo (no desbaneado y no expirado)
create or replace function prestamos.is_banned(p_uid uuid)
returns boolean
language sql
stable
security definer
set search_path = prestamos, pg_temp
as $$
select exists (
select 1 from prestamos.baneos
where profile_id = p_uid
and unbanned_at is null
and (expires_at is null or expires_at > now())
);
$$;
grant execute on function prestamos.is_banned(uuid) to anon, authenticated;
commit;