Skip to content

use NavLink instead of Link to avoid using active class #4

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

use NavLink instead of Link to avoid using active class #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
60 changes: 16 additions & 44 deletions src/components/common/navBar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,61 +1,33 @@
import React from "react";
import { Link } from "react-router-dom";
import { NavLink } from "react-router-dom";

import "./styles/navBar.css";

const NavBar = (props) => {
const { active } = props;

const NavBar = () => {
return (
<React.Fragment>
<div className="nav-container">
<nav className="navbar">
<div className="nav-background">
<ul className="nav-list">
<li
className={
active === "home"
? "nav-item active"
: "nav-item"
}
>
<Link to="/">Home</Link>
<li className="nav-item">
<NavLink to="/">Home</NavLink>
</li>
<li
className={
active === "about"
? "nav-item active"
: "nav-item"
}
>
<Link to="/about">About</Link>

<li className="nav-item">
<NavLink to="/about">About</NavLink>
</li>
<li
className={
active === "projects"
? "nav-item active"
: "nav-item"
}
>
<Link to="/projects">Projects</Link>

<li className="nav-item">
<NavLink to="/projects">Projects</NavLink>
</li>
<li
className={
active === "articles"
? "nav-item active"
: "nav-item"
}
>
<Link to="/articles">Articles</Link>

<li className="nav-item">
<NavLink to="/articles">Articles</NavLink>
</li>
<li
className={
active === "contact"
? "nav-item active"
: "nav-item"
}
>
<Link to="/contact">Contact</Link>

<li className="nav-item">
<NavLink to="/contact">Contact</NavLink>
</li>
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/styles/navBar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
font-size: 80%;
}

.nav-item.active a {
.active {
color: var(--link-color) !important;
}

Expand Down
2 changes: 1 addition & 1 deletion src/pages/about.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const About = () => {
</Helmet>

<div className="page-content">
<NavBar active="about" />
<NavBar />
<div className="content-wrapper">
<div className="about-logo-container">
<div className="about-logo">
Expand Down
2 changes: 1 addition & 1 deletion src/pages/articles.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const Articles = () => {
</Helmet>

<div className="page-content">
<NavBar active="articles" />
<NavBar />
<div className="content-wrapper">
<div className="articles-logo-container">
<div className="articles-logo">
Expand Down
2 changes: 1 addition & 1 deletion src/pages/contact.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const Contact = () => {
</Helmet>

<div className="page-content">
<NavBar active="contact" />
<NavBar />
<div className="content-wrapper">
<div className="contact-logo-container">
<div className="contact-logo">
Expand Down
2 changes: 1 addition & 1 deletion src/pages/homepage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ const Homepage = () => {
</Helmet>

<div className="page-content">
<NavBar active="home" />
<NavBar />
<div className="content-wrapper">
<div className="homepage-logo-container">
<div style={logoStyle}>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/projects.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const Projects = () => {
</Helmet>

<div className="page-content">
<NavBar active="projects" />
<NavBar />
<div className="content-wrapper">
<div className="projects-logo-container">
<div className="projects-logo">
Expand Down