bender/a8156490-49e4-41dd-a028-e4686ac14170
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #2

Merged
bender merged 3 commits from version_2 into main 2026-05-06 09:53:28 +00:00
Conversation 0 Commits 3 Files Changed 3 +65 -22
3 changed files with 65 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/app/dashboard/page.tsx
View File

@@ -5,8 +5,21 @@ import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatin
export default function DashboardPage() {
return (
<ThemeProvider>
<NavbarLayoutFloatingOverlay navItems={[{ name: "Home", id: "/" }]} brandName="jonn" />
<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: "Dashboard", id: "/dashboard" }]} brandName="jonn" />
</div>
<div className="min-h-screen p-20">
<h1 className="text-4xl font-bold">Welcome to your Dashboard</h1>
<p className="mt-4">Access premium content here.</p>

35
src/app/login/page.tsx
View File

@@ -2,19 +2,32 @@
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
import ContactCenter from '@/components/sections/contact/ContactCenter';
import FooterBase from '@/components/sections/footer/FooterBase';
export default function LoginPage() {
return (
<ThemeProvider>
<NavbarLayoutFloatingOverlay
navItems={[
{ name: "Home", id: "/" },
{ name: "Signup", id: "/signup" }
]}
brandName="jonn"
/>
<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: "Signup", id: "/signup" },
{ name: "Login", id: "/login" }
]}
brandName="jonn"
/>
</div>
<div className="min-h-screen flex items-center justify-center p-8">
<div className="max-w-md w-full p-8 border rounded-lg">
<h1 className="text-2xl font-bold mb-6">Login</h1>
@@ -25,7 +38,9 @@ export default function LoginPage() {
</form>
</div>
</div>
<FooterBase columns={[]} logoText="jonn" />
<div id="footer" data-section="footer">
<FooterBase columns={[]} logoText="jonn" />
</div>
</ThemeProvider>
);
}

35
src/app/signup/page.tsx
View File

@@ -2,19 +2,32 @@
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
import ContactCenter from '@/components/sections/contact/ContactCenter';
import FooterBase from '@/components/sections/footer/FooterBase';
export default function SignupPage() {
return (
<ThemeProvider>
<NavbarLayoutFloatingOverlay
navItems={[
{ name: "Home", id: "/" },
{ name: "Login", id: "/login" }
]}
brandName="jonn"
/>
<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: "Login", id: "/login" },
{ name: "Signup", id: "/signup" }
]}
brandName="jonn"
/>
</div>
<div className="min-h-screen flex items-center justify-center p-8">
<div className="max-w-md w-full p-8 border rounded-lg">
<h1 className="text-2xl font-bold mb-6">Create Account</h1>
@@ -26,7 +39,9 @@ export default function SignupPage() {
</form>
</div>
</div>
<FooterBase columns={[]} logoText="jonn" />
<div id="footer" data-section="footer">
<FooterBase columns={[]} logoText="jonn" />
</div>
</ThemeProvider>
);
}