Skip to content

feat: redesign Hợp Nhất sidebar, intro/social videos (autoplay+loop+f… - #1

Merged
Phongxuan123 merged 1 commit into
mainfrom
feat/major-fe-upgrade-v1.3.0
Jun 6, 2026
Merged

feat: redesign Hợp Nhất sidebar, intro/social videos (autoplay+loop+f…#1
Phongxuan123 merged 1 commit into
mainfrom
feat/major-fe-upgrade-v1.3.0

Conversation

@Phongxuan123

Copy link
Copy Markdown
Owner

…aststart), next-lesson button

  • Bảng Nguồn Gốc Triết Học (sidebar phải): thu thập 2 mảnh ghép → ghép thành đúc kết hoàn chỉnh
  • Chèn + faststart video mở đầu & xã hội; tất cả video autoplay + loop
  • Chuyển câu hỏi nhận thức sang dạng chấm điểm; tách khối GHI NHỚ thành 3 ý
  • Thêm nút 'Bài học tiếp theo' ở màn hoàn thành (helper findNextLesson)
  • Redesign JourneyHeader thành stepper trực quan; nút Quay lại lùi từng chặng

…aststart), next-lesson button

- Bảng Nguồn Gốc Triết Học (sidebar phải): thu thập 2 mảnh ghép → ghép thành đúc kết hoàn chỉnh
- Chèn + faststart video mở đầu & xã hội; tất cả video autoplay + loop
- Chuyển câu hỏi nhận thức sang dạng chấm điểm; tách khối GHI NHỚ thành 3 ý
- Thêm nút 'Bài học tiếp theo' ở màn hoàn thành (helper findNextLesson)
- Redesign JourneyHeader thành stepper trực quan; nút Quay lại lùi từng chặng

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Copilot AI review requested due to automatic review settings June 6, 2026 08:50
@vercel

vercel Bot commented Jun 6, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
mln Ready Ready Preview, Comment Jun 6, 2026 8:50am

@Phongxuan123
Phongxuan123 merged commit f5c85d0 into main Jun 6, 2026
3 checks passed

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR updates the “Hành trình Khai Sáng” interactive lesson UI/flow by introducing autoplay+loop intro/social videos, a right-side “Nguồn Gốc Triết Học” merge panel, a redesigned stepper header with back navigation, and a “Bài học tiếp theo” CTA after completion.

Changes:

  • Replace intro/social scene banners with video-based headers and update question flow (graded cognitive question; “GHI NHỚ” rendered as a 3-item list).
  • Add “Bảng Hợp Nhất” sidebar to visualize collected pieces and enable merging into a final consolidated statement.
  • Add next-lesson navigation (findNextLesson) and completion screen CTA, plus a redesigned stepper header with per-stage back navigation.

Reviewed changes

Copilot reviewed 4 out of 6 changed files in this pull request and generated 2 comments.

File Description
src/pages/PhilosophyJourney.jsx Adds video scene headers, merge sidebar + merged state, redesigned JourneyHeader stepper/back, and completion next-lesson CTA.
src/pages/Lesson.jsx Wires nextLesson + onNextLesson into PhilosophyJourney.
src/data/mindmapData.js Adds findNextLesson helper to compute the next lesson in flattened order.
src/data/journeyContent.js Updates lesson script/content to match new graded flow, warning list format, and merged final statement.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment on lines 155 to 166
<video
// React khong phai luc nao cung set dung DOM property `muted` qua JSX attribute,
// nen set truc tiep qua ref de dam bao video co tieng khi muted=false.
ref={(el) => {
if (el) el.muted = muted;
}}
src={src}
controls
autoPlay
muted
autoPlay={autoPlay}
loop
playsInline
preload="metadata"
Comment on lines 499 to 510
{phase === 0 && (
<div className="bg-gray-50 rounded-2xl border border-gray-200 p-5 md:p-6">
<DialogueSequence lines={R.setup} onComplete={() => setPhase(1)} ctaLabel="Vào vai trải nghiệm" />
<div className="flex justify-end">
<button
type="button"
onClick={() => setPhase(1)}
className="inline-flex items-center gap-1.5 bg-red-800 text-white px-5 py-2.5 rounded-lg font-bold hover:bg-red-900 transition-colors"
>
Vào vai trải nghiệm
<span className="material-symbols-outlined text-base">arrow_forward</span>
</button>
</div>
)}
Phongxuan123 added a commit that referenced this pull request Jul 3, 2026
Phongxuan123 added a commit that referenced this pull request Jul 3, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants