Skip to content

Commit

Permalink
Merge pull request #16 from UFABCRocketDesign/dev
Browse files Browse the repository at this point in the history
Atualização Parcial
  • Loading branch information
matheusalefe authored Mar 4, 2024
2 parents ca48d99 + a5517ad commit 95012b3
Show file tree
Hide file tree
Showing 23 changed files with 710 additions and 728 deletions.
287 changes: 136 additions & 151 deletions package-lock.json

Large diffs are not rendered by default.

Binary file added public/gallery/base.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
158 changes: 158 additions & 0 deletions public/images/foguete.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 0 additions & 12 deletions public/images/logoHorizontal.svg

This file was deleted.

Binary file added public/images/logo_inovaufabc.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/logo_rocket.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/logo_rocket_azul.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/logo_ufabc.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/app/about/page.tsx → src/app/a_entidade/page.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Metadata } from 'next';

import styles from '../../styles/about.module.scss'
import styles from '../../styles/a_entidade.module.scss'

export const metadata: Metadata = {
title: 'Sobre - UFABC Rocket Design',
Expand All @@ -24,5 +24,5 @@ export default function About() {

</div>
</>
)
)
}
190 changes: 95 additions & 95 deletions src/app/team/page.tsx → src/app/a_equipe/page.tsx
Original file line number Diff line number Diff line change
@@ -1,96 +1,96 @@
import styles from '../../styles/team.module.scss';
import { DoubleArrowRotateIcon, MicroChipIcon, EarthIcon } from '../../components/icons';
import Image from 'next/image';
import team from '../../../data/team.json';


// 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';

export const metadata: Metadata = {
title: 'Quem somos - UFABC Rocket Design',
description: 'Where\'s the One Piece?',
}

const teamList = team.team;

