Skip to content

Updated Hematorun Title to have blood cell #203

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.

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
merged 3 commits into from
May 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 6 additions & 15 deletions src/components/AmbassadorsHeading/AmbassadorsHeading.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,23 +25,14 @@
@include desktop-screen {
gap: 24px;
}
}

&__sub {
.text {
font-size: 50px;
font-weight: 500;
font-size: 16px;
@include desktop-screen {
font-size: 50px;
font-weight: 500;
font-size: 16px;
@include desktop-screen {
font-size: 50px;
}
}

&__main {
font-size: 90px;
font-weight: 800;
font-size: 36px;
@include desktop-screen {
font-size: 90px;
}
}
}

Expand Down
5 changes: 3 additions & 2 deletions src/components/AmbassadorsHeading/AmbassadorsHeading.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import HandwrittenLine from '../../Icons/HandwrittenLine/HandwrittenLine';
import { useLanguageStore } from '../../Zustand/useLanguageStore';
import HematorunTitle from '../hematorunTitle/HematorunTitle';
import scss from './AmbassadorsHeading.module.scss';
import translations from './translations';

Expand All @@ -10,8 +11,8 @@ function AmbassadorsHeading() {
return (
<div className={scss.header}>
<h2 className={scss.heading}>
<span className={scss.heading__sub}>{t.sub}</span>
<span className={scss.heading__main}>{t.main}</span>
<span className={scss.text}>{t.heading}</span>
<HematorunTitle secondTitle={{ pl: 'biegu', eng: 'run' }} />
</h2>
<div className={scss.line}>
<HandwrittenLine />
Expand Down
6 changes: 2 additions & 4 deletions src/components/AmbassadorsHeading/translations.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
const translations = {
PL: {
sub: 'Poznaj ambasadorów',
main: 'HEMATOBIEGU',
heading: 'Poznaj ambasadorów',
},
EN: {
sub: 'Meet the ambassadors of',
main: 'HEMATORUN',
heading: 'Meet the ambassadors of',
},
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@ import { useLanguageStore } from '../../Zustand/useLanguageStore';
import translations from './translations';
import TrippleArrowDown from '../../Icons/TrippleArrowDown/TrippleArrowDown';
import HandwrittenLine from '../../Icons/HandwrittenLine/HandwrittenLine';
import HematorunTitle from '../hematorunTitle/HematorunTitle';

export const ParticipantAreaHeading = () => {
const { language } = useLanguageStore();
const t = translations[language];
return (
<StyledHeading as="section" id="heading">
<h1>{t.hematorun}</h1>
<HematorunTitle />
<div className="participantArea">
<h2>{t.participantArea}</h2>
<HandwrittenLine />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export const StyledHeading = styled.section`
padding-bottom: min(0.75rem, max(0.6rem, 4vw));
}

svg {
& > div:not(:first-child) > svg {
width: 100%;
}

Expand Down
31 changes: 10 additions & 21 deletions src/components/SponsorsHeading/SponsorsHeading.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,28 +17,17 @@
@include desktop-screen {
margin-bottom: 48px;
}
}

&__sub {
margin-bottom: 16px;
font-size: 28px;
font-size: 14px;
line-height: 1.5;
font-weight: 500;
max-width: 56vw;

@include desktop-screen {
font-size: 28px;
}
}

&__main {
font-size: 32px;
font-weight: 800;
color: var(--orange);
text-transform: uppercase;
.text {
margin-bottom: 16px;
font-size: 28px;
font-size: 14px;
line-height: 1.5;
font-weight: 500;
max-width: 56vw;

@include desktop-screen {
font-size: 90px;
}
@include desktop-screen {
font-size: 28px;
}
}
5 changes: 3 additions & 2 deletions src/components/SponsorsHeading/SponsorsHeading.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { useLanguageStore } from '../../Zustand/useLanguageStore';
import BecomeSponsorButton from '../BecomeSponsorButton/BecomeSponsorButton';
import HematorunTitle from '../hematorunTitle/HematorunTitle';
import scss from './SponsorsHeading.module.scss';
import translations from './translations';

Expand All @@ -10,8 +11,8 @@ function SponsorsHeading() {
return (
<div className={scss.container}>
<h2 className={scss.heading}>
<span className={scss.heading__sub}>{t.sub}</span>
<span className={scss.heading__main}>{t.main}</span>
<span className={scss.text}>{t.heading}</span>
<HematorunTitle secondTitle={{ pl: 'biegu!', eng: 'run!' }} />
</h2>
<BecomeSponsorButton />
</div>
Expand Down
6 changes: 2 additions & 4 deletions src/components/SponsorsHeading/translations.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
const translations = {
PL: {
sub: 'Dziękujemy wszystkim sponsorom i partnerom',
main: 'Hematobiegu!',
heading: 'Dziękujemy wszystkim sponsorom i partnerom',
},
EN: {
sub: 'Thank you to all sponsors and partners of',
main: 'Hemmatorun!',
heading: 'Thank you to all sponsors and partners of',
},
};

Expand Down
3 changes: 1 addition & 2 deletions src/components/SupportDonation/SupportDonation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,10 @@ function SupportDonation() {
}}
/>
<SupportSubHeading
subText={{
content={{
pl: 'Wpłać darowiznę aby wesprzeć nas w organizacji wydarzenia',
eng: 'Make a donation to support us in organizing',
}}
mainText={{ pl: 'Hematobieg', eng: 'Hematorun' }}
/>
<DonationContainer />
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/components/SupportSponsor/SupportSponsor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ function SupportSponsor() {
/>
</div>
<SupportSubHeading
subText={{
content={{
pl: 'Pomóż nam w realizacji celów Fundacji oraz wesprzyj organizacje',
eng: 'Help us achieve the goals of the Foundation and support the organization',
}}
mainText={{ pl: 'Hematobiegu', eng: 'Hematorun' }}
titleSub={{ pl: 'biegu', eng: 'run' }}
/>
</div>
<SupportSponsorText />
Expand Down
16 changes: 11 additions & 5 deletions src/components/SupportSubHeading/SupportSubHeading.tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
import { useLanguageStore } from '../../Zustand/useLanguageStore';
import HematorunTitle from '../hematorunTitle/HematorunTitle';
import scss from './SupportSubHeading.module.scss';

type SupportSubHeadingProps = {
subText: { pl: string; eng: string };
mainText: { pl: string; eng: string };
content: { pl: string; eng: string };
titleMain?: { pl: string; eng: string };
titleSub?: { pl: string; eng: string };
};

function SupportSubHeading({ subText, mainText }: SupportSubHeadingProps) {
function SupportSubHeading({
content,
titleMain = { pl: 'Hemat', eng: 'Hemat' },
titleSub = { pl: 'bieg', eng: 'run' },
}: SupportSubHeadingProps) {
const { language } = useLanguageStore();
const languageString = language === 'PL' ? 'pl' : 'eng';

return (
<h3 className={scss.heading}>
<span className={scss.sub}>{subText[languageString]}</span>
<span className={scss.main}>{mainText[languageString]}</span>
<span className={scss.sub}>{content[languageString]}</span>
<HematorunTitle mainTitle={titleMain} secondTitle={titleSub} />
</h3>
);
}
Expand Down
68 changes: 37 additions & 31 deletions src/components/SupportVolunteers/SupportVolunteers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,37 +7,43 @@ import SupportVolunteersText from '../SupportVolunteersText/SupportVolunteersTex
import scss from './SupportVolunteers.module.scss';

function SupportVolunteers() {
return (
<section className={scss.section}>
< div className={scss.container}>
<div className={scss.heading}>
<SupportHeading
headingText={{
pl: 'Wesprzyj Fundację \n i zostań wolontariuszem',
eng: 'Support the foundation and become a volunteer',
}}
/></div>
<SupportSubHeading
subText={{
pl: 'Pomóż nam w realizacji celów Fundacji oraz wesprzyj organizację',
eng: 'Help us achieve the goals of the Foundation and support the organization',
}}
mainText={{ pl: 'Hematobiegu', eng: 'Hematorun' }}
/>

<SupportVolunteersJoin />
<SupportVolunteersHeading subText={{
pl: 'W jakich obszarach możesz pomóc?',
eng: 'In what areas can you help?',
}}/>
<SupportVolunteersList />
<SupportVolunteersHeading subText={{
pl: 'Kto może zostać wolontariuszem?',
eng: 'Who can become a volunteer?'
}}/>
<SupportVolunteersText /></div>
</section>
);
return (
<section className={scss.section}>
<div className={scss.container}>
<div className={scss.heading}>
<SupportHeading
headingText={{
pl: 'Wesprzyj Fundację \n i zostań wolontariuszem',
eng: 'Support the foundation and become a volunteer',
}}
/>
</div>
<SupportSubHeading
content={{
pl: 'Pomóż nam w realizacji celów Fundacji oraz wesprzyj organizację',
eng: 'Help us achieve the goals of the Foundation and support the organization',
}}
titleSub={{ pl: 'biegu', eng: 'run' }}
/>

<SupportVolunteersJoin />
<SupportVolunteersHeading
subText={{
pl: 'W jakich obszarach możesz pomóc?',
eng: 'In what areas can you help?',
}}
/>
<SupportVolunteersList />
<SupportVolunteersHeading
subText={{
pl: 'Kto może zostać wolontariuszem?',
eng: 'Who can become a volunteer?',
}}
/>
<SupportVolunteersText />
</div>
</section>
);
}

export default SupportVolunteers;
43 changes: 23 additions & 20 deletions src/components/SupportVolunteersText/SupportVolunteersText.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,31 @@ import scss from './SupportVolunteersText.module.scss';
import translations from './translations';

function SupportVolunteersText() {
const { language } = useLanguageStore();
const t = translations[language];
const { language } = useLanguageStore();
const t = translations[language];

return (
<div className={scss.sponsorship}>
<p className={scss.content}><span className={scss.welcome}>{t.welcome}</span> {t.welcomeNext}</p>
<div className={scss.vector}>
<TrippleVector />
</div>
<p className={scss.heading}>{t.joinTeam}</p>
<p className={scss.content}>
{t.contactInfo} <br />
<div className={scss.content}>
</div>
<div className={scss.contactEmail}>
<a href={`mailto:${t.email}`} className={scss.contactLink}>{t.email}</a>
</div>
{t.instructions}
</p>
<p className={scss.contentThanks}>{t.thanks}</p>
return (
<div className={scss.sponsorship}>
<p className={scss.content}>
<span className={scss.welcome}>{t.welcome}</span> {t.welcomeNext}
</p>
<div className={scss.vector}>
<TrippleVector />
</div>
<p className={scss.heading}>{t.joinTeam}</p>
<div className={scss.content}>
{t.contactInfo} <br />
<span className={scss.content}></span>
<div className={scss.contactEmail}>
<a href={`mailto:${t.email}`} className={scss.contactLink}>
{t.email}
</a>
</div>
);
{t.instructions}
</div>
<p className={scss.contentThanks}>{t.thanks}</p>
</div>
);
}

export default SupportVolunteersText;
3 changes: 2 additions & 1 deletion src/components/TogetherToTheGoal/TogetherToTheGoal.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import scss from './TogetherToTheGoal.module.scss';
import { useLanguageStore } from '../../Zustand/useLanguageStore';
import translations from './translations';
import HematorunTitle from '../hematorunTitle/HematorunTitle';

export const TogetherToTheGoal = () => {
const { language } = useLanguageStore();
Expand All @@ -11,7 +12,7 @@ export const TogetherToTheGoal = () => {
<h3 className={scss.togetherToTheGoal__together}>
{t.togetherToTheGoal}
</h3>
<h1 className={scss.togetherToTheGoal__title}>{t.hematorun}</h1>
<HematorunTitle />
<p className={scss.togetherToTheGoal__foundation}>
{t.foundationForHelpingPeopleWithLeukemia}{' '}
</p>{' '}
Expand Down
35 changes: 35 additions & 0 deletions src/components/hematorunTitle/HematorunTitle.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
@import '../../stylesheets/mixins.scss';

.title {
font-size: 36px;
display: flex;
align-items: center;
font-weight: 800;
color: var(--orange);
text-transform: uppercase;

& > svg {
width: 26px;
height: auto;
}

@include desktop-screen {
font-size: 90px;

& > svg {
width: auto;
}
}
}

.blood {
& > svg {
width: 26px;
height: auto;

@include desktop-screen {
width: auto;
height: 100%;
}
}
}
Loading
Loading