- {Cookies.get("username")}
+ {Cookies.get("username")}
{Cookies.get("email")}
@@ -109,7 +111,7 @@ const Dropdown = () => {
onClick={handleMenuItemClick}
className="block px-4 py-3 text-sm text-gray-600 capitalize transition-colors duration-200 transform dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700 dark:hover:text-white"
>
- Subscribe
+ Subscribe
)}
@@ -119,7 +121,7 @@ const Dropdown = () => {
onClick={handleMenuItemClick}
className="block px-4 py-3 text-sm text-gray-600 capitalize transition-colors duration-200 transform dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700 dark:hover:text-white"
>
- Support
+ Support
)}
diff --git a/src/components/Navbar/Navbar.jsx b/src/components/Navbar/Navbar.jsx
index b75fdb4..c4e5c1a 100644
--- a/src/components/Navbar/Navbar.jsx
+++ b/src/components/Navbar/Navbar.jsx
@@ -1,10 +1,14 @@
import React, { useState } from "react";
import { Link } from "react-router-dom";
-import { useLocation } from "react-router-dom";
import { useRouteVariables } from "./Location";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import {
+ faHouse,
+ faPlus,
+ faNewspaper,
+} from "@fortawesome/free-solid-svg-icons";
import Dropdown from "./Dropdown";
const Navbar = () => {
- const location = useLocation();
const {
isLoginPage,
isSignupPage,
@@ -17,6 +21,8 @@ const Navbar = () => {
isHomePage,
isContactPage,
isEmailPage,
+ isConfirmPage,
+ isForgotPage,
} = useRouteVariables();
const [open, setOpen] = useState(false);
@@ -24,7 +30,7 @@ const Navbar = () => {
const toggleMenu = () => {
setOpen(!open);
};
- if (isLoginPage || isSignupPage ) {
+ if (isLoginPage || isSignupPage || isEmailPage || isForgotPage) {
return null;
}
@@ -37,7 +43,7 @@ const Navbar = () => {
to="#"
className="text-lg font-semibold tracking-widest text-gray-900 uppercase rounded-lg dark-mode:text-white focus:outline-none focus:shadow-outline pointer-events-none"
>
- TechTalk News
+ TechTalk News
diff --git a/src/components/RequiresAuth.jsx b/src/components/RequiresAuth.jsx
index 5a47988..d5e4b71 100644
--- a/src/components/RequiresAuth.jsx
+++ b/src/components/RequiresAuth.jsx
@@ -16,7 +16,7 @@ const RequiresAuth = ({ allowedRoles }) => {