Skip to content

promotion: dev to main #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
colombefioren merged 2 commits into from
Jun 29, 2026
Merged

promotion: dev to main #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98f3c4c
Feat/search input (#40)
colombefioren Jun 29, 2026
c2e5d5b
fix: show empty state when speaker has no sessions instead of infinit…
colombefioren Jun 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions next.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ const nextConfig = {
protocol: "https",
hostname: "i.pravatar.cc",
},
{
protocol: "https",
hostname: "imgs.search.brave.com",
},
],
qualities: [75, 85],
},
Expand Down
99 changes: 96 additions & 3 deletions src/app/favorites/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,30 @@
"use client";

import { useState } from "react";
import { useState, useDeferredValue, useMemo } from "react";
import Link from "next/link";
import dynamic from "next/dynamic";
import { useFavorites } from "@/lib/hooks/useFavorites";
import { useQuery, keepPreviousData } from "@tanstack/react-query";
import { api } from "@/lib/api";
import { fromEventSessionDetail } from "@/lib/utils/sessionMappers";
import { sortScheduleSessions } from "@/lib/utils/sortSessions";
import { ScheduleTable } from "@/components/sessions/ScheduleTable";
import { TablePagination } from "@/components/ui/TablePagination";
import { Select } from "@/components/ui/Select";
import { Search, X } from "lucide-react";

const DateRangePicker = dynamic(() =>
import("@/components/ui/DateRangePicker").then((m) => ({ default: m.DateRangePicker })),
);

type FavStatus = "all" | "live" | "upcoming" | "ended";

const STATUS_OPTIONS = [
{ value: "all" as const, label: "All statuses" },
{ value: "live" as const, label: "Live now" },
{ value: "upcoming" as const, label: "Upcoming" },
{ value: "ended" as const, label: "Ended" },
];

const PAGE_SIZE = 5;

Expand All @@ -29,17 +45,63 @@ export default function FavoritesPage() {
placeholderData: keepPreviousData,
});

const [favSearch, setFavSearch] = useState("");
const deferredFavSearch = useDeferredValue(favSearch);
const [favStatus, setFavStatus] = useState<FavStatus>("all");
const [dateFrom, setDateFrom] = useState("");
const [dateTo, setDateTo] = useState("");

const sorted = sortScheduleSessions(
(sessions ?? []).filter(Boolean).map(fromEventSessionDetail),
"asc",
);
const filtered = useMemo(() => {
const now = new Date();
let result = sorted;

if (deferredFavSearch) {
result = result.filter((s) =>
s.title.toLowerCase().includes(deferredFavSearch.toLowerCase()),
);
}

if (favStatus !== "all") {
result = result.filter((s) => {
if (favStatus === "live") return s.isLive;
if (favStatus === "upcoming") return s.startTime > now;
if (favStatus === "ended") return s.endTime < now;
return true;
});
}

const totalFavPages = Math.max(1, Math.ceil(sorted.length / PAGE_SIZE));
if (dateFrom) {
const from = new Date(dateFrom);
result = result.filter((s) => s.endTime >= from);
}
if (dateTo) {
const to = new Date(dateTo);
to.setHours(23, 59, 59, 999);
result = result.filter((s) => s.startTime <= to);
}

return result;
}, [sorted, deferredFavSearch, favStatus, dateFrom, dateTo]);

