diff --git a/src/assets/pics/Leads/Jadens_face.jpg b/src/assets/pics/Leads/Jadens_face.jpg new file mode 100644 index 0000000..c3fcacf Binary files /dev/null and b/src/assets/pics/Leads/Jadens_face.jpg differ diff --git a/src/assets/pics/Leads/Jonah_Face.jpeg b/src/assets/pics/Leads/Jonah_Face.jpg similarity index 100% rename from src/assets/pics/Leads/Jonah_Face.jpeg rename to src/assets/pics/Leads/Jonah_Face.jpg diff --git a/src/assets/pics/Leads/roccos_face2.jpg b/src/assets/pics/Leads/roccos_face2.jpg new file mode 100644 index 0000000..bb97957 Binary files /dev/null and b/src/assets/pics/Leads/roccos_face2.jpg differ diff --git a/src/assets/pics/photo-gallery/rmc/comp-team-2024.jpg b/src/assets/pics/photo-gallery/rmc/comp-team-2024.jpg new file mode 100644 index 0000000..eeb481d Binary files /dev/null and b/src/assets/pics/photo-gallery/rmc/comp-team-2024.jpg differ diff --git a/src/data/RoboticsPhotoGalleryInfo.tsx b/src/data/RoboticsPhotoGalleryInfo.tsx index 26227f6..d1a1a42 100644 --- a/src/data/RoboticsPhotoGalleryInfo.tsx +++ b/src/data/RoboticsPhotoGalleryInfo.tsx @@ -3,28 +3,30 @@ import { GalleryImage } from '../pages/general/photo-gallery/PhotoGalleryStyles' // eslint-disable-next-line id-length const ROBOTICS_PHOTO_GALLERY_INFO: GalleryImage[] = [ - { image: RMC_PHOTO_GALLERY[0], title: '2023', description: 'The team after our first competition run at the University of Alabama.' }, - { image: RMC_PHOTO_GALLERY[1], title: '2023', description: `The leads in front of the project after finishing + { image: RMC_PHOTO_GALLERY[0], title: '2024', description: `The team before our first competition run at the University of + Central Florida.`}, + { image: RMC_PHOTO_GALLERY[1], title: '2023', description: 'The team after our first competition run at the University of Alabama.' }, + { image: RMC_PHOTO_GALLERY[2], title: '2023', description: `The leads in front of the project after finishing the outside construction.` }, - { image: RMC_PHOTO_GALLERY[2], title: '2023', description: `The team worked hard on the design in the fall semester, + { image: RMC_PHOTO_GALLERY[3], title: '2023', description: `The team worked hard on the design in the fall semester, then built the arena over winter break.` }, - { image: RMC_PHOTO_GALLERY[3], title: '2023', description: `A major goal of 2023 was to construct a practice arena + { image: RMC_PHOTO_GALLERY[4], title: '2023', description: `A major goal of 2023 was to construct a practice arena for the robot. Here is the team hard at work!` }, - { image: RMC_PHOTO_GALLERY[4], title: '2022', description: `The 2022 robot is coming together! No belts yet but the + { image: RMC_PHOTO_GALLERY[5], title: '2022', description: `The 2022 robot is coming together! No belts yet but the chasses is complete.` }, - { image: RMC_PHOTO_GALLERY[5], title: '2022', description: 'I guess our team has never heard of cable management...' }, - { image: RMC_PHOTO_GALLERY[6], title: '2022', description: `Us showing off JPL at the 30th anniversary of the NASA + { image: RMC_PHOTO_GALLERY[6], title: '2022', description: 'I guess our team has never heard of cable management...' }, + { image: RMC_PHOTO_GALLERY[7], title: '2022', description: `Us showing off JPL at the 30th anniversary of the NASA Space Grant.` }, - { image: RMC_PHOTO_GALLERY[7], title: '2018', description: 'Our ME\'s filing away to make sure everything fits perfectly.' }, - { image: RMC_PHOTO_GALLERY[8], title: '2018', description: 'BoxBot, of course we still love you.' }, - { image: RMC_PHOTO_GALLERY[9], title: '2017', description: `Our team plugged the ethernet cable into the wrong port. + { image: RMC_PHOTO_GALLERY[8], title: '2018', description: 'Our ME\'s filing away to make sure everything fits perfectly.' }, + { image: RMC_PHOTO_GALLERY[9], title: '2018', description: 'BoxBot, of course we still love you.' }, + { image: RMC_PHOTO_GALLERY[10], title: '2017', description: `Our team plugged the ethernet cable into the wrong port. Good thing duct tape fixes everything!` }, - { image: RMC_PHOTO_GALLERY[10], title: '2017', description: `Our hotel didn't like us working on the robot in our rooms. + { image: RMC_PHOTO_GALLERY[11], title: '2017', description: `Our hotel didn't like us working on the robot in our rooms. I guess we'll just use our vans.` }, - { image: RMC_PHOTO_GALLERY[11], title: '2011', description: `The year our team's autonomous was so good they had to + { image: RMC_PHOTO_GALLERY[12], title: '2011', description: `The year our team's autonomous was so good they had to change the rules.` }, - { image: RMC_PHOTO_GALLERY[12], title: '2010', description: 'Scoops was born.' }, - { image: RMC_PHOTO_GALLERY[13], title: '2009', description: 'Our first team at the very first Robotics Mining Competition.' } + { image: RMC_PHOTO_GALLERY[13], title: '2010', description: 'Scoops was born.' }, + { image: RMC_PHOTO_GALLERY[14], title: '2009', description: 'Our first team at the very first Robotics Mining Competition.' } ] export default ROBOTICS_PHOTO_GALLERY_INFO diff --git a/src/pages/general/contact/Contact.tsx b/src/pages/general/contact/Contact.tsx index c0aefaa..4505495 100644 --- a/src/pages/general/contact/Contact.tsx +++ b/src/pages/general/contact/Contact.tsx @@ -1,11 +1,12 @@ import React from 'react' import { BsHeartFill } from 'react-icons/bs' -import { FiFacebook, FiInstagram, FiMail, FiTwitter, FiYoutube } from 'react-icons/fi' +import { FiFacebook, FiInstagram, FiLinkedin, FiMail, FiTwitter, FiYoutube } from 'react-icons/fi' import { RiSnapchatLine } from 'react-icons/ri' import IconButton from '../button/IconButton' import Styles from './ContactStyles' + export default class Contact extends React.Component, never> { render (): React.ReactElement { return ( @@ -18,6 +19,7 @@ export default class Contact extends React.Component, neve } source={'https://snapchat.com/add/templerobotics'} /> } source={'https://www.youtube.com/channel/UCv59XUAVDLtgk0KA9r4RTsA'} /> } source={'Mailto:Temple.Robotics@outlook.com'} /> + } source={ 'https://www.linkedin.com/company/temple-robotics/posts/?feedView=all'}/> ) diff --git a/src/pages/home/Home.tsx b/src/pages/home/Home.tsx index a9923e8..3fa690e 100644 --- a/src/pages/home/Home.tsx +++ b/src/pages/home/Home.tsx @@ -40,7 +40,7 @@ const Home = (): React.ReactElement => {

