Skip to content

responsive partners #32

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
pawli444 wants to merge 6 commits into
base: master
Choose a base branch
from
Open

responsive partners #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
92c733c
Merge pull request #19 from IAESTE-AGH/master
Sosek1 Feb 10, 2025
2a45af3
Added translations, created good looking folder
pawli444 Feb 13, 2025
45094b1
partners-design
pawli444 Feb 24, 2025
72e70d8
Refactor i18n structure, enhancing translation keys
pawli444 Feb 26, 2025
677c0a2
Merge pull request #26 from IAESTE-AGH/feat/partners-design
Sosek1 Feb 27, 2025
b81ba97
Add responsive design for partners grid on mobile devices
pawli444 Feb 27, 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
50 changes: 0 additions & 50 deletions src/18n.ts
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import logo from "./logo.svg"
import "./App.css"
import "./18n";
import "./i18n/i18n";
import "react-toastify/dist/ReactToastify.css"

function App() {
Expand Down
Binary file added src/assets/img/PSRP_logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 13 additions & 13 deletions src/components/navbar/navbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import logo from "@/assets/img/logo_horizontal.png";
import { useState } from "react";
import { HomeRepairService, AdminPanelSettings, Logout } from "@mui/icons-material";
import { isAdmin } from "@/utils/isAdmin";
import { t } from '../../18n';
import { t } from '../../i18n/i18n';

const NAVLINK_STYLE: React.CSSProperties = {
color: "inherit",
Expand Down Expand Up @@ -43,30 +43,30 @@ export default function Navbar() {

<Stack direction={"row"} justifyContent={"space-around"} gap={2}>
<NavLink to="/projekt" style={NAVLINK_STYLE}>
{t("O Projekcie")}
{t("menuOptions.aboutProject")}
</NavLink>
<NavLink to="/iaeste" style={NAVLINK_STYLE}>
{t("O IAESTE")}
{t("menuOptions.aboutIaeste")}
</NavLink>
<NavLink to="/warsztaty" style={NAVLINK_STYLE}>
{t("Warsztaty")}
{t("menuOptions.workshops")}
</NavLink>
<NavLink to="/partnerzy" style={NAVLINK_STYLE}>
{t("Partnerzy")}
{t("menuOptions.partners")}
</NavLink>
<NavLink to="/firmy" style={NAVLINK_STYLE}>
{t("Firmy")}
{t("menuOptions.companies")}
</NavLink>
<NavLink to="/kontakt" style={NAVLINK_STYLE}>
{t("Kontakt")}
{t("menuOptions.contact")}
</NavLink>
</Stack>

<Stack direction={"row"} justifyContent={"flex-end"}>
<AuthContext.Consumer>
{(state) => (
<>
<Tooltip title={state.status === "authenticated" ? t("Menu") : t("Zaloguj się")}>
<Tooltip title={state.status === "authenticated" ? t("menu") : t("accountOptions.logIn")}>
<ButtonBase
onClick={state.status === "authenticated" ? (e) => handleClick(e) : () => navigate("/login")}
sx={{
Expand All @@ -87,7 +87,7 @@ export default function Navbar() {
padding: "8px 16px",
}}
>
<span>{state.status === "authenticated" ? `${state.currentUser.firstName} ${state.currentUser.lastName}` : t("Zaloguj się")}</span>
<span>{state.status === "authenticated" ? `${state.currentUser.firstName} ${state.currentUser.lastName}` : t("accountOptions.logIn")}</span>
<img src={user_icon} alt="User icon" style={{ width: "40px" }} />
</Box>
</ButtonBase>
Expand Down Expand Up @@ -138,28 +138,28 @@ export default function Navbar() {
}}
>
<MenuItem onClick={() => navigate("/user")}>
<img src={user_icon} alt="User icon" style={{ width: "32px" }} /> {t("Moje konto")}
<img src={user_icon} alt="User icon" style={{ width: "32px" }} /> {t("accountOptions.myAccount")}
</MenuItem>
<Divider />
<MenuItem onClick={() => navigate("/user/warsztaty")}>
<ListItemIcon>
<HomeRepairService fontSize="small" />
</ListItemIcon>
{t("Moje warsztaty")}
{t("accountOptions.myWorkshops")}
</MenuItem>
{isAdmin(state) ? (
<MenuItem onClick={() => navigate("/admin")}>
<ListItemIcon>
<AdminPanelSettings fontSize="small" />
</ListItemIcon>
{t("Panel administracyjny")}
{t("accountOptions.adminPanel")}
</MenuItem>
) : null}
<MenuItem onClick={() => navigate("/logout")}>
<ListItemIcon>
<Logout fontSize="small" />
</ListItemIcon>
{t("Wyloguj się")}
{t("accountOptions.logOut")}
</MenuItem>
</Menu>
</>
Expand Down
82 changes: 70 additions & 12 deletions src/components/pages/landing/partnersCompanies/partnersCompanies.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,51 @@
@import url('https://fonts.googleapis.com/css2?family=Roboto:wght@700&display=swap');

.partnersSection {
position: relative;
isolation: isolate;
overflow: hidden;
margin: 0;
padding: 0;
box-sizing: border-box;
font-family: Arial, sans-serif;
background-color: white;
background: linear-gradient(to top, #ffffff 20%, #DAB88B 90%, #cfa87a);
background-size: 100% 50%;
background-position: top;
background-repeat: no-repeat;
color: #333;

}

/* lewo */
.partnersSection::before {
content: "";
position: absolute;
top: 50%;
left: -7%;
width: 35rem;
height: 35rem;
background-image: url('@/assets/icons/cogwheel_light_icon.svg');
background-repeat: no-repeat;
background-size: contain;
opacity: 0.9;
pointer-events: none;
z-index: 0;
}

/* prawo */
.partnersSection::after {
content: "";
position: absolute;
bottom: 50%;
right: 5%;
width: 19.875rem;
height: 19.875rem;
background-image: url('@/assets/icons/cogwheel_light_icon.svg');
background-repeat: no-repeat;
background-size: contain;
opacity: 0.9;
pointer-events: none;
z-index: 0;
}

.container {
Expand All @@ -16,15 +55,19 @@
}

.title {
font-size: 3rem;
margin-top: 1.25rem;
margin-bottom: 1.25rem;
font-weight: bold;
display: flex;
justify-content: center;
font-size: 6rem;
margin-top: 2.75rem;
margin-bottom: 2.75rem;
padding-top: 2.75rem;
font-weight: 700;
text-align: left;
font-family: 'Roboto', sans-serif;
color: #333;
text-transform: uppercase;
font-family: League Spartan, 'Roboto', sans-serif;
color: #2C2C2C;
letter-spacing: 0.625rem;
margin-left: 3.75rem;

}

.partnersGrid {
Expand All @@ -33,32 +76,47 @@
gap: 1.25rem;
justify-items: center;
list-style-type: none;

}

.partner {
text-align: center;
margin-top: 1.25rem;
margin-bottom: 1.25rem;
margin-bottom: 2rem;
z-index: 1;

}

.partner img {
max-width: 9.375rem;
height: auto;
width: 31.38rem;
height: 19.25rem;
border: 0.125rem solid #000;
transition: transform 0.3s ease-in-out;
object-fit: cover;
z-index: 1;
}

.partner img:hover {
transform: scale(1.1);
transform: scale(1.05);
}

.partnerName {
margin-top: 0.625rem;
font-size: 1rem;
font-weight: 600;
z-index: 1;
}

.partnerStatus {
margin-top: 0.375rem;
font-size: 0.75rem;
color: #1271FF;
z-index: 1;
}


@media(max-width: 768px){
Copy link
Contributor

@Sosek1 Sosek1 Mar 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okok jest kolumna ale jak włącze widok na telefonie to:

image

Spróbuj się jeszcze raz za to wziąć i tak wyskalować te loga aby dobrze wyglądały na każdym urządzeniu czyli zarówno monitorze, laptopie, tablecie, telefonie. Proponuje skalować w górę czyli te pierwsze klasy pisać dla telefonu i potem pisać media queries dla tabletu jeśli trzeba i dla desktopu. Używaj min-width w tych media queries sprawdź jakie są najpopularniejsze break pointy i ich użyj. Możesz w sumie wziąć te co ma tailwind css wbudowane bo do duża biblioteka cssowa więc napewno są dobrze dobrane.

.partnersGrid {
grid-template-columns: repeat(1, 1fr);
}
}
12 changes: 6 additions & 6 deletions src/components/pages/landing/partnersCompanies/partnersCompanies.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@ import React from 'react';
import { Company } from "@/@types/API";
import styles from './partnersCompanies.module.css';
import naTeraz from '@/assets/img/temp.png';
import temporaryCompaniesLogo from '@/assets/img/PSRP_logo.png';
import { PartnersPageProps } from './partnersCompanies.type';
import { t } from '@/18n';
import { t } from '@/i18n/i18n';

const PartnersCompanies: React.FC<PartnersPageProps> = ({ companies, title }) => {
return (
<section className={styles.partnersSection}>
<h1 className={styles.title}>{title}:</h1>
<h1 className={styles.title}>{title}</h1>
<ul className={styles.partnersGrid}>
{companies.map((company) => (
<li key={company.id} className={styles.partner}>
<div className={styles.partnerWrapper}>
<a href={company.websiteUrl} target="_blank" rel="noopener noreferrer">
<img src={naTeraz} alt={company.name} />
</a>
<p className={styles.partnerName}>{company.name}</p>
<p className={styles.partnerStatus}>{t("Honorary Status")}</p> {/* tymczosowo poki nie ma w bazie tego statusu hardcodem jest */}
<img src={temporaryCompaniesLogo} alt={company.name} />
</a>
{/* <p className={styles.partnerStatus}>{t("partners.honoraryStatus")}</p> */}
</div>
</li>
))}
Expand Down
Loading