Skip to content

Commit

Permalink
Merge pull request #5 from fusion479/team
Browse files Browse the repository at this point in the history 
kayden working on about and robots page
  • Loading branch information
@notkayz
notkayz authored Jan 4, 2025
2 parents 07e3218 + 55a7454 commit 48b1db7
Show file tree
Hide file tree
Showing 8 changed files with 105 additions and 160 deletions.
Binary file added public/team/jason.jpg
View file
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/team/owen.jpg
View file
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/team/zachary.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions src/app/about/components/Team/Executives.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@ export default function Executives() {
<div className="gap-10 grid auto-rows-fr grid-cols-1 sm:grid-cols-2">
{new Array(
{
name: "Daniel Xu",
name: "Victoria Reguyal",
role: "President",
avatar,
description:
"Robotics and technology have fascinated me ever since I was a child. Joining 479 as a sophomore, I was a little late to the party, but I felt like I was still welcomed and encouraged to learn just like everyone else. The adrenaline you get watching the team succeed is unlike any other, and you feel kind of proud in a way. FTC has allowed me to develop my skills as an amateur engineer, machinist, software developer, and team leader, and has made me into a more well-rounded individual.",
"I’m a senior and I joined Team 479 as a freshman to learn about engineering and electronics while having fun with robots. Though I’ve been interested in STEM since elementary school, I started out with hardly any relevant experience. But in FTC, I have been a part of a warm community with people who push each other to learn and achieve more. Outside of school, I like to spend my time reading, playing games, and exploring the city.",
},

{
name: "Victoria Reguyal",
name: "Megan Chan",
role: "Vice President",
avatar,
description:
"I’m a junior and I joined Team 479 as a freshman to learn about engineering and electronics while having fun with robots. Though I’ve been interested in STEM since elementary school, I started out with hardly any relevant experience. But in FTC, I have been a part of a warm community with people who push each other to learn and achieve more. Outside of school, I like to spend my time reading, playing games, and exploring the city.",
"I joined the team as a sophomore, looking to learn more about mechanical engineering and electronics. Participating in the late-night meetings, I learned more about engineering and FTC in general. Learning from others, I began to take a role in our team for engineering. I’m excited to continue learning about robotics and strive to better my engineering skills to lead the engineering aspect of the team. Outside of school, I really enjoy sleeping in, playing video games, and buying weird snacks to try with friends.",
},
).map((v, i) => (
<div
Expand Down
21 changes: 12 additions & 9 deletions src/app/about/components/Team/Heads.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,34 @@
import Image from "next/image";
import avatar from "../../../../../public/team/avatar.webp";
import owen from "../../../../../public/team/owen.jpg"
import jason from "../../../../../public/team/jason.jpg"

export default function Heads() {
return (
<div className="gap-10 grid auto-rows-fr grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 mt-20">
{new Array(
{
name: "Megan Chan",
name: "Jason Zhao",
role: "Head of Engineering",
avatar,
avatar: jason,
description:
"I joined the team as a sophomore, looking to learn more about mechanical engineering and electronics. Participating in the late-night meetings, I learned more about engineering and FTC in general. Learning from others, I began to take a role in our team for engineering. I’m excited to continue learning about robotics and strive to better my engineering skills to lead the engineering aspect of the team. Outside of school, I really enjoy sleeping in, playing video games, and buying weird snacks to try with friends.",
"jason desc",
},

{
name: "Princeden Hom",
name: "Owen Shi",
role: "Head of Programming",
avatar,
avatar: owen,
description:
"I first joined the team as sophmore, interested to learn more about software engineering. I had never been a part of a robotics team in the past, and I decided to join Team 479 by pure chance. I started with zero knowledge of programming or robotics, but over the course of the year I was able to learn enough from veteran members of the team and hands on experience with the robot, to become the head of SE this year. I’m excited to continue to develop both my leadership and robotics skills by continuing to help lead our software efforts, and hope to continue the spirit of the team by teaching new members.",
"I joined Stuy Fusion a little late, as a sophomore, unsure of where I could contribute. Determined to help out, I quickly immersed myself in learning FTC software and discovered my passion for programming and problem-solving. Being part of Stuy Fusion has sharpened my technical skills and taught me the value of collaboration and perseverance. Outside of robotics, I enjoy playing video games and swimming, both of which help me unwind and stay motivated in everything I do.",
},

{
name: "Khin Aung",
name: "Elizabeth Chen",
role: "Head of Marketing",
avatar,
description:
"As the Head of Marketing for Stuy Fusion, FTC Team 479, I combine my marketing skills with my enthusiasm for robotics. My interests in osu, EDM, and J-Pop inspire my creative approaches, helping me design campaigns that appeal to a broad audience. In this role, I enjoy blending my technical knowledge with current cultural trends, making every project an exciting challenge and an opportunity to connect with others who share my passions.",
"elizabeth desc"
},
).map((v, i) => (
<div
Expand All @@ -34,7 +37,7 @@ export default function Heads() {
>
<div className="flex justify-center pb-8">
<Image
src={avatar}
src={v.avatar}
height={164}
width={164}
alt="img"
Expand Down
33 changes: 19 additions & 14 deletions src/app/about/components/Team/Members.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,31 @@
import Image from "next/image";
import avatar from "../../../../../public/team/avatar.webp";
import zachary from "../../../../../public/team/zachary.jpg";

export default function Members() {
return (
<div className="gap-10 grid auto-rows-fr grid-cols-2 sm:grid-cols-2 lg:grid-cols-4 mt-20">
{[
{ name: "Brandon Ngyuen", role: "Rookie Programmer" },
{ name: "Owen Shi", role: "Rookie Programmer" },
{ name: "Stephen Chen", role: "Rookie Engineer" },
{ name: "Kayden Au", role: "Rookie Engineer" },
{ name: "Xuan Yao", role: "Rookie Engineer" },
{ name: "Zachary Aaron", role: "Rookie Engineer" },
{ name: "Kiran Yesley", role: "Rookie Engineer" },
{ name: "Jason Zhao", role: "Rookie Engineer" },
{ name: "Elizabeth Chen", role: "Rookie Engineer" },
{ name: "Kelly Lin", role: "Rookie Engineer" },
{ name: "Ryan Kim", role: "Rookie Engineer" },
].map((v, i) => (
{new Array(
{ name: "Ryan Kim", role: "Driver", avatar, },
{ name: "Kelly Lin", role: "Driver", avatar, },
{ name: "Kiran Yesley", role: "Coach", avatar, },
{ name: "Brandon Ngyuen", role: "Veteran Programmer", avatar, },
{ name: "Stephen Chen", role: "Veteran Engineer", avatar, },
{ name: "Kayden Au", role: "Veteran Engineer", avatar, },
{ name: "Zachary Aaron", role: "Veteran Engineer", avatar: zachary, },
{ name: "Aidan Gray", role: "Rookie Engineer", avatar, },
{ name: "Cassandra Chan", role: "Rookie Programmer", avatar, },
{ name: "Erica You", role: "Rookie Engineer", avatar, },
{ name: "Izo Kawaguchi", role: "Rookie Engineer", avatar, },
{ name: "Gus Hurwitz", role: "Rookie Engineer", avatar, },
{ name: "Tasfia Bideeta", role: "Rookie Engineer", avatar, },


).map((v, i) => (
<div key={i}>
<div className="justify-center pb-8 grid place-items-center">
<Image
src={avatar}
src={v.avatar}
height={100}
width={100}
alt="img"
Expand Down
200 changes: 68 additions & 132 deletions src/app/robots/components/Robots/Info.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,187 +4,123 @@ import { act } from "react-dom/test-utils";

const info = [
{
name: "[CENTERSTAGE NAME]",
name: "[INTO THE DEEP NAME]",
image: powerplay,
description: `Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim
veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint
occaecat cupidatat non proident, sunt in culpa qui officia deserunt
mollit anim id est laborum. tion ullamco laboris nisi ut aliquip ex ea
commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint
occaecat cupidatat non proident, sunt in culpa qui officia deserunt
mollit anim id est laborum.`,
description: `fake rectangles womp womp`,
awards: [
" NYC Qualifier 3 Design Award",
" NYC Qualifier 5 Winning Alliance",
" NYC Super Qualifier Innovate Award",
" NYC Super Qualifier Inspire Award 2nd place",
" NYC Championship Motivate Award",
"NYC Qualifier 2 Think Award Winner",
],
videos: [
" NYC Qualifier 3 Design Award",
"NYC Qualifier 5 Winning Alliance",
"NYC Super Qualifier Innovate Award",
"NYC Super Qualifier Inspire Award 2nd place",
"NYC Championship Motivate Award",

],
code: [
"NYC Qualifier 3 Design Award",
"NYC Qualifier 5 Winning Alliance",
"NYC Super Qualifier Innovate Award",
"NYC Super Qualifier Inspire Award 2nd place",
"NYC Championship Motivate Award",

],
},
{
name: "[THEO]",
image: powerplay,
description: `hexagons are the bestagons`,
awards: [
"NYC Qualifier 2 Think Award Winner",
"NYC Qualifier 2 Design Award 3rd Place",
"NYC Qualifier 4 Think Award Winner",
"NYC Super Qualifiers 1 Finalist Alliance 1st Pick",
"NYC Super Qualifiers 1 Think Award Winner",
"NYC Championship Finalist Alliance Captain",
"NYC Championship Finalist Design Award 3rd Place",
"NYC Championship Finalist Promote Award Winner",
],
videos: [
<b><a href= "https://youtu.be/1cGlKInUGVw?si=k56MmKQ53QeEoi6n"> Centerstage MTI Submission </a></b>,
<b><a href= "https://youtu.be/ECyHcyyOW_I?si=x4e9TfUC0rPLX4vL"> NYC Championship Promote Award </a></b>,
],
code: [

],
},

{
name: "[POWERPLAY NAME]",
name: "[STEVEN]",
image: powerplay,
description: `Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim
veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint
occaecat cupidatat non proident, sunt in culpa qui officia deserunt
mollit anim id est laborum. tion ullamco laboris nisi ut aliquip ex ea
commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint
occaecat cupidatat non proident, sunt in culpa qui officia deserunt
mollit anim id est laborum.`,
description: `stack cup`,
awards: [
" NYC Qualifier 3 Design Award",
" NYC Qualifier 5 Winning Alliance",
" NYC Super Qualifier Innovate Award",
" NYC Super Qualifier Inspire Award 2nd place",
" NYC Championship Motivate Award",
"NYC Qualifier 3 Think Award 2nd Place",
"NYC Qualifier 3 Design Award Winner",
"NYC Qualifier 5 Winning Alliance 1st Pick",
"NYC Super Qualifier 2 Inspire Award 2nd Place",
"NYC Super Qualifier 2 Finalist Alliance 2nd Pick",
"NYC Super Qualifier 2 Innovate Award Winner",
"NYC Championship Inspire Award 3rd Place",
"NYC Championship Finalist Alliance 1st Pick",
"NYC Championship Motivate Award Winner",
],
videos: [
" NYC Qualifier 3 Design Award",
"NYC Qualifier 5 Winning Alliance",
"NYC Super Qualifier Innovate Award",
"NYC Super Qualifier Inspire Award 2nd place",
"NYC Championship Motivate Award",
<b><a href= "https://youtu.be/iQ7rFubse38?si=W5AwveR3rZ7It94y"> Powerplay MTI Submission </a></b>,
],
code: [
"NYC Qualifier 3 Design Award",
"NYC Qualifier 5 Winning Alliance",
"NYC Super Qualifier Innovate Award",
"NYC Super Qualifier Inspire Award 2nd place",
"NYC Championship Motivate Award",

],
},

{
name: "[FREIGHT FRENZY NAME]",
image: powerplay,
description: `Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim
veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint
occaecat cupidatat non proident, sunt in culpa qui officia deserunt
mollit anim id est laborum. tion ullamco laboris nisi ut aliquip ex ea
commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint
occaecat cupidatat non proident, sunt in culpa qui officia deserunt
mollit anim id est laborum.`,
description: `train car woo`,
awards: [
" NYC Qualifier 3 Design Award",
" NYC Qualifier 5 Winning Alliance",
" NYC Super Qualifier Innovate Award",
" NYC Super Qualifier Inspire Award 2nd place",
" NYC Championship Motivate Award",
"NYC Qualifier 3 Winning Alliance 1st Pick",
"NYC Qualifier 3 Design Award Winner",
"NYC Qualifier 5 Inspire Award 2nd Place",
"NYC Qualifier 5 Winning Alliance Captain",
"NYC Qualifier 5 Think Award 3rd Place",
"NYC Qualifier 5 Control Award Winner",
"NYC Qualifier 5 Design Award 3rd Place",
"NYC Championship Innovate Award 2nd Place",
],
videos: [
" NYC Qualifier 3 Design Award",
"NYC Qualifier 5 Winning Alliance",
"NYC Super Qualifier Innovate Award",
"NYC Super Qualifier Inspire Award 2nd place",
"NYC Championship Motivate Award",
<b><a href= "https://youtu.be/eH5ao59nbVw?si=0V4ii-xrdjf4FPQK"> Freight Frenzy MTI Submission </a></b>,
],
code: [
"NYC Qualifier 3 Design Award",
"NYC Qualifier 5 Winning Alliance",
"NYC Super Qualifier Innovate Award",
"NYC Super Qualifier Inspire Award 2nd place",
"NYC Championship Motivate Award",

],
},

{
name: "[ULTIMATE GOAL NAME]",
image: powerplay,
description: `Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim
veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint
occaecat cupidatat non proident, sunt in culpa qui officia deserunt
mollit anim id est laborum. tion ullamco laboris nisi ut aliquip ex ea
commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint
occaecat cupidatat non proident, sunt in culpa qui officia deserunt
mollit anim id est laborum.`,
description: `frc 2023 but smaller`,
awards: [
" NYC Qualifier 3 Design Award",
" NYC Qualifier 5 Winning Alliance",
" NYC Super Qualifier Innovate Award",
" NYC Super Qualifier Inspire Award 2nd place",
" NYC Championship Motivate Award",
"NYC Qualifying Tournament 2 Top Ranked First Place",
"NYC Qualifying Tournament 2 Innovate Award Winner",
"NYC Qualifying Tournament 2 Design Award 2nd Place",
"NYC Championship Tournament Top Ranked 4th Place",
"NYC Championship Tournament Innovate Award Winner",
],
videos: [
" NYC Qualifier 3 Design Award",
"NYC Qualifier 5 Winning Alliance",
"NYC Super Qualifier Innovate Award",
"NYC Super Qualifier Inspire Award 2nd place",
"NYC Championship Motivate Award",

],
code: [
"NYC Qualifier 3 Design Award",
"NYC Qualifier 5 Winning Alliance",
"NYC Super Qualifier Innovate Award",
"NYC Super Qualifier Inspire Award 2nd place",
"NYC Championship Motivate Award",

],
},

{
name: "[SKYSTONE NAME]",
image: powerplay,
description: `Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim
veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint
occaecat cupidatat non proident, sunt in culpa qui officia deserunt
mollit anim id est laborum. tion ullamco laboris nisi ut aliquip ex ea
commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint
occaecat cupidatat non proident, sunt in culpa qui officia deserunt
mollit anim id est laborum.`,
description: `lego but ftc`,
awards: [
" NYC Qualifier 3 Design Award",
" NYC Qualifier 5 Winning Alliance",
" NYC Super Qualifier Innovate Award",
" NYC Super Qualifier Inspire Award 2nd place",
" NYC Championship Motivate Award",
"NYC Qualifier 2 Finalist Alliance 1st Pick",
"NYC Qualifier 2 Think Award Winner",
"NYC Super Qualifier 1 Finalist Alliance 1st Pick",
"NYC Super Qualifier 1 Connect Award Winner",
"NYC Championship Connect Award 3rd Place",
"NYC Championship Design Award 2nd Place",
],
videos: [
" NYC Qualifier 3 Design Award",
"NYC Qualifier 5 Winning Alliance",
"NYC Super Qualifier Innovate Award",
"NYC Super Qualifier Inspire Award 2nd place",
"NYC Championship Motivate Award",

],
code: [
"NYC Qualifier 3 Design Award",
"NYC Qualifier 5 Winning Alliance",
"NYC Super Qualifier Innovate Award",
"NYC Super Qualifier Inspire Award 2nd place",
"NYC Championship Motivate Award",

],
},
];
Expand Down
3 changes: 2 additions & 1 deletion src/app/robots/components/Robots/Timeline.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export default function Timeline({
return (
<div className="border-l hidden xl:block pl-2">
{[
"Into The Deep",
"Centerstage",
"Powerplay",
"Freight Frenzy",
Expand All @@ -24,7 +25,7 @@ export default function Timeline({
className={`inline-block tracking-widest rounded-lg font-light text-xs mr-2 text-gray-500
${i === active && "text-blue-700"}`}
>
{2023 - i}:
{2024 - i}:
</span>
<button
className={`relative block px-4 py-2 my-4 rounded-lg hover:bg-blue-100 hover:-translate-y-0.5 hover:text-blue-600 duration-150 ${i === active ? "bg-blue-50 text-blue-600" : "text-slate-700"
Expand Down

0 comments on commit 48b1db7

Please sign in to comment.