Skip to content

fix(navbar): unify login/register navbar into shared PublicNavBar component #15

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

Merged
udaycodespace merged 2 commits into from
Jul 18, 2026
Merged

fix(navbar): unify login/register navbar into shared PublicNavBar component #15

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
b619053
fix(navbar): unify login/register navbar into shared PublicNavBar com…
Hunter69240 Jul 18, 2026
1358959
fix(navbar): match brand slogan and casing with Home page navbar
Hunter69240 Jul 18, 2026
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
20 changes: 3 additions & 17 deletions frontend/src/components/common/Login.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import React, { useState } from 'react'
import { Link, useNavigate } from 'react-router-dom';
import Navbar from 'react-bootstrap/Navbar';
import { Container, Nav } from 'react-bootstrap';
import { Container } from 'react-bootstrap';
import Avatar from '@mui/material/Avatar';
import Button from '@mui/material/Button';
import TextField from '@mui/material/TextField';
import Grid from '@mui/material/Grid';
import Box from '@mui/material/Box';
import Typography from '@mui/material/Typography';
import axiosInstance from './AxiosInstance';
import PublicNavBar from './PublicNavBar';

const Login = () => {
const navigate = useNavigate()
Expand Down Expand Up @@ -97,21 +97,7 @@ const Login = () => {
return (
<>

<Navbar expand="lg" className="bg-body-tertiary premium-navbar">
<Container fluid>
<Navbar.Brand>
<span className="brand-premium"><span className="brand-premium-L">L</span>earnhub</span>
</Navbar.Brand>
<Navbar.Toggle aria-controls="navbarScroll" />
<Navbar.Collapse id="navbarScroll">
<Nav className="ms-auto premium-nav-links">
<Link className="premium-btn" to={'/'}>Home</Link>
<Link className="premium-btn" to={'/login'}>Login</Link>
<Link className="premium-btn" to={'/register'}>Register</Link>
</Nav>
</Navbar.Collapse>
</Container>
</Navbar>
<PublicNavBar />

<div className='first-container premium-bg'>
<Container component="main" className="premium-login-container">
Expand Down
30 changes: 30 additions & 0 deletions frontend/src/components/common/PublicNavBar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import React from 'react'
import { NavLink } from 'react-router-dom';
import Navbar from 'react-bootstrap/Navbar';
import { Container, Nav } from 'react-bootstrap';

const PublicNavBar = () => {
return (
<Navbar expand="lg" className="landing-nav-wrapper">
<Container fluid className="landing-nav">
<Navbar.Brand href="/" className="landing-brand">
<span className="landing-brand-mark">L</span>
<span>
<strong>LearnHub</strong>
<small>Skills that move with you</small>
</span>
</Navbar.Brand>
<Navbar.Toggle aria-controls="publicNavbarScroll" />
<Navbar.Collapse id="publicNavbarScroll">
<Nav className="landing-nav-actions ms-auto">
<NavLink className="nav-text-link" to={'/'}>Home</NavLink>
<NavLink className="nav-text-link" to={'/login'}>Login</NavLink>
<NavLink className="nav-text-link" to={'/register'}>Register</NavLink>
</Nav>
</Navbar.Collapse>
</Container>
</Navbar>
)
}

export default PublicNavBar
20 changes: 3 additions & 17 deletions frontend/src/components/common/Register.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import React, { useState } from 'react'
import { Link, useNavigate } from 'react-router-dom';
import Navbar from 'react-bootstrap/Navbar';
import { Container, Nav } from 'react-bootstrap';
import { Container } from 'react-bootstrap';
import Avatar from '@mui/material/Avatar';
import Button from '@mui/material/Button';
import TextField from '@mui/material/TextField';
import Grid from '@mui/material/Grid';
import Box from '@mui/material/Box';
import Typography from '@mui/material/Typography';
import axiosInstance from './AxiosInstance';
import PublicNavBar from './PublicNavBar';
import Dropdown from 'react-bootstrap/Dropdown';


Expand Down Expand Up @@ -77,21 +77,7 @@ const Register = () => {
return (
<>

<Navbar expand="lg" className="bg-body-tertiary premium-navbar">
<Container fluid>
<Navbar.Brand>
<span className="brand-premium"><span className="brand-premium-L">L</span>earnhub</span>
</Navbar.Brand>
<Navbar.Toggle aria-controls="navbarScroll" />
<Navbar.Collapse id="navbarScroll">
<Nav className="ms-auto premium-nav-links">
<Link className="premium-btn" to={'/'}>Home</Link>
<Link className="premium-btn" to={'/login'}>Login</Link>
<Link className="premium-btn" to={'/register'}>Register</Link>
</Nav>
</Navbar.Collapse>
</Container>
</Navbar>
<PublicNavBar />
<div className="first-container premium-bg">
<Container component="main" className="premium-login-container">
<Box className="premium-login-box">
Expand Down
Loading