diff --git a/apps/lms/app/layout.tsx b/apps/lms/app/layout.tsx index 909af32..01d9d7e 100644 --- a/apps/lms/app/layout.tsx +++ b/apps/lms/app/layout.tsx @@ -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<{ @@ -23,7 +17,7 @@ export default function RootLayout({ diff --git a/apps/lms/app/not-found.tsx b/apps/lms/app/not-found.tsx index bf08da0..36560d0 100644 --- a/apps/lms/app/not-found.tsx +++ b/apps/lms/app/not-found.tsx @@ -25,7 +25,7 @@ export default function NotFound() {

404

@@ -34,7 +34,7 @@ export default function NotFound() {

Có vẻ bạn đã đi lạc?

diff --git a/apps/lms/features/auth/components/AuthLayout.tsx b/apps/lms/features/auth/components/AuthLayout.tsx index 6d6dd66..b23974e 100644 --- a/apps/lms/features/auth/components/AuthLayout.tsx +++ b/apps/lms/features/auth/components/AuthLayout.tsx @@ -42,7 +42,7 @@ export function AuthLayout({ children }: AuthLayoutProps) { Quay lại trang chủ diff --git a/apps/lms/features/auth/components/FormField.tsx b/apps/lms/features/auth/components/FormField.tsx index c90caaf..e160d49 100644 --- a/apps/lms/features/auth/components/FormField.tsx +++ b/apps/lms/features/auth/components/FormField.tsx @@ -15,7 +15,7 @@ export function FormField({ label, error, children, hint }: FormFieldProps) {
diff --git a/apps/lms/features/auth/components/LoginForm.tsx b/apps/lms/features/auth/components/LoginForm.tsx index b818c1a..939dcf6 100644 --- a/apps/lms/features/auth/components/LoginForm.tsx +++ b/apps/lms/features/auth/components/LoginForm.tsx @@ -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 ? ( diff --git a/apps/lms/features/portal/components/ConsultantShowcase.tsx b/apps/lms/features/portal/components/ConsultantShowcase.tsx index 577cad5..7d09ed1 100644 --- a/apps/lms/features/portal/components/ConsultantShowcase.tsx +++ b/apps/lms/features/portal/components/ConsultantShowcase.tsx @@ -134,7 +134,7 @@ export function ClassActivationShowcase() { >

Consultant Xác Nhận,{" "} Hệ Thống Kích Hoạt @@ -187,7 +187,7 @@ export function ClassActivationShowcase() {

{item.step}

@@ -238,7 +238,7 @@ export function ClassActivationShowcase() { /> Kích hoạt tự động diff --git a/apps/lms/features/portal/components/DualRoleFeatureGrid.tsx b/apps/lms/features/portal/components/DualRoleFeatureGrid.tsx index c3f8d32..94d1986 100644 --- a/apps/lms/features/portal/components/DualRoleFeatureGrid.tsx +++ b/apps/lms/features/portal/components/DualRoleFeatureGrid.tsx @@ -168,7 +168,7 @@ function StudentBillingCard() { 18 buổi @@ -344,7 +344,7 @@ function TutorIncomeCard() { 18 buổi @@ -436,7 +436,7 @@ export function DualRoleFeatureGrid() { >

Mang lại giá trị riêng cho
@@ -539,7 +539,7 @@ export function DualRoleFeatureGrid() {

{card.title}

diff --git a/apps/lms/features/portal/components/FaqAndCtaSection.tsx b/apps/lms/features/portal/components/FaqAndCtaSection.tsx index 1130e12..41d2037 100644 --- a/apps/lms/features/portal/components/FaqAndCtaSection.tsx +++ b/apps/lms/features/portal/components/FaqAndCtaSection.tsx @@ -60,7 +60,7 @@ function AccordionItem({ > {item.q} @@ -123,7 +123,7 @@ export function FaqAndCtaSection() { >

Câu hỏi thường gặp

@@ -166,7 +166,7 @@ export function FaqAndCtaSection() { >

Bắt Đầu Quản Lý Lớp Học

@@ -194,7 +194,7 @@ export function FaqAndCtaSection() { Bắt Đầu Ngay diff --git a/apps/lms/features/portal/components/LmsHeader.tsx b/apps/lms/features/portal/components/LmsHeader.tsx index d75a670..50498c5 100644 --- a/apps/lms/features/portal/components/LmsHeader.tsx +++ b/apps/lms/features/portal/components/LmsHeader.tsx @@ -57,7 +57,7 @@ export function LmsHeader() { @@ -87,7 +87,7 @@ export function LmsHeader() { Đăng Nhập Hệ Thống @@ -134,7 +134,7 @@ export function LmsHeader() { Đăng Nhập Hệ Thống diff --git a/apps/lms/features/portal/components/LmsHeroSection.tsx b/apps/lms/features/portal/components/LmsHeroSection.tsx index a80f767..d513552 100644 --- a/apps/lms/features/portal/components/LmsHeroSection.tsx +++ b/apps/lms/features/portal/components/LmsHeroSection.tsx @@ -58,7 +58,7 @@ function ScheduleGrid() {

Lịch Học Tuần Này

@@ -192,7 +192,7 @@ export function LmsHeroSection() {

Quản Lý Lớp Học Sau Kết Nối
@@ -210,7 +210,7 @@ export function LmsHeroSection() { Bắt Đầu Ngay @@ -252,7 +252,7 @@ export function LmsHeroSection() {

{stat.value}

@@ -289,7 +289,7 @@ export function LmsHeroSection() { Hệ thống xác thực diff --git a/apps/lms/features/tutor-dashboard/components/KpiCard.tsx b/apps/lms/features/tutor-dashboard/components/KpiCard.tsx index 8208080..cc18e98 100644 --- a/apps/lms/features/tutor-dashboard/components/KpiCard.tsx +++ b/apps/lms/features/tutor-dashboard/components/KpiCard.tsx @@ -39,7 +39,7 @@ export const KpiCard = ({
-

+

{value}

diff --git a/apps/lms/features/tutor-dashboard/components/TutorDashboard.tsx b/apps/lms/features/tutor-dashboard/components/TutorDashboard.tsx index 822e522..7ad07cf 100644 --- a/apps/lms/features/tutor-dashboard/components/TutorDashboard.tsx +++ b/apps/lms/features/tutor-dashboard/components/TutorDashboard.tsx @@ -79,7 +79,7 @@ export function TutorDashboard() {

Chào buổi sáng, {user?.fullName?.split(" ").pop() || "Gia sư"}!

@@ -131,7 +131,7 @@ export function TutorDashboard() {

@@ -189,7 +189,7 @@ export function TutorDashboard() {

Thao tác nhanh

@@ -238,7 +238,7 @@ export function TutorDashboard() {

diff --git a/apps/lms/features/tutor-dashboard/components/TutorVerificationDashboard.tsx b/apps/lms/features/tutor-dashboard/components/TutorVerificationDashboard.tsx index 0226c81..ce09365 100644 --- a/apps/lms/features/tutor-dashboard/components/TutorVerificationDashboard.tsx +++ b/apps/lms/features/tutor-dashboard/components/TutorVerificationDashboard.tsx @@ -67,13 +67,13 @@ export function TutorVerificationDashboard() {

Xin chào,

{user?.fullName ?? "Gia sư"}

@@ -81,7 +81,7 @@ export function TutorVerificationDashboard() { Tài khoản của bạn chưa được xác minh @@ -140,7 +140,7 @@ 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} @@ -148,7 +148,7 @@ export function TutorVerificationDashboard() { 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}

@@ -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} diff --git a/apps/lms/features/tutor-materials/components/LessonDetailCard.tsx b/apps/lms/features/tutor-materials/components/LessonDetailCard.tsx index 1da63f3..e246602 100644 --- a/apps/lms/features/tutor-materials/components/LessonDetailCard.tsx +++ b/apps/lms/features/tutor-materials/components/LessonDetailCard.tsx @@ -71,7 +71,7 @@ export const LessonDetailCard = ({

Chi tiết buổi học diff --git a/apps/lms/features/tutor-materials/components/MaterialsTable.tsx b/apps/lms/features/tutor-materials/components/MaterialsTable.tsx index ff91c5a..8190c3a 100644 --- a/apps/lms/features/tutor-materials/components/MaterialsTable.tsx +++ b/apps/lms/features/tutor-materials/components/MaterialsTable.tsx @@ -38,7 +38,7 @@ export const MaterialsTable = () => {

Quản lý tài liệu diff --git a/apps/lms/features/tutor-messages/components/MessagesScreen.tsx b/apps/lms/features/tutor-messages/components/MessagesScreen.tsx index 6be6811..3c02154 100644 --- a/apps/lms/features/tutor-messages/components/MessagesScreen.tsx +++ b/apps/lms/features/tutor-messages/components/MessagesScreen.tsx @@ -22,7 +22,7 @@ export function MessagesScreen() {

CỘNG ĐỒNG GIA SƯ diff --git a/apps/lms/features/tutor-schedule/TutorSchedulePage.tsx b/apps/lms/features/tutor-schedule/TutorSchedulePage.tsx index f8b80bb..01baf3b 100644 --- a/apps/lms/features/tutor-schedule/TutorSchedulePage.tsx +++ b/apps/lms/features/tutor-schedule/TutorSchedulePage.tsx @@ -43,7 +43,7 @@ export function TutorSchedulePage() {
-

+

Lịch Dạy

diff --git a/apps/lms/features/tutor-schedule/components/CalendarView.tsx b/apps/lms/features/tutor-schedule/components/CalendarView.tsx index 4729c7c..6878742 100644 --- a/apps/lms/features/tutor-schedule/components/CalendarView.tsx +++ b/apps/lms/features/tutor-schedule/components/CalendarView.tsx @@ -71,7 +71,7 @@ export function CalendarView({ sessions, onSessionClick }: CalendarViewProps) {
{/* Calendar Header */}
-

+

{MONTH_NAMES[viewMonth]}, {viewYear}

diff --git a/apps/lms/features/tutor-schedule/components/OverviewCards.tsx b/apps/lms/features/tutor-schedule/components/OverviewCards.tsx index a440d05..796681a 100644 --- a/apps/lms/features/tutor-schedule/components/OverviewCards.tsx +++ b/apps/lms/features/tutor-schedule/components/OverviewCards.tsx @@ -70,7 +70,7 @@ export function OverviewCards({

{card.label}

-

+

{card.value}

diff --git a/apps/lms/features/tutor-schedule/components/SessionDetailSheet.tsx b/apps/lms/features/tutor-schedule/components/SessionDetailSheet.tsx index 0cfab31..ec721aa 100644 --- a/apps/lms/features/tutor-schedule/components/SessionDetailSheet.tsx +++ b/apps/lms/features/tutor-schedule/components/SessionDetailSheet.tsx @@ -107,7 +107,7 @@ export function SessionDetailSheet({

{/* Subject title */} - + {session.subject} {session.subjectLevel} {/* Student name */} @@ -171,7 +171,7 @@ export function SessionDetailSheet({ {/* Fee */} - + {formatFee(session.feeVnd)} diff --git a/apps/lms/public/fonts/GoogleSans-Bold.ttf b/apps/lms/public/fonts/GoogleSans-Bold.ttf deleted file mode 100644 index 427ce4e..0000000 Binary files a/apps/lms/public/fonts/GoogleSans-Bold.ttf and /dev/null differ diff --git a/apps/lms/public/fonts/GoogleSans-BoldItalic.ttf b/apps/lms/public/fonts/GoogleSans-BoldItalic.ttf deleted file mode 100644 index 766a45f..0000000 Binary files a/apps/lms/public/fonts/GoogleSans-BoldItalic.ttf and /dev/null differ diff --git a/apps/lms/public/fonts/GoogleSans-Italic.ttf b/apps/lms/public/fonts/GoogleSans-Italic.ttf deleted file mode 100644 index 56c4434..0000000 Binary files a/apps/lms/public/fonts/GoogleSans-Italic.ttf and /dev/null differ diff --git a/apps/lms/public/fonts/GoogleSans-Medium.ttf b/apps/lms/public/fonts/GoogleSans-Medium.ttf deleted file mode 100644 index c1588a6..0000000 Binary files a/apps/lms/public/fonts/GoogleSans-Medium.ttf and /dev/null differ diff --git a/apps/lms/public/fonts/GoogleSans-MediumItalic.ttf b/apps/lms/public/fonts/GoogleSans-MediumItalic.ttf deleted file mode 100644 index bc0690b..0000000 Binary files a/apps/lms/public/fonts/GoogleSans-MediumItalic.ttf and /dev/null differ diff --git a/apps/lms/public/fonts/GoogleSans-Regular.ttf b/apps/lms/public/fonts/GoogleSans-Regular.ttf deleted file mode 100644 index 32dd557..0000000 Binary files a/apps/lms/public/fonts/GoogleSans-Regular.ttf and /dev/null differ diff --git a/apps/lms/public/fonts/GoogleSans-SemiBold.ttf b/apps/lms/public/fonts/GoogleSans-SemiBold.ttf deleted file mode 100644 index 2da593b..0000000 Binary files a/apps/lms/public/fonts/GoogleSans-SemiBold.ttf and /dev/null differ diff --git a/apps/lms/public/fonts/GoogleSans-SemiBoldItalic.ttf b/apps/lms/public/fonts/GoogleSans-SemiBoldItalic.ttf deleted file mode 100644 index ba6c745..0000000 Binary files a/apps/lms/public/fonts/GoogleSans-SemiBoldItalic.ttf and /dev/null differ diff --git a/apps/lms/public/fonts/GoogleSans_17pt-Bold.ttf b/apps/lms/public/fonts/GoogleSans_17pt-Bold.ttf deleted file mode 100644 index cd95c7c..0000000 Binary files a/apps/lms/public/fonts/GoogleSans_17pt-Bold.ttf and /dev/null differ diff --git a/apps/lms/public/fonts/GoogleSans_17pt-BoldItalic.ttf b/apps/lms/public/fonts/GoogleSans_17pt-BoldItalic.ttf deleted file mode 100644 index 64d8661..0000000 Binary files a/apps/lms/public/fonts/GoogleSans_17pt-BoldItalic.ttf and /dev/null differ diff --git a/apps/lms/public/fonts/GoogleSans_17pt-Italic.ttf b/apps/lms/public/fonts/GoogleSans_17pt-Italic.ttf deleted file mode 100644 index 8bdee76..0000000 Binary files a/apps/lms/public/fonts/GoogleSans_17pt-Italic.ttf and /dev/null differ diff --git a/apps/lms/public/fonts/GoogleSans_17pt-Medium.ttf b/apps/lms/public/fonts/GoogleSans_17pt-Medium.ttf deleted file mode 100644 index 3f1fc18..0000000 Binary files a/apps/lms/public/fonts/GoogleSans_17pt-Medium.ttf and /dev/null differ diff --git a/apps/lms/public/fonts/GoogleSans_17pt-MediumItalic.ttf b/apps/lms/public/fonts/GoogleSans_17pt-MediumItalic.ttf deleted file mode 100644 index 2e5583e..0000000 Binary files a/apps/lms/public/fonts/GoogleSans_17pt-MediumItalic.ttf and /dev/null differ diff --git a/apps/lms/public/fonts/GoogleSans_17pt-Regular.ttf b/apps/lms/public/fonts/GoogleSans_17pt-Regular.ttf deleted file mode 100644 index 70fb415..0000000 Binary files a/apps/lms/public/fonts/GoogleSans_17pt-Regular.ttf and /dev/null differ diff --git a/apps/lms/public/fonts/GoogleSans_17pt-SemiBold.ttf b/apps/lms/public/fonts/GoogleSans_17pt-SemiBold.ttf deleted file mode 100644 index 1436ff3..0000000 Binary files a/apps/lms/public/fonts/GoogleSans_17pt-SemiBold.ttf and /dev/null differ diff --git a/apps/lms/public/fonts/GoogleSans_17pt-SemiBoldItalic.ttf b/apps/lms/public/fonts/GoogleSans_17pt-SemiBoldItalic.ttf deleted file mode 100644 index e34ae9e..0000000 Binary files a/apps/lms/public/fonts/GoogleSans_17pt-SemiBoldItalic.ttf and /dev/null differ diff --git a/apps/lms/public/images/Banner/Banner-1.png b/apps/lms/public/images/Banner/Banner-1.png deleted file mode 100644 index 849baa5..0000000 Binary files a/apps/lms/public/images/Banner/Banner-1.png and /dev/null differ diff --git a/apps/lms/public/images/Banner/Banner-2.png b/apps/lms/public/images/Banner/Banner-2.png deleted file mode 100644 index 4c18cbd..0000000 Binary files a/apps/lms/public/images/Banner/Banner-2.png and /dev/null differ diff --git a/apps/lms/public/images/Banner/Painpoint-3.png b/apps/lms/public/images/Banner/Painpoint-3.png deleted file mode 100644 index a6a0ac2..0000000 Binary files a/apps/lms/public/images/Banner/Painpoint-3.png and /dev/null differ diff --git a/apps/lms/public/images/Banner/Paintpoint-2.png b/apps/lms/public/images/Banner/Paintpoint-2.png deleted file mode 100644 index 3b79f71..0000000 Binary files a/apps/lms/public/images/Banner/Paintpoint-2.png and /dev/null differ diff --git a/apps/lms/public/images/Banner/onboard-banner.png b/apps/lms/public/images/Banner/onboard-banner.png deleted file mode 100644 index 517160c..0000000 Binary files a/apps/lms/public/images/Banner/onboard-banner.png and /dev/null differ diff --git a/apps/lms/public/images/Sticker/E1-1.PNG b/apps/lms/public/images/Sticker/E1-1.PNG deleted file mode 100644 index c4086f6..0000000 Binary files a/apps/lms/public/images/Sticker/E1-1.PNG and /dev/null differ diff --git a/apps/lms/public/images/Sticker/E1-2.PNG b/apps/lms/public/images/Sticker/E1-2.PNG deleted file mode 100644 index 70b0025..0000000 Binary files a/apps/lms/public/images/Sticker/E1-2.PNG and /dev/null differ diff --git a/apps/lms/public/images/Sticker/E1-3.PNG b/apps/lms/public/images/Sticker/E1-3.PNG deleted file mode 100644 index cdf868e..0000000 Binary files a/apps/lms/public/images/Sticker/E1-3.PNG and /dev/null differ diff --git a/apps/lms/public/images/Sticker/E1-4.PNG b/apps/lms/public/images/Sticker/E1-4.PNG deleted file mode 100644 index d8f9be1..0000000 Binary files a/apps/lms/public/images/Sticker/E1-4.PNG and /dev/null differ diff --git a/apps/lms/public/images/Sticker/E1-5.PNG b/apps/lms/public/images/Sticker/E1-5.PNG deleted file mode 100644 index 5c49e5a..0000000 Binary files a/apps/lms/public/images/Sticker/E1-5.PNG and /dev/null differ diff --git a/apps/lms/public/images/Sticker/E1-6.PNG b/apps/lms/public/images/Sticker/E1-6.PNG deleted file mode 100644 index d8075ba..0000000 Binary files a/apps/lms/public/images/Sticker/E1-6.PNG and /dev/null differ diff --git a/apps/lms/public/images/Sticker/E2-1.PNG b/apps/lms/public/images/Sticker/E2-1.PNG deleted file mode 100644 index 603f8d9..0000000 Binary files a/apps/lms/public/images/Sticker/E2-1.PNG and /dev/null differ diff --git a/apps/lms/public/images/Sticker/E2-2.PNG b/apps/lms/public/images/Sticker/E2-2.PNG deleted file mode 100644 index e03f7bb..0000000 Binary files a/apps/lms/public/images/Sticker/E2-2.PNG and /dev/null differ diff --git a/apps/lms/public/images/Sticker/E2-3.PNG b/apps/lms/public/images/Sticker/E2-3.PNG deleted file mode 100644 index 1a7cc30..0000000 Binary files a/apps/lms/public/images/Sticker/E2-3.PNG and /dev/null differ diff --git a/apps/lms/public/images/Sticker/E3-1.PNG b/apps/lms/public/images/Sticker/E3-1.PNG deleted file mode 100644 index 8f41a93..0000000 Binary files a/apps/lms/public/images/Sticker/E3-1.PNG and /dev/null differ diff --git a/apps/lms/public/images/Sticker/E3-2.PNG b/apps/lms/public/images/Sticker/E3-2.PNG deleted file mode 100644 index ca036f2..0000000 Binary files a/apps/lms/public/images/Sticker/E3-2.PNG and /dev/null differ diff --git a/apps/lms/public/images/Sticker/E3-3.PNG b/apps/lms/public/images/Sticker/E3-3.PNG deleted file mode 100644 index 1b8a791..0000000 Binary files a/apps/lms/public/images/Sticker/E3-3.PNG and /dev/null differ diff --git a/apps/lms/public/images/Sticker/E3-4.PNG b/apps/lms/public/images/Sticker/E3-4.PNG deleted file mode 100644 index e79d832..0000000 Binary files a/apps/lms/public/images/Sticker/E3-4.PNG and /dev/null differ diff --git a/apps/lms/public/images/tutors/2.png b/apps/lms/public/images/tutors/2.png deleted file mode 100644 index fbd58f6..0000000 Binary files a/apps/lms/public/images/tutors/2.png and /dev/null differ diff --git a/apps/lms/public/images/tutors/5.png b/apps/lms/public/images/tutors/5.png deleted file mode 100644 index cc64427..0000000 Binary files a/apps/lms/public/images/tutors/5.png and /dev/null differ diff --git a/apps/sale/app/layout.tsx b/apps/sale/app/layout.tsx index 254033a..e249b50 100644 --- a/apps/sale/app/layout.tsx +++ b/apps/sale/app/layout.tsx @@ -1,5 +1,4 @@ -import { Montserrat } from "next/font/google"; -import { googleSans } from "@workspace/core/configs/fonts"; +import { googleSans, nunito } from "@workspace/core/configs/fonts"; import { Providers } from '@workspace/ui/components/providers'; import "@workspace/ui/globals.css"; import { Metadata } from "next"; @@ -8,12 +7,6 @@ export const metadata: Metadata = { title: "Cộng đồng gia sư", }; -const montserrat = Montserrat({ - variable: "--font-montserrat", - subsets: ["latin"], -}); - - export default function RootLayout({ children, }: Readonly<{ @@ -23,7 +16,7 @@ export default function RootLayout({ {children} diff --git a/apps/sale/app/not-found.tsx b/apps/sale/app/not-found.tsx index bf08da0..8ad0de3 100644 --- a/apps/sale/app/not-found.tsx +++ b/apps/sale/app/not-found.tsx @@ -24,8 +24,7 @@ export default function NotFound() {

404

@@ -34,7 +33,7 @@ export default function NotFound() {

Có vẻ bạn đã đi lạc?

diff --git a/apps/sale/features/auth/components/AuthLayout.tsx b/apps/sale/features/auth/components/AuthLayout.tsx index 7532c7a..af3bb29 100644 --- a/apps/sale/features/auth/components/AuthLayout.tsx +++ b/apps/sale/features/auth/components/AuthLayout.tsx @@ -52,7 +52,7 @@ export function AuthLayout({ children, variant = "login" }: AuthLayoutProps) {
Cộng Đồng Gia Sư @@ -61,7 +61,7 @@ export function AuthLayout({ children, variant = "login" }: AuthLayoutProps) {
"Gia nhập BeeWise,
Kiến tạo tương lai." diff --git a/apps/sale/features/auth/components/FormField.tsx b/apps/sale/features/auth/components/FormField.tsx index 7b17cef..bae708e 100644 --- a/apps/sale/features/auth/components/FormField.tsx +++ b/apps/sale/features/auth/components/FormField.tsx @@ -13,7 +13,7 @@ export function FormField({ label, error, children, hint }: FormFieldProps) {
diff --git a/apps/sale/features/auth/components/LoginForm.tsx b/apps/sale/features/auth/components/LoginForm.tsx index 69043c2..a0ee9fa 100644 --- a/apps/sale/features/auth/components/LoginForm.tsx +++ b/apps/sale/features/auth/components/LoginForm.tsx @@ -49,8 +49,7 @@ export function LoginForm() {

Chào mừng trở lại

@@ -116,7 +115,7 @@ export function LoginForm() { flex items-center justify-center gap-2 hover:bg-accent/90 active:scale-[0.98] transition-all duration-200 disabled:opacity-60 disabled:cursor-not-allowed shadow-lg shadow-accent/25" - style={{ fontFamily: "var(--font-montserrat)" }} + style={{ fontFamily: "var(--font-nunito-family)" }} > {isPending ? ( diff --git a/apps/sale/features/auth/components/RegisterForm.tsx b/apps/sale/features/auth/components/RegisterForm.tsx index b90d09c..48bc009 100644 --- a/apps/sale/features/auth/components/RegisterForm.tsx +++ b/apps/sale/features/auth/components/RegisterForm.tsx @@ -78,8 +78,7 @@ export function RegisterForm() {

Tạo tài khoản BEEWISE

@@ -96,7 +95,7 @@ export function RegisterForm() {
Bạn muốn trở thành @@ -128,7 +127,7 @@ export function RegisterForm() { /> {label} @@ -307,7 +306,7 @@ export function RegisterForm() { className="relative flex h-9 w-full items-center justify-center gap-2 rounded-xl bg-accent text-sm font-bold text-primary hover:bg-accent/90 active:scale-[0.98] transition-all duration-200 disabled:opacity-60 disabled:cursor-not-allowed shadow-lg shadow-accent/25" - style={{ fontFamily: "var(--font-montserrat)" }} + style={{ fontFamily: "var(--font-nunito-family)" }} > {isPending ? ( diff --git a/apps/sale/features/favorite-tutors/components/FavoriteTutorsPage.tsx b/apps/sale/features/favorite-tutors/components/FavoriteTutorsPage.tsx index 7e16d81..2d7715b 100644 --- a/apps/sale/features/favorite-tutors/components/FavoriteTutorsPage.tsx +++ b/apps/sale/features/favorite-tutors/components/FavoriteTutorsPage.tsx @@ -55,7 +55,7 @@ export function FavoriteTutorsPage() { return (
-

+

Gia sư yêu thích

diff --git a/apps/sale/features/landing/components/FaqSection.tsx b/apps/sale/features/landing/components/FaqSection.tsx index ce5fcd0..337dcaf 100644 --- a/apps/sale/features/landing/components/FaqSection.tsx +++ b/apps/sale/features/landing/components/FaqSection.tsx @@ -22,7 +22,7 @@ export function FaqSection() {

Câu Hỏi Thường Gặp

@@ -43,7 +43,7 @@ export function FaqSection() { diff --git a/apps/sale/features/landing/components/HeroSection.tsx b/apps/sale/features/landing/components/HeroSection.tsx index 961fc5e..947258b 100644 --- a/apps/sale/features/landing/components/HeroSection.tsx +++ b/apps/sale/features/landing/components/HeroSection.tsx @@ -37,17 +37,17 @@ export function HeroSection() {
-
+

- BeeWise: "Find your tutor, fuel your future" + "Gia sư BeeWise, kiến tạo tương lai"

Tìm Gia Sư Phù Hợp{" "} - Trong 30 Giây + Với Beewise AI

diff --git a/apps/sale/features/landing/components/HeroVisual.tsx b/apps/sale/features/landing/components/HeroVisual.tsx index 5d9a850..85cfd89 100644 --- a/apps/sale/features/landing/components/HeroVisual.tsx +++ b/apps/sale/features/landing/components/HeroVisual.tsx @@ -201,7 +201,7 @@ function StatBadge({ > {value} diff --git a/apps/sale/features/landing/components/HowItWorksSection.tsx b/apps/sale/features/landing/components/HowItWorksSection.tsx index f649e15..b15bccf 100644 --- a/apps/sale/features/landing/components/HowItWorksSection.tsx +++ b/apps/sale/features/landing/components/HowItWorksSection.tsx @@ -52,7 +52,7 @@ export function HowItWorksSection() {

Chỉ 3 Bước Để Bắt Đầu

@@ -99,7 +99,7 @@ export function HowItWorksSection() { @@ -111,7 +111,7 @@ export function HowItWorksSection() {

diff --git a/apps/sale/features/landing/components/TutorCarouselSection.tsx b/apps/sale/features/landing/components/TutorCarouselSection.tsx index 4b33ab5..ed59982 100644 --- a/apps/sale/features/landing/components/TutorCarouselSection.tsx +++ b/apps/sale/features/landing/components/TutorCarouselSection.tsx @@ -156,7 +156,7 @@ export function TutorCarouselSection() {

diff --git a/apps/sale/features/landing/components/TutorSection.tsx b/apps/sale/features/landing/components/TutorSection.tsx index 95d51c1..d756681 100644 --- a/apps/sale/features/landing/components/TutorSection.tsx +++ b/apps/sale/features/landing/components/TutorSection.tsx @@ -36,7 +36,7 @@ export function TutorSection() { id="tutor-headline" className="flex flex-col text-3xl sm:text-3xl tracking-tight mb-3 text-primary" style={{ - fontFamily: "var(--font-montserrat)", + fontFamily: "var(--font-nunito-family)", fontWeight: 800, }} > diff --git a/apps/sale/features/messages/components/ChatRoomPanel.tsx b/apps/sale/features/messages/components/ChatRoomPanel.tsx index ac05e8c..ec8f4c0 100644 --- a/apps/sale/features/messages/components/ChatRoomPanel.tsx +++ b/apps/sale/features/messages/components/ChatRoomPanel.tsx @@ -96,7 +96,7 @@ export function ChatRoomPanel({ chatRoomId }: ChatRoomPanelProps) {
-

+

{room.learner.name}

diff --git a/apps/sale/features/messages/components/ChatSidebar.tsx b/apps/sale/features/messages/components/ChatSidebar.tsx index 8036e08..640796e 100644 --- a/apps/sale/features/messages/components/ChatSidebar.tsx +++ b/apps/sale/features/messages/components/ChatSidebar.tsx @@ -124,7 +124,7 @@ export function ChatSidebar() {

CỘNG ĐỒNG GIA SƯ diff --git a/apps/sale/features/messages/components/MessagesScreen.tsx b/apps/sale/features/messages/components/MessagesScreen.tsx index ebe2874..8db88fb 100644 --- a/apps/sale/features/messages/components/MessagesScreen.tsx +++ b/apps/sale/features/messages/components/MessagesScreen.tsx @@ -22,7 +22,7 @@ export function MessagesScreen() {
CỘNG ĐỒNG GIA SƯ diff --git a/apps/sale/features/tutor-approved/components/tutor-approved.ui.tsx b/apps/sale/features/tutor-approved/components/tutor-approved.ui.tsx index 341dde4..1cd578a 100644 --- a/apps/sale/features/tutor-approved/components/tutor-approved.ui.tsx +++ b/apps/sale/features/tutor-approved/components/tutor-approved.ui.tsx @@ -156,7 +156,7 @@ function WelcomeBanner() {

Tutor Home

-

{title}

+

{title}

{description}

@@ -493,7 +493,7 @@ function ProfileScreen({ edit }: { edit: boolean }) {

Hồ sơ gia sư

-

+

{edit ? "Chỉnh sửa hồ sơ" : "Hồ sơ của tôi"}

@@ -606,7 +606,7 @@ function NotificationsScreen() {

-

Thông báo

+

Thông báo

Theo dõi kết nối, tin nhắn, hồ sơ và gói hiển thị.

@@ -688,7 +688,7 @@ function AvailabilityScreen() { return (
-

Lịch rảnh nhận lớp

+

Lịch rảnh nhận lớp

Lịch lớp đã hình thành được quản lý trong Tutor LMS.

@@ -791,7 +791,7 @@ function SubscriptionScreen() { return (
-

Gói hiển thị hồ sơ

+

Gói hiển thị hồ sơ

Duy trì khả năng xuất hiện trong Search, AI Search và nhận kết nối mới. diff --git a/apps/sale/features/tutor-guide/components/TutorGuideCta.tsx b/apps/sale/features/tutor-guide/components/TutorGuideCta.tsx index 7ddbcf9..772b161 100644 --- a/apps/sale/features/tutor-guide/components/TutorGuideCta.tsx +++ b/apps/sale/features/tutor-guide/components/TutorGuideCta.tsx @@ -2,28 +2,67 @@ import Image from "next/image"; import Link from "next/link"; import { ArrowRightIcon, CheckIcon } from "@phosphor-icons/react/dist/ssr"; -const NOTES = ["Miễn phí tạo hồ sơ", "Biết rõ cơ chế thu nhập", "Có đội ngũ hỗ trợ"]; +const NOTES = [ + "Miễn phí tạo hồ sơ", + "Biết rõ cơ chế thu nhập", + "Có đội ngũ hỗ trợ", +]; export function TutorGuideCta() { return ( -

+
-

Sẵn sàng để năng lực của bạn được nhìn thấy?

-

Hoàn thiện hồ sơ gia sư BeeWise và bắt đầu gặp những học viên đang tìm đúng chuyên môn của bạn.

- +

+ Sẵn sàng kết nối cùng học viên phù hợp? +

+

+ Hoàn thiện hồ sơ gia sư BeeWise và bắt đầu gặp những học viên đang + tìm đúng chuyên môn của bạn. +

+ Bắt đầu tạo hồ sơ
- Thành viên cộng đồng gia sư BeeWise + Thành viên cộng đồng gia sư BeeWise
diff --git a/apps/sale/features/tutor-guide/components/TutorGuideFaq.tsx b/apps/sale/features/tutor-guide/components/TutorGuideFaq.tsx index 590ab76..1ba3324 100644 --- a/apps/sale/features/tutor-guide/components/TutorGuideFaq.tsx +++ b/apps/sale/features/tutor-guide/components/TutorGuideFaq.tsx @@ -54,8 +54,8 @@ function FaqItem({ className="w-full flex items-center justify-between gap-4 py-5 text-left group" > {question} @@ -75,7 +75,7 @@ function FaqItem({ className="overflow-hidden transition-all duration-300" style={{ maxHeight: isOpen ? "200px" : "0px", opacity: isOpen ? 1 : 0 }} > -

+

{answer}

@@ -91,25 +91,25 @@ export function TutorGuideFaq() { className="py-20 sm:py-24 bg-background" aria-labelledby="faq-heading" > -
-
+
+

Câu hỏi thường gặp

-

+

Những thắc mắc phổ biến nhất từ gia sư khi đăng ký tham gia BeeWise.

-
+
{FAQS.map((faq) => ( +
-

- Một hồ sơ có chiều sâu, - không chỉ là vài dòng giới thiệu +

+ + Một hồ sơ có chiều sâu, + + + không chỉ là vài dòng giới thiệu +

-

Môn dạy, kinh nghiệm, bằng cấp, lịch trống và phương pháp giảng dạy được trình bày trong cùng một hồ sơ để học viên hiểu rõ bạn trước khi kết nối.

+

+ Môn dạy, kinh nghiệm, bằng cấp, lịch trống và phương pháp giảng + dạy được trình bày trong cùng một hồ sơ để học viên hiểu rõ bạn + trước khi kết nối. +

- Đội ngũ BeeWise xây dựng nền tảng dành cho gia sư + Đội ngũ BeeWise xây dựng nền tảng dành cho gia sư
-
{SUPPORT_ITEMS.map((item) => { const Icon = item.icon; return ( -
-
+
+
+
-

{item.title}

-

{item.text}

+

+ {item.title} +

+

+ {item.text} +

); diff --git a/apps/sale/features/tutor-guide/components/TutorGuideHero.tsx b/apps/sale/features/tutor-guide/components/TutorGuideHero.tsx index 0a2c3c3..ca143bd 100644 --- a/apps/sale/features/tutor-guide/components/TutorGuideHero.tsx +++ b/apps/sale/features/tutor-guide/components/TutorGuideHero.tsx @@ -3,7 +3,11 @@ import Image from "next/image"; import Link from "next/link"; import { motion, useReducedMotion } from "motion/react"; -import { ArrowRightIcon, CheckCircleIcon, ShieldCheckIcon } from "@phosphor-icons/react"; +import { + ArrowRightIcon, + CheckCircleIcon, + ShieldCheckIcon, +} from "@phosphor-icons/react"; const PROOFS = [ "Hồ sơ được xác thực trước khi hiển thị", @@ -15,37 +19,80 @@ export function TutorGuideHero() { const reduceMotion = useReducedMotion(); return ( -
-