Sign up for volunteering and contact us on teams!

-
diff --git a/src/pages/meet-the-leads/MeetTheLeads.tsx b/src/pages/meet-the-leads/MeetTheLeads.tsx index ae23bff..ffbb842 100644 --- a/src/pages/meet-the-leads/MeetTheLeads.tsx +++ b/src/pages/meet-the-leads/MeetTheLeads.tsx @@ -10,13 +10,13 @@ import Contact from '../general/contact/Contact' import Styles from './MeetTheLeadsStyles' // Images -import JaredsFace from '../../assets/pics/Leads/jareds_face.jpg' import TanishkasFace from '../../assets/pics/Leads/Tanishkas_face.jpg' import RoccosFace from '../../assets/pics/Leads/roccos_face.jpg' import MalinsFace from '../../assets/pics/Leads/Malins_face.jpg' import BriansFace from '../../assets/pics/Leads/Brians_face.jpg' import AlessiasFace from '../../assets/pics/Leads/Alessia_headshot.png' -import JonahsFace from '../../assets/pics/Leads/Jonah_Face.jpeg' +import JonahsFace from '../../assets/pics/Leads/Jonah_Face.jpg' +import JadensFace from '../../assets/pics/Leads/Jadens_face.jpg' // a separator is needed for some reason, troubleshoot this or create a very small section div or style this like the robotics page //use robotics format //bakround is implemented but sections are not made to be compatible, change to gallery sections @@ -43,8 +43,7 @@ const MeetTheLeads = (): React.ReactElement => {
-

