Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Navbar mobile refactored design #1568

Merged
merged 7 commits into from
Jun 21, 2024
Merged

Navbar mobile refactored design #1568

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6287291
basic layout
mertbagt Jun 6, 2024
6a5955b
set up shared collapse menu
mertbagt Jun 7, 2024
2d40fbf
added x's for open menus
mertbagt Jun 7, 2024
7864744
100vh
mertbagt Jun 7, 2024
c1984cd
clean up
mertbagt Jun 7, 2024
f8cabec
clean up
mertbagt Jun 7, 2024
00c2132
close dropdowns when logo is clicked
mertbagt Jun 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
basic layout
  • Loading branch information
@mertbagt
mertbagt committed Jun 6, 2024
commit 6287291607fe5e50c7fd54102cfed7024a94c364
214 changes: 214 additions & 0 deletions components/MobileNavV2.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,214 @@
import { useTranslation } from "next-i18next"
import React, { FC, useState } from "react"
import { SignInWithButton, signOutAndRedirectToHome, useAuth } from "./auth"
import { Container, Nav, Navbar, NavDropdown } from "./bootstrap"
import { useProfile } from "./db"
import {
Avatar,
NavbarLinkBills,
NavbarLinkEditProfile,
NavbarLinkEffective,
NavbarLinkFAQ,
NavbarLinkGoals,
NavbarLinkLogo,
NavbarLinkProcess,
NavbarLinkSignOut,
NavbarLinkSupport,
NavbarLinkTeam,
NavbarLinkTestimony,
NavbarLinkViewProfile,
NavbarLinkWhyUse
} from "./NavbarComponents"

import { Col, Row } from "./bootstrap"

const NavBarBoxContainer: FC<
React.PropsWithChildren<{ className?: string }>
> = ({ children, className }) => {
return (
<div
className={`d-flex flex-row align-items-start justify-content-between w-100`}
>
{children}
</div>
)
}

const NavBarBox: FC<React.PropsWithChildren<{ className?: string }>> = ({
children,
className
}) => {
return (
<div
className={`col d-flex justify-content-start align-items-center ${className}`}
>
{children}
</div>
)
}

