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

feat: Navbar responsiveness fixed successfully Issue 205 #225

Merged
merged 2 commits into from
Jun 16, 2024
Merged

feat: Navbar responsiveness fixed successfully Issue 205 #225

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
c8caa14
New PR for navbar with all issues fixed
MeetDOD Jun 16, 2024
f464193
Bug fixed in edit post feature
MeetDOD Jun 16, 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
1 change: 1 addition & 0 deletions frontend/src/components/EditPost.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ const EditPost = () => {
Save
</button>
<button
type='button'
onClick={() => navigate(-1)}
className="ml-2 px-3 py-2 bg-red-600 hover:bg-red-700 text-white text-sm rounded"
>
Expand Down
93 changes: 26 additions & 67 deletions frontend/src/components/Navbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { useRecoilValue, useSetRecoilState } from "recoil";
import { loggedInState, tokenState } from "../store/atoms/auth";
import { Link, useLocation } from "react-router-dom";
import toast from "react-hot-toast";
import logo from "../assets/favicon.png";
import logo from '../assets/favicon.png';
import { useTranslation } from "react-i18next";

const Navbar = () => {
Expand All @@ -25,23 +25,19 @@ const Navbar = () => {
localStorage.removeItem("token");
setTokenState("");
closeMenu();
toast.success("Logged out successfully");
toast.success('Logged out successfully');
};

const getNavLinkClass = (path: string) => {
const getNavLinkClass = (path:string) => {
return location.pathname === path
? "block py-2 px-3 bg-blue-600 rounded md:bg-transparent md:p-0 text-white md:text-blue-300"
: "block py-2 px-3 rounded md:border-0 md:p-0 text-white md:hover:text-blue-300 hover:bg-blue-400 hover:text-white md:hover:bg-transparent";
? "block py-2 px-3 bg-blue-600 rounded lg:bg-transparent lg:p-0 text-white lg:text-blue-300"
: "block py-2 px-3 rounded lg:border-0 lg:p-0 text-white lg:hover:text-blue-300 hover:bg-blue-400 hover:text-white lg:hover:bg-transparent";
};

return (
<nav className="bg-gradient-to-r from-[#6a11cb] via-[#ab67df] to-[#2575fc] fixed w-full z-20 top-0 start-0 ">
<nav className="bg-gradient-to-r from-pink-900 to-sky-600 fixed w-full z-20 top-0 start-0">
<div className="max-w-screen-xl flex flex-wrap items-center justify-between mx-auto p-4">
<Link
to="/app"
className="flex items-center space-x-3 rtl:space-x-reverse"
onClick={closeMenu}
>
<Link to="/app" className="flex items-center space-x-3 rtl:space-x-reverse" onClick={closeMenu}>
<img src={logo} className="h-8" alt="Styleshare Logo" />
<span className="self-center justify-between text-2xl font-bold whitespace-nowrap text-white font-mono">
{t("navbar.logo")}
Expand All @@ -50,7 +46,7 @@ const Navbar = () => {
<button
onClick={toggleMenu}
type="button"
className="inline-flex items-center p-2 w-10 h-10 justify-center text-sm text-gray-100 rounded-lg md:hidden hover:bg-blue-400 focus:outline-none focus:ring-2 focus:ring-gray-200"
className="inline-flex items-center p-2 w-10 h-10 justify-center text-sm text-gray-100 rounded-lg lg:hidden hover:bg-blue-400 focus:outline-none focus:ring-2 focus:ring-gray-200"
aria-controls="navbar-default"
aria-expanded={isMenuOpen ? "true" : "false"}
>
Expand All @@ -74,108 +70,71 @@ const Navbar = () => {
<div
className={`${
isMenuOpen ? "block" : "hidden"
} w-full md:block md:w-auto transition-all duration-300 ease-in-out`}
} w-full lg:block lg:w-auto transition-all duration-300 ease-in-out`}
id="navbar-default"
>
<ul className="font-medium flex flex-col p-4 text-lg md:p-0 mt-4 border rounded-lg md:flex-row md:space-x-8 rtl:space-x-reverse md:mt-0 md:border-0">
<li className="mt-2 md:mb-0">
<Link
to="/app"
className={getNavLinkClass("/app")}
aria-current="page"
onClick={closeMenu}
>
<ul className="font-medium flex flex-col p-4 text-lg lg:p-0 mt-4 border rounded-lg lg:flex-row lg:space-x-8 rtl:space-x-reverse lg:mt-0 lg:border-0">
<li className="mt-2 lg:mb-0">
<Link to="/app" className={getNavLinkClass("/app")} aria-current="page" onClick={closeMenu}>
{t("navbar.links.home")}
</Link>
</li>
<li className="mt-2">
<Link
to="/app/posts"
className={getNavLinkClass("/app/posts")}
onClick={closeMenu}
>
<Link to="/app/posts" className={getNavLinkClass("/app/posts")} onClick={closeMenu}>
{t("navbar.links.posts")}
</Link>
</li>
<li className="mt-2">
<Link
to="/app/leaderboard"
className={getNavLinkClass("/app/leaderboard")}
onClick={closeMenu}
>
<Link to="/app/leaderboard" className={getNavLinkClass("/app/leaderboard")} onClick={closeMenu}>
{t("navbar.links.leaderboard")}
</Link>
</li>
{!isLoggedIn ? (
<div className="flex flex-col md:flex-row md:space-x-4">
<li className="mb-2 md:mb-0">
<div className="flex flex-col lg:flex-row lg:space-x-4">
<li className="mb-2 lg:mb-0">
<Link
to="/app/signin"
className="block py-2 px-3 rounded-full text-white bg-gradient-to-l from-blue-400 to-pink-500 duration-300 transition-colors hover:from-pink-500 hover:to-blue-500 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-pink-500"
onClick={closeMenu}
>
<button className="relative inline-flex h-12 overflow-hidden rounded-full p-[1px] focus:outline-none focus:ring-2 focus:ring-slate-400 focus:ring-offset-2 focus:ring-offset-slate-50">
<span className="absolute inset-[-1000%] animate-[spin_2s_linear_infinite] bg-[conic-gradient(from_90deg_at_50%_50%,#E2CBFF_0%,#393BB2_50%,#E2CBFF_100%)]" />
<span className="inline-flex h-full w-full cursor-pointer items-center justify-center rounded-full bg-gradient-to-l from-[#c779e8] to-indigo-500 px-5 text-lg font-small text-white backdrop-blur-3xl">
{t("navbar.links.signin")}
</span>
</button>
{t("navbar.links.signin")}
</Link>
</li>
<li>
<Link
to="/app/signup"
className="block py-2 px-3 rounded-full text-white bg-gradient-to-l from-blue-400 to-pink-500 duration-300 transition-colors hover:from-pink-500 hover:to-blue-500 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-pink-500"
onClick={closeMenu}
>
<button className="relative inline-flex h-12 overflow-hidden rounded-full p-[1px] focus:outline-none focus:ring-2 focus:ring-slate-400 focus:ring-offset-2 focus:ring-offset-slate-50">
<span className="absolute inset-[-1000%] animate-[spin_2s_linear_infinite] bg-[conic-gradient(from_90deg_at_50%_50%,#E2CBFF_0%,#393BB2_50%,#E2CBFF_100%)]" />
<span className="inline-flex h-full w-full cursor-pointer items-center justify-center rounded-full bg-gradient-to-l from-[#c779e8] to-indigo-500 px-5 text-lg font-small text-white backdrop-blur-3xl">
{t("navbar.links.signup")}
</span>
</button>
{t("navbar.links.signup")}
</Link>
</li>
</div>
) : (
<>
<li className="mt-2">
<Link
to="/app/new-post"
className={getNavLinkClass("/app/new-post")}
onClick={closeMenu}
>
<Link to="/app/new-post" className={getNavLinkClass("/app/new-post")} onClick={closeMenu}>
{t("navbar.links.newpost")}
</Link>
</li>
<li className="mt-2">
<Link
to="/app/code"
className={getNavLinkClass("/app/code")}
onClick={closeMenu}
>
<li className="mt-2">
<Link to="/app/code" className={getNavLinkClass("/app/code")} onClick={closeMenu}>
{t("code")}
</Link>
</li>
<li className="mt-2">
<Link
to="/app/profile"
className={getNavLinkClass("/app/profile")}
onClick={closeMenu}
>
<Link to="/app/profile" className={getNavLinkClass("/app/profile")} onClick={closeMenu}>
{t("navbar.links.profile")}
</Link>
</li>
<li className="mt-2">
<Link
to="/app/fav"
className={getNavLinkClass("/app/fav")}
onClick={closeMenu}
>
<Link to="/app/fav" className={getNavLinkClass("/app/fav")} onClick={closeMenu}>
{t("navbar.links.favorite")}
</Link>
</li>
<li className="mt-2">
<button
className="block py-2 px-3 rounded md:border-0 md:p-0 text-white md:hover:text-blue-500 hover:bg-gray-700 hover:text-white md:hover:bg-transparent w-full text-left"
className="block py-2 px-3 rounded lg:border-0 lg:p-0 text-white lg:hover:text-blue-500 hover:bg-gray-700 hover:text-white lg:hover:bg-transparent w-full text-left"
onClick={handleLogout}
>
{t("navbar.links.logout")}
Expand Down
Loading