Meet our Vice President

-

and Website Manager!

+

Meet our Vice President!

Malin Kussi

@@ -52,11 +51,11 @@ const MeetTheLeads = (): React.ReactElement => {

Meet our Electrical Lead!

- Jared Levin + Jaden Howard

- +
diff --git a/src/pages/robotic-mining/RoboticMiningStyles.tsx b/src/pages/robotic-mining/RoboticMiningStyles.tsx index 783f1f9..805ae6b 100644 --- a/src/pages/robotic-mining/RoboticMiningStyles.tsx +++ b/src/pages/robotic-mining/RoboticMiningStyles.tsx @@ -8,7 +8,7 @@ export const MEET_THE_TEAM: GalleryImage[] = [ { image: RMC_TEAM[0], title: 'Dr. John Helferty', description: 'Head Advisor' }, { image: RMC_TEAM[1], title: 'Rocco Gruzman', description: 'Robotic\'s President' }, { image: RMC_TEAM[2], title: 'Malin Kussi', description: 'Vice President' }, - { image: RMC_TEAM[3], title: 'Jared Levin', description: 'Electrical Lead' }, + { image: RMC_TEAM[3], title: 'Jaden Howard', description: 'Electrical Lead' }, { image: RMC_TEAM[4], title: 'Alessia Smith', description: 'Mechanical Lead' }, { image: RMC_TEAM[5], title: 'Brian Ervin', description: 'Programming Lead' }, { image: RMC_TEAM[6], title: 'Tanishka Shah', description: 'Project Manager' }, diff --git a/src/pages/sponsors/Sponsors.tsx b/src/pages/sponsors/Sponsors.tsx index d0b9834..0d7bcc7 100644 --- a/src/pages/sponsors/Sponsors.tsx +++ b/src/pages/sponsors/Sponsors.tsx @@ -15,6 +15,7 @@ import Contact from '../general/contact/Contact' // Custom styles import Styles, { SponsorImages } from './SponsorsStyles' + const Sponsors = (): React.ReactElement => { return ( @@ -22,10 +23,15 @@ const Sponsors = (): React.ReactElement => {

Sponsors

+ +
+
+

Current Sponsors

-
diff --git a/src/pages/sponsors/SponsorsStyles.tsx b/src/pages/sponsors/SponsorsStyles.tsx index 6507bbb..97be8e8 100644 --- a/src/pages/sponsors/SponsorsStyles.tsx +++ b/src/pages/sponsors/SponsorsStyles.tsx @@ -60,4 +60,21 @@ export default class SponsorsStyles { ${FONT_FAMILY.PAGE_TITLE} } ` + + static readonly SectionHeader = styled.div` + display: flex; + justify-content: center; + width: 100%; + flex-direction: column; + row-gap: 10%; + height: 80%; + align-self: center; + + & > .button-container { + width: 100%; + display: flex; + column-gap: 10%; + justify-content: center; + } + ` } diff --git a/src/tools/Constants.tsx b/src/tools/Constants.tsx index 3fe5a77..2cbbc16 100644 --- a/src/tools/Constants.tsx +++ b/src/tools/Constants.tsx @@ -34,14 +34,15 @@ export const RMC_TEAM = [ require('../assets/pics/team/john-helferty.jpg'), require('../assets/pics/Leads/roccos_face.jpg'), require('../assets/pics/Leads/Malins_face.jpg'), - require('../assets/pics/Leads/jareds_face.jpg'), + require('../assets/pics/Leads/Jadens_face.jpg'), require('../assets/pics/Leads/Alessia_headshot.png'), require('../assets/pics/Leads/Brians_face.jpg'), require('../assets/pics/Leads/Tanishkas_face.jpg'), - require('../assets/pics/Leads/Jonah_Face.jpeg') + require('../assets/pics/Leads/Jonah_Face.jpg') ] export const RMC_PHOTO_GALLERY = [ + require('../assets/pics/photo-gallery/rmc/comp-team-2024.jpg'), require('../assets/pics/photo-gallery/rmc/comp-team-2023.jpg'), require('../assets/pics/photo-gallery/rmc/arena-3.jpeg'), require('../assets/pics/photo-gallery/rmc/arena-2.jpeg'),