export const MobileNavV2: React.FC<React.PropsWithChildren<unknown>> = () => {
const { authenticated } = useAuth()
const [isExpanded, setIsExpanded] = useState(false)
const { t } = useTranslation(["common", "auth"])

const toggleNav = () => setIsExpanded(!isExpanded)
const closeNav = () => setIsExpanded(false)

const result = useProfile()
let isOrg = result?.profile?.role === "organization"

return (
<>
<div
className={`d-flex flex-row align-items-start justify-content-between w-100`}
>
<Col>
<Navbar
bg="secondary"
expand="lg"
// className="bg-body-tertiary"
// variant="dark"
data-bs-theme="dark"
>
<Container>
<Navbar.Brand href="#home">
<Navbar.Toggle aria-controls="basic-navbar-nav" />
</Navbar.Brand>
<Navbar.Collapse id="basic-navbar-nav">
<Nav className="d-flex align-items-end">
<Nav.Link href="#home">Home</Nav.Link>
<Nav.Link href="#link">Link</Nav.Link>
<NavDropdown title="Dropdown" id="basic-nav-dropdown">
<NavDropdown.Item href="#action/3.1">
Action
</NavDropdown.Item>
<NavDropdown.Item href="#action/3.2">
Another action
</NavDropdown.Item>
<NavDropdown.Item href="#action/3.3">
Something
</NavDropdown.Item>
<NavDropdown.Divider />
<NavDropdown.Item href="#action/3.4">
Separated link
</NavDropdown.Item>
</NavDropdown>
</Nav>
</Navbar.Collapse>
</Container>
</Navbar>
</Col>
<Col>
<div className="d-flex justify-content-center">
<NavbarLinkLogo />
</div>
</Col>
<Col>
<div>
<Navbar
bg="secondary"
expand="lg"
// variant="dark"
data-bs-theme="dark"
>
<Container className="d-flex justify-content-end">
<Navbar.Brand href="#home">
<Nav>
<Navbar.Toggle aria-controls="basic-navbar-nav" />
</Nav>
</Navbar.Brand>
<Navbar.Collapse id="profile-nav">
<Nav className="me-4 d-flex align-items-end">
<NavbarLinkViewProfile />
<NavbarLinkEditProfile
handleClick={() => {
closeNav()
}}
/>
<NavbarLinkSignOut
handleClick={() => {
closeNav()
void signOutAndRedirectToHome()
}}
/>
</Nav>
</Navbar.Collapse>
</Container>
</Navbar>
</div>
</Col>
</div>

{/* <Navbar
bg="secondary"
expand="lg"
// className="bg-body-tertiary"
// variant="dark"
data-bs-theme="dark"
>
<Container>
<Navbar.Brand href="#home">
<Navbar.Toggle aria-controls="basic-navbar-nav" />
</Navbar.Brand>
<NavbarLinkLogo />
<Navbar.Brand href="#home">
<Navbar.Toggle aria-controls="basic-navbar-nav" />
</Navbar.Brand>
<Navbar.Collapse id="basic-navbar-nav">
<Nav className="me-auto">
<Nav.Link href="#home">Home</Nav.Link>
<Nav.Link href="#link">Link</Nav.Link>
<NavDropdown title="Dropdown" id="basic-nav-dropdown">
<NavDropdown.Item href="#action/3.1">Action</NavDropdown.Item>
<NavDropdown.Item href="#action/3.2">
Another action
</NavDropdown.Item>
<NavDropdown.Item href="#action/3.3">
Something
</NavDropdown.Item>
<NavDropdown.Divider />
<NavDropdown.Item href="#action/3.4">
Separated link
</NavDropdown.Item>
</NavDropdown>
</Nav>
</Navbar.Collapse>
</Container>
</Navbar> */}

{/* <Navbar
bg="secondary"
expand="lg"
// className="bg-body-tertiary"
// variant="dark"
data-bs-theme="dark"
>
<Container>
<Navbar.Brand href="#home">
<Navbar.Toggle aria-controls="basic-navbar-nav" />
</Navbar.Brand>
<Navbar.Collapse id="basic-navbar-nav">
<Nav className="me-auto">
<Nav.Link href="#home">Home</Nav.Link>
<Nav.Link href="#link">Link</Nav.Link>
<NavDropdown title="Dropdown" id="basic-nav-dropdown">
<NavDropdown.Item href="#action/3.1">Action</NavDropdown.Item>
<NavDropdown.Item href="#action/3.2">
Another action
</NavDropdown.Item>
<NavDropdown.Item href="#action/3.3">
Something
</NavDropdown.Item>
<NavDropdown.Divider />
<NavDropdown.Item href="#action/3.4">
Separated link
</NavDropdown.Item>
</NavDropdown>
</Nav>
</Navbar.Collapse>
</Container>
</Navbar> */}
</>
)
}
3 changes: 2 additions & 1 deletion components/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import AuthModal from "./auth/AuthModal"
import { DesktopNav } from "./DesktopNav"
import PageFooter from "./Footer/Footer"
import { MobileNav } from "./MobileNav"
import { MobileNavV2 } from "./MobileNavV2"

export const PageContainer: FC<React.PropsWithChildren<unknown>> = ({
children
Expand Down Expand Up @@ -45,7 +46,7 @@ export const Layout: React.FC<React.PropsWithChildren<LayoutProps>> = ({
<link rel="icon" href="/favicon.ico" />
</Head>
<PageContainer>
{isMobile ? <MobileNav /> : <DesktopNav />}
{isMobile ? <MobileNavV2 /> : <DesktopNav />}
<AuthModal />
<div className={`col`}>{children}</div>
<PageFooter
Expand Down