Skip to content

This Pull Request fixes issue #211 #221

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

Open
ameynaik-9 wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

This Pull Request fixes issue #211 #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc8d807
Footer BrandLogo Made redirectable to rocket.chat
ameynaik-9 Jan 18, 2023
b379428
Navbar Brand logo also made redirectable to rocket.chat
ameynaik-9 Jan 19, 2023
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
6 changes: 4 additions & 2 deletions app/components/footer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ function Footer() {
<div className="d-flex align-item-center justify-content-center text-decoration-none text-black">
<span className="d-flex">Powered by </span>
<span className="d-flex ps-2">
<BrandLogo
<a href="https://rocket.chat" target={"blank"}>
<BrandLogo
brandLink={"/"}
brandLogoSrc={
"https://global-uploads.webflow.com/611a19b9853b7414a0f6b3f6/611bbb87319adfd903b90f24_logoRC.svg"
Expand All @@ -17,11 +18,12 @@ function Footer() {
height={32}
width={98}
/>
</a>
</span>
</div>
</footer>
</>
);
}

export default Footer;
export default Footer;
31 changes: 19 additions & 12 deletions app/components/menubar/newMenuBar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@ const MobileNav = ({ nav_Items, nft, brandInfo }) => {
const { user, handleLogin, handleLogout, handleResend, isModalOpen, setIsModalOpen, method } =
useRCAuth4Google();
return (
<Navbar className='d-lg-none' expand={false}>
<Navbar
className='d-lg-none'
expand={false}
>
<Container fluid>
<Navbar.Toggle
aria-controls='offcanvasNavbar'
Expand All @@ -50,14 +53,14 @@ const MobileNav = ({ nav_Items, nft, brandInfo }) => {
href='/'
className='d-flex justify-content-center align-items-center '
>
<BrandLogo
brandLink={brandInfo.brandLink}
brandLogoSrc={brandInfo.brandLogoSrc}
imageTitle={brandInfo.imageTitle}
brandName={brandInfo.brandName}
height={30}
width={132}
/>
<BrandLogo
brandLink={brandInfo.brandLink}
brandLogoSrc={brandInfo.brandLogoSrc}
imageTitle={brandInfo.imageTitle}
brandName={brandInfo.brandName}
height={30}
width={132}
/>
</Navbar.Brand>
</Offcanvas.Header>
<Offcanvas.Body>
Expand Down Expand Up @@ -157,7 +160,9 @@ const MobileNav = ({ nav_Items, nft, brandInfo }) => {
</Offcanvas.Body>
</Navbar.Offcanvas>
<Navbar.Brand className={styles.brand}>
{nft ? <NFTProfilePicture id='img2' /> :
{nft ? (
<NFTProfilePicture id='img2' />
) : (
<RCAuthGoogleLoginButton
user={user}
handleLogin={handleLogin}
Expand All @@ -166,7 +171,8 @@ const MobileNav = ({ nav_Items, nft, brandInfo }) => {
isModalOpen={isModalOpen}
setIsModalOpen={setIsModalOpen}
method={method}
/>}
/>
)}
</Navbar.Brand>
</Container>
</Navbar>
Expand Down Expand Up @@ -195,14 +201,15 @@ const DesktopNav = ({ nav_Items, nft, brandInfo }) => {

return (
<Navbar className='d-none d-lg-flex justify-content-between px-4 py-3'>
<BrandLogo
<a href='https://rocket.chat' target={"blank"} ><BrandLogo
brandLink={brandInfo.brandLink}
brandLogoSrc={brandInfo.brandLogoSrc}
imageTitle={brandInfo.imageTitle}
brandName={brandInfo.brandName}
height={32}
width={132}
/>
</a>
<Nav className='w-full ' ref={clickRef}>
{nav_Items?.map((nav_item, key) =>
nav_item.sub_menus?.data?.length > 1 ? (
Expand Down