feat: B3 — search vidéos (filtre client-side + param ?q= backend)
All checks were successful
CI/CD — Build & Deploy / Build & Deploy (push) Successful in 22s
All checks were successful
CI/CD — Build & Deploy / Build & Deploy (push) Successful in 22s
This commit is contained in:
@@ -35,19 +35,26 @@ router.get("/", async (req: Request, res: Response): Promise<void> => {
|
|||||||
try {
|
try {
|
||||||
const user = (req as AuthenticatedRequest).user as AuthenticatedUser | undefined;
|
const user = (req as AuthenticatedRequest).user as AuthenticatedUser | undefined;
|
||||||
const userLevel = user ? await getUserPlanLevel(user.id) : 0;
|
const userLevel = user ? await getUserPlanLevel(user.id) : 0;
|
||||||
|
const q = typeof req.query.q === "string" ? req.query.q.trim() : "";
|
||||||
|
|
||||||
const videos = await AppDataSource.getRepository(Video).find({
|
const qb = AppDataSource.getRepository(Video)
|
||||||
where: { isPublished: true },
|
.createQueryBuilder("v")
|
||||||
order: { publishedAt: "DESC" },
|
.where("v.isPublished = :pub", { pub: true })
|
||||||
select: ["id", "title", "description", "thumbnailUrl", "duration",
|
.select([
|
||||||
"storageType", "storageKey", "requiredLevel", "publishedAt"],
|
"v.id", "v.title", "v.description", "v.thumbnailUrl", "v.duration",
|
||||||
});
|
"v.storageType", "v.storageKey", "v.requiredLevel", "v.publishedAt",
|
||||||
|
])
|
||||||
|
.orderBy("v.publishedAt", "DESC");
|
||||||
|
|
||||||
|
if (q) {
|
||||||
|
qb.andWhere("(v.title LIKE :q OR v.description LIKE :q)", { q: `%${q}%` });
|
||||||
|
}
|
||||||
|
|
||||||
|
const videos = await qb.getMany();
|
||||||
|
|
||||||
// Injequer un flag `locked` côté client pour les vidéos hors niveau
|
|
||||||
const result = videos.map((v) => ({
|
const result = videos.map((v) => ({
|
||||||
...v,
|
...v,
|
||||||
locked: v.requiredLevel > userLevel,
|
locked: v.requiredLevel > userLevel,
|
||||||
// Ne pas exposer storageKey si la vidéo est verrouillée
|
|
||||||
storageKey: v.requiredLevel > userLevel ? null : v.storageKey,
|
storageKey: v.requiredLevel > userLevel ? null : v.storageKey,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { useState, useEffect } from 'react';
|
import { useState, useEffect, useMemo } from 'react';
|
||||||
import { Link } from 'react-router-dom';
|
import { Link } from 'react-router-dom';
|
||||||
import { apiFetch } from '../lib/api';
|
import { apiFetch } from '../lib/api';
|
||||||
|
|
||||||
@@ -20,6 +20,7 @@ export default function HomePage() {
|
|||||||
const [videos, setVideos] = useState<Video[]>([]);
|
const [videos, setVideos] = useState<Video[]>([]);
|
||||||
const [loading, setLoading] = useState(true);
|
const [loading, setLoading] = useState(true);
|
||||||
const [error, setError] = useState(false);
|
const [error, setError] = useState(false);
|
||||||
|
const [query, setQuery] = useState('');
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
apiFetch<VideosResponse>('/videos')
|
apiFetch<VideosResponse>('/videos')
|
||||||
@@ -28,8 +29,16 @@ export default function HomePage() {
|
|||||||
.finally(() => setLoading(false));
|
.finally(() => setLoading(false));
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const free = videos.filter((v) => !v.locked);
|
const filtered = useMemo(() => {
|
||||||
const premium = videos.filter((v) => v.locked);
|
const q = query.trim().toLowerCase();
|
||||||
|
if (!q) return videos;
|
||||||
|
return videos.filter(
|
||||||
|
(v) => v.title.toLowerCase().includes(q) || v.description?.toLowerCase().includes(q),
|
||||||
|
);
|
||||||
|
}, [videos, query]);
|
||||||
|
|
||||||
|
const free = filtered.filter((v) => !v.locked);
|
||||||
|
const premium = filtered.filter((v) => v.locked);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex flex-col gap-10">
|
<div className="flex flex-col gap-10">
|
||||||
@@ -40,6 +49,13 @@ export default function HomePage() {
|
|||||||
<p className="mt-2 text-sm text-od-muted">
|
<p className="mt-2 text-sm text-od-muted">
|
||||||
Contenu libre et premium — connecte-toi pour accéder aux formations complètes.
|
Contenu libre et premium — connecte-toi pour accéder aux formations complètes.
|
||||||
</p>
|
</p>
|
||||||
|
<input
|
||||||
|
type="search"
|
||||||
|
value={query}
|
||||||
|
onChange={(e) => setQuery(e.target.value)}
|
||||||
|
placeholder="Rechercher…"
|
||||||
|
className="mt-4 w-full max-w-sm rounded border border-od-border bg-od-surface px-3 py-2 text-sm text-od-text placeholder-od-muted outline-none focus:border-od-accent"
|
||||||
|
/>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
{loading && (
|
{loading && (
|
||||||
@@ -79,6 +95,9 @@ export default function HomePage() {
|
|||||||
{videos.length === 0 && (
|
{videos.length === 0 && (
|
||||||
<p className="text-sm text-od-muted">Aucune vidéo disponible pour l'instant.</p>
|
<p className="text-sm text-od-muted">Aucune vidéo disponible pour l'instant.</p>
|
||||||
)}
|
)}
|
||||||
|
{videos.length > 0 && filtered.length === 0 && (
|
||||||
|
<p className="text-sm text-od-muted">Aucun résultat pour « {query} ».</p>
|
||||||
|
)}
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user