Skip to content

Commit

Permalink
Merge pull request #245 from Lapkipomoshi/fix-mobile-logo-home-link
Browse files Browse the repository at this point in the history
Fix mobile logo home link
  • Loading branch information
Notsmartname committed Aug 17, 2024
2 parents be0a1be + 32e97b9 commit 5427786
Showing 1 changed file with 65 additions and 69 deletions.
134 changes: 65 additions & 69 deletions src/modules/Header/Header.jsx
Original file line number Diff line number Diff line change
@@ -1,69 +1,65 @@
import React, { useState, useContext } from 'react';
import { Link, NavLink } from 'react-router-dom';
import { useMediaQuery } from 'react-responsive';
import './Header.scss';
import MainContainer from '../../components/MainContainer/MainContainer';
import BurgerMenu from '../../components/BurgerMenu/BurgerMenu';
import ProfilePopup from '../../components/ProfilePopup/ProfilePopup';
import MenuLink from '../../ui/MenuLink/MenuLink';
import Paw from './svg/Paw';
import CurrentUserContext from '../../contexts/CurrentUserContext';

const Header = () => {
const { username } = useContext(CurrentUserContext);
const [profilePopupOpen, setProfilePopupOpen] = useState(false);

const openProfilePopup = () => {
setProfilePopupOpen(true);
};

const closeProfilePopup = () => {
setProfilePopupOpen(false);
};

const isScreenWide = useMediaQuery({
minWidth: 1200,
});

const isElementHidden = isScreenWide ? '' : 'menu_hidden';

return (
<MainContainer theme='additional'>
<header className='header'>
<BurgerMenu />

{isScreenWide ? (
<Link to='/'>
<Paw className='header__logo' />
</Link>
) : (
<Paw className='header__logo' />
)}

<nav className={`menu menu_items_links ${isElementHidden}`}>
<MenuLink url='/papers'>Полезные статьи</MenuLink>
<MenuLink url='/shelters'>Карта приютов</MenuLink>
<MenuLink url='/news'>Новости</MenuLink>
</nav>
<nav className='menu'>
{!username && (
<NavLink className='menu__sign menu__sign_in' to='/sign-in'>
Вход
</NavLink>
)}
{isScreenWide && !username && (
<NavLink className='menu__sign menu__sign_up ' to='/sign-up'>
Регистрация
</NavLink>
)}

{username && <button className='menu__profile' type='button' onClick={openProfilePopup} />}
</nav>

<ProfilePopup isOpen={profilePopupOpen} closeProfilePopup={closeProfilePopup} />
</header>
</MainContainer>
);
};

export default Header;
import React, { useState, useContext } from 'react';
import { Link, NavLink } from 'react-router-dom';
import { useMediaQuery } from 'react-responsive';
import './Header.scss';
import MainContainer from '../../components/MainContainer/MainContainer';
import BurgerMenu from '../../components/BurgerMenu/BurgerMenu';
import ProfilePopup from '../../components/ProfilePopup/ProfilePopup';
import MenuLink from '../../ui/MenuLink/MenuLink';
import Paw from './svg/Paw';
import CurrentUserContext from '../../contexts/CurrentUserContext';

const Header = () => {
const { username } = useContext(CurrentUserContext);
const [profilePopupOpen, setProfilePopupOpen] = useState(false);

const openProfilePopup = () => {
setProfilePopupOpen(true);
};

const closeProfilePopup = () => {
setProfilePopupOpen(false);
};

const isScreenWide = useMediaQuery({
minWidth: 1200,
});

const isElementHidden = isScreenWide ? '' : 'menu_hidden';

return (
<MainContainer theme='additional'>
<header className='header'>
<BurgerMenu />

<Link to='/'>
<Paw className='header__logo' />
</Link>

<nav className={`menu menu_items_links ${isElementHidden}`}>
<MenuLink url='/papers'>Полезные статьи</MenuLink>
<MenuLink url='/shelters'>Карта приютов</MenuLink>
<MenuLink url='/news'>Новости</MenuLink>
</nav>
<nav className='menu'>
{!username && (
<NavLink className='menu__sign menu__sign_in' to='/sign-in'>
Вход
</NavLink>
)}
{isScreenWide && !username && (
<NavLink className='menu__sign menu__sign_up ' to='/sign-up'>
Регистрация
</NavLink>
)}

{username && <button className='menu__profile' type='button' onClick={openProfilePopup} />}
</nav>

<ProfilePopup isOpen={profilePopupOpen} closeProfilePopup={closeProfilePopup} />
</header>
</MainContainer>
);
};

export default Header;

0 comments on commit 5427786

Please sign in to comment.