WIP - save all current changes

app/[locale]/(site)/layout.tsx

@@ -3,6 +3,7 @@ import { unstable_noStore as noStore } from "next/cache";
 import { getLocale } from "next-intl/server";
 import { redirect } from "next/navigation";
 
+import { FloatingAdminButton } from "@/components/layout/floating-admin-button";
 import { SiteAmbientBackdrop } from "@/components/layout/site-ambient-backdrop";
 import { PageTransition } from "@/components/layout/page-transition";
 import { SiteDock } from "@/components/layout/site-dock";
@@ -44,7 +45,17 @@ export default async function SiteLayout({ children, params }: SiteLayoutProps)
     <>
       <ScrollSmootherProvider />
       <SiteAmbientBackdrop />
+<<<<<<< HEAD
       <SiteDock defaultLocale={siteSettings.defaultLocale} isSuperAdmin={authenticated} />
+=======
+      <SiteHeader
+        lightLogoUrl={mediaBindings.siteLogoLight?.url}
+        darkLogoUrl={mediaBindings.siteLogoDark?.url}
+        defaultLocale={siteSettings.defaultLocale}
+        isSuperAdmin={authenticated}
+      />
+      <FloatingAdminButton />
+>>>>>>> 9fabf17 (update)
       <div id="smooth-wrapper">
         <div id="smooth-content">
           <div className="site-content-frame flex min-h-screen flex-col">