bender/272c0499-b0ba-4038-93e4-cd6a9bc04262
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_4 into main #5

Merged
bender merged 9 commits from version_4 into main 2026-05-21 06:35:47 +00:00
Conversation 0 Commits 9 Files Changed 9 +21 -9
9 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/grade-1/page.tsx
View File

@@ -3,10 +3,11 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
export default function Grade1Page() {
const navItems = [{name: "Home", id: "/"}, {name: "Grade 1", id: "/grade-1"}, {name: "Grade 2", id: "/grade-2"}, {name: "Grade 3", id: "/grade-3"}, {name: "Grade 4", id: "/grade-4"}, {name: "Grade 9", id: "/grade-9"}, {name: "Grade 10", id: "/grade-10"}, {name: "Grade 11", id: "/grade-11"}, {name: "Grade 12", id: "/grade-12"}];
return (
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay navItems={[{name: "Home", id: "/"}]} brandName="Tuition Pro" />
<NavbarLayoutFloatingOverlay navItems={navItems} brandName="Tuition Pro" />
</div>
<div className="pt-32 p-8 max-w-4xl mx-auto">
<h1 className="text-4xl font-bold mb-6">Grade 1 Curriculum</h1>

3
src/app/grade-10/page.tsx
View File

@@ -4,10 +4,11 @@ import FeatureCardSix from '@/components/sections/feature/FeatureCardSix';
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
export default function Grade10Page() {
const navItems = [{name: "Home", id: "/"}, {name: "Grade 1", id: "/grade-1"}, {name: "Grade 2", id: "/grade-2"}, {name: "Grade 3", id: "/grade-3"}, {name: "Grade 4", id: "/grade-4"}, {name: "Grade 9", id: "/grade-9"}, {name: "Grade 10", id: "/grade-10"}, {name: "Grade 11", id: "/grade-11"}, {name: "Grade 12", id: "/grade-12"}];
return (
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay navItems={[{name: "Home", id: "/"}, {name: "Grade 9", id: "/grade-9"}, {name: "Grade 10", id: "/grade-10"}, {name: "Grade 11", id: "/grade-11"}, {name: "Grade 12", id: "/grade-12"}]} brandName="Crispy Cluck" />
<NavbarLayoutFloatingOverlay navItems={navItems} brandName="Crispy Cluck" />
</div>
<div className="pt-32 pb-20 px-8">
<FeatureCardSix

3
src/app/grade-11/page.tsx
View File

@@ -4,10 +4,11 @@ import FeatureCardSix from '@/components/sections/feature/FeatureCardSix';
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
export default function Grade11Page() {
const navItems = [{name: "Home", id: "/"}, {name: "Grade 1", id: "/grade-1"}, {name: "Grade 2", id: "/grade-2"}, {name: "Grade 3", id: "/grade-3"}, {name: "Grade 4", id: "/grade-4"}, {name: "Grade 9", id: "/grade-9"}, {name: "Grade 10", id: "/grade-10"}, {name: "Grade 11", id: "/grade-11"}, {name: "Grade 12", id: "/grade-12"}];
return (
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay navItems={[{name: "Home", id: "/"}, {name: "Grade 9", id: "/grade-9"}, {name: "Grade 10", id: "/grade-10"}, {name: "Grade 11", id: "/grade-11"}, {name: "Grade 12", id: "/grade-12"}]} brandName="Crispy Cluck" />
<NavbarLayoutFloatingOverlay navItems={navItems} brandName="Crispy Cluck" />
</div>
<div className="pt-32 pb-20 px-8">
<FeatureCardSix

3
src/app/grade-12/page.tsx
View File

@@ -4,10 +4,11 @@ import FeatureCardSix from '@/components/sections/feature/FeatureCardSix';
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
export default function Grade12Page() {
const navItems = [{name: "Home", id: "/"}, {name: "Grade 1", id: "/grade-1"}, {name: "Grade 2", id: "/grade-2"}, {name: "Grade 3", id: "/grade-3"}, {name: "Grade 4", id: "/grade-4"}, {name: "Grade 9", id: "/grade-9"}, {name: "Grade 10", id: "/grade-10"}, {name: "Grade 11", id: "/grade-11"}, {name: "Grade 12", id: "/grade-12"}];
return (
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay navItems={[{name: "Home", id: "/"}, {name: "Grade 9", id: "/grade-9"}, {name: "Grade 10", id: "/grade-10"}, {name: "Grade 11", id: "/grade-11"}, {name: "Grade 12", id: "/grade-12"}]} brandName="Crispy Cluck" />
<NavbarLayoutFloatingOverlay navItems={navItems} brandName="Crispy Cluck" />
</div>
<div className="pt-32 pb-20 px-8">
<FeatureCardSix

3
src/app/grade-2/page.tsx
View File

@@ -3,10 +3,11 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
export default function Grade2Page() {
const navItems = [{name: "Home", id: "/"}, {name: "Grade 1", id: "/grade-1"}, {name: "Grade 2", id: "/grade-2"}, {name: "Grade 3", id: "/grade-3"}, {name: "Grade 4", id: "/grade-4"}, {name: "Grade 9", id: "/grade-9"}, {name: "Grade 10", id: "/grade-10"}, {name: "Grade 11", id: "/grade-11"}, {name: "Grade 12", id: "/grade-12"}];
return (
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay navItems={[{name: "Home", id: "/"}]} brandName="Tuition Pro" />
<NavbarLayoutFloatingOverlay navItems={navItems} brandName="Tuition Pro" />
</div>
<div className="pt-32 p-8 max-w-4xl mx-auto">
<h1 className="text-4xl font-bold mb-6">Grade 2 Curriculum</h1>

3
src/app/grade-3/page.tsx
View File

@@ -3,10 +3,11 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
export default function Grade3Page() {
const navItems = [{name: "Home", id: "/"}, {name: "Grade 1", id: "/grade-1"}, {name: "Grade 2", id: "/grade-2"}, {name: "Grade 3", id: "/grade-3"}, {name: "Grade 4", id: "/grade-4"}, {name: "Grade 9", id: "/grade-9"}, {name: "Grade 10", id: "/grade-10"}, {name: "Grade 11", id: "/grade-11"}, {name: "Grade 12", id: "/grade-12"}];
return (
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay navItems={[{name: "Home", id: "/"}]} brandName="Tuition Pro" />
<NavbarLayoutFloatingOverlay navItems={navItems} brandName="Tuition Pro" />
</div>
<div className="pt-32 p-8 max-w-4xl mx-auto">
<h1 className="text-4xl font-bold mb-6">Grade 3 Curriculum</h1>

3
src/app/grade-4/page.tsx
View File

@@ -3,10 +3,11 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
export default function Grade4Page() {
const navItems = [{name: "Home", id: "/"}, {name: "Grade 1", id: "/grade-1"}, {name: "Grade 2", id: "/grade-2"}, {name: "Grade 3", id: "/grade-3"}, {name: "Grade 4", id: "/grade-4"}, {name: "Grade 9", id: "/grade-9"}, {name: "Grade 10", id: "/grade-10"}, {name: "Grade 11", id: "/grade-11"}, {name: "Grade 12", id: "/grade-12"}];
return (
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay navItems={[{name: "Home", id: "/"}]} brandName="Tuition Pro" />
<NavbarLayoutFloatingOverlay navItems={navItems} brandName="Tuition Pro" />
</div>
<div className="pt-32 p-8 max-w-4xl mx-auto">
<h1 className="text-4xl font-bold mb-6">Grade 4 Curriculum</h1>

3
src/app/grade-9/page.tsx
View File

@@ -4,10 +4,11 @@ import FeatureCardSix from '@/components/sections/feature/FeatureCardSix';
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
export default function Grade9Page() {
const navItems = [{name: "Home", id: "/"}, {name: "Grade 1", id: "/grade-1"}, {name: "Grade 2", id: "/grade-2"}, {name: "Grade 3", id: "/grade-3"}, {name: "Grade 4", id: "/grade-4"}, {name: "Grade 9", id: "/grade-9"}, {name: "Grade 10", id: "/grade-10"}, {name: "Grade 11", id: "/grade-11"}, {name: "Grade 12", id: "/grade-12"}];
return (
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay navItems={[{name: "Home", id: "/"}, {name: "Grade 9", id: "/grade-9"}, {name: "Grade 10", id: "/grade-10"}, {name: "Grade 11", id: "/grade-11"}, {name: "Grade 12", id: "/grade-12"}]} brandName="Crispy Cluck" />
<NavbarLayoutFloatingOverlay navItems={navItems} brandName="Crispy Cluck" />
</div>
<div className="pt-32 pb-20 px-8">
<FeatureCardSix

6
src/app/page.tsx
View File

@@ -33,6 +33,10 @@ export default function LandingPage() {
<NavbarLayoutFloatingOverlay
navItems={[
{ name: "Home", id: "hero" },
{ name: "Grade 1", id: "/grade-1" },
{ name: "Grade 2", id: "/grade-2" },
{ name: "Grade 3", id: "/grade-3" },
{ name: "Grade 4", id: "/grade-4" },
{ name: "Grade 9", id: "/grade-9" },
{ name: "Grade 10", id: "/grade-10" },
{ name: "Grade 11", id: "/grade-11" },
@@ -178,4 +182,4 @@ export default function LandingPage() {
</ReactLenis>
</ThemeProvider>
);
}
}