Implement Final Adjustments

Squash and merge the following commits into develop: * data: add static publications and results tables data * assets: add new assets * locales: update lang files * enhancement: enhance various pages and components * locales: set default locale to pt-BR
robocin · Feb 3, 2024 · de69061 · de69061
1 parent 1e29f4d
commit de69061
Show file tree

Hide file tree

Showing 31 changed files with 991 additions and 57 deletions.
diff --git a/next.config.js b/next.config.js
@@ -1,14 +1,14 @@
-/** @type {import('next').NextConfig} */
-const nextConfig = {
-  i18n: {
-    // TODO: add domains (?)
-    locales: ['en', 'pt-BR'],
-    defaultLocale: 'en',
-  },
-  reactStrictMode: true,
-  compiler: {
-    styledComponents: true,
-  },
-}
-
-module.exports = nextConfig
+/** @type {import('next').NextConfig} */
+const nextConfig = {
+  i18n: {
+    // TODO: add domains (?)
+    locales: ['en', 'pt-BR'],
+    defaultLocale: 'pt-BR',
+  },
+  reactStrictMode: true,
+  compiler: {
+    styledComponents: true,
+  },
+}
+
+module.exports = nextConfig
diff --git a/public/locales/en/index.js b/public/locales/en/index.js
@@ -47,9 +47,9 @@ const en = {
       {
         title: 'Very Small Size League',
         competitions: 'LARC | IronCup',
-        description: `The Very Small Size Soccer (VSSS) competition 
+        description: `The Very Small Size Soccer (VSS) competition 
         is a multifaceted challenge that necessitates excellence in 
-        key domains within RoboCIn. This includes advanced computer 
+        key domains within RobôCIn. This includes advanced computer 
         vision techniques for extracting critical game-related 
         information, the deployment of artificial intelligence 
         algorithms to orchestrate precise movements for scoring 
@@ -91,18 +91,76 @@ const en = {
       {
         title: 'Drone',
         competitions: 'LARC',
-        description: 'Description of Drone',
+        description: `RobôCIn's drone category was designed for the 
+        development of autonomous flying robots and related technologies.  
+        To validate our work, we seek to participate in competitions and 
+        symposiums, mainly LARC and RoboCup Brazil.  In it we participated in the 
+        Flying Robots Trial League.  In this competition there are four 
+        challenges that the robot must be able to perform autonomously, 
+        generally involving reading and detecting objects, searching and 
+        moving between platforms and transporting loads.`,
         table_header: 'Drone - Results',
       },
     ],
+    resultsTables: {
+      vssl: {
+        label: 'VSSL - Results',
+        th: ['Year', 'LARC', 'IRONCup'],
+        trs: [
+          ['2021', '1º 3v3 RL', '1º'],
+          ['2020', '4º DET, 5º RL', '3º RL, 5º DET'],
+          ['2019', '4º DET, 5º RL', '3º RL'],
+          ['2018', '3º', '3º'],
+          ['2017', '5º', 'N/A'],
+          ['2016', '16º', 'N/A'],
+        ],
+      },
+      ssl: {
+        label: 'SSL - Results',
+        th: ['Year', 'LARC', 'Robocup'],
+        trs: [
+          [
+            '2023',
+            'N/A',
+            '1st Div B, 1st Ball Placement Technical Challenge, 5th Chip Pass Challenge',
+          ],
+          [
+            '2022',
+            '1st',
+            '1st Div B, 1st Ball Placement Technical Challenge, 2nd Vision Blackout, 3rd Dribbling Challenge',
+          ],
+          [
+            '2021',
+            '1st',
+            '3rd Div A/B, 1st Ball Placement Technical Challenge, 5th Hardware Challenge',
+          ],
+          ['2020', '1st', 'Postponed'],
+          ['2019', '5th', '3rd/4th Div B'],
+          ['2018', '5th', 'N/A'],
+        ],
+      },
+      simulation: {
+        label: '2D Simulation - Results',
+        th: ['Year', 'RoboCup', 'LARC', 'IRONCup'],
+        trs: [
+          ['2023', '6h', 'N/A', '2nd'],
+          ['2022', '10th', '1st', '3rd'],
+          ['2021', '7th', '1st', '3rd'],
+          ['2020', 'Postponed', '3rd', '6th'],
+          ['2019', '9th', '2nd', 'N/A'],
+          ['2018', 'N/A', '4th', '6th'],
+        ],
+      },
+    },
   },
   content: 'This content is in English',
   home: {
     banner: {
       headline: {
-        title: `"Brazilian team wins second title in the world's 
-        largest robotics competition"`,
-        complement: `Read more at:`,
+        title: `excellence in Research and Development 
+        in Robotics and Artificial Intelligence.`,
+        complement: `Our Artifical Intelligence, Computer Vision
+        and engineering are world-wide champions.`,
       },
       heading: 'Award-winning AI and Robotics Research',
       achievements: [
@@ -200,15 +258,15 @@ const en = {
     },
     publications_list: {
       header: {
-        title: 'Our Publications',
-        description: 'Check out out publications below',
+        title: 'Our Papers',
+        description: 'Check out out description papers below',
       },
       default_filter_options: {
         all: 'All',
         recent: 'Most recent',
       },
       publication_card: {
-        url_label: 'Article',
+        url_label: 'Paper',
       },
       filter_results: {
         fallback: 'Oops! No publications were found for this year.',

diff --git a/public/locales/pt-BR/index.js b/public/locales/pt-BR/index.js
@@ -46,7 +46,7 @@ const ptBR = {
       {
         title: 'Very Small Size League',
         competitions: 'LARC | IronCup',
-        description: `Very Small Size Soccer (VSSS) é uma competição 
+        description: `Very Small Size Soccer (VSS) é uma competição 
         que requer desenvolvimento nas principais áreas do RobôCIn, 
         visão computacional para detectar informações sobre a situação 
         do jogo; inteligência artificial para planejar todos os 
@@ -89,18 +89,88 @@ const ptBR = {
       {
         title: 'Drone',
         competitions: 'LARC',
-        description: `Descrição de participação na categoria "drone".`,
+        description: `A categoria de drones do RobôCIn foi projetada para o 
+        desenvolvimento de robôs voadores autônomos e tecnologias relacionadas. 
+        Para validar nosso trabalho, buscamos participar de competições e simpósios, 
+        principalmente a LARC e a Robocup Brasil. Nela, participamos da Flying Robots Trial 
+        League. Nessa competição, existem quatro desafios que o robô deve 
+        ser capaz de realizar autonomamente, geralmente envolvendo a leitura e 
+        detecção de objetos, a busca e movimentação entre plataformas e o transporte 
+        de cargas.`,
         table_header: 'Drone - Resultados',
       },
     ],
+    resultsTables: {
+      vssl: {
+        label: 'VSSL - Resultados',
+        th: ['Ano', 'LARC', 'IRONCup'],
+        trs: [
+          ['2021', '1º 3v3 RL', '1º'],
+          ['2020', '4º DET, 5º RL', '3º RL, 5º DET'],
+          ['2019', '4º DET, 5º RL', '3º RL'],
+          ['2018', '3º', '3º'],
+          ['2017', '5º', 'N/A'],
+          ['2016', '16º', 'N/A'],
+        ],
+      },
+      ssl: {
+        label: 'SSL - Resultados',
+        th: ['Ano', 'LARC', 'Robocup'],
+        trs: [
+          [
+            '2023',
+            'N/A',
+            '1º Divisão B, 1º Ball Placement Technical Challenge, 5º Desafio de Chip Pass',
+          ],
+          [
+            '2022',
+            '1º',
+            '1º Divisão B, 1º Ball Placement Technical Challenge, 2º Vision Blackout, 3º Dribbling Challenge',
+          ],
+          [
+            '2021',
+            '1º',
+            '3º Divisão A/B, 1º Technical Challenge de Ball Placement, 5º Desafio de Hardware',
+          ],
+          ['2020', '1º', 'Adiado'],
+          ['2019', '5º', '3º/4º Divisão B'],
+          ['2018', '5º', 'N/A'],
+        ],
+      },
+      simulation: {
+        label: 'Simulação 2D - Resultados',
+        th: ['Ano', 'RoboCup', 'LARC', 'IRONCup'],
+        trs: [
+          ['2023', '6º', 'N/A', '2º'],
+          ['2022', '10º', '1º', '3º'],
+          ['2021', '7º', '1º', '3º'],
+          ['2020', 'Adiado', '3º', '6º'],
+          ['2019', '9º', '2º', 'N/A'],
+          ['2018', 'N/A', '4º', '6º'],
+        ],
+      },
+      drone: {
+        label: 'Drones - Resultados',
+        th: ['Ano', 'Robocup'],
+        trs: [
+          [
+            '2023',
+            '2º no Technical Challenge da Flying Robots Trial League, 3º geral na Flying Robots Trial League',
+          ][
+            ('2022', '3º no Technical Challenge da Flying Robots Trial League')
+          ],
+        ],
+      },
+    },
   },
   content: 'Esse conteúdo está em português',
   home: {
     banner: {
       headline: {
-        title: `"Equipe da UFPE conquista o bicampeonato da maior competição de
-        robótica do mundo"`,
-        complement: 'Leia mais em:',
+        title: `excelência em Pesquisa e Desenvolvimento 
+        em Robótica e Inteligência Artificial.`,
+        complement: `Nossa Inteligência Artificial, Visão Computacional e 
+        engenharia vencem campeonatos mundiais.`,
       },
       heading: 'Pesquisa de IA e Robótica premiada internacionalmente',
       achievements: [
@@ -199,19 +269,19 @@ const ptBR = {
       button_label: `Ver documentos`,
     },
     publication_card: {
-      url_label: 'Artigo',
+      url_label: 'Paper',
     },
     publications_list: {
       header: {
-        title: 'Nossas Publicações',
-        description: 'Veja nossas publicações',
+        title: 'Papers',
+        description: 'Veja nossos Description Papers abaixo',
       },
       default_filter_options: {
-        all: 'Todas',
+        all: 'Todos',
         recent: 'Mais recentes',
       },
       publication_card: {
-        url_label: 'Artigo',
+        url_label: 'Paper',
       },
       filter_results: {
         fallback: 'Oops! Nenhuma publicação foi encontrada para esse ano.',

diff --git a/src/assets/2d-sim.jpg b/src/assets/2d-sim.jpg
diff --git a/src/assets/banner-ide.jpg b/src/assets/banner-ide.jpg
diff --git a/src/assets/circuit-board.jpg b/src/assets/circuit-board.jpg
diff --git a/src/assets/drone.jpg b/src/assets/drone.jpg
diff --git a/src/assets/drone2.jpg b/src/assets/drone2.jpg
diff --git a/src/assets/index.ts b/src/assets/index.ts
@@ -8,6 +8,15 @@ import OpenInNewIcon from './open-in-new-icon.svg'
 import RoboCup2023 from './groupPhotos/robocup-2023.jpg'
 
 import GroupPhoto from './groupPhotos/robocin-group-2023.jpg'
+import AltGroupPhoto from './groupPhotos/IMG_4146.jpg'
+import BannerIDE from './banner-ide.jpg'
+
+import Robot from './ssl-robot.png'
+import Drone from './drone2.jpg'
+
+import TwoDimensionSim from './2d-sim.jpg'
+
+import RobotModel from './robot-model.jpg'
 
 export {
   LogoWithLabel,
@@ -18,4 +27,10 @@ export {
   ArrowIcon,
   RoboCup2023,
   GroupPhoto,
+  BannerIDE,
+  Robot,
+  Drone,
+  TwoDimensionSim,
+  RobotModel,
+  AltGroupPhoto,
 }
diff --git a/src/assets/robot-model.jpg b/src/assets/robot-model.jpg
diff --git a/src/assets/ssl-robot.png b/src/assets/ssl-robot.png
diff --git a/src/components/CategoriesPage/components/Categories/index.tsx b/src/components/CategoriesPage/components/Categories/index.tsx
@@ -2,15 +2,14 @@ import React from 'react'
 
 import SSL from './assets/small-size-league.png'
 import VSS from './assets/very-small-size-league.png'
-import Simulation from './assets/2d-simulation.png'
-import Drone from './assets/drone.jpeg'
+import { Drone, TwoDimensionSim } from '@/assets'
 
 import Main from './Categories'
 
 import { CategoriesDefaultProps } from './interfaces'
 
 const Categories = ({ translate }: CategoriesDefaultProps) => {
-  const images = [SSL, VSS, Simulation, Drone]
+  const images = [SSL, VSS, TwoDimensionSim, Drone]
 
   return <Main categories={translate} images={images} />
 }

diff --git a/src/components/CategoriesPage/components/Category/Category.tsx b/src/components/CategoriesPage/components/Category/Category.tsx
@@ -1,18 +1,35 @@
 import React from 'react'
+import { useRouter } from 'next/router'
+
+import { resultsTables } from '@/data/tables'
 
 import { ExpandableTable } from '@/components'
 
 import { CategoryDefaultProps } from './interfaces'
 
 import * as S from './Category.styles'
 
+type ResultTableKey = 'vssl' | 'ssl' | 'simulation' | 'drone'
+type localeType = 'en' | 'pt-BR'
+
+const titleMap: Record<string, ResultTableKey> = {
+  'Small Size League': 'ssl',
+  'Very Small Size League': 'vssl',
+  '2D Simulation': 'simulation',
+  'Drone': 'drone',
+}
+
 const Category = ({
   title,
   image,
   competitions,
   description,
   approaches,
 }: CategoryDefaultProps) => {
+  const router = useRouter()
+  const { locale } = router
+  const lang = locale === 'en' ? 'en' : 'ptBR'
+
   return (
     <S.Container id={title.toLowerCase()}>
       <S.Divider />
@@ -45,7 +62,7 @@ const Category = ({
         </>
       )}
       <S.TableWrapper>
-        <ExpandableTable />
+        <ExpandableTable data={resultsTables[lang][titleMap[title]]} />
       </S.TableWrapper>
     </S.Container>
   )

diff --git a/src/components/CategoriesPage/components/Category/interfaces.ts b/src/components/CategoriesPage/components/Category/interfaces.ts
@@ -9,4 +9,5 @@ export interface CategoryDefaultProps {
   competitions: string
   description: string
   approaches?: Approach[]
+  tables?: any[]
 }
diff --git a/src/components/CategoriesPage/components/Header/interfaces.ts b/src/components/CategoriesPage/components/Header/interfaces.ts
@@ -4,5 +4,5 @@ export interface CategoriesHeaderProps {
     description: string
     categories: string[]
   }
-  scrollToSection: (sectionId: string) => void
+  scrollToSection?: (sectionId: string) => void
 }
diff --git a/src/components/Home/BannerV2/Banner.styles.ts b/src/components/Home/BannerV2/Banner.styles.ts
@@ -19,7 +19,7 @@ export const TextContainer = styled.div`
   margin: auto;
   padding: auto;
   color: white;
-  text-shadow: 5px 5px 4px rgba(0, 0, 0, 0.8);
+  text-shadow: 5px 5px 5px rgba(0, 0, 0, 0.2);
 
   @media (max-width: 768px) {
     padding: 0;

diff --git a/src/components/Home/Bannerv3/index.tsx b/src/components/Home/Bannerv3/index.tsx
@@ -0,0 +1,19 @@
+import Image from 'next/image'
+import { StyledBanner, StyledImage, StyledContent } from './style'
+import { Robot } from '@/assets'
+
+const Banner = ({ translate }: { translate: any }) => {
+  return (
+    <StyledBanner>
+      <StyledImage src={Robot} alt="Robô" />
+      <StyledContent>
+        <h2>
+          <span>RobôCIn:</span> {translate.title}
+        </h2>
+        <p>{translate.complement}</p>
+      </StyledContent>
+    </StyledBanner>
+  )
+}
+
+export default Banner