Skip to content

Improve responsive layout consistency #139

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
marcofabiani12 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Improve responsive layout consistency #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2f467f
Fix responsive layout for header, home and about pages
marcofabiani12 May 11, 2026
df3d160
Improve JoinUs responsive layout
marcofabiani12 May 11, 2026
aa740ed
Improve People page responsiveness
marcofabiani12 May 11, 2026
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
229 changes: 165 additions & 64 deletions components/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,25 @@ import Image from "next/image";
import { useRouter } from "next/router";
import RoundButton from "./molecules/RoundButton";
import React, { useState } from "react";
import { Navbar } from '../components/components_toolge/NavBar';
import { T, useTranslate } from "@tolgee/react";
import { T } from "@tolgee/react";

const Header = ({ darkHeader = false }: { darkHeader?: boolean }) => {
const router = useRouter();
const { locale, asPath } = router;

const isActive = (pathname: string) => router.pathname === pathname;

const [navbarOpen, toggleNavbar] = useState(false);
const { t } = useTranslate();
const [peopleDropdownOpen, setPeopleDropdownOpen] = useState(false);

const handleNavigate = (event: React.MouseEvent<Element, MouseEvent>, pathname: string) => {
const handleNavigate = (
event: React.MouseEvent<Element, MouseEvent>,
pathname: string
) => {
event.preventDefault();
event.stopPropagation();
router.push(pathname);
}
};

const handleLangChange = (lang: string) => {
if (lang === locale) return;
Expand All @@ -32,14 +36,24 @@ const Header = ({ darkHeader = false }: { darkHeader?: boolean }) => {
<div className={styles.topbarInner}>
<div className={styles.langSwitch}>
<button
className={`${styles.langButton} ${isLangActive("it") ? styles.langButtonActive : ""}`}
className={`${styles.langButton} ${
isLangActive("it")
? styles.langButtonActive
: ""
}`}
onClick={() => handleLangChange("it")}
>
IT
</button>

<span className={styles.langSeparator}>|</span>

<button
className={`${styles.langButton} ${isLangActive("en") ? styles.langButtonActive : ""}`}
className={`${styles.langButton} ${
isLangActive("en")
? styles.langButtonActive
: ""
}`}
onClick={() => handleLangChange("en")}
>
EN
Expand All @@ -48,74 +62,161 @@ const Header = ({ darkHeader = false }: { darkHeader?: boolean }) => {
</div>
</div>

<header className={`${styles.header} ${navbarOpen ? styles.open : ''}`} >
<div className={styles.logoTitle} onClick={() => router.push('/')} >
<Image className={styles.logo} src="/Common/hkn_logo_white_vector.svg" alt="HKN PoliTO Logo" width={90} height={90} />
</div>

<div className={`${styles.menu} ${navbarOpen ? styles.open : ''}`}>
<div className={isActive('/') ? styles.active : styles.inactive} onClick={() => router.push('/')}>
<T keyName="header.nav.home" />
<header className={`${styles.header} ${navbarOpen ? styles.open : ""}`}>
<div className={styles.headerInner}>
<div className={styles.logoTitle} onClick={() => router.push("/")}>
<Image
className={styles.logo}
src="/Common/hkn_logo_white_vector.svg"
alt="HKN PoliTO Logo"
width={82}
height={82}
/>
</div>

<div className={isActive('/AboutUs') ? styles.active : styles.inactive} onClick={() => router.push('/AboutUs')}>
<T keyName="header.nav.about" />
</div>
<div className={`${styles.menu} ${navbarOpen ? styles.open : ""}`}>
<div
className={isActive("/") ? styles.active : styles.inactive}
onClick={() => router.push("/")}
>
<T keyName="header.nav.home" />
</div>

<div className={`${isActive('/People/People') || isActive('/People/Alumni') || isActive('/People/Professionals') || isActive('/People/PastBoards') ? styles.active : styles.inactive} ${styles.menuItem}`}
/* onClick={() => router.push('/People/People')}*/>
<div className={styles.itemWrapper}>
<T keyName="header.nav.people.main" />
<div className={styles.arrowDown}></div>
<div
className={isActive("/AboutUs") ? styles.active : styles.inactive}
onClick={() => router.push("/AboutUs")}
>
<T keyName="header.nav.about" />
</div>
<ul className={styles.dropdown}>
<li className={isActive('/People/People') ? styles.activeDropdown : ''}
onClick={(e: React.MouseEvent<Element, MouseEvent>) => handleNavigate(e, '/People/People')}>
<T keyName="header.nav.people.people" />
</li>
<li className={isActive('/People/Alumni') ? styles.activeDropdown : ''}
onClick={(e: React.MouseEvent<Element, MouseEvent>) => handleNavigate(e, '/People/Alumni')}>
<T keyName="header.nav.people.alumni" />
</li>
<li className={isActive('/People/Professionals') ? styles.activeDropdown : ''}
onClick={(e: React.MouseEvent<Element, MouseEvent>) => handleNavigate(e, '/People/Professionals')}>
<T keyName="header.nav.people.professionals" />
</li>
<li className={isActive('/People/PastBoards') ? styles.activeDropdown : ''}
onClick={(e: React.MouseEvent<Element, MouseEvent>) => handleNavigate(e, '/People/PastBoards')}>
<T keyName="header.nav.people.past_boards" />
</li>

</ul>
</div>

<div className={isActive('/Activities/Events') ? styles.active : styles.inactive}
onClick={() => router.push('/Activities/Events')}>
<T keyName="header.nav.events" />
</div>
<div
className={`${
isActive("/People/People") ||
isActive("/People/Alumni") ||
isActive("/People/Professionals") ||
isActive("/People/PastBoards")
? styles.active
: styles.inactive
} ${styles.menuItem}`}
onClick={() => {
if (window.innerWidth <= 960) {
setPeopleDropdownOpen((prev) => !prev);
}
}}
>
<div className={styles.itemWrapper}>
<T keyName="header.nav.people.main" />
<div className={styles.arrowDown}></div>
</div>

<ul
className={`${styles.dropdown} ${
peopleDropdownOpen ? styles.dropdownOpen : ""
}`}
>
<li
className={
isActive("/People/People")
? styles.activeDropdown
: ""
}
onClick={(e) => handleNavigate(e, "/People/People")}
>
<T keyName="header.nav.people.people" />
</li>

<li
className={
isActive("/People/Alumni")
? styles.activeDropdown
: ""
}
onClick={(e) => handleNavigate(e, "/People/Alumni")}
>
<T keyName="header.nav.people.alumni" />
</li>

<li
className={
isActive("/People/Professionals")
? styles.activeDropdown
: ""
}
onClick={(e) =>
handleNavigate(e, "/People/Professionals")
}
>
<T keyName="header.nav.people.professionals" />
</li>

<li
className={
isActive("/People/PastBoards")
? styles.activeDropdown
: ""
}
onClick={(e) => handleNavigate(e, "/People/PastBoards")}
>
<T keyName="header.nav.people.past_boards" />
</li>
</ul>
</div>

<div className={isActive('/Activities/StudyGroups') ? styles.active : styles.inactive}
onClick={() => router.push('/Activities/StudyGroups')}>
<T keyName="header.nav.study_groups" />
</div>
<div
className={
isActive("/Activities/Events")
? styles.active
: styles.inactive
}
onClick={() => router.push("/Activities/Events")}
>
<T keyName="header.nav.events" />
</div>

<div
className={
isActive("/Activities/StudyGroups")
? styles.active
: styles.inactive
}
onClick={() => router.push("/Activities/StudyGroups")}
>
<T keyName="header.nav.study_groups" />
</div>

<div className={isActive('/Publications/Recognitions') ? styles.active : styles.inactive}
onClick={() => router.push('/Publications/Recognitions')}>
<T keyName="header.nav.publications" />
<div
className={
isActive("/Publications/Recognitions")
? styles.active
: styles.inactive
}
onClick={() => router.push("/Publications/Recognitions")}
>
<T keyName="header.nav.publications" />
</div>
</div>

</div>
<div className={styles.headerSpace}>
<RoundButton
className={styles.joinUsButton}
onClick={() => router.push("/JoinUs")}
>
<T keyName="common.join_us" />
</RoundButton>
</div>

<div className={styles.headerSpace}>
<RoundButton className={styles.joinUsButton} onClick={() => router.push('/JoinUs')}>
<T keyName="common.join_us" />
</RoundButton>
<img
onClick={() => toggleNavbar((open) => !open)}
src={"/Common/bars.svg"}
height={"30px"}
width={"30px"}
alt="Menu"
className={styles.showMenu}
/>
</div>

<img onClick={() => toggleNavbar((open) => !open)} src={'/Common/bars.svg'} height={'30px'} width={'30px'} alt="Menu" className={styles.showMenu} />
</header>
</>
)
}
);
};

