Improve Bootcamp timeline with collapsible modules and HTML support

- Add collapsible structure: Module → Lesson → Timeline (as sublesson)
- Support HTML in timeline titles with DOMPurify sanitization
- Add inline code styling for timeline content
- Fix vertical alignment (items-start instead of items-center)
- Add soft borders between timeline items
- Change layout from 2-column grid to single column (video full width, timeline below)
- Align Bootcamp page layout with WebinarRecording page

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
dwindown
2026-01-04 10:47:59 +07:00
parent ce10be63f3
commit 963160d165
3 changed files with 204 additions and 58 deletions

View File

@@ -1,6 +1,7 @@
import { Clock } from 'lucide-react'; import { Clock } from 'lucide-react';
import { Button } from '@/components/ui/button'; import { Button } from '@/components/ui/button';
import { Card } from '@/components/ui/card'; import { Card } from '@/components/ui/card';
import DOMPurify from 'dompurify';
interface VideoChapter { interface VideoChapter {
time: number; // Time in seconds time: number; // Time in seconds
@@ -58,9 +59,10 @@ export function TimelineChapters({
</div> </div>
{/* Scrollable chapter list with max-height */} {/* Scrollable chapter list with max-height */}
<div className="max-h-[400px] overflow-y-auto space-y-1 pr-2 scrollbar-thin scrollbar-thumb-gray-300 scrollbar-track-gray-100 hover:scrollbar-thumb-gray-400"> <div className="max-h-[400px] overflow-y-auto pr-2 scrollbar-thin scrollbar-thumb-gray-300 scrollbar-track-gray-100 hover:scrollbar-thumb-gray-400">
{chapters.map((chapter, index) => { {chapters.map((chapter, index) => {
const active = isChapterActive(index); const active = isChapterActive(index);
const isLast = index === chapters.length - 1;
return ( return (
<button <button
@@ -68,12 +70,13 @@ export function TimelineChapters({
onClick={() => clickable && onChapterClick && onChapterClick(chapter.time)} onClick={() => clickable && onChapterClick && onChapterClick(chapter.time)}
disabled={!clickable} disabled={!clickable}
className={` className={`
w-full flex items-center gap-3 p-3 rounded-lg transition-all text-left w-full flex items-start gap-3 p-3 rounded-lg transition-all text-left
${clickable ? 'hover:bg-muted cursor-pointer' : 'cursor-not-allowed opacity-75'} ${clickable ? 'hover:bg-muted cursor-pointer' : 'cursor-not-allowed opacity-75'}
${active ${active
? `bg-primary/10 border-l-4` ? `bg-primary/10 border-l-4`
: 'border-l-4 border-transparent' : 'border-l-4 border-transparent'
} }
${!isLast ? 'border-b border-border/50' : ''}
`} `}
style={ style={
active active
@@ -84,24 +87,30 @@ export function TimelineChapters({
> >
{/* Timestamp */} {/* Timestamp */}
<div className={` <div className={`
font-mono text-sm font-semibold font-mono text-sm font-semibold shrink-0 pt-0.5
${active ? 'text-primary' : 'text-muted-foreground'} ${active ? 'text-primary' : 'text-muted-foreground'}
`} style={active ? { color: accentColor } : undefined}> `} style={active ? { color: accentColor } : undefined}>
{formatTime(chapter.time)} {formatTime(chapter.time)}
</div> </div>
{/* Chapter Title */} {/* Chapter Title - supports HTML with sanitized output */}
<div className={` <div
flex-1 text-sm className={`
flex-1 text-sm prose prose-sm max-w-none
${active ? 'font-medium' : 'text-muted-foreground'} ${active ? 'font-medium' : 'text-muted-foreground'}
`}> `}
{chapter.title} dangerouslySetInnerHTML={{
</div> __html: DOMPurify.sanitize(chapter.title, {
ALLOWED_TAGS: ['code', 'strong', 'em', 'b', 'i', 'u', 'br', 'p', 'span'],
ALLOWED_ATTR: ['class', 'style'],
})
}}
/>
{/* Active indicator */} {/* Active indicator */}
{active && ( {active && (
<div <div
className="w-2 h-2 rounded-full" className="w-2 h-2 rounded-full shrink-0 mt-1.5"
style={{ backgroundColor: accentColor }} style={{ backgroundColor: accentColor }}
/> />
)} )}

View File

@@ -382,4 +382,10 @@ All colors MUST be HSL.
.prose img { .prose img {
@apply rounded-lg my-4; @apply rounded-lg my-4;
} }
/* Timeline chapter inline code styling */
.prose-sm code:not(pre code) {
@apply bg-slate-100 text-slate-800 px-1 py-0.5 rounded text-xs font-mono;
border: 1px solid rgba(0, 0, 0, 0.1);
}
} }

View File

@@ -8,7 +8,7 @@ import { Badge } from '@/components/ui/badge';
import { Skeleton } from '@/components/ui/skeleton'; import { Skeleton } from '@/components/ui/skeleton';
import { toast } from '@/hooks/use-toast'; import { toast } from '@/hooks/use-toast';
import { formatDuration } from '@/lib/format'; import { formatDuration } from '@/lib/format';
import { ChevronLeft, ChevronRight, Check, Play, BookOpen, Clock, Menu, Star, CheckCircle } from 'lucide-react'; import { ChevronLeft, ChevronRight, Check, Play, BookOpen, Clock, Menu, Star, CheckCircle, ChevronDown, ChevronUp } from 'lucide-react';
import { cn } from '@/lib/utils'; import { cn } from '@/lib/utils';
import { Sheet, SheetContent, SheetTrigger } from '@/components/ui/sheet'; import { Sheet, SheetContent, SheetTrigger } from '@/components/ui/sheet';
import { ReviewModal } from '@/components/reviews/ReviewModal'; import { ReviewModal } from '@/components/reviews/ReviewModal';
@@ -82,6 +82,10 @@ export default function Bootcamp() {
const [accentColor, setAccentColor] = useState<string>(''); const [accentColor, setAccentColor] = useState<string>('');
const playerRef = useRef<VideoPlayerRef>(null); const playerRef = useRef<VideoPlayerRef>(null);
// Collapsible state for modules and lessons
const [collapsedModules, setCollapsedModules] = useState<Set<string>>(new Set());
const [collapsedLessons, setCollapsedLessons] = useState<Set<string>>(new Set());
useEffect(() => { useEffect(() => {
if (!authLoading && !user) { if (!authLoading && !user) {
navigate('/auth'); navigate('/auth');
@@ -210,6 +214,17 @@ export default function Bootcamp() {
return progress.some(p => p.lesson_id === lessonId); return progress.some(p => p.lesson_id === lessonId);
}; };
const formatTime = (seconds: number): string => {
const hours = Math.floor(seconds / 3600);
const minutes = Math.floor((seconds % 3600) / 60);
const secs = Math.floor(seconds % 60);
if (hours > 0) {
return `${hours}:${minutes.toString().padStart(2, '0')}:${secs.toString().padStart(2, '0')}`;
}
return `${minutes}:${secs.toString().padStart(2, '0')}`;
};
const handleSelectLesson = (lesson: Lesson) => { const handleSelectLesson = (lesson: Lesson) => {
setSelectedLesson(lesson); setSelectedLesson(lesson);
// Update URL without full page reload // Update URL without full page reload
@@ -383,8 +398,9 @@ export default function Bootcamp() {
const isAdilo = video.type === 'adilo'; const isAdilo = video.type === 'adilo';
return ( return (
<div className={hasChapters ? "grid grid-cols-1 lg:grid-cols-3 gap-6 mb-6" : "mb-6"}> <>
<div className={hasChapters ? "lg:col-span-2" : ""}> {/* Video Player - Full Width */}
<div className="mb-6">
<VideoPlayerWithChapters <VideoPlayerWithChapters
ref={playerRef} ref={playerRef}
videoUrl={isYouTube ? video.url : undefined} videoUrl={isYouTube ? video.url : undefined}
@@ -399,8 +415,9 @@ export default function Bootcamp() {
/> />
</div> </div>
{/* Timeline Chapters - Below video like WebinarRecording */}
{hasChapters && ( {hasChapters && (
<div className="lg:col-span-1"> <div className="mb-6">
<TimelineChapters <TimelineChapters
chapters={lesson.chapters} chapters={lesson.chapters}
onChapterClick={(time) => { onChapterClick={(time) => {
@@ -413,7 +430,7 @@ export default function Bootcamp() {
/> />
</div> </div>
)} )}
</div> </>
); );
}; };
@@ -421,27 +438,76 @@ export default function Bootcamp() {
const totalLessons = modules.reduce((sum, m) => sum + m.lessons.length, 0); const totalLessons = modules.reduce((sum, m) => sum + m.lessons.length, 0);
const isBootcampCompleted = totalLessons > 0 && completedCount >= totalLessons; const isBootcampCompleted = totalLessons > 0 && completedCount >= totalLessons;
// Toggle functions for collapsible modules and lessons
const toggleModule = (moduleId: string) => {
setCollapsedModules(prev => {
const newSet = new Set(prev);
if (newSet.has(moduleId)) {
newSet.delete(moduleId);
} else {
newSet.add(moduleId);
}
return newSet;
});
};
const toggleLesson = (lessonId: string) => {
setCollapsedLessons(prev => {
const newSet = new Set(prev);
if (newSet.has(lessonId)) {
newSet.delete(lessonId);
} else {
newSet.add(lessonId);
}
return newSet;
});
};
const renderSidebarContent = () => ( const renderSidebarContent = () => (
<div className="p-4"> <div className="p-4">
{modules.map((module) => ( {modules.map((module) => {
const isModuleCollapsed = collapsedModules.has(module.id);
return (
<div key={module.id} className="mb-4"> <div key={module.id} className="mb-4">
<h3 className="font-semibold text-sm text-muted-foreground uppercase tracking-wide mb-2"> {/* Module Header - Collapsible */}
<button
onClick={() => toggleModule(module.id)}
className="w-full flex items-center gap-2 text-left mb-2 group"
>
<h3 className="font-semibold text-sm text-muted-foreground uppercase tracking-wide flex-1">
{module.title} {module.title}
</h3> </h3>
<div className="space-y-1"> {isModuleCollapsed ? (
<ChevronDown className="w-4 h-4 text-muted-foreground group-hover:text-foreground transition-colors" />
) : (
<ChevronUp className="w-4 h-4 text-muted-foreground group-hover:text-foreground transition-colors" />
)}
</button>
{/* Lessons - Hidden if module is collapsed */}
{!isModuleCollapsed && (
<div className="space-y-1 ml-2">
{module.lessons.map((lesson) => { {module.lessons.map((lesson) => {
const isCompleted = isLessonCompleted(lesson.id); const isCompleted = isLessonCompleted(lesson.id);
const isSelected = selectedLesson?.id === lesson.id; const isSelected = selectedLesson?.id === lesson.id;
const isReleased = !lesson.release_at || new Date(lesson.release_at) <= new Date(); const isReleased = !lesson.release_at || new Date(lesson.release_at) <= new Date();
const isLessonCollapsed = collapsedLessons.has(lesson.id);
const hasChapters = lesson.chapters && lesson.chapters.length > 0;
return ( return (
<div key={lesson.id}>
{/* Lesson Button - Collapsible if has chapters */}
<button <button
key={lesson.id}
onClick={() => { onClick={() => {
if (isReleased) { if (isReleased) {
if (hasChapters) {
toggleLesson(lesson.id);
} else {
handleSelectLesson(lesson); handleSelectLesson(lesson);
setMobileMenuOpen(false); setMobileMenuOpen(false);
} }
}
}} }}
disabled={!isReleased} disabled={!isReleased}
className={cn( className={cn(
@@ -461,12 +527,77 @@ export default function Bootcamp() {
{lesson.duration_seconds && ( {lesson.duration_seconds && (
<span className="text-xs text-muted-foreground">{formatDuration(lesson.duration_seconds)}</span> <span className="text-xs text-muted-foreground">{formatDuration(lesson.duration_seconds)}</span>
)} )}
{hasChapters && (
<>
{isLessonCollapsed ? (
<ChevronDown className="w-4 h-4 text-muted-foreground shrink-0 ml-1" />
) : (
<ChevronUp className="w-4 h-4 text-muted-foreground shrink-0 ml-1" />
)}
</>
)}
</button>
{/* Timeline Chapters - Shown if lesson is expanded */}
{hasChapters && !isLessonCollapsed && (
<div className="ml-4 mt-1 space-y-1">
{lesson.chapters?.map((chapter, index) => {
const isChapterActive = currentTime >= chapter.time &&
(!lesson.chapters?.[index + 1] || currentTime < lesson.chapters[index + 1].time);
return (
<button
key={index}
onClick={() => {
if (playerRef.current) {
// First select the lesson if not selected
if (selectedLesson?.id !== lesson.id) {
handleSelectLesson(lesson);
}
// Then jump to time
setTimeout(() => {
if (playerRef.current) {
playerRef.current.jumpToTime(chapter.time);
}
}, 100);
}
}}
className={cn(
"w-full text-left px-3 py-1.5 rounded text-xs flex items-center gap-2 transition-colors border-l-2",
isChapterActive
? "bg-primary/10 border-primary"
: "border-transparent hover:bg-muted/50"
)}
title={`Jump to ${formatTime(chapter.time)}`}
>
<span className="font-mono text-xs text-muted-foreground shrink-0">
{formatTime(chapter.time)}
</span>
<span
className="flex-1 truncate prose-sm prose"
dangerouslySetInnerHTML={{
__html: DOMPurify.sanitize(chapter.title, {
ALLOWED_TAGS: ['code', 'strong', 'em'],
ALLOWED_ATTR: [],
})
}}
/>
{isChapterActive && (
<div className="w-1.5 h-1.5 rounded-full bg-primary shrink-0" />
)}
</button> </button>
); );
})} })}
</div> </div>
)}
</div> </div>
))} );
})}
</div>
)}
</div>
);
})}
</div> </div>
); );