const totalFavPages = Math.max(1, Math.ceil(filtered.length / PAGE_SIZE));
const safeFavPage = Math.min(favPage, totalFavPages);
const paginatedSessions = sorted.slice(
const paginatedSessions = filtered.slice(
(safeFavPage - 1) * PAGE_SIZE,
safeFavPage * PAGE_SIZE,
);
const hasActiveFilters = favStatus !== "all" || !!favSearch || !!dateFrom || !!dateTo;

const clearAll = () => {
setFavSearch("");
setFavStatus("all");
setDateFrom("");
setDateTo("");
setFavPage(1);
};

return (
<div className="pt-16 pb-24">
Expand Down Expand Up @@ -97,12 +159,43 @@ export default function FavoritesPage() {
</div>
</div>
) : (
<>
<div
className="flex items-center justify-between gap-3 p-3 mb-6 squircle-lg"
style={{ background: "#222222E6", border: "1px dashed rgba(255,255,255,0.18)" }}
>
<div className="relative w-56 shrink-0">
<Search size={13} className="absolute left-3 top-1/2 -translate-y-1/2 text-ivory/40 pointer-events-none" />
<input
type="text"
value={favSearch}
onChange={(e) => { setFavSearch(e.target.value); setFavPage(1); }}
placeholder="Search favorites"
className="w-full h-9 pl-8 pr-3 text-sm font-medium text-ivory placeholder-ivory/40 focus:outline-none transition-colors rounded-lg"
style={{ background: "rgba(255,255,255,0.05)", border: "1px solid rgba(255,255,255,0.1)" }}
/>
</div>
<div className="flex items-center gap-2 flex-wrap justify-end">
<Select value={favStatus} onValueChange={(v) => { setFavStatus(v as FavStatus); setFavPage(1); }} options={STATUS_OPTIONS} placeholder="Status" />
<DateRangePicker from={dateFrom} to={dateTo} onFromChange={(v) => { setDateFrom(v); setFavPage(1); }} onToChange={(v) => { setDateTo(v); setFavPage(1); }} />
{hasActiveFilters && (
<button
onClick={clearAll}
className="flex items-center gap-1.5 h-9 px-3 text-xs font-semibold text-ivory/60 hover:text-ivory transition-colors rounded-lg whitespace-nowrap"
style={{ background: "rgba(255,255,255,0.08)", border: "1px dashed rgba(255,255,255,0.18)" }}
>
<X size={11} /> Clear all
</button>
)}
</div>
</div>
<ScheduleTable
sessions={paginatedSessions}
variant="extended"
sort={false}
emptyMessage="No favorite sessions found"
/>
</>
)}

<TablePagination
Expand Down
131 changes: 120 additions & 11 deletions src/app/speakers/[speakerId]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,34 @@
"use client";

import { useState } from "react";
import { useState, useDeferredValue, useMemo } from "react";
import { useParams } from "next/navigation";
import Link from "next/link";
import Image from "next/image";
import dynamic from "next/dynamic";
import { useQuery } from "@tanstack/react-query";
import { api } from "@/lib/api";
import { fromSpeakerEventSession } from "@/lib/utils/sessionMappers";
import { sortScheduleSessions } from "@/lib/utils/sortSessions";
import { ScheduleTable } from "@/components/sessions/ScheduleTable";
import { TablePagination } from "@/components/ui/TablePagination";
import { Select } from "@/components/ui/Select";
import { keepPreviousData } from "@tanstack/react-query";
import { MessageCircle, ChevronUp, ExternalLink } from "lucide-react";
import { MessageCircle, ChevronUp, ExternalLink, Search, X } from "lucide-react";
import type { QuestionDto } from "@/types/dto";

const DateRangePicker = dynamic(() =>
import("@/components/ui/DateRangePicker").then((m) => ({ default: m.DateRangePicker })),
);

type SessStatus = "all" | "live" | "upcoming" | "ended";

const STATUS_OPTIONS = [
{ value: "all" as const, label: "All statuses" },
{ value: "live" as const, label: "Live now" },
{ value: "upcoming" as const, label: "Upcoming" },
{ value: "ended" as const, label: "Ended" },
];

export default function SpeakerProfilePage() {
const { speakerId } = useParams<{ speakerId: string }>();

Expand All @@ -26,6 +41,13 @@ export default function SpeakerProfilePage() {

const [sessPage, setSessPage] = useState(1);
const [questionPage, setQuestionPage] = useState(1);
const [sessSearch, setSessSearch] = useState("");
const deferredSessSearch = useDeferredValue(sessSearch);
const [sessStatus, setSessStatus] = useState<SessStatus>("all");
const [sessDateFrom, setSessDateFrom] = useState("");
const [sessDateTo, setSessDateTo] = useState("");
const [questionSearch, setQuestionSearch] = useState("");
const deferredQuestionSearch = useDeferredValue(questionSearch);

const sessionIds = speaker?.eventSessions.map((s) => s.id) ?? [];

Expand Down Expand Up @@ -56,18 +78,63 @@ export default function SpeakerProfilePage() {
).sort(
(a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime()
);
const searchedQuestions = deferredQuestionSearch
? questionsWithSession.filter((qq) =>
qq.content.toLowerCase().includes(deferredQuestionSearch.toLowerCase()),
)
: questionsWithSession;
const QUESTION_PAGE_SIZE = 5;
const totalQuestionPages = Math.max(1, Math.ceil(questionsWithSession.length / QUESTION_PAGE_SIZE));
const totalQuestionPages = Math.max(1, Math.ceil(searchedQuestions.length / QUESTION_PAGE_SIZE));
const safeQuestionPage = Math.min(questionPage, totalQuestionPages);
const paginatedQuestions = questionsWithSession.slice((safeQuestionPage - 1) * QUESTION_PAGE_SIZE, safeQuestionPage * QUESTION_PAGE_SIZE);
const paginatedQuestions = searchedQuestions.slice((safeQuestionPage - 1) * QUESTION_PAGE_SIZE, safeQuestionPage * QUESTION_PAGE_SIZE);

const sortedSessions = speaker
? sortScheduleSessions(speaker.eventSessions.map(fromSpeakerEventSession), "asc")
: [];
const filteredSessions = useMemo(() => {
const now = new Date();
let result = sortedSessions;

if (deferredSessSearch) {
result = result.filter((s) =>
s.title.toLowerCase().includes(deferredSessSearch.toLowerCase()),
);
}

if (sessStatus !== "all") {
result = result.filter((s) => {
if (sessStatus === "live") return s.isLive;
if (sessStatus === "upcoming") return s.startTime > now;
if (sessStatus === "ended") return s.endTime < now;
return true;
});
}

if (sessDateFrom) {
const from = new Date(sessDateFrom);
result = result.filter((s) => s.endTime >= from);
}
if (sessDateTo) {
const to = new Date(sessDateTo);
to.setHours(23, 59, 59, 999);
result = result.filter((s) => s.startTime <= to);
}

return result;
}, [sortedSessions, deferredSessSearch, sessStatus, sessDateFrom, sessDateTo]);
const SESSION_PAGE_SIZE = 5;
const totalSessPages = Math.max(1, Math.ceil(sortedSessions.length / SESSION_PAGE_SIZE));
const totalSessPages = Math.max(1, Math.ceil(filteredSessions.length / SESSION_PAGE_SIZE));
const safeSessPage = Math.min(sessPage, totalSessPages);
const paginatedSessions = sortedSessions.slice((safeSessPage - 1) * SESSION_PAGE_SIZE, safeSessPage * SESSION_PAGE_SIZE);
const paginatedSessions = filteredSessions.slice((safeSessPage - 1) * SESSION_PAGE_SIZE, safeSessPage * SESSION_PAGE_SIZE);
const hasActiveSessionFilters = sessSearch !== "" || sessStatus !== "all" || sessDateFrom !== "" || sessDateTo !== "";

const clearSessionFilters = () => {
setSessSearch("");
setSessStatus("all");
setSessDateFrom("");
setSessDateTo("");
setSessPage(1);
};

return (
<div className="pt-16 pb-24 animate-fade-in">
Expand Down Expand Up @@ -136,10 +203,23 @@ export default function SpeakerProfilePage() {
<MessageCircle size={16} className="text-chartreuse" />
<span className="label-mono text-ivory/85">QUESTIONS FROM THEIR SESSIONS</span>
<div className="flex-1 h-px bg-ivory/10" />
<span className="label-mono text-ivory/40">{questionsWithSession.length}</span>
<span className="label-mono text-ivory/40">{searchedQuestions.length}</span>
</div>
<div className="mb-4">
<div className="relative w-full">
<Search size={13} className="absolute left-3 top-1/2 -translate-y-1/2 text-ivory/40 pointer-events-none" />
<input
type="text"
value={questionSearch}
onChange={(e) => { setQuestionSearch(e.target.value); setQuestionPage(1); }}
placeholder="Search questions"
className="w-full h-9 pl-8 pr-3 text-sm font-medium text-ivory placeholder-ivory/40 focus:outline-none transition-colors rounded-lg"
style={{ background: "rgba(255,255,255,0.05)", border: "1px solid rgba(255,255,255,0.1)" }}
/>
</div>
</div>

{!questionsBySession ? (
{!questionsBySession && sessionIds.length > 0 ? (
<div className="space-y-3 flex-1 animate-pulse">
{Array.from({ length: 3 }).map((_, i) => (
<div key={i} className="p-4 rounded-lg" style={{ background: "rgba(255,255,255,0.03)" }}>
Expand All @@ -148,7 +228,7 @@ export default function SpeakerProfilePage() {
</div>
))}
</div>
) : questionsWithSession.length > 0 ? (
) : searchedQuestions.length > 0 ? (
<div className="space-y-3 pr-1 flex-1">
{paginatedQuestions.map((q) => (
<div key={q.id} className="p-4 rounded-lg" style={{ background: "rgba(255,255,255,0.03)", border: "1px dashed rgba(255,255,255,0.08)" }}>
Expand Down Expand Up @@ -207,7 +287,36 @@ export default function SpeakerProfilePage() {
</svg>
<span className="label-mono text-ivory/85">SESSIONS</span>
<div className="flex-1 h-px bg-ivory/10" />
<span className="label-mono text-ivory/40">{sortedSessions.length} TOTAL</span>
<span className="label-mono text-ivory/40">{filteredSessions.length} TOTAL</span>
</div>
<div
className="flex items-center justify-between gap-3 p-3 mb-6 squircle-lg"
style={{ background: "#222222E6", border: "1px dashed rgba(255,255,255,0.18)" }}
>
<div className="relative w-56 shrink-0">
<Search size={13} className="absolute left-3 top-1/2 -translate-y-1/2 text-ivory/40 pointer-events-none" />
<input
type="text"
value={sessSearch}
onChange={(e) => { setSessSearch(e.target.value); setSessPage(1); }}
placeholder="Search a session"
className="w-full h-9 pl-8 pr-3 text-sm font-medium text-ivory placeholder-ivory/40 focus:outline-none transition-colors rounded-lg"
style={{ background: "rgba(255,255,255,0.05)", border: "1px solid rgba(255,255,255,0.1)" }}
/>
</div>
<div className="flex items-center gap-2 flex-wrap justify-end">
<Select value={sessStatus} onValueChange={(v) => { setSessStatus(v as SessStatus); setSessPage(1); }} options={STATUS_OPTIONS} placeholder="Status" />
<DateRangePicker from={sessDateFrom} to={sessDateTo} onFromChange={(v) => { setSessDateFrom(v); setSessPage(1); }} onToChange={(v) => { setSessDateTo(v); setSessPage(1); }} />
{hasActiveSessionFilters && (
<button
onClick={clearSessionFilters}
className="flex items-center gap-1.5 h-9 px-3 text-xs font-semibold text-ivory/60 hover:text-ivory transition-colors rounded-lg whitespace-nowrap"
style={{ background: "rgba(255,255,255,0.08)", border: "1px dashed rgba(255,255,255,0.18)" }}
>
<X size={11} /> Clear all
</button>
)}
</div>
</div>
{!speaker ? (
<div className="space-y-3 animate-pulse">
Expand All @@ -225,7 +334,7 @@ export default function SpeakerProfilePage() {
</div>
))}
</div>
) : sortedSessions.length > 0 ? (
) : filteredSessions.length > 0 ? (
<>
<ScheduleTable
sessions={paginatedSessions}
Expand Down
Loading