Merge version_1_1782065737334 into main

Merge version_1_1782065737334 into main
This commit was merged in pull request #1.
This commit is contained in:
2026-06-21 18:17:40 +00:00

View File

@@ -2,76 +2,45 @@ import FooterMinimal from '@/components/sections/footer/FooterMinimal';
import NavbarFloating from '@/components/ui/NavbarFloating';
import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
import SiteBackgroundSlot from "@/components/ui/SiteBackgroundSlot";
import { Instagram, Layout, Twitter } from "lucide-react";
import { Twitter, Instagram, LayoutGrid } from "lucide-react";
import { Outlet } from 'react-router-dom';
import { StyleProvider } from "@/components/ui/StyleProvider";
export default function Layout() {
const navItems = [
{
"name": "Work",
"href": "#work"
},
{
"name": "About",
"href": "#about"
},
{
"name": "Contact",
"href": "#contact"
},
{
"name": "Hero",
"href": "#hero"
},
{
"name": "Portfolio",
"href": "#portfolio"
},
{
"name": "Metrics",
"href": "#metrics"
},
{
"name": "Testimonials",
"href": "#testimonials"
}
];
{ name: "Work", href: "#work" },
{ name: "About", href: "#about" },
{ name: "Contact", href: "#contact" },
{ name: "Hero", href: "#hero" },
{ name: "Portfolio", href: "#portfolio" },
{ name: "Metrics", href: "#metrics" },
{ name: "Testimonials", href: "#testimonials" }
];
return (
<StyleProvider buttonVariant="default" siteBackground="floatingGradient" heroBackground="cornerGlow">
<SiteBackgroundSlot />
<SectionErrorBoundary name="navbar">
<NavbarFloating
logo="Portfolio"
ctaButton={{
text: "Get in Touch",
href: "#contact",
}}
navItems={navItems} />
logo="Portfolio"
ctaButton={{
text: "Get in Touch", href: "#contact"}}
navItems={navItems}
/>
</SectionErrorBoundary>
<main className="flex-grow">
<Outlet />
</main>
<SectionErrorBoundary name="footer">
<FooterMinimal
brand="Jordan Creative"
copyright="© 2024 Jordan Creative. All rights reserved."
socialLinks={[
{
icon: Twitter,
href: "#",
},
{
icon: Instagram,
href: "#",
},
{
icon: Layout,
href: "#",
},
]}
/>
brand="Jordan Creative"
copyright="© 2024 Jordan Creative. All rights reserved."
socialLinks={[
{ icon: "Twitter", href: "#" },
{ icon: "Instagram", href: "#" },
{ icon: "LayoutGrid", href: "#" },
]}
/>
</SectionErrorBoundary>
</StyleProvider>
);