Skip to content

Multiple api calls fixed #174

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: main
Choose a base branch
from
Open

Multiple api calls fixed #174

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
2 changes: 1 addition & 1 deletion client/src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ function App() {
<Router>
<ToastContainer autoClose={2000} position="top-center" newestOnTop />

<Layout setLoggedIn={setLoggedIn}>
<Layout loggedIn={loggedIn} setLoggedIn={setLoggedIn}>
<ScrollToTop/>

<Routes>
Expand Down
4 changes: 2 additions & 2 deletions client/src/Layout.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ import { useLocation } from 'react-router-dom';
import Header from './components/Header';
import Footer2 from './components/Footer2';

const Layout = ({ setLoggedIn,children }) => {
const Layout = ({ loggedIn, setLoggedIn,children }) => {
const location = useLocation();
const isAdminRoute = location.pathname === '/dashboard' || /^\/admin\/user\/[^\/]+$/.test(location.pathname);

return (
<>
{!isAdminRoute && <Header setLoggedIn={setLoggedIn}/>}
{!isAdminRoute && <Header loggedIn={loggedIn} setLoggedIn={setLoggedIn}/>}
{children}
{!isAdminRoute && <Footer2 />}
</>
Expand Down
4 changes: 2 additions & 2 deletions client/src/components/Header.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ import leaf from "../assets/leaf.png";
import sun from "../assets/sun.png";
import moon from "../assets/moon.png"

function Header({ setLoggedIn }) {
function Header({ loggedIn, setLoggedIn }) {
const [logIn, setLogIn] = useState(false);
const navigate = useNavigate();
const [showMenu, setShowMenu] = useState(false);
Expand Down Expand Up @@ -136,7 +136,7 @@ const handleMenuClick = () => {
};

checkLoginStatus();
});
}, [loggedIn]);


const handleLogout = async () => {
Expand Down