Skip to content

Jarno/feature/298-responsive-flexbox-layout-for-clans-main-page #311

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

Merged
Jonroi merged 8 commits into from
Jan 17, 2025
Merged

Jarno/feature/298-responsive-flexbox-layout-for-clans-main-page #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
34044c1
Flexboxes added
Rutjake Dec 9, 2024
e01ffa6
Margins for divs
Rutjake Dec 10, 2024
6e8624b
Flexboxes added to create a responsive layout
Rutjake Dec 10, 2024
9425aa5
Flexbox background color removed and page.tsx original code restored.
Rutjake Dec 10, 2024
07069c0
Changed file location
Rutjake Dec 16, 2024
4866f41
the files renamed and moved to the correct location
Rutjake Dec 17, 2024
8e1791a
add: export for clanLayout
Skoivumaki Dec 17, 2024
e3b7865
Pixels changed to breakpoints
Rutjake Jan 7, 2025
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: 2 additions & 0 deletions frontend-next-migration/src/preparedPages/ClanPages/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ export { default as ClanAddSubPage } from './ui/ClanAddSubPage/ClanAddSubPage';
export { default as MyClanPage } from './ui/MyClanPage/MyClanPage';

export { default as ClanLeaderBoardPage } from './ui/ClanLeaderBoardPage/ClanLeaderBoardPage';

export { default as ClanLayout } from './ui/ClanLayout/ClanLayout';
79 changes: 79 additions & 0 deletions frontend-next-migration/src/preparedPages/ClanPages/ui/ClanLayout/ClanLayout.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
/* Base styles */
.layoutContainer {
display: flex;
height: 100vh;
max-width: 1400px;
margin: 0 auto;
}

.headerSidebarContainer {
display: flex;
flex-direction: column;
width: 25%;
margin: 0.5rem;
}

.header {
flex-shrink: 0;
padding: 1rem;
text-align: center;
}

/* Sidebar styles */
.sidebar {
flex: 1;
padding: 1rem;
display: none;
}

.content {
flex: 1;
padding: 1rem;
margin: 0.5rem;
}

/* Desktop */
@media (min-width: breakpoint(lg)) {
.sidebar {
display: block;
/* Visible on desktop */
}
.header {
text-align: left;
padding: 1rem 2rem;
margin-bottom: 1rem;
}
.mobileNav {
display: none;
}
}

@media (max-width: breakpoint(lg)) {
.layoutContainer {
flex-direction: column;
}
.headerSidebarContainer {
width: 100%;
margin: 0;
}
.header {
text-align: center;
height: 50px;
padding: 0.5rem;
}
.mobileNav {
display: block;
/* Visible on mobile */
margin-top: 0.5rem;
height: 50px;
}
.sidebar {
display: none;
/* Hidden on mobile */
}
.content {
margin: 0rem;
margin-top: 0.5rem;
margin-bottom: 0.5rem;
}
}
24 changes: 24 additions & 0 deletions frontend-next-migration/src/preparedPages/ClanPages/ui/ClanLayout/ClanLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import cls from './ClanLayout.module.scss';

type LayoutProps = {
children: React.ReactNode;
};

const ClanMainPageLayout: React.FC<LayoutProps> = ({ children }) => {
return (
<div className={cls.container}>
<div className={cls.layoutContainer}>
<div className={cls.headerSidebarContainer}>
<header className={cls.header}>
<h1>Clans</h1>
</header>
<nav className={cls.mobileNav}>Mobile Dropdown</nav>
<aside className={cls.sidebar}>Sidebar</aside>
</div>
<main className={cls.content}>{children}</main>
</div>
</div>
);
};

export default ClanMainPageLayout;
Loading