Hackathons/HoyaHax2025
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

possile fix for layout

Browse Source
This commit is contained in:
Joseph J Helfenbein
2025-01-25 07:33:42 -05:00
parent 98161b11db
commit bb7ababb7d
4 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/app/(web)/layout.tsx
View File

@@ -1,7 +1,6 @@
"use client" "use client"
import React from 'react'; import React from 'react';
import { ClerkProvider } from '@clerk/nextjs';
import { Navbar } from '@/components/navbar'; import { Navbar } from '@/components/navbar';
import { Footer } from '@/components/footer'; import { Footer } from '@/components/footer';
import { ThemeProvider } from '@/components/theme-provider'; import { ThemeProvider } from '@/components/theme-provider';
@@ -10,16 +9,14 @@ import '../globals.css'
export default function RootLayout({ children }: { children: React.ReactNode }) { export default function RootLayout({ children }: { children: React.ReactNode }) {
return ( return (
<ClerkProvider> <html lang="en">
<html lang="en"> <body>
<body> <ThemeProvider attribute="class" defaultTheme="system" enableSystem disableTransitionOnChange>
<ThemeProvider attribute="class" defaultTheme="system" enableSystem disableTransitionOnChange> <Navbar />
<Navbar /> <main suppressHydrationWarning>{children}</main>
<main suppressHydrationWarning>{children}</main> <Footer />
<Footer /> </ThemeProvider>
</ThemeProvider> </body>
</body> </html>
</html>
</ClerkProvider>
) )
} }

8
src/app/(web)/account/page.jsx → src/app/account/page.jsx
View File

@@ -2,10 +2,10 @@
import { useState, useEffect } from 'react'; import { useState, useEffect } from 'react';
import axios from 'axios'; import axios from 'axios';
import { useUser } from '@clerk/clerk-react'; import { useUser } from '@clerk/clerk-react';
import { Button } from '../../../components/ui/button'; import { Button } from '../../components/ui/button';
import { Input } from '../../../components/ui/input'; import { Input } from '../../components/ui/input';
import { Label } from '../../../components/ui/label'; import { Label } from '../../components/ui/label';
import { Card, CardHeader, CardContent, CardFooter } from '../../../components/ui/card'; import { Card, CardHeader, CardContent, CardFooter } from '../../components/ui/card';
const AccountPage = () => { const AccountPage = () => {

2
src/app/api/layout.tsx
View File

@@ -1,3 +1,5 @@
import { ClerkProvider } from '@clerk/nextjs';
export const metadata = { export const metadata = {
title: 'Next.js', title: 'Next.js',
description: 'Generated by Next.js', description: 'Generated by Next.js',

2
tsconfig.json
View File

@@ -22,6 +22,6 @@
"@/*": ["./src/*"] "@/*": ["./src/*"]
} }
}, },
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts", "src/app/api/connectDB.js", "src/lib/utils.js", "src/app/(web)/account/page.jsx"], "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts", "src/app/api/connectDB.js", "src/lib/utils.js", "src/app/account/page.jsx"],
"exclude": ["node_modules"] "exclude": ["node_modules"]
} }