Skip to content

Development #88

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
vyngochi merged 2 commits into from
Aug 18, 2026
Merged

Development #88

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
c2c312e
feat: initialize project architecture and implement core UI component…
vyngochi Aug 18, 2026
eac68b8
Merge pull request #87 from bee-wise/feat/system-ui-update
vyngochi Aug 18, 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
10 changes: 2 additions & 8 deletions apps/lms/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
import { Montserrat } from "next/font/google";
import { Providers } from "@workspace/ui/components/providers";
import "@workspace/ui/globals.css";
import { Metadata } from "next";
import { googleSans } from "@workspace/core/configs/fonts";
import { googleSans, nunito } from "@workspace/core/configs/fonts";
import { TooltipProvider } from "@workspace/ui/components/ui/tooltip";

export const metadata: Metadata = {
title: "BeeWise LMS — Hệ Thống Quản Lý Học Tập Thông Minh",
};

const montserrat = Montserrat({
variable: "--font-montserrat",
subsets: ["latin"],
});

export default function RootLayout({
children,
}: Readonly<{
Expand All @@ -23,7 +17,7 @@ export default function RootLayout({
<html
lang="vi"
suppressHydrationWarning
className={`${montserrat.variable} ${googleSans.variable} h-full antialiased`}
className={`${googleSans.variable} ${nunito.variable} h-full antialiased`}
>
<body className="min-h-full flex flex-col">
<Providers>
Expand Down
4 changes: 2 additions & 2 deletions apps/lms/app/not-found.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default function NotFound() {
<HeroMotion delay={0.1}>
<h1
className="text-7xl sm:text-9xl tracking-tighter text-[#280F91] mb-6 leading-none"
style={{ fontFamily: "var(--font-montserrat)", fontWeight: 800 }}
style={{ fontFamily: "var(--font-nunito-family)", fontWeight: 800 }}
>
404
</h1>
Expand All @@ -34,7 +34,7 @@ export default function NotFound() {
<HeroMotion delay={0.2}>
<h2
className="text-2xl sm:text-3xl text-[#0C0C0B] mb-4 tracking-tight"
style={{ fontFamily: "var(--font-montserrat)", fontWeight: 700 }}
style={{ fontFamily: "var(--font-nunito-family)", fontWeight: 700 }}
>
Có vẻ bạn đã đi lạc?
</h2>
Expand Down
2 changes: 1 addition & 1 deletion apps/lms/features/auth/components/AuthLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export function AuthLayout({ children }: AuthLayoutProps) {
<ArrowLeft weight="bold" className="w-4 h-4" />
<span
className="font-semibold text-sm"
style={{ fontFamily: "var(--font-montserrat)" }}
style={{ fontFamily: "var(--font-nunito-family)" }}
>
Quay lại trang chủ
</span>
Expand Down
2 changes: 1 addition & 1 deletion apps/lms/features/auth/components/FormField.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export function FormField({ label, error, children, hint }: FormFieldProps) {
<div className="flex flex-col gap-1">
<label
className="text-xs font-semibold text-foreground/80"
style={{ fontFamily: "var(--font-montserrat)" }}
style={{ fontFamily: "var(--font-nunito-family)" }}
>
{label}
</label>
Expand Down
2 changes: 1 addition & 1 deletion apps/lms/features/auth/components/LoginForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ export function LoginForm() {
flex items-center justify-center gap-2
hover:bg-[#1f0c73] active:scale-[0.98] transition-all duration-200
disabled:opacity-60 disabled:cursor-not-allowed shadow-lg shadow-[#280f91]/30"
style={{ fontFamily: "var(--font-montserrat)" }}
style={{ fontFamily: "var(--font-nunito-family)" }}
>
{isPending ? (
<span className="w-5 h-5 rounded-full border-2 border-white/30 border-t-white animate-spin" />
Expand Down
6 changes: 3 additions & 3 deletions apps/lms/features/portal/components/ConsultantShowcase.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ export function ClassActivationShowcase() {
>
<h2
className="text-3xl md:text-4xl lg:text-[44px] leading-tight tracking-tight text-white mb-5"
style={{ fontFamily: "var(--font-montserrat)", fontWeight: 800 }}
style={{ fontFamily: "var(--font-nunito-family)", fontWeight: 800 }}
>
Consultant Xác Nhận,{" "}
<span className="text-[#ffc500]">Hệ Thống Kích Hoạt</span>
Expand Down Expand Up @@ -187,7 +187,7 @@ export function ClassActivationShowcase() {
<div>
<p
className="text-sm font-bold text-white mb-0.5"
style={{ fontFamily: "var(--font-montserrat)" }}
style={{ fontFamily: "var(--font-nunito-family)" }}
>
{item.step}
</p>
Expand Down Expand Up @@ -238,7 +238,7 @@ export function ClassActivationShowcase() {
/>
<span
className="text-[9px] font-bold text-[#0c0c0b]"
style={{ fontFamily: "var(--font-montserrat)" }}
style={{ fontFamily: "var(--font-nunito-family)" }}
>
Kích hoạt tự động
</span>
Expand Down
8 changes: 4 additions & 4 deletions apps/lms/features/portal/components/DualRoleFeatureGrid.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ function StudentBillingCard() {
</span>
<span
className="text-sm font-bold text-[#280f91]"
style={{ fontFamily: "var(--font-montserrat)" }}
style={{ fontFamily: "var(--font-nunito-family)" }}
>
18 buổi
</span>
Expand Down Expand Up @@ -344,7 +344,7 @@ function TutorIncomeCard() {
</span>
<span
className="text-sm font-bold text-[#447353]"
style={{ fontFamily: "var(--font-montserrat)" }}
style={{ fontFamily: "var(--font-nunito-family)" }}
>
18 buổi
</span>
Expand Down Expand Up @@ -436,7 +436,7 @@ export function DualRoleFeatureGrid() {
>
<h2
className="text-3xl md:text-4xl lg:text-[44px] leading-tight tracking-tight text-[#0c0c0b] mb-4"
style={{ fontFamily: "var(--font-montserrat)", fontWeight: 800 }}
style={{ fontFamily: "var(--font-nunito-family)", fontWeight: 800 }}
>
<span className="text-[#280f91]">Mang lại giá trị riêng cho</span>
<br />
Expand Down Expand Up @@ -539,7 +539,7 @@ export function DualRoleFeatureGrid() {
<div>
<h3
className="text-sm font-bold text-[#0c0c0b]"
style={{ fontFamily: "var(--font-montserrat)" }}
style={{ fontFamily: "var(--font-nunito-family)" }}
>
{card.title}
</h3>
Expand Down
8 changes: 4 additions & 4 deletions apps/lms/features/portal/components/FaqAndCtaSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ function AccordionItem({
>
<span
className="text-sm md:text-base font-bold text-[#0c0c0b] pr-4 group-hover:text-[#280f91] transition-colors duration-200"
style={{ fontFamily: "var(--font-montserrat)" }}
style={{ fontFamily: "var(--font-nunito-family)" }}
>
{item.q}
</span>
Expand Down Expand Up @@ -123,7 +123,7 @@ export function FaqAndCtaSection() {
>
<h2
className="text-3xl md:text-4xl leading-tight tracking-tight text-[#0c0c0b] mb-3"
style={{ fontFamily: "var(--font-montserrat)", fontWeight: 800 }}
style={{ fontFamily: "var(--font-nunito-family)", fontWeight: 800 }}
>
Câu hỏi <span className="text-[#280f91]">thường gặp</span>
</h2>
Expand Down Expand Up @@ -166,7 +166,7 @@ export function FaqAndCtaSection() {
>
<h2
className="text-3xl md:text-4xl lg:text-5xl leading-tight tracking-tight text-white mb-5"
style={{ fontFamily: "var(--font-montserrat)", fontWeight: 800 }}
style={{ fontFamily: "var(--font-nunito-family)", fontWeight: 800 }}
>
Bắt Đầu Quản Lý Lớp Học
</h2>
Expand Down Expand Up @@ -194,7 +194,7 @@ export function FaqAndCtaSection() {
<Link
href="/login"
className="inline-flex h-14 items-center justify-center gap-2.5 rounded-xl bg-[#ffc500] px-10 text-base font-bold text-[#0c0c0b] hover:bg-[#ffcc1a] active:scale-[0.97] transition-all duration-200 shadow-xl shadow-[#ffc500]/30"
style={{ fontFamily: "var(--font-montserrat)" }}
style={{ fontFamily: "var(--font-nunito-family)" }}
>
Bắt Đầu Ngay
</Link>
Expand Down
6 changes: 3 additions & 3 deletions apps/lms/features/portal/components/LmsHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export function LmsHeader() {
<span
className="text-[#280f91] text-sm leading-none uppercase hidden sm:block"
style={{
fontFamily: "var(--font-montserrat)",
fontFamily: "var(--font-nunito-family)",
fontWeight: 800,
}}
>
Expand Down Expand Up @@ -87,7 +87,7 @@ export function LmsHeader() {
<Link
href="/login"
className="hidden md:inline-flex h-9 items-center justify-center rounded-xl bg-[#ffc500] px-5 text-sm font-bold text-primary hover:bg-[#ffcc1a] active:scale-[0.97] transition-all duration-200 shadow-sm shadow-[#ffc500]/30"
style={{ fontFamily: "var(--font-montserrat)" }}
style={{ fontFamily: "var(--font-nunito-family)" }}
>
Đăng Nhập Hệ Thống
</Link>
Expand Down Expand Up @@ -134,7 +134,7 @@ export function LmsHeader() {
<Link
href="/login"
className="inline-flex h-10 items-center justify-center rounded-xl bg-[#ffc500] px-5 text-sm font-bold text-[#0c0c0b]"
style={{ fontFamily: "var(--font-montserrat)" }}
style={{ fontFamily: "var(--font-nunito-family)" }}
>
Đăng Nhập Hệ Thống
</Link>
Expand Down
10 changes: 5 additions & 5 deletions apps/lms/features/portal/components/LmsHeroSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ function ScheduleGrid() {
<div className="flex items-center justify-between mb-3">
<p
className="text-xs font-bold text-[#0c0c0b]"
style={{ fontFamily: "var(--font-montserrat)" }}
style={{ fontFamily: "var(--font-nunito-family)" }}
>
Lịch Học Tuần Này
</p>
Expand Down Expand Up @@ -192,7 +192,7 @@ export function LmsHeroSection() {

<h1
className="text-[25px] sm:text-4xl leading-[1.1] tracking-tight text-[#0c0c0b] mb-5"
style={{ fontFamily: "var(--font-montserrat)", fontWeight: 800 }}
style={{ fontFamily: "var(--font-nunito-family)", fontWeight: 800 }}
>
Quản Lý Lớp Học Sau Kết Nối
<br />
Expand All @@ -210,7 +210,7 @@ export function LmsHeroSection() {
<Link
href="/login"
className="inline-flex h-12 items-center justify-center gap-2 rounded-xl bg-[#ffc500] px-7 text-sm font-bold text-primary hover:bg-[#ffcc1a] active:scale-[0.97] transition-all duration-200 shadow-lg shadow-[#ffc500]/30"
style={{ fontFamily: "var(--font-montserrat)" }}
style={{ fontFamily: "var(--font-nunito-family)" }}
>
Bắt Đầu Ngay
</Link>
Expand Down Expand Up @@ -252,7 +252,7 @@ export function LmsHeroSection() {
<div>
<p
className="text-sm font-bold text-[#0c0c0b] leading-none"
style={{ fontFamily: "var(--font-montserrat)" }}
style={{ fontFamily: "var(--font-nunito-family)" }}
>
{stat.value}
</p>
Expand Down Expand Up @@ -289,7 +289,7 @@ export function LmsHeroSection() {
<ShieldCheck size={12} weight="fill" />
<span
className="text-[9px] font-bold"
style={{ fontFamily: "var(--font-montserrat)" }}
style={{ fontFamily: "var(--font-nunito-family)" }}
>
Hệ thống xác thực
</span>
Expand Down
2 changes: 1 addition & 1 deletion apps/lms/features/tutor-dashboard/components/KpiCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export const KpiCard = ({
</div>

<div className="relative z-10">
<h3 className="text-3xl font-extrabold text-[#280F91] tracking-tight" style={{ fontFamily: "var(--font-montserrat)" }}>
<h3 className="text-3xl font-extrabold text-[#280F91] tracking-tight" style={{ fontFamily: "var(--font-nunito-family)" }}>
{value}
</h3>

Expand Down
8 changes: 4 additions & 4 deletions apps/lms/features/tutor-dashboard/components/TutorDashboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export function TutorDashboard() {
</p>
<h1
className="text-3xl md:text-4xl text-[#280F91] "
style={{ fontFamily: "var(--font-montserrat)", fontWeight: 800 }}
style={{ fontFamily: "var(--font-nunito-family)", fontWeight: 800 }}
>
Chào buổi sáng, {user?.fullName?.split(" ").pop() || "Gia sư"}!
</h1>
Expand Down Expand Up @@ -131,7 +131,7 @@ export function TutorDashboard() {
<h2
className="text-xl text-gray-900 "
style={{
fontFamily: "var(--font-montserrat)",
fontFamily: "var(--font-nunito-family)",
fontWeight: 800,
}}
>
Expand Down Expand Up @@ -189,7 +189,7 @@ export function TutorDashboard() {
<div className="bg-[#CFE1FA]/20 rounded-2xl border border-[#CFE1FA] p-6">
<h2
className="text-xl text-[#280F91] mb-4"
style={{ fontFamily: "var(--font-montserrat)", fontWeight: 800 }}
style={{ fontFamily: "var(--font-nunito-family)", fontWeight: 800 }}
>
Thao tác nhanh
</h2>
Expand Down Expand Up @@ -238,7 +238,7 @@ export function TutorDashboard() {
<h2
className="text-xl text-gray-900 flex items-center gap-2"
style={{
fontFamily: "var(--font-montserrat)",
fontFamily: "var(--font-nunito-family)",
fontWeight: 800,
}}
>
Expand Down
12 changes: 6 additions & 6 deletions apps/lms/features/tutor-dashboard/components/TutorVerificationDashboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,21 +67,21 @@ export function TutorVerificationDashboard() {
<div className="flex flex-col gap-1 mb-10 text-center md:text-left">
<p
className="text-sm text-muted-foreground"
style={{ fontFamily: "var(--font-montserrat)" }}
style={{ fontFamily: "var(--font-nunito-family)" }}
>
Xin chào,
</p>
<h1
className="text-2xl md:text-3xl text-foreground"
style={{ fontFamily: "var(--font-montserrat)", fontWeight: 800 }}
style={{ fontFamily: "var(--font-nunito-family)", fontWeight: 800 }}
>
{user?.fullName ?? "Gia sư"}
</h1>
<div className="inline-flex items-center gap-1.5 mt-1 justify-center md:justify-start w-full md:w-fit">
<span className="w-1.5 h-1.5 rounded-full bg-amber-400 animate-pulse" />
<span
className="text-xs font-semibold text-amber-600"
style={{ fontFamily: "var(--font-montserrat)" }}
style={{ fontFamily: "var(--font-nunito-family)" }}
>
Tài khoản của bạn chưa được xác minh
</span>
Expand Down Expand Up @@ -140,15 +140,15 @@ export function TutorVerificationDashboard() {
className={`text-[10px] font-bold uppercase tracking-wider
${isDone ? "text-[#447353]" : isCurrent ? "text-[#280f91]" : "text-muted-foreground/50"}
`}
style={{ fontFamily: "var(--font-montserrat)" }}
style={{ fontFamily: "var(--font-nunito-family)" }}
>
Bước {step.id}
</span>
<h3
className={`text-sm font-bold
${isPending ? "text-muted-foreground/70" : "text-foreground"}
`}
style={{ fontFamily: "var(--font-montserrat)" }}
style={{ fontFamily: "var(--font-nunito-family)" }}
>
{step.title}
</h3>
Expand All @@ -167,7 +167,7 @@ export function TutorVerificationDashboard() {
className="inline-flex items-center gap-1.5 px-3.5 py-1.5 rounded-lg border border-[#280f91]
text-[#280f91] text-xs font-bold bg-[#280f91]/5
hover:bg-[#280f91]/10 active:scale-[0.98] transition-all"
style={{ fontFamily: "var(--font-montserrat)" }}
style={{ fontFamily: "var(--font-nunito-family)" }}
>
{step.ctaLabel}
<ArrowRight size={12} weight="bold" />
Expand Down
2 changes: 1 addition & 1 deletion apps/lms/features/tutor-materials/components/LessonDetailCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export const LessonDetailCard = ({
<h1
className="text-xl md:text-2xl font-extrabold text-[#280F91] mb-2"
style={{
fontFamily: "var(--font-montserrat, Montserrat), sans-serif",
fontFamily: "var(--font-nunito-family), sans-serif",
}}
>
Chi tiết buổi học
Expand Down
2 changes: 1 addition & 1 deletion apps/lms/features/tutor-materials/components/MaterialsTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export const MaterialsTable = () => {
<h1
className="text-2xl font-extrabold text-[#280F91]"
style={{
fontFamily: "var(--font-montserrat, Montserrat), sans-serif",
fontFamily: "var(--font-nunito-family), sans-serif",
}}
>
Quản lý tài liệu
Expand Down
2 changes: 1 addition & 1 deletion apps/lms/features/tutor-messages/components/MessagesScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export function MessagesScreen() {
</div>
<span
className="text-xl tracking-tight text-[#280f91]"
style={{ fontFamily: "var(--font-montserrat)", fontWeight: 800 }}
style={{ fontFamily: "var(--font-nunito-family)", fontWeight: 800 }}
>
CỘNG ĐỒNG GIA SƯ
</span>
Expand Down
2 changes: 1 addition & 1 deletion apps/lms/features/tutor-schedule/TutorSchedulePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export function TutorSchedulePage() {
<div className="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-3">
<div>
<div className="flex items-center gap-2.5 mb-1">
<h1 className="text-2xl font-extrabold font-montserrat text-foreground leading-tight">
<h1 className="text-2xl font-extrabold font-nunito text-foreground leading-tight">
Lịch Dạy
</h1>
</div>
Expand Down
2 changes: 1 addition & 1 deletion apps/lms/features/tutor-schedule/components/CalendarView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export function CalendarView({ sessions, onSessionClick }: CalendarViewProps) {
<div className="rounded-2xl border border-border/60 bg-white shadow-sm overflow-hidden">
{/* Calendar Header */}
<div className="flex items-center justify-between px-6 py-4 border-b border-border/40">
<h2 className="text-base font-bold font-montserrat text-foreground">
<h2 className="text-base font-bold font-nunito text-foreground">
{MONTH_NAMES[viewMonth]}, {viewYear}
</h2>
<div className="flex items-center gap-1">
Expand Down
2 changes: 1 addition & 1 deletion apps/lms/features/tutor-schedule/components/OverviewCards.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export function OverviewCards({
<p className="text-xs font-semibold uppercase tracking-wide text-muted-foreground mb-2">
{card.label}
</p>
<p className="text-4xl font-extrabold leading-none font-montserrat text-foreground">
<p className="text-4xl font-extrabold leading-none font-nunito text-foreground">
{card.value}
</p>
<p className="text-sm text-muted-foreground mt-1.5">
Expand Down
Loading
Loading