Revert "Merge pull request #29 from UFABCRocketDesign/dev"

This reverts commit 213dcfa, reversing changes made to 0205f2c.
UFABCRocketDesign · May 28, 2024 · e32b87b · e32b87b
1 parent 213dcfa
commit e32b87b
Show file tree

Hide file tree

Showing 19 changed files with 387 additions and 644 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -12,11 +12,9 @@
     "@types/node": "20.2.1",
     "@types/react": "18.2.6",
     "@types/react-dom": "18.2.4",
-    "axios": "^1.7.1",
     "eslint": "8.40.0",
     "eslint-config-next": "13.4.2",
-    "next": "^14.2.3",
-    "node": "^18.17.0",
+    "next": "^13.4.6",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "5.0.4"

diff --git a/src/app/a_entidade/page.tsx b/src/app/a_entidade/page.tsx
@@ -0,0 +1,33 @@
+import { Metadata } from 'next';
+import Image from "next/image";
+import styles from '../../styles/a_entidade.module.scss'
+
+export const metadata: Metadata = {
+    title: 'Sobre - UFABC Rocket Design',
+    description: 'Where\'s the One Piece?',
+}
+
+export default function About() {
+    return (
+    <>
+        <section className={`${styles.container} ${styles.stars}`}>
+            <div className={styles.historia}>
+                <h1>A entidade</h1>
+                <h2>História</h2>
+                <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed sit amet nisi vel dolor laoreet rhoncus quis in massa. Nunc fermentum quam commodo elementum posuere. Nam eu varius magna. Aliquam pulvinar finibus semper. Integer a est lorem. Proin non aliquet eros. Sed tempor imperdiet nulla, nec scelerisque purus gravida nec.</p>
+                <p>Phasellus tempus, sapien sit amet pulvinar lacinia, orci est scelerisque lacus, a aliquet arcu ipsum non nisi. Praesent pharetra id lacus sed maximus. Nulla vehicula diam quis egestas vestibulum. Vivamus in vestibulum sem. Interdum et malesuada fames ac ante ipsum primis in faucibus. Proin eget scelerisque enim, et venenatis arcu. Aliquam erat volutpat. </p>
+            </div>
+            <div className={styles.divisao}>
+                <Image className={styles.foguete} src="/images/foguete.png" fill alt="Logomarca UFABC Rocket Design" />
+                <Image className={styles.foguete_horizontal} src="/images/foguete_horizontal.png" fill alt="Logomarca UFABC Rocket Design" />
+            </div>
+            <div className={styles.mvo}>
+                <h2>Missão e Valores</h2>
+                <p>Sed a ultricies turpis, vitae vehicula nibh. Etiam sollicitudin justo vel nunc aliquet ultrices. Suspendisse laoreet eu enim eu venenatis. Donec porttitor consequat lectus. </p>
+                <h2>Organização</h2>
+                <p>Nulla convallis diam ex, quis viverra ipsum laoreet at. Proin vitae ex sit amet justo dapibus sodales ac eu nisl. Cras non massa eros.</p>
+            </div>
+        </section>
+    </>
+    ) 
+}
diff --git a/src/app/a_equipe/page.tsx b/src/app/a_equipe/page.tsx
@@ -1,33 +1,45 @@
+import styles from '../../styles/a_equipe.module.scss';
+import Image from 'next/image';
+
+
+// file ID: 141Qu2apXdlOTrQ1PjM8N3jQBlU_k0h6S
+// https://drive.google.com/uc?export=download&id=141Qu2apXdlOTrQ1PjM8N3jQBlU_k0h6S
+
+//import team from 'https://www.googleapis.com/drive/v3/files/141Qu2apXdlOTrQ1PjM8N3jQBlU_k0h6S?alt=media&key=[YOUR_API_KEY]s';
+
 import { Metadata } from 'next';
-import Image from "next/image";
-import styles from '../../styles/a_equipe.module.scss'
 
 export const metadata: Metadata = {
-    title: 'Sobre - UFABC Rocket Design',
-    description: 'Where\'s the One Piece?',
+    title: 'A Equipe - UFABC Rocket Design',
+    description: '',
 }
 
