Merge version_1 into main #2

Merged
bender merged 2 commits from version_1 into main 2026-03-10 23:38:18 +00:00
2 changed files with 38 additions and 50 deletions

View File

@@ -23,16 +23,16 @@ const navItems = [
const courseProducts = [
{
id: "math-101", name: "Mathematics Fundamentals", price: "Free", variant: "Beginner • 8 Weeks", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Am768rL1dNr74xvJDmhbcn282i/three-course-cards-displayed-in-a-grid-s-1773185787539-744e2dc9.png?_wi=1", imageAlt: "Mathematics course"
id: "math-101", name: "Mathematics Fundamentals", price: "Free", variant: "Beginner • 8 Weeks", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Am768rL1dNr74xvJDmhbcn282i/three-course-cards-displayed-in-a-grid-s-1773185787539-744e2dc9.png", imageAlt: "Mathematics course"
},
{
id: "science-201", name: "Advanced Science Concepts", price: "Free", variant: "Intermediate • 10 Weeks", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Am768rL1dNr74xvJDmhbcn282i/three-course-cards-displayed-in-a-grid-s-1773185787539-744e2dc9.png?_wi=2", imageAlt: "Science course"
id: "science-201", name: "Advanced Science Concepts", price: "Free", variant: "Intermediate • 10 Weeks", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Am768rL1dNr74xvJDmhbcn282i/three-course-cards-displayed-in-a-grid-s-1773185787539-744e2dc9.png", imageAlt: "Science course"
},
{
id: "english-101", name: "English Literature Mastery", price: "Free", variant: "Intermediate • 6 Weeks", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Am768rL1dNr74xvJDmhbcn282i/three-course-cards-displayed-in-a-grid-s-1773185787539-744e2dc9.png?_wi=3", imageAlt: "English course"
id: "english-101", name: "English Literature Mastery", price: "Free", variant: "Intermediate • 6 Weeks", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Am768rL1dNr74xvJDmhbcn282i/three-course-cards-displayed-in-a-grid-s-1773185787539-744e2dc9.png", imageAlt: "English course"
},
{
id: "history-101", name: "World History Essentials", price: "Free", variant: "Beginner • 12 Weeks", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Am768rL1dNr74xvJDmhbcn282i/three-course-cards-displayed-in-a-grid-s-1773185787539-744e2dc9.png?_wi=4", imageAlt: "History course"
id: "history-101", name: "World History Essentials", price: "Free", variant: "Beginner • 12 Weeks", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Am768rL1dNr74xvJDmhbcn282i/three-course-cards-displayed-in-a-grid-s-1773185787539-744e2dc9.png", imageAlt: "History course"
}
];
@@ -68,22 +68,22 @@ const upcomingAccordionItems = [
const achievementMembers = [
{
id: "1", name: "Quick Learner", role: "Completed First Lesson", description: "Earned by completing your first course lesson within 24 hours of enrollment.", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Am768rL1dNr74xvJDmhbcn282i/a-showcase-of-student-achievement-badges-1773185789519-bafcbcff.png?_wi=1", imageAlt: "Quick Learner Badge"
id: "1", name: "Quick Learner", role: "Completed First Lesson", description: "Earned by completing your first course lesson within 24 hours of enrollment.", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Am768rL1dNr74xvJDmhbcn282i/a-showcase-of-student-achievement-badges-1773185789519-bafcbcff.png", imageAlt: "Quick Learner Badge"
},
{
id: "2", name: "Perfect Score", role: "100% Quiz Accuracy", description: "Achieved by scoring 100% on any course assessment without mistakes.", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Am768rL1dNr74xvJDmhbcn282i/a-showcase-of-student-achievement-badges-1773185789519-bafcbcff.png?_wi=2", imageAlt: "Perfect Score Badge"
id: "2", name: "Perfect Score", role: "100% Quiz Accuracy", description: "Achieved by scoring 100% on any course assessment without mistakes.", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Am768rL1dNr74xvJDmhbcn282i/a-showcase-of-student-achievement-badges-1773185789519-bafcbcff.png", imageAlt: "Perfect Score Badge"
},
{
id: "3", name: "Consistent Performer", role: "30 Day Streak", description: "Earned by maintaining a 30-day continuous learning streak without missing a day.", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Am768rL1dNr74xvJDmhbcn282i/a-showcase-of-student-achievement-badges-1773185789519-bafcbcff.png?_wi=3", imageAlt: "Consistent Performer Badge"
id: "3", name: "Consistent Performer", role: "30 Day Streak", description: "Earned by maintaining a 30-day continuous learning streak without missing a day.", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Am768rL1dNr74xvJDmhbcn282i/a-showcase-of-student-achievement-badges-1773185789519-bafcbcff.png", imageAlt: "Consistent Performer Badge"
},
{
id: "4", name: "Knowledge Master", role: "Course Completion", description: "Achieved by completing an entire course from start to finish with excellent marks.", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Am768rL1dNr74xvJDmhbcn282i/a-showcase-of-student-achievement-badges-1773185789519-bafcbcff.png?_wi=4", imageAlt: "Knowledge Master Badge"
id: "4", name: "Knowledge Master", role: "Course Completion", description: "Achieved by completing an entire course from start to finish with excellent marks.", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Am768rL1dNr74xvJDmhbcn282i/a-showcase-of-student-achievement-badges-1773185789519-bafcbcff.png", imageAlt: "Knowledge Master Badge"
},
{
id: "5", name: "Community Leader", role: "Peer Mentor", description: "Earned by helping 10+ fellow students and receiving positive feedback.", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Am768rL1dNr74xvJDmhbcn282i/a-showcase-of-student-achievement-badges-1773185789519-bafcbcff.png?_wi=5", imageAlt: "Community Leader Badge"
id: "5", name: "Community Leader", role: "Peer Mentor", description: "Earned by helping 10+ fellow students and receiving positive feedback.", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Am768rL1dNr74xvJDmhbcn282i/a-showcase-of-student-achievement-badges-1773185789519-bafcbcff.png", imageAlt: "Community Leader Badge"
},
{
id: "6", name: "Innovation Champion", role: "Creative Project", description: "Awarded for submitting an exceptional and creative project that exceeded expectations.", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Am768rL1dNr74xvJDmhbcn282i/a-showcase-of-student-achievement-badges-1773185789519-bafcbcff.png?_wi=6", imageAlt: "Innovation Champion Badge"
id: "6", name: "Innovation Champion", role: "Creative Project", description: "Awarded for submitting an exceptional and creative project that exceeded expectations.", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Am768rL1dNr74xvJDmhbcn282i/a-showcase-of-student-achievement-badges-1773185789519-bafcbcff.png", imageAlt: "Innovation Champion Badge"
}
];
@@ -151,7 +151,7 @@ export default function LandingPage() {
borderRadius="rounded"
contentWidth="mediumLarge"
sizing="mediumLargeSizeLargeTitles"
background="grid"
background="circleGradient"
cardStyle="gradient-mesh"
primaryButtonStyle="flat"
secondaryButtonStyle="layered"
@@ -165,7 +165,7 @@ export default function LandingPage() {
<HeroBillboard
title="Welcome to Your Learning Dashboard"
description="Manage your courses, track your progress, and engage with interactive learning tools designed to help you succeed in every subject."
background={{ variant: "grid" }}
background={{ variant: "sparkles-gradient" }}
tag="Your Learning Hub"
tagIcon={Sparkles}
tagAnimation="slide-up"
@@ -295,7 +295,7 @@ export default function LandingPage() {
{ text: "Contact Support", href: "#" }
]}
buttonAnimation="slide-up"
background={{ variant: "grid" }}
background={{ variant: "sparkles-gradient" }}
useInvertedBackground={false}
/>
</div>

View File

@@ -1,51 +1,39 @@
"use client";
import { memo } from "react";
import useSvgTextLogo from "./useSvgTextLogo";
import { cls } from "@/lib/utils";
import React from 'react';
interface SvgTextLogoProps {
logoText: string;
adjustHeightFactor?: number;
verticalAlign?: "top" | "center";
text: string;
fontSize?: number;
fontWeight?: number | string;
fontFamily?: string;
fill?: string;
className?: string;
}
const SvgTextLogo = memo<SvgTextLogoProps>(function SvgTextLogo({
logoText,
adjustHeightFactor,
verticalAlign = "top",
className = "",
}) {
const { svgRef, textRef, viewBox, aspectRatio } = useSvgTextLogo(logoText, false, adjustHeightFactor);
export const SvgTextLogo: React.FC<SvgTextLogoProps> = ({
text,
fontSize = 32,
fontWeight = 700,
fontFamily = 'system-ui, -apple-system, sans-serif',
fill = 'currentColor',
className = '',
}) => {
return (
<svg
ref={svgRef}
viewBox={viewBox}
className={cls("w-full", className)}
style={{ aspectRatio: aspectRatio }}
preserveAspectRatio="none"
role="img"
aria-label={`${logoText} logo`}
viewBox={`0 0 ${text.length * fontSize * 0.6} ${fontSize * 1.2}`}
xmlns="http://www.w3.org/2000/svg"
className={className}
>
<text
ref={textRef}
x="0"
y={verticalAlign === "center" ? "50%" : "0"}
className="font-bold fill-current"
style={{
fontSize: "20px",
letterSpacing: "-0.02em",
dominantBaseline: verticalAlign === "center" ? "middle" : "text-before-edge"
}}
y={fontSize * 0.85}
fontSize={fontSize}
fontWeight={fontWeight}
fontFamily={fontFamily}
fill={fill}
dominantBaseline="auto"
>
{logoText}
{text}
</text>
</svg>
);
});
SvgTextLogo.displayName = "SvgTextLogo";
export default SvgTextLogo;
};