Skip to content

Commit 0b4f9da

Browse files
Anmol-BaranwalAnmol-Baranwal
committed
chore: update layout, tailwind config, and add icons for auth pages
1 parent e32ba04 commit 0b4f9da

File tree

5 files changed

+1693
-5820
lines changed

5 files changed

+1693
-5820
lines changed

‎app/layout.tsx

Lines changed: 37 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,22 @@
1-
import { Inter as FontSans } from "next/font/google";
2-
import localFont from "next/font/local";
3-
4-
5-
6-
import "@/styles/globals.css";
7-
import { Metadata } from "next";
8-
9-
10-
11-
import { landingConfig } from "@/config/landing";
12-
import { siteConfig } from "@/config/site";
13-
import { supabaseServer } from "@/lib/supabase-server";
14-
import { cn } from "@/lib/utils";
15-
import { Toaster } from "@/components/ui/toaster";
16-
import AuthNav from "@/components/auth-nav";
17-
import { MainNav } from "@/components/main-nav";
18-
import { SiteFooter } from "@/components/site-footer";
19-
import { TailwindIndicator } from "@/components/tailwind-indicator";
20-
import { ThemeProvider } from "@/components/theme-provider";
21-
22-
23-
24-
import MirageProvider from "./mirage-provider";
25-
1+
import { Inter as FontSans } from "next/font/google"
2+
import localFont from "next/font/local"
3+
4+
import "@/styles/globals.css"
5+
import { Metadata } from "next"
6+
7+
import { landingConfig } from "@/config/landing"
8+
import { siteConfig } from "@/config/site"
9+
import {
10+
AuthPageContext,
11+
AuthPageProvider,
12+
} from "@/lib/context/AuthPageContext"
13+
import { cn } from "@/lib/utils"
14+
import { Toaster } from "@/components/ui/toaster"
15+
import AuthNav from "@/components/auth-page/auth-nav"
16+
import { MainNav } from "@/components/main-nav"
17+
import { SiteFooter } from "@/components/site-footer"
18+
import { TailwindIndicator } from "@/components/tailwind-indicator"
19+
import { ThemeProvider } from "@/components/theme-provider"
2620

2721
export const dynamic = "force-dynamic"
2822

@@ -57,11 +51,11 @@ export const metadata: Metadata = {
5751
],
5852
authors: [
5953
{
60-
name: "webxdao",
61-
url: "https://webxdao.xyz",
54+
name: "webxguild",
55+
url: "https://guidlify.com",
6256
},
6357
],
64-
creator: "webxdao",
58+
creator: "webxguild",
6559
themeColor: [
6660
{ media: "(prefers-color-scheme: light)", color: "white" },
6761
{ media: "(prefers-color-scheme: dark)", color: "black" },
@@ -90,35 +84,30 @@ export const metadata: Metadata = {
9084
}
9185

9286
export default async function RootLayout({ children }: RootLayoutProps) {
93-
const supabase = supabaseServer()
94-
const {
95-
data: { session },
96-
} = await supabase.auth.getSession()
97-
9887
return (
9988
<html lang="en" suppressHydrationWarning>
100-
<head />
10189
<body
10290
className={cn(
10391
"flex min-h-screen flex-col bg-background font-sans antialiased",
10492
fontSans.variable,
10593
fontHeading.variable
10694
)}
10795
>
108-
<ThemeProvider attribute="class" defaultTheme="system" enableSystem>
109-
<header className="container z-40 bg-background">
110-
<div className="flex h-20 items-center justify-between py-6">
111-
<MainNav items={landingConfig.mainNav} />
112-
<AuthNav session={session} items={landingConfig.privateNav} />
113-
</div>
114-
</header>
115-
<div className="grow">{children}</div>
116-
<SiteFooter></SiteFooter>
117-
<TailwindIndicator />
118-
<Toaster />
119-
</ThemeProvider>
120-
<MirageProvider />
96+
<AuthPageProvider>
97+
<ThemeProvider attribute="class" defaultTheme="system" enableSystem>
98+
<header className="container z-40 bg-background">
99+
<div className="flex h-20 items-center justify-between py-6">
100+
<MainNav items={landingConfig.mainNav} />
101+
<AuthNav items={landingConfig.privateNav} />
102+
</div>
103+
</header>
104+
<div className="grow">{children}</div>
105+
{/* <SiteFooter></SiteFooter> */}
106+
<TailwindIndicator />
107+
<Toaster />
108+
</ThemeProvider>
109+
</AuthPageProvider>
121110
</body>
122111
</html>
123112
)
124-
}
113+
}

‎components/icons.tsx

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
import {
2+
Eye,
3+
EyeOff,
24
Github,
35
Laptop,
46
LucideProps,
57
Moon,
68
RadioTower,
9+
Search,
710
SunMedium,
811
Twitter,
912
X,
10-
type Icon as LucideIcon
13+
type Icon as LucideIcon,
1114
} from "lucide-react"
1215

1316
export type Icon = LucideIcon
@@ -20,6 +23,9 @@ export const Icons = {
2023
laptop: Laptop,
2124
close: X,
2225
github: Github,
26+
eyeOff: EyeOff,
27+
eye: Eye,
28+
search: Search,
2329
logo: (props: LucideProps) => (
2430
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" {...props}>
2531
<path
@@ -36,4 +42,17 @@ export const Icons = {
3642
></path>
3743
</svg>
3844
),
45+
google: (props: LucideProps) => (
46+
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" {...props}>
47+
<path d="M12.48 10.92v3.28h7.84c-.24 1.84-.853 3.187-1.787 4.133-1.147 1.147-2.933 2.4-6.053 2.4-4.827 0-8.6-3.893-8.6-8.72s3.773-8.72 8.6-8.72c2.6 0 4.507 1.027 5.907 2.347l2.307-2.307C18.747 1.44 16.133 0 12.48 0 5.867 0 .307 5.387.307 12s5.56 12 12.173 12c3.573 0 6.267-1.173 8.373-3.36 2.16-2.16 2.84-5.213 2.84-7.667 0-.76-.053-1.467-.173-2.053H12.48z" />
48+
</svg>
49+
),
50+
spinner: (props: LucideProps) => (
51+
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" {...props}>
52+
<path
53+
fill="currentColor"
54+
d="M12.48 10.92v3.28h7.84c-.24 1.84-.853 3.187-1.787 4.133-1.147 1.147-2.933 2.4-6.053 2.4-4.827 0-8.6-3.893-8.6-8.72s3.773-8.72 8.6-8.72c2.6 0-4.507 1.027 5.907 2.347l2.307-2.307C18.747 1.44 16.133 0 12.48 0 5.867 0 .307 5.387.307 12s5.56 12 12.173 12c3.573 0 6.267-1.173 8.373-3.36 2.16-2.16 2.84-5.213 2.84-7.667 0-.76-.053-1.467-.173-2.053H12.48z"
55+
/>
56+
</svg>
57+
),
3958
}

0 commit comments

Comments
 (0)