-
Notifications
You must be signed in to change notification settings - Fork 44
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
code improvements of header, and layouts
- Loading branch information
Showing
14 changed files
with
122 additions
and
260 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,31 @@ | ||
| import type { Metadata } from 'next' | ||
| import { Inter } from 'next/font/google' | ||
| import './globals.css' | ||
|
|
||
| const inter = Inter({ subsets: ['latin'] }) | ||
|
|
||
| import type { Metadata } from "next"; | ||
| import { Inter } from "next/font/google"; | ||
| import { Work_Sans } from "next/font/google"; | ||
| import { Footer } from "@/components/Footer"; | ||
| import { Header } from "@/components/Header"; | ||
| import "./globals.css"; | ||
| const inter = Inter({ subsets: ["latin"] }); | ||
| const workSans = Work_Sans({ subsets: ["latin"] }); | ||
| export const metadata: Metadata = { | ||
| title: 'JSLovers', | ||
| description: 'JSLovers - a community for the developers', | ||
| } | ||
| title: "JSLovers", | ||
| description: "JSLovers - a community for the developers", | ||
| }; | ||
|
|
||
| export default function RootLayout({ | ||
| children, | ||
| }: { | ||
| children: React.ReactNode | ||
| children: React.ReactNode; | ||
| }) { | ||
| return ( | ||
| <html lang="en"> | ||
| <body className={inter.className}>{children}</body> | ||
| <body className={inter.className}> | ||
| {" "} | ||
| <div className="flex min-h-screen flex-col"> | ||
| <Header /> | ||
| <main className={`${workSans.className} flex-1`}>{children}</main> | ||
| <Footer /> | ||
| </div> | ||
| </body> | ||
| </html> | ||
| ) | ||
| ); | ||
| } |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| import { MainNav } from "@/components/navigation/MainNav"; | ||
| import { NAVIGATION } from "@/config/navigation"; | ||
|
|
||
| export function Header() { | ||
| return ( | ||
| <header className="container z-40 bg-background"> | ||
| <div className="flex h-32 items-center py-6"> | ||
| <MainNav items={NAVIGATION.Navigation} /> | ||
| </div> | ||
| </header> | ||
| ); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| "use client"; | ||
| import Link from "next/link"; | ||
| import { Icons } from "../Icons"; | ||
|
|
||
| export function Logo() { | ||
| return ( | ||
| <h1> | ||
| <Link href="/"> | ||
| <span className="sr-only">JSLovers</span> | ||
| <Icons.logo /> | ||
| </Link> | ||
| </h1> | ||
| ); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,42 +1,52 @@ | ||
| "use client" | ||
|
|
||
| import { NavItem } from "@/types"; | ||
| "use client"; | ||
| import Link from "next/link"; | ||
| import { Icons } from "../Icons"; | ||
| import { usePathname } from 'next/navigation'; | ||
| import { NavItem } from "@/types"; | ||
| import { usePathname } from "next/navigation"; | ||
| import { Logo } from "./Logo"; | ||
| import { buttonVariants } from "@/components/Button"; | ||
| import { cn } from "@/lib/utils"; | ||
|
|
||
| interface MainNavProps { | ||
| items?: NavItem[]; | ||
| children?: React.ReactNode; | ||
| } | ||
| const createNavigation = (items: NavItem[], currentPath: string) => { | ||
| return items.map((item, index) => ( | ||
| <Link | ||
| key={index} | ||
| href={item.href || ""} | ||
| className={`flex items-center border-b-4 sm:text-sm md:text-lg ${ | ||
| currentPath === item.href ? "border-black" : "border-white" | ||
| }`} | ||
| > | ||
| {item.title} | ||
| </Link> | ||
| )); | ||
| }; | ||
|
|
||
| export function MainNav({ items }: MainNavProps) { | ||
| const currentPath = usePathname(); | ||
|
|
||
| return ( | ||
| <div className="flex gap-6 md:gap-10"> | ||
| <h1> | ||
| <Link href="/"> | ||
| <span className="sr-only">JSLovers</span> | ||
| <Icons.logo /> | ||
| </Link> | ||
| </h1> | ||
| <div className="flex justify-between w-full"> | ||
| <div className="flex"> | ||
| <Logo /> | ||
|
|
||
| {items?.length ? ( | ||
| <nav className="hidden gap-10 lg:flex"> | ||
| {items.map((item, index) => ( | ||
| <nav className="hidden gap-10 lg:flex"> | ||
| {items && createNavigation(items, currentPath)} | ||
| </nav> | ||
| </div> | ||
| <nav> | ||
| <Link | ||
| key={index} | ||
| href={item.href || ""} | ||
| className={`flex items-center border-b-4 md:text-lg sm:text-sm ${ | ||
| currentPath === item.href ? "border-black" : "border-white" | ||
| }`} | ||
| href="/register" | ||
| className={cn( | ||
| buttonVariants(), | ||
| "border-solid border-2 border-border" | ||
| )} | ||
| > | ||
| {item.title} | ||
| Register Now | ||
| </Link> | ||
| ))} | ||
| </nav> | ||
| ) : null} | ||
| </nav> | ||
| </div> | ||
| ); | ||
| } |
Oops, something went wrong.