-export default function About() {
+
+export default function Team() {
     return (
     <>
         <section className={`${styles.container} ${styles.stars}`}>
-            <div className={styles.historia}>
-                <h1>A equipe</h1>
-                <h2>História</h2>
-                <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed sit amet nisi vel dolor laoreet rhoncus quis in massa. Nunc fermentum quam commodo elementum posuere. Nam eu varius magna. Aliquam pulvinar finibus semper. Integer a est lorem. Proin non aliquet eros. Sed tempor imperdiet nulla, nec scelerisque purus gravida nec.</p>
-                <p>Phasellus tempus, sapien sit amet pulvinar lacinia, orci est scelerisque lacus, a aliquet arcu ipsum non nisi. Praesent pharetra id lacus sed maximus. Nulla vehicula diam quis egestas vestibulum. Vivamus in vestibulum sem. Interdum et malesuada fames ac ante ipsum primis in faucibus. Proin eget scelerisque enim, et venenatis arcu. Aliquam erat volutpat. </p>
-            </div>
-            <div className={styles.divisao}>
-                <Image className={styles.foguete} src="/images/foguete.png" fill alt="Logomarca UFABC Rocket Design" />
-                <Image className={styles.foguete_horizontal} src="/images/foguete_horizontal.png" fill alt="Logomarca UFABC Rocket Design" />
+            <h1>A Equipe</h1>
+            <div className={styles.conteudo1}>
+                <div className={styles.divEsq}>
+                    <span>XX</span>
+                    <h2>Já atuaram</h2>
+                </div>
+                <div className={styles.containerFoto}>
+                    <Image className={styles.foto} src="/gallery/foto_rg_2024_1.jpg" fill alt="" />
+                </div>
+                <div className={styles.divDir}>
+                    <span>XX</span>
+                    <h2>Membros ativos</h2>
+                </div>
             </div>
-            <div className={styles.mvo}>
-                <h2>Missão e Valores</h2>
-                <p>Sed a ultricies turpis, vitae vehicula nibh. Etiam sollicitudin justo vel nunc aliquet ultrices. Suspendisse laoreet eu enim eu venenatis. Donec porttitor consequat lectus. </p>
-                <h2>Organização</h2>
-                <p>Nulla convallis diam ex, quis viverra ipsum laoreet at. Proin vitae ex sit amet justo dapibus sodales ac eu nisl. Cras non massa eros.</p>
+            <div className={styles.conteudo2}>
+                <p>In fringilla fringilla nulla. Vestibulum felis enim, convallis quis nisi quis, maximus ornare ante. Proin in tortor posuere tellus posuere scelerisque sit amet a diam. Aliquam mattis eros eu ex vulputate pretium.Nunc quam diam, tincidunt eget augue sit amet, sodales faucibus turpis. Pellentesque habitant morbi tristique. </p>
+                <p>Aliquam erat volutpat. Ut a sodales libero, ac scelerisque eros. Morbi magna odio, commodo blandit neque vel, rutrum varius arcu.Donec eget eros vel purus consectetur suscipit. Praesent congue elementum dolor eu congue.Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
+                <p>Fusce nec ex vitae lacus tempor iaculis commodo eu metus. Donec at metus interdum, malesuada ante at, mattis nulla. Proin at urna in lorem semper eleifend. In finibus condimentum fringilla. Maecenas ultrices, augue et maximus suscipit, arcu ipsum tincidunt tortor, ac tempus urna est et est. </p>
             </div>
         </section>
     </>
-    ) 
+
+    );
 }
diff --git a/src/app/apoio/page.tsx b/src/app/apoio/page.tsx
@@ -1,69 +1,48 @@
-'use client'
+
 import { Metadata } from 'next';
 
 import styles from '../../styles/apoio.module.scss'
 import { ParalelogramoApoio } from '@/components/paralelogramo_apoio/paralelogramo_apoio';
 import { CardApoio } from '@/components/card_apoio/card_apoio';
