Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump #109

Merged
merged 5 commits into from
Oct 13, 2024
Merged

bump #109

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed public/assets/board/Alan.webp
Binary file not shown.
Binary file added public/assets/board/Albert.webp
Binary file not shown.
Binary file added public/assets/board/Alexander.webp
Binary file not shown.
Binary file added public/assets/board/Brandon.webp
Binary file not shown.
Binary file added public/assets/board/BrandonM.webp
Binary file not shown.
Binary file added public/assets/board/Carlos.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/assets/board/George.webp
Binary file not shown.
Binary file added public/assets/board/James.webp
Binary file not shown.
Binary file added public/assets/board/Jaskaran.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/assets/board/Javen.webp
Binary file not shown.
Binary file modified public/assets/board/Joel.webp
Binary file not shown.
Binary file removed public/assets/board/Jordy.webp
Binary file not shown.
Binary file modified public/assets/board/Khulan.webp
Binary file not shown.
Binary file removed public/assets/board/Lawrence.webp
Binary file not shown.
Binary file added public/assets/board/Marcus.webp
Binary file not shown.
Binary file modified public/assets/board/Marlon.webp
Binary file not shown.
Binary file modified public/assets/board/Mehmet.webp
Binary file not shown.
Binary file added public/assets/board/Stephanie.webp
Binary file not shown.
Binary file removed public/assets/board/Theopolis.webp
Binary file not shown.
Binary file removed public/assets/board/Uma.webp
Binary file not shown.
Binary file added public/assets/donate/sponsors/altium.webp
Binary file not shown.
6 changes: 3 additions & 3 deletions src/components/board/Profile.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ const Profile = ({
<Image
src={image}
alt="Picture of board member"
className="mt-3 mr-auto ml-auto"
className="mt-3 mr-auto ml-auto rounded-xl border-black border-3 h-[220px] w-[233px]"
/>
<div className="ml-5">
<div className="font-bold font-montserrat text-xl mt-3">{name}</div>
<div className="text-l font-urbanist">{title}</div>
<div className="flex space-x-2 ">
<Link href={"mailto:" + email}>
<Link href={"mailto:" + email} target="_blank">
<MdEmail className="h-8 w-8 text-slate-800 hover:opacity-70" />
</Link>
<Link href={linkedin}>
<Link href={linkedin} target="_blank">
<GrLinkedinOption className="h-7 w-7 text-slate-800 hover:opacity-70" />
</Link>
</div>
Expand Down
11 changes: 5 additions & 6 deletions src/components/donate/Contact.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,15 @@ const Contact = () => {
<div className=" font-sans text-base lg:text-lg mt-4">
<div className="mb-4">[email protected] </div>

<div className="font-extrabold">Javen Dosanjh</div>
<div className="font-extrabold">Brandon Tabata</div>

<div>President/Chief Engineer</div>
<div> [email protected]</div>
<div>(916)-840-8409</div>
<div>President</div>
<div>[email protected]</div>

<div className="font-extrabold mt-4">Jordy Hendra</div>
<div className="font-extrabold mt-4">Albert Dela Rosa</div>

<div>Vice President</div>
<div>jhend060@ucr.edu</div>
<div>adela056@ucr.edu</div>

<div className="mt-4">Winston Chung Hall, 446</div>

Expand Down
2 changes: 1 addition & 1 deletion src/components/donate/Sponsors.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const Sponsors = ({ logos }) => {
key={index}
className="flex flex-wrap m-2 hover:cursor-pointer hover:scale-105"
>
<Link href={logos.link}>
<Link href={logos.link} target="_blank">
<Image src={logos.img} alt={""} width={250} height={200} />
</Link>
</div>
Expand Down
138 changes: 80 additions & 58 deletions src/data/Board.js
Original file line number Diff line number Diff line change
@@ -1,96 +1,118 @@
import Javen from "../../public/assets/board/Javen.webp";
import Jordy from "../../public/assets/board/Jordy.webp";
import Lawrence from "../../public/assets/board/Lawrence.webp";
import George from "../../public/assets/board/George.webp";
import Alan from "../../public/assets/board/Alan.webp";
import Brandon from "../../public/assets/board/Brandon.webp";
import Stephanie from "../../public/assets/board/Stephanie.webp";
import Albert from "../../public/assets/board/Albert.webp";
import BrandonM from "../../public/assets/board/BrandonM.webp";
import Marcus from "../../public/assets/board/Marcus.webp";
import Alexander from "../../public/assets/board/Alexander.webp";
import Joel from "../../public/assets/board/Joel.webp";
import Khulan from "../../public/assets/board/Khulan.webp";
import Marlon from "../../public/assets/board/Marlon.webp";
import Mehmet from "../../public/assets/board/Mehmet.webp";
import Theopolis from "../../public/assets/board/Theopolis.webp";
import Uma from "../../public/assets/board/Uma.webp";
import Carlos from "../../public/assets/board/Carlos.JPG";
import James from "../../public/assets/board/James.webp";
import Jaskaran from "../../public/assets/board/Jaskaran.JPG";

export const BOARD = [
[
{
name: "Javen Dosanjh",
email: "jdosa001@ucr.edu",
title: "Chief Engineer, Operations President",
image: Javen,
year: "4th year",
name: "Brandon Tabata",
email: "btaba002@ucr.edu",
title: "Operations President",
image: Brandon,
year: "5th year",
major: "Mechanical Engineering",
pronouns: "He/Him/His",
linkedin: "https://www.linkedin.com/in/javendosanjh/",
linkedin: "https://www.linkedin.com/in/brandontabata/",
},
{
name: "Jordy Hendra",
email: "jhend060@ucr.edu",
title: "Vice President",
image: Jordy,
year: "2nd year",
name: "Stephanie Chang",
email: "schan406@ucr.edu",
title: "Chief Engineer",
image: Stephanie,
year: "3rd year",
major: "Mechanical Engineering",
pronouns: "He/Him/His",
linkedin: "https://www.linkedin.com/in/jordy-hendra/",
pronouns: "She/Her/Hers",
linkedin: "https://www.linkedin.com/in/stephchang594/",
},
{
name: "Lawrence Aboukhalil",
email: "labou003@ucr.edu",
title: "Systems Engineering Lead",
image: Lawrence,
name: "Albert Dela Rosa",
email: "adela056@ucr.edu",
title: "Vice President of Operations",
image: Albert,
year: "4th year",
major: "Chemical Engineering",
major: "Mechanical Engineering",
pronouns: "He/Him/His",
linkedin: "https://www.linkedin.com/in/lawrence-aboukhalil-16b358267/",
linkedin: "https://www.linkedin.com/in/albertdelarosa/",
},
{
name: "Uma Akundi",
email: "uakun001@ucr.edu",
name: "Jaskaran Shekhon",
email: "jshek005@ucr.edu",
title: "Social Media Lead",
image: Uma,
image: Jaskaran,
year: "2nd year",
major: "Computer Engineering",
pronouns: "She/Her/Hers",
linkedin: "linkedin.com",
pronouns: "He/Him/His",
linkedin: "https://www.linkedin.com/in/jaskaran-shekhon-24850b21a/",
},
],
[
{
name: "Alan Li",
email: "ali184@ucr.edu",
title: "Structure Team Lead",
image: Alan,
year: "2nd year",
major: "Mechanical Engineering",
name: "Brandon Marcus",
email: "bmarc018@ucr.edu",
title: "Systems Engineering Lead",
image: BrandonM,
year: "4th year",
major: "Robotics Engineering",
pronouns: "He/Him/His",
linkedin: "https://www.linkedin.com/in/alan-li-4161301b9/",
linkedin: "https://www.linkedin.com/in/brandon-marcus-162355130/",
},
{
name: "Alexander Dobmeier",
email: "[email protected]",
title: "Controls Lead",
image: Alexander,
year: "4th year",
major: "Computer Science",
pronouns: "He/Him/His",
linkedin: "https://www.linkedin.com/in/alexander-dobmeier",
},
{
name: "Khulan Bayarsaikhan",
email: "[email protected]",
title: "Combustion Devices Team Lead",
title: "Combustion Devices Lead",
image: Khulan,
year: "2nd year",
year: "3rd year",
major: "Mechanical Engineering",
pronouns: "She/Her/Hers",
linkedin: "https://www.linkedin.com/in/khulan-b-7a3a48256/",
},
{
name: "Theopolis Armstrong",
email: "[email protected]",
title: "Avionics Co-Lead",
image: Theopolis,
name: "Carlos Rio",
email: "[email protected]",
title: "Airframe Co-Lead",
image: Carlos,
year: "3rd year",
major: "Mechanical Engineering",
pronouns: "He/Him/His",
linkedin: "https://www.linkedin.com/in/carlos-rios-43a727236/",
},
{
name: "James Notley",
email: "[email protected]",
title: "Airframe Co-Lead",
image: James,
year: "2nd year",
major: "Computer Science",
pronouns: "They/Them/Theirs",
linkedin: "https://www.linkedin.com/in/theopolis-armstrong-iii/",
major: "Materials Science",
pronouns: "He/Him/His",
linkedin: "https://www.linkedin.com/in/jamesnotley/",
},
{
name: "Marlon Lopez",
email: "[email protected]",
title: "Avionics Co-Lead",
title: "DAQ Lead",
image: Marlon,
year: "2nd year",
major: "Computer Science",
year: "3rd year",
major: "Computer Engineering",
pronouns: "He/Him/His",
linkedin: "https://www.linkedin.com/in/marlon-lopez-0a4b62298/",
},
Expand All @@ -99,27 +121,27 @@ export const BOARD = [
email: "[email protected]",
title: "Payload Lead",
image: Joel,
year: "2nd year",
year: "3rd year",
major: "Mechanical Engineering",
pronouns: "He/Him/His",
linkedin: "https://www.linkedin.com/in/joel-liu-a896ba253/",
},
{
name: "George Herrera",
email: "gherr026@ucr.edu",
name: "Marcus Jun Dumlao",
email: "mduml003@ucr.edu",
title: "Fluid Systems Lead",
image: George,
year: "4th year",
major: "Chemical Engineering",
image: Marcus,
year: "3rd year",
major: "Mechanical Engineering",
pronouns: "He/Him/His",
linkedin: "https://www.linkedin.com/in/gherrera0007/",
linkedin: "https://www.linkedin.com/in/marcusjnd/",
},
{
name: "Mehmet Aydin Aktas",
email: "[email protected]",
title: "Recovery Team Lead",
image: Mehmet,
year: "3rd year",
year: "4th year",
major: "Mechanical Engineering",
pronouns: "He/Him/His",
linkedin: "https://www.linkedin.com/in/mehmet-a-aktas/",
Expand Down
5 changes: 5 additions & 0 deletions src/data/Sponsors.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
import Logo1 from "../../public/assets/donate/sponsors/gcap.webp";
import Logo2 from "../../public/assets/donate/sponsors/altium.webp";

const logos = [
{
img: Logo1,
link: "https://www.gcapucr.com/",
},
{
img: Logo2,
link: "https://www.altium.com/",
},
];
export default logos;
Loading