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

[NEW] add menubar commponent #155

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

[NEW] add menubar commponent #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1101241
[FIX] livestream component
irffanasiff Apr 16, 2022
0b41726
[removed] timer
irffanasiff Apr 16, 2022
99064d0
Merge branch 'RocketChat:master' into master
irffanasiff Apr 20, 2022
5034a7a
[ADD] new Menubar component
irffanasiff May 22, 2022
a032783
Merge branch 'master' into master
irffanasiff May 22, 2022
1eaed70
Merge branch 'master' into master
irffanasiff May 27, 2022
b2b5a52
[FIX] build issue
irffanasiff May 27, 2022
2df61a8
Merge branch 'master' of github.com:RocketChat/RC4Community
irffanasiff Jun 9, 2022
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
4 changes: 3 additions & 1 deletion app/components/layout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import '../styles/Layout.module.css';
import Footer from './footer';
import NewMenubar from './newMenuBar';
import Menubar from './menubar';
import { useRouter } from 'next/router';

function Layout(props) {
const { pathname } = useRouter();
return (
<>
<Menubar menu={props.menu.topNavItems} />
{/*<Menubar menu={props.menu.topNavItems} />*/}
<NewMenubar menu={props.menu.topNavItems} />
{props.children}
<Footer></Footer>
{/* announcement component here*/}
Expand Down
273 changes: 273 additions & 0 deletions app/components/newMenuBar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,273 @@
import { useEffect, useRef, useState } from 'react';
import { Navbar, Nav, Container, Col, Row, Offcanvas } from 'react-bootstrap';
import styles from '../styles/Menubar.module.css';
import { FirebaseAuthMenuButton } from './auth/firebase';
import BrandLogo from './brandlogo';

const ArrowIcon = () => {
return (
<svg
width='14'
height='15'
viewBox='0 0 32 17'
fill='none'
xmlns='http://www.w3.org/2000/svg'
>
<path d='M1.5 1.5L15.5 15.5L31 1.5' stroke='black' stroke-width='2' />
</svg>
);
};

const MobileNav = ({ nav_Items }) => {
const [dropDown, setDropDown] = useState({ show: false, _id: 0 });

return (
<Navbar className='d-lg-none' expand={false}>
<Container fluid>
<Navbar.Toggle
aria-controls='offcanvasNavbar'
className={styles.default_toggler}
>
<div
className={`${styles.navbar_toggler} navbar-toggler collapsed d-flex d-lg-none flex-column justify-content-around bg-white`}
type='button'
>
<span className={`${styles.toggler_icon} mb-2`}></span>
<span className={`${styles.toggler_icon} mt-2`}></span>
</div>
</Navbar.Toggle>
<Navbar.Offcanvas
id='offcanvasNavbar'
aria-labelledby='offcanvasNavbarLabel'
placement='start'
>
<Offcanvas.Header closeButton>
<Navbar.Brand href='#'>Rocket Chat Community</Navbar.Brand>
</Offcanvas.Header>
<Offcanvas.Body>
{nav_Items?.map((nav_Item) =>
nav_Item.url ? (
<div key={nav_Item.id}>
<Row
className={`${styles.dropdown} d-flex flex-row justify-content-between align-items-center mt-3 `}
onClick={() => {
setDropDown({ show: false, _id: 0 });
}}
>
<Col>
<a
href={nav_Item.url}
className='text-decoration-none fs-4 fw-light text-dark'
>
{nav_Item.label}
</a>
</Col>
</Row>
</div>
) : (
<div key={nav_Item.id}>
<Row
className={`${styles.dropdown} d-flex flex-row justify-content-between align-items-center mt-3 `}
onClick={() => {
if (dropDown._id === nav_Item.id) {
setDropDown({ show: false, _id: 0 });
} else {
setDropDown({ show: true, _id: nav_Item.id });
}
}}
>
<Col
className={
dropDown._id === nav_Item.id && dropDown.show
? `${styles.color} fs-4 fw-light`
: 'fs-4 fw-light'
}
>
{nav_Item.label}
</Col>
<Col>
{nav_Item.sub_menus?.length > 1 && (
<span
className={
dropDown.show
? `${styles.arrowRotate} bg-transparent me-2`
: `${styles.arrow} bg-transparent me-2 `
}
>
<ArrowIcon />
</span>
)}
</Col>
</Row>
{dropDown._id === nav_Item.id && dropDown.show ? (
<div>
<div>
{nav_Item.sub_menus.map(
(item) =>
item.parent_id === null && (
<>
<div className='p-2 fw-medium'>
<a
href={item.url}
className={styles.subItemLinks}
>
{item.label}
</a>
</div>
{nav_Item.sub_menus.map(
(subItem) =>
subItem.parent_id === item.id && (
<div className='px-4 py-1 fw-light'>
<a
href={subItem.url}
className={styles.subItemLinks}
>
{subItem.label}
</a>
</div>
)
)}
</>
)
)}
</div>
</div>
) : (
''
)}
</div>
)
)}
</Offcanvas.Body>
</Navbar.Offcanvas>
<Navbar.Brand>
<div className='ms-2'>
<FirebaseAuthMenuButton />
</div>
</Navbar.Brand>
</Container>
</Navbar>
);
};

const DesktopNav = ({ nav_Items }) => {
const [isShown, setIsShown] = useState(0);
const clickRef = useRef(null);

const handleClickOutside = (event) => {
if (clickRef.current && !clickRef.current.contains(event.target)) {
setIsShown(false);
}
};

useEffect(() => {
document.addEventListener('click', handleClickOutside, true);
return () => {
document.removeEventListener('click', handleClickOutside, true);
};
}, []);

return (
<Navbar className='d-none d-lg-flex justify-content-between px-4 py-3'>
<BrandLogo
brandLink={'/'}
logoLink={
'https://global-uploads.webflow.com/611a19b9853b7414a0f6b3f6/611bbb87319adfd903b90f24_logoRC.svg'
}
imageTitle={'Rocket.Chat'}
brandName={'Rocket.Chat Community'}
height={32}
width={132}
/>
<Nav className='w-full ' ref={clickRef}>
{nav_Items?.map((nav_item, key) =>
nav_item.sub_menus?.length > 1 ? (
<span
key={key}
className='p-2 d-flex flex-column mx-3 '
onMouseEnter={() => {
setIsShown(nav_item.id);
}}
onTouchStart={() => {
setIsShown(nav_item.id);
}}
onMouseLeave={() => setIsShown(0)}
>
<span className={`${styles.navbar_item_hover} text-muted`}>
{nav_item.url ? (
<a href={nav_item.url} className='text-decoration-none'>
{nav_item.label}
</a>
) : (
nav_item.label
)}
</span>
{/*submenu container | this will be shown for those whose id is in isShown */}
<div className={`${styles.navbar_subitems} shadow-lg`}>
{isShown === nav_item.id && (
<div
className={
nav_item.sub_menus?.length > 10
? 'd-flex flex-row '
: 'd-flex flex-column '
}
>
{/* iterate over sub menus like omnichannels, devops, GSoC, GSoD */}
{nav_item.sub_menus.map(
(item) =>
item.parent_id < 1 && (
<div className={`${styles.navbar_subitems_items}`}>
<div>
<a
href={item.url}
className={styles.subItemLinks}
>
{item.label}
</a>
</div>
{/*if submenus contain more sub menus */}
{nav_item.sub_menus.map(
(subItem) =>
subItem.parent_id === item.id && (
<div className='px-4 pt-3 fw-light'>
<a
href={subItem.url}
className={styles.subItemLinks}
>
{subItem.label}
</a>
</div>
)
)}
</div>
)
)}
</div>
)}
</div>
</span>
) : (
<Nav.Link
key={key}
className={`${styles.navbar_item_hover} text-muted mx-3`}
>
{nav_item.label}
</Nav.Link>
)
)}
</Nav>
<div className='mx-1'>
<FirebaseAuthMenuButton />
</div>
</Navbar>
);
};

export default function NewMenubar(props) {
return (
<Container fluid className='border-bottom'>
<MobileNav nav_Items={props.menu?.body} />
<DesktopNav nav_Items={props.menu?.body} />
</Container>
);
}
50 changes: 48 additions & 2 deletions app/styles/Menubar.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,57 @@
top: 0;
}

.rotate {
transform: rotate(-180deg);
transition: all 0.1s;
}
.navbar_subitems {
position: absolute;
transform: translate(-5rem, 30px);
background-color: white;
padding: 0rem;
max-width: 36rem;
z-index: 10;
}

.navbar_subitems_items {
padding: 1rem 1rem 1rem 2rem;
width: 18rem;
}

.subItemLinks {
cursor: pointer;

text-decoration: none;
color: black;
}

.color {
color: red;
}

.arrow {
margin-left: 80%;
}

.arrowRotate {
margin-left: 80%;
transform: rotate(180deg);
}
.navbar_item_hover:hover {
cursor: pointer;
color: red;
}

.dropdown {
cursor: pointer;
}

.toggler_bar::before{
transform: rotate(45deg);
top: 0
}


.threedots:after {
content: "\2807";
font-size: 30px;
Expand Down Expand Up @@ -141,4 +186,5 @@
.dropdown_menu_item {
color: black;
text-decoration: none;
}
}

3 changes: 3 additions & 0 deletions cms/src/api/sub-menu/content-types/sub-menu/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
},
"url": {
"type": "string"
},
"parent_id": {
"type": "integer"
}
}
}