-import { useEffect, useState } from "react";
-import apoio_api from '@/drive/getApoio';
-import parseCSV from '@/drive/parseCSV';
 // Beginning of page with the current project featured, followed by a list of all projects
 
 // import  {sponsors} from '../../../data/sponsors.json'
 
-interface Apoiador{
-    nome : string;
-    nivel : string;
-    link_do_site: string;
-    link_do_logo: string;
+export const metadata: Metadata = {
+    title: 'Patrocinadores - UFABC Rocket Design',
+    description: 'Where\'s the One Piece?',
 }
 
 export default function Sponsors() {
-
-    const [apoiadores, setApoiadores] : any = useState([{nome:'', nivel:'', link_do_site:'', link_do_logo:''}])
-
-    useEffect(()=>{
-        apoio_api.get('').then(res => setApoiadores(parseCSV(res.data)))
-    },[])
-
     return (<>
         <div className={styles.container}>
             <h1 className={styles.title}>Quem nos impulsiona</h1>
             <section className={styles.conteudo}>
                 <div className={styles.secaoapoio}>
                     <ParalelogramoApoio nivel='diamante' cor='#0abab5'/>
                     <div className={styles.cards}>
-                        {apoiadores.map((card:Apoiador) => card.nivel == 'Diamante' ? 
-                        <>
-                            <CardApoio nome={card.nome} logo={card.link_do_logo} link={card.link_do_site}/>
-                        </> : '')}
+                        <CardApoio nome="Guatifer" logo={"images/apoiadores/diamante/guatifer.png"} link={'https://www.guatiferusinagem.com.br/'}/>
                     </div>
                 </div>
                 <div className={styles.secaoapoio}>
                     <ParalelogramoApoio nivel='ouro' cor='#daa520'/>
                     <div className={styles.cards}>
-                        {apoiadores.map((card:Apoiador) => card.nivel == 'Ouro' ? 
-                            <>
-                                <CardApoio nome={card.nome} logo={card.link_do_logo} link={card.link_do_site}/>
-                            </> : '')}
+                        <CardApoio nome="InovaUFABC" logo={"images/apoiadores/ouro/InovaUFABC.png"} link={'https://inova.ufabc.edu.br/'}/>
                     </div>
                 </div>
                 <div className={styles.secaoapoio}>
                     <ParalelogramoApoio nivel='prata' cor='#979ea8'/>
                     <div className={styles.cards}>
-                        {apoiadores.map((card:Apoiador) => card.nivel == 'Prata' ? 
-                            <>
-                                <CardApoio nome={card.nome} logo={card.link_do_logo} link={card.link_do_site}/>
-                            </> : '')}
+                        <CardApoio nome="3D Fila" logo={"images/apoiadores/prata/3dfila.png"} link={'https://3dfila.com.br/'}/>
+                        <CardApoio nome="MathWorks" logo={"images/apoiadores/prata/MathWorks.png"} link={'https://www.mathworks.com/?s_tid=gn_logo'}/>
+                        <CardApoio nome="Texiglass" logo={"images/apoiadores/prata/texiglass.png"} link={'https://texiglass.com.br/'}/>
                     </div>
                 </div>
                 <div className={styles.secaoapoio}>
                     <ParalelogramoApoio nivel='bronze' cor='#c8682b'/>
                     <div className={styles.cards}>
-                        {apoiadores.map((card:Apoiador) => card.nivel == 'Bronze' ? 
-                            <>
-                                <CardApoio nome={card.nome} logo={card.link_do_logo} link={card.link_do_site}/>
-                            </> : '')}
+                        <CardApoio nome="Redelease" logo={"images/apoiadores/bronze/redelease.png"} link={'https://www.redelease.ind.br/'}/>
+                        <CardApoio nome="GPDA" logo={"images/apoiadores/bronze/gpda.jpg"} link={'https://www.facebook.com/ufabcgpda/'}/>
                     </div>
                 </div>
             </section>

diff --git a/src/app/membros/page.tsx b/src/app/membros/page.tsx
diff --git a/src/app/page.tsx b/src/app/page.tsx
@@ -1,18 +1,9 @@
-'use client'
 import Image from "next/image";
 
 // import Layout from '../components/layout';
 import styles from '../styles/index.module.scss';
-import textos_api from "@/drive/getTextos";
-import { useEffect } from "react";
-import parseCSV from "@/drive/parseCSV";
 
 export default function Home() {
-
-  useEffect(()=>{
-    textos_api.get('').then((res) => console.log(parseCSV(res.data)))
-  },[])
-
   return (
     <div className={`${styles.banner} ${styles.stars}`} >
       {/* We have 3 sections, one with photos on the left, one with abtract on the right, and one with sponsors on the bot */}

diff --git a/src/components/footer.tsx b/src/components/footer.tsx
@@ -26,8 +26,8 @@ export default function Footer() {
                     </p>
                 </div>
                 <div className={styles.nav}>
+                    <Link href='a_entidade' passHref className={styles.navItem}>A entidade</Link>
                     <Link href='a_equipe' passHref className={styles.navItem}>A equipe</Link>
-                    <Link href='membros' passHref className={styles.navItem}>Membros</Link>
                     <Link href='missoes' passHref className={styles.navItem}>Missões</Link>
                     <Link href='noticias' passHref className={styles.navItem}>Notícias</Link>
                     <Link href='apoio' passHref className={styles.navItem}>Apoio</Link>

diff --git a/src/components/header.tsx b/src/components/header.tsx
@@ -22,8 +22,8 @@ export default function Header({menuStatus, setMenuStatus}: HeaderProps){
             </Link>
 
             <ul className={styles.nav}>
+                <li ><Link href="a_entidade" passHref className={styles.navLink}>A ENTIDADE</Link></li>
                 <li ><Link href="a_equipe" passHref className={styles.navLink}>A EQUIPE</Link></li>
-                <li ><Link href="membros" passHref className={styles.navLink}>MEMBROS</Link></li>
                 <li ><Link href="missoes" passHref className={styles.navLink}>MISSÕES</Link></li>
                 <li ><Link href="noticias" passHref className={styles.navLink}>NOTÍCIAS</Link></li>
                 <li ><Link href="apoio" passHref className={styles.navLink}>APOIO</Link></li>
@@ -36,8 +36,8 @@ export default function Header({menuStatus, setMenuStatus}: HeaderProps){
                 <div className={styles.blur} onClick={() => setMenuStatus(false)}>
                     <div className={styles.menuNav}>
                         <ul className={styles.menuNavList}>
+                            <li ><Link onClick={() => setMenuStatus(false)} href="a_entidade" passHref className={styles.navLink}>A ENTIDADE</Link></li>
                             <li ><Link onClick={() => setMenuStatus(false)} href="a_equipe" passHref className={styles.navLink}>A EQUIPE</Link></li>
-                            <li ><Link onClick={() => setMenuStatus(false)} href="membros" passHref className={styles.navLink}>MEMBROS</Link></li>
                             <li ><Link onClick={() => setMenuStatus(false)} href="missoes" passHref className={styles.navLink}>MISSÕES</Link></li>
                             <li ><Link onClick={() => setMenuStatus(false)} href="noticias" passHref className={styles.navLink}>NOTÍCIAS</Link></li>
                             <li ><Link onClick={() => setMenuStatus(false)} href="apoio" passHref className={styles.navLink}>APOIO</Link></li>

diff --git a/src/drive/getApoio.js b/src/drive/getApoio.js
diff --git a/src/drive/getMembros.js b/src/drive/getMembros.js
diff --git a/src/drive/getMissoes.js b/src/drive/getMissoes.js
diff --git a/src/drive/getNoticias.js b/src/drive/getNoticias.js
diff --git a/src/drive/getTextos.js b/src/drive/getTextos.js
diff --git a/src/drive/parseCSV.js b/src/drive/parseCSV.js