Skip to content

Commit

Permalink
Fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
typeofweb committed Oct 11, 2023
1 parent f185aaa commit 66d92db
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
4 changes: 2 additions & 2 deletions src/app/(main)/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { type ReactNode } from "react";
import { Footer } from "@/ui/components/Footer";
import { Nav } from "@/ui/components/Nav";
import { Topbar } from "@/ui/components/Topbar";
Expand All @@ -7,14 +8,13 @@ export const metadata = {
description: "Starter pack for building performant e-commerce experiences with Saleor.",
};

export default function RootLayout(props: { children: React.ReactNode; modal: React.ReactNode }) {
export default function RootLayout(props: { children: ReactNode }) {
return (
<>
<Topbar />
<Nav />
<div className="min-h-[calc(100vh-106px)] flex-grow">{props.children}</div>
<Footer />
{props.modal}
</>
);
}
8 changes: 3 additions & 5 deletions src/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Inter } from "next/font/google";
import "./globals.css";
import { type ReactNode } from "react";
import { AuthProvider } from "@/ui/components/AuthProvider";

const inter = Inter({ subsets: ["latin"] });
Expand All @@ -9,14 +10,11 @@ export const metadata = {
description: "Starter pack for building performant e-commerce experiences with Saleor.",
};

export default function RootLayout(props: { children: React.ReactNode; modal: React.ReactNode }) {
export default function RootLayout(props: { children: ReactNode }) {
return (
<html lang="en">
<body className={`${inter.className} flex min-h-screen flex-col`}>
<AuthProvider>
<div className="min-h-[calc(100vh-106px)] flex-grow">{props.children}</div>
{props.modal}
</AuthProvider>
<AuthProvider>{props.children}</AuthProvider>
</body>
</html>
);
Expand Down

0 comments on commit 66d92db

Please sign in to comment.