diff --git a/components/navbar-components/NavHeader.jsx b/components/navbar-components/NavHeader.jsx deleted file mode 100644 index 0aa3c379..00000000 --- a/components/navbar-components/NavHeader.jsx +++ /dev/null @@ -1,39 +0,0 @@ -import React from 'react'; -import { Fade as Hamburger } from 'hamburger-react'; -import style from 'styles/NavBar.module.css'; -import NavLinks from './NavLinks'; - -export default function NavHeader(props) { - const { toggleMenu } = props; - const { isMenuOpen } = props; - - return ( - <> -
- - Zenith Logo - - - - -
- -
-
- - ); -} diff --git a/components/navbar-components/NavLinks.jsx b/components/navbar-components/NavLinks.jsx deleted file mode 100644 index cd38c69f..00000000 --- a/components/navbar-components/NavLinks.jsx +++ /dev/null @@ -1,30 +0,0 @@ -import React from 'react'; -import Link from 'next/link'; -import useTranslation from 'next-translate/useTranslation'; -import { navBarItem } from '../../styles/NavBar.module.css'; - -export default function NavLinks(props) { - const { t } = useTranslation(); - const navTexts = t('common:navBar', { count: -1 }, { returnObjects: true }); - return ( - <> - - - ); -} diff --git a/components/navbar-components/NavMenu.jsx b/components/navbar-components/NavMenu.jsx deleted file mode 100644 index f069b2a1..00000000 --- a/components/navbar-components/NavMenu.jsx +++ /dev/null @@ -1,17 +0,0 @@ -import React from 'react'; -import NavLinks from './NavLinks'; -import style from 'styles/NavBar.module.css'; - -export default function NavMenu(props) { - return ( -
- -
- ); -} diff --git a/components/projects-components/HeroSection.jsx b/components/projects-components/HeroSection.jsx index 275ba987..08215c1d 100644 --- a/components/projects-components/HeroSection.jsx +++ b/components/projects-components/HeroSection.jsx @@ -4,23 +4,25 @@ import styles from 'styles/projects/ProjectHeroSection.module.css'; export default function HeroSection(props) { const backgroundImage = { backgroundImage: `${props.backgroundImage}`, - backgroundColor: `${props.backgroundColor}`, + backgroundColor: `${props.backgroundColor}` }; - const { path } = props + const { path } = props; return (

{props.title}

-

- {props.subtitle} -

+

{props.subtitle}

-
- {"Projeto -
- + {props.page !== 'launches' && ( +
+ Projeto explodido do cubesat zensat mostrando cada uma de suas placase os paineis laterais +
+ )}
); } diff --git a/locales/en/common.json b/locales/en/common.json index a56446b9..85ad00b9 100644 --- a/locales/en/common.json +++ b/locales/en/common.json @@ -1,7 +1,7 @@ { - "navBar": ["ABOUT US", "PROJECTS", "KURUMIM", "SELECTION PROCESS", "OBSAT"], - "footer": { - "copyright": "© 2024 Zenith Aerospace", - "easterEgg": "MADE WITH TONS OF JAVASCRIPT AND CONFUSION ON DISCORD" - } + "navBar": ["ABOUT US", "PROJECTS", "KURUMIM", "SELECTION PROCESS", "OBSAT"], + "footer": { + "copyright": "©Zenith Aerospace", + "easterEgg": "MADE WITH TONS OF JAVASCRIPT AND CONFUSION ON DISCORD" + } } diff --git a/locales/es/common.json b/locales/es/common.json index af750480..3af9e5a1 100644 --- a/locales/es/common.json +++ b/locales/es/common.json @@ -1,7 +1,7 @@ { - "navBar": ["SOBRE NÓS", "PROJETOS", "KURUMIM", "PROCESSO SELETIVO", "OBSAT"], - "footer": { - "copyright": "© 2024 Zenith Aerospace", - "easterEgg": "FEITO COM MUITO JAVASCRIPT E CONFUSÃO NO DISCORD" - } + "navBar": ["SOBRE NÓS", "PROJETOS", "KURUMIM", "PROCESSO SELETIVO", "LANÇAMENTOS", "OBSAT"], + "footer": { + "copyright": "© Zenith Aerospace", + "easterEgg": "FEITO COM MUITO JAVASCRIPT E CONFUSÃO NO DISCORD" + } } diff --git a/locales/pt/allLaunches.json b/locales/pt/allLaunches.json index 9dd5e55b..628406d5 100644 --- a/locales/pt/allLaunches.json +++ b/locales/pt/allLaunches.json @@ -1,4 +1,12 @@ { + "metaTags": { + "pageName": "lançamentos", + "lang": "pt", + "pageTitle": "Lançamentos", + "title": "Lançamentos", + "description": "Acompanhe alguns lançamentos e os dados de cada missão.", + "subtitle": "Acompanhe alguns lançamentos e os dados de cada missão." + }, "allLaunchesPage": { "header": { "title": "Lançamentos", diff --git a/locales/pt/common.json b/locales/pt/common.json index af750480..1ef11b64 100644 --- a/locales/pt/common.json +++ b/locales/pt/common.json @@ -1,7 +1,15 @@ { - "navBar": ["SOBRE NÓS", "PROJETOS", "KURUMIM", "PROCESSO SELETIVO", "OBSAT"], - "footer": { - "copyright": "© 2024 Zenith Aerospace", - "easterEgg": "FEITO COM MUITO JAVASCRIPT E CONFUSÃO NO DISCORD" - } + "navBar": ["SOBRE NÓS", "PROJETOS", "KURUMIM", "PROCESSO SELETIVO", "LANÇAMENTOS", "OBSAT"], + "NAVBAR": { + "ABOUT_US": "SOBRE NÓS", + "PROJECTS": "PROJETOS", + "KURUMIM": "KURUMIM", + "RECRUITMENT_PROCESS": "PROCESSO SELETIVO", + "LAUNCHES": "LANÇAMENTOS", + "OBSAT": "OBSAT" + }, + "footer": { + "copyright": "© Zenith Aerospace", + "easterEgg": "FEITO COM MUITO JAVASCRIPT E CONFUSÃO NO DISCORD" + } } diff --git a/pages/index.jsx b/pages/index.jsx index c3a9922e..d5a26039 100644 --- a/pages/index.jsx +++ b/pages/index.jsx @@ -1,26 +1,42 @@ import React from 'react'; -import NavBar from 'components/navbar-components/NavBar'; +import HeadTags from 'components/general/HeadTags'; import HighlightsSection from 'components/home-components/highlights-section/HighlightsSection'; import ProjectBanner from 'components/banners-components/ProjectBanner'; import SupportersBanner from 'components/banners-components/SupportersBanner'; import Sectors from 'components/home-components/sectors-section/Sectors'; import Footer from 'components/Footer'; import useTranslation from 'next-translate/useTranslation'; -import HeadTags from 'components/general/HeadTags'; +import NavBar from '../src/components/Navbar/NavBar.tsx'; import HomepageHeroSection from '../components/home-components/HeroSection'; function Home() { - const { t } = useTranslation(); const metaTags = t('homePage:metaTags', { count: -1 }, { returnObjects: true }); return ( <> - + - - + +