Skip to content

Commit 3a42b97

Browse files
itMatositMatos
authored
Merge pull request #357 from zenitheesc/enhancement/launches-page
[enhancement] launches page
2 parents b7abb8c + 25a05e0 commit 3a42b97

22 files changed

Lines changed: 616 additions & 458 deletions

File tree

‎components/navbar-components/NavHeader.jsx‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎components/navbar-components/NavLinks.jsx‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎components/navbar-components/NavMenu.jsx‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎components/projects-components/HeroSection.jsx‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,25 @@ import styles from 'styles/projects/ProjectHeroSection.module.css';
44
export default function HeroSection(props) {
55
const backgroundImage = {
66
backgroundImage: `${props.backgroundImage}`,
7-
backgroundColor: `${props.backgroundColor}`,
7+
backgroundColor: `${props.backgroundColor}`
88
};
99

10-
const { path } = props
10+
const { path } = props;
1111

1212
return (
1313
<div style={backgroundImage} className={styles.heroContainer}>
1414
<div className={styles.textContainer}>
1515
<h1>{props.title}</h1>
16-
<h2>
17-
{props.subtitle}
18-
</h2>
16+
<h2>{props.subtitle}</h2>
1917
</div>
20-
<div className={styles.imgContainer}>
21-
<img alt={"Projeto explodido do cubesat zensat mostrando cada uma de suas placase os paineis laterais"} src={`/images/Projetos/${path}`} />
22-
</div>
23-
18+
{props.page !== 'launches' && (
19+
<div className={styles.imgContainer}>
20+
<img
21+
alt="Projeto explodido do cubesat zensat mostrando cada uma de suas placase os paineis laterais"
22+
src={`/images/Projetos/${path}`}
23+
/>
24+
</div>
25+
)}
2426
</div>
2527
);
2628
}

‎locales/en/common.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"navBar": ["ABOUT US", "PROJECTS", "KURUMIM", "SELECTION PROCESS", "OBSAT"],
3-
"footer": {
4-
"copyright": "© 2024 Zenith Aerospace",
5-
"easterEgg": "MADE WITH TONS OF JAVASCRIPT AND CONFUSION ON DISCORD"
6-
}
2+
"navBar": ["ABOUT US", "PROJECTS", "KURUMIM", "SELECTION PROCESS", "OBSAT"],
3+
"footer": {
4+
"copyright": "©Zenith Aerospace",
5+
"easterEgg": "MADE WITH TONS OF JAVASCRIPT AND CONFUSION ON DISCORD"
6+
}
77
}

‎locales/es/common.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"navBar": ["SOBRE NÓS", "PROJETOS", "KURUMIM", "PROCESSO SELETIVO", "OBSAT"],
3-
"footer": {
4-
"copyright": "© 2024 Zenith Aerospace",
5-
"easterEgg": "FEITO COM MUITO JAVASCRIPT E CONFUSÃO NO DISCORD"
6-
}
2+
"navBar": ["SOBRE NÓS", "PROJETOS", "KURUMIM", "PROCESSO SELETIVO", "LANÇAMENTOS", "OBSAT"],
3+
"footer": {
4+
"copyright": "© Zenith Aerospace",
5+
"easterEgg": "FEITO COM MUITO JAVASCRIPT E CONFUSÃO NO DISCORD"
6+
}
77
}

