Merge version_4 into main

Merge version_4 into main
This commit was merged in pull request #4.
This commit is contained in:
2026-05-11 13:38:23 +00:00
2 changed files with 4 additions and 3 deletions

View File

@@ -7,7 +7,7 @@ import FooterCard from '@/components/sections/footer/FooterCard';
export default function AdminPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="hover-magnetic" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<ReactLenis root>
<NavbarLayoutFloatingOverlay
navItems={[
@@ -34,7 +34,7 @@ export default function AdminPage() {
</div>
</div>
</main>
<FooterCard logoText="SchoolPortal" copyrightText="© 2025 School Portal Inc." />
<FooterCard logoText="SchoolPortal" leftLink={{ text: "Home", href: "/" }} rightLink={{ text: "Login", href: "/login" }} />
</ReactLenis>
</ThemeProvider>
);

View File

@@ -9,7 +9,7 @@ export default function LoginPage() {
const [isLogin, setIsLogin] = useState(true);
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="hover-magnetic" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<NavbarLayoutFloatingOverlay
navItems={[{ name: "Home", id: "/" }, { name: "Login", id: "/login" }]}
brandName="SchoolPortal"
@@ -23,6 +23,7 @@ export default function LoginPage() {
{ name: "password", type: "password", placeholder: "Password", required: true },
...(!isLogin ? [{ name: "confirmPassword", type: "password", placeholder: "Confirm Password", required: true }] : [])
]}
useInvertedBackground={false}
buttonText={isLogin ? "Sign In" : "Sign Up"}
onSubmit={(data) => console.log("Form submitted:", data)}
/>