export default Header;
export default Header;
8 changes: 6 additions & 2 deletions pages/JoinUs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,12 @@ export default function JoinUs() {
</p>
</div>
<div className={styles.halfWidth}>
<img alt={t('join_us.build_future.image_alt')} src="/JoinUs/hiring.png"
width={"80%"} height={"auto"} loading="lazy" className={styles.headingImage} />
<img
alt={t('join_us.build_future.image_alt')}
src="/JoinUs/hiring.png"
loading="lazy"
className={styles.headingImage}
/>
</div>
</section>

Expand Down
6 changes: 6 additions & 0 deletions pages/People/People.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@ export default function People() {
fetchData();
}, []);

useEffect(() => {
return () => {
document.body.style.overflow = 'auto';
};
}, []);

const router = useRouter();
const [boardIndex, setBoardIndex] = useState(0);
const [teamIndex, setTeamIndex] = useState(0);
Expand Down
68 changes: 68 additions & 0 deletions styles/AboutUs/AboutUs.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,3 +414,71 @@
.divider1 {
height: 40px;
}

@media (max-width: 780px) {
.sections {
width: 100%;
padding-inline: 20px;
}

.section__container_img {
width: min(100%, 450px);
height: 420px;
margin-inline: auto;
overflow: hidden;
}

.section_image {
max-width: 100%;
}

.section1_image1,
.section1_image2,
.section2_image1,
.section3_image1,
.section4_image1 {
width: 80%;
height: auto;
}

.section1_image2 {
left: 20%;
}

.section2_image2,
.section4_image2 {
right: 0;
}

.section3_image3 {
left: 0;
}

.stats {
flex-direction: column;

&__element {
width: 100%;
}

&__container_img {
width: 70px;
height: 70px;
}
}
}

@media screen and (max-width: 960px) {
.menu {
gap: 10px;
padding: 10px 0 6px;
}

.dropdown {
margin-top: 4px;
}

.dropdown > li {
padding: 0.4em 0.8em;
}
}
Loading