‎locales/pt/allLaunches.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
11
{
2+
"metaTags": {
3+
"pageName": "lançamentos",
4+
"lang": "pt",
5+
"pageTitle": "Lançamentos",
6+
"title": "Lançamentos",
7+
"description": "Acompanhe alguns lançamentos e os dados de cada missão.",
8+
"subtitle": "Acompanhe alguns lançamentos e os dados de cada missão."
9+
},
210
"allLaunchesPage": {
311
"header": {
412
"title": "Lançamentos",

‎locales/pt/common.json‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
{
2-
"navBar": ["SOBRE NÓS", "PROJETOS", "KURUMIM", "PROCESSO SELETIVO", "OBSAT"],
3-
"footer": {
4-
"copyright": "© 2024 Zenith Aerospace",
5-
"easterEgg": "FEITO COM MUITO JAVASCRIPT E CONFUSÃO NO DISCORD"
6-
}
2+
"navBar": ["SOBRE NÓS", "PROJETOS", "KURUMIM", "PROCESSO SELETIVO", "LANÇAMENTOS", "OBSAT"],
3+
"NAVBAR": {
4+
"ABOUT_US": "SOBRE NÓS",
5+
"PROJECTS": "PROJETOS",
6+
"KURUMIM": "KURUMIM",
7+
"RECRUITMENT_PROCESS": "PROCESSO SELETIVO",
8+
"LAUNCHES": "LANÇAMENTOS",
9+
"OBSAT": "OBSAT"
10+
},
11+
"footer": {
12+
"copyright": "© Zenith Aerospace",
13+
"easterEgg": "FEITO COM MUITO JAVASCRIPT E CONFUSÃO NO DISCORD"
14+
}
715
}

‎pages/index.jsx‎

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,51 @@
11
import React from 'react';
2-
import NavBar from 'components/navbar-components/NavBar';
2+
import HeadTags from 'components/general/HeadTags';
33
import HighlightsSection from 'components/home-components/highlights-section/HighlightsSection';
44
import ProjectBanner from 'components/banners-components/ProjectBanner';
55
import SupportersBanner from 'components/banners-components/SupportersBanner';
66
import Sectors from 'components/home-components/sectors-section/Sectors';
77
import Footer from 'components/Footer';
88
import useTranslation from 'next-translate/useTranslation';
9-
import HeadTags from 'components/general/HeadTags';
9+
import NavBar from '../src/components/Navbar/NavBar.tsx';
1010
import HomepageHeroSection from '../components/home-components/HeroSection';
1111

1212
function Home() {
13-
1413
const { t } = useTranslation();
1514
const metaTags = t('homePage:metaTags', { count: -1 }, { returnObjects: true });
1615
return (
1716
<>
18-
<HeadTags pageName={metaTags.pageName} title={metaTags.title} description={metaTags.description} pageTitle={metaTags.pageTitle} lang={metaTags.lang} mainPage/>
17+
<HeadTags
18+
pageName={metaTags.pageName}
19+
title={metaTags.title}
20+
description={metaTags.description}
21+
pageTitle={metaTags.pageTitle}
22+
lang={metaTags.lang}
23+
mainPage
24+
/>
1925
<NavBar />
2026
<HomepageHeroSection />
2127
<Sectors />
22-
<ProjectBanner textContent={t('homePage:homePageBanners.genus', { count: -1 }, { returnObjects: true })} bgColor={"#605F62"} folderName={"genus-banner"} loop autoPlay />
23-
<ProjectBanner textContent={t('homePage:homePageBanners.zenithMonitor', { count: -1 }, { returnObjects: true })} bgColor={"#000000"} folderName={"monitor-banner"} />
28+
<ProjectBanner
29+
textContent={t('homePage:homePageBanners.genus', { count: -1 }, { returnObjects: true })}
30+
bgColor={'#605F62'}
31+
folderName={'genus-banner'}
32+
loop
33+
autoPlay
34+
/>
35+
<ProjectBanner
36+
textContent={t('homePage:homePageBanners.zenithMonitor', { count: -1 }, { returnObjects: true })}
37+
bgColor={'#000000'}
38+
folderName={'monitor-banner'}
39+
/>
2440
<HighlightsSection />
2541
<SupportersBanner textContent={t('homePage:homePageSupporters', { count: -1 }, { returnObjects: true })} />
2642
<Footer />
2743
</>
2844
);
2945
}
3046

31-
export function getServerSideProps() { return { props: {} }; }
47+
export function getServerSideProps() {
48+
return { props: {} };
49+
}
3250

3351
export default Home;

0 commit comments

Comments
 (0)