export default function Team() {
return (<>

<div className={styles.container}>
<h1 className={styles.title}>Conheça a equipe</h1>
<p>As such I have no regrets in meeting you, friend. Should the day ever come that we are not together, you will continue to shine like gold in my memories. </p>
</div>

<div className={styles.container}>
<h2 className={styles.subTitle}>Nossos Valores</h2>
<div className={styles.valuesList}>
<div className={styles.valuesItem}>
<div className={styles.valuesIcon}><DoubleArrowRotateIcon /></div>
<p>Desenvolvimento de tecnologia de ponta</p>
</div>
<div className={styles.valuesItem}>
<div className={styles.valuesIcon}><MicroChipIcon /></div>
<p>Apoiando pesquisadores</p>
</div>
<div className={styles.valuesItem}>
<div className={styles.valuesIcon}><EarthIcon /></div>
<p>Projetos focados na melhoria da area aeroespacial</p>
</div>
</div>
</div>

<div className={styles.container}>
<h2 className={styles.subTitle}>Nosso Time</h2>
<div className={styles.team}>
{teamList.map((person, index) => {
return (
<>
<div className={styles.person}
// onClick={() => document.getElementById('modal' + index.toString())!.style.display = 'flex'}
>
<Image src={person.photo} alt={person.name}
height={1500}
width={1500}
style={{
width: "100%",
height: "auto",
aspectRatio: "1/1",
borderRadius: "50%",

}} />
<div >
<h4 className={styles.personName}>{person.name}</h4>
<p className={styles.personTitle}>{person.role}</p>
</div>
</div>
<div className={styles.modal} id={'modal' + index.toString()}
// onClick={(event) => {
// let modal = document.getElementById('modal' + index.toString());
// if (event.target == modal) {
// modal.style.display = "none";
// }
// }}
>
<div className={styles.personDetails}>
<div className={styles.personPhotoModal}>
<Image src={person.photo} alt={person.name}
height={150}
width={150} />
</div>
<div className={styles.personInfo}>
<h4 className={styles.personName}>{person.name} - {person.role} </h4>
<p className={styles.personTitle}>{person.text}</p>
</div>
</div>
</div></>
)
})}
</div>
</div>
</>);
import styles from '../../styles/team.module.scss';
import { DoubleArrowRotateIcon, MicroChipIcon, EarthIcon } from '../../components/icons';
import Image from 'next/image';
import team from '../../../data/team.json';


// 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';

export const metadata: Metadata = {
title: 'Quem somos - UFABC Rocket Design',
description: 'Where\'s the One Piece?',
}

const teamList = team.team;

export default function Team() {
return (<>

<div className={styles.container}>
<h1 className={styles.title}>Conheça a equipe</h1>
<p>As such I have no regrets in meeting you, friend. Should the day ever come that we are not together, you will continue to shine like gold in my memories. </p>
</div>

<div className={styles.container}>
<h2 className={styles.subTitle}>Nossos Valores</h2>
<div className={styles.valuesList}>
<div className={styles.valuesItem}>
<div className={styles.valuesIcon}><DoubleArrowRotateIcon /></div>
<p>Desenvolvimento de tecnologia de ponta</p>
</div>
<div className={styles.valuesItem}>
<div className={styles.valuesIcon}><MicroChipIcon /></div>
<p>Apoiando pesquisadores</p>
</div>
<div className={styles.valuesItem}>
<div className={styles.valuesIcon}><EarthIcon /></div>
<p>Projetos focados na melhoria da area aeroespacial</p>
</div>
</div>
</div>

<div className={styles.container}>
<h2 className={styles.subTitle}>Nosso Time</h2>
<div className={styles.team}>
{teamList.map((person, index) => {
return (
<>
<div className={styles.person}
// onClick={() => document.getElementById('modal' + index.toString())!.style.display = 'flex'}
>
<Image src={person.photo} alt={person.name}
height={1500}
width={1500}
style={{
width: "100%",
height: "auto",
aspectRatio: "1/1",
borderRadius: "50%",

}} />
<div >
<h4 className={styles.personName}>{person.name}</h4>
<p className={styles.personTitle}>{person.role}</p>
</div>
</div>
<div className={styles.modal} id={'modal' + index.toString()}
// onClick={(event) => {
// let modal = document.getElementById('modal' + index.toString());
// if (event.target == modal) {
// modal.style.display = "none";
// }
// }}
>
<div className={styles.personDetails}>
<div className={styles.personPhotoModal}>
<Image src={person.photo} alt={person.name}
height={150}
width={150} />
</div>
<div className={styles.personInfo}>
<h4 className={styles.personName}>{person.name} - {person.role} </h4>
<p className={styles.personTitle}>{person.text}</p>
</div>
</div>
</div></>
)
})}
</div>
</div>
</>);
}
68 changes: 34 additions & 34 deletions src/app/sponsors/page.tsx → src/app/apoio/page.tsx
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@

import { Metadata } from 'next';

import styles from '../../styles/sponsors.module.scss'
// Beginning of page with the current project featured, followed by a list of all projects

// import {sponsors} from '../../../data/sponsors.json'

export const metadata: Metadata = {
title: 'Patrocinadores - UFABC Rocket Design',
description: 'Where\'s the One Piece?',
}

export default function Sponsors() {
return (<>
<div className={styles.container}>
<h1 className={styles.title}>Todo agradecimento a nossos apoiadores</h1>
</div>

{/* TODO: Implementar como será mostrado os patrocinadores */}
<div className={styles.container}>

{/* {sponsors.map((sponsor, index) => {
return (<>
{/* <div class="col-lg-3 col-md-6 col-sm-6 single-logo">
<a href="https://www.gerdau.com.br/" target="_blank"><img class="img-fluid" src="img/logo/gerdau.png" alt="GERDAU" width="200px"></a>
</div>
</>);
})} */}


</div>
</>
)

import { Metadata } from 'next';

import styles from '../../styles/sponsors.module.scss'
// Beginning of page with the current project featured, followed by a list of all projects

// import {sponsors} from '../../../data/sponsors.json'

export const metadata: Metadata = {
title: 'Patrocinadores - UFABC Rocket Design',
description: 'Where\'s the One Piece?',
}

export default function Sponsors() {
return (<>
<div className={styles.container}>
<h1 className={styles.title}>Todo agradecimento a nossos apoiadores</h1>
</div>

{/* TODO: Implementar como será mostrado os patrocinadores */}
<div className={styles.container}>

{/* {sponsors.map((sponsor, index) => {
return (<>
{/* <div class="col-lg-3 col-md-6 col-sm-6 single-logo">
<a href="https://www.gerdau.com.br/" target="_blank"><img class="img-fluid" src="img/logo/gerdau.png" alt="GERDAU" width="200px"></a>
</div>
</>);
})} */}


</div>
</>
)
}
77 changes: 0 additions & 77 deletions src/app/joinus/page.tsx

This file was deleted.

Loading

0 comments on commit 95012b3

Please sign in to comment.