Skip to content
Merged
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 added src/assets/pics/Leads/Jadens_face.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 added src/assets/pics/Leads/roccos_face2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 16 additions & 14 deletions src/data/RoboticsPhotoGalleryInfo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,30 @@ import { GalleryImage } from '../pages/general/photo-gallery/PhotoGalleryStyles'

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wouldn't add this as a new variable. I would just put it inline like the others like on like 8 and 9

// 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
Expand Down
4 changes: 3 additions & 1 deletion src/pages/general/contact/Contact.tsx
Original file line number Diff line number Diff line change
@@ -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<Record<string, never>, never> {
render (): React.ReactElement {
return (
Expand All @@ -18,6 +19,7 @@ export default class Contact extends React.Component<Record<string, never>, neve
<IconButton icon={<RiSnapchatLine/>} source={'https://snapchat.com/add/templerobotics'} />
<IconButton icon={<FiYoutube/>} source={'https://www.youtube.com/channel/UCv59XUAVDLtgk0KA9r4RTsA'} />
<IconButton icon={<FiMail/>} source={'Mailto:Temple.Robotics@outlook.com'} />
<IconButton icon={<FiLinkedin/>} source={ 'https://www.linkedin.com/company/temple-robotics/posts/?feedView=all'}/>
</div>
</Styles.ContactContainer>
)
Expand Down
2 changes: 1 addition & 1 deletion src/pages/home/Home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const Home = (): React.ReactElement => {
<Styles.SectionHeader>
<h2>Sign up for volunteering and contact us on teams!</h2>
<div className='button-container'>
<Button text={'Sign up for volunteering here!'} size={'large'} source={'https://forms.gle/1RcJw5DNXHVX2YzD8'}/>
<Button text={'Sign up to Volunteer'} size={'large'} source={'https://forms.gle/1RcJw5DNXHVX2YzD8'}/>
<Button text='Join Teams Here!' source={TEAMS}/>
</div>
</Styles.SectionHeader>
Expand Down
11 changes: 5 additions & 6 deletions src/pages/meet-the-leads/MeetTheLeads.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -43,20 +43,19 @@ const MeetTheLeads = (): React.ReactElement => {
<img src={ MalinsFace }/>
</div>
<div className='leads-slide'>
<h2>Meet our Vice President</h2>
<h2> and Website Manager!</h2>
<h2>Meet our Vice President!</h2>
<p>
Malin Kussi
</p>
</div>
<div className='leads-slide'>
<h2>Meet our Electrical Lead!</h2>
<p>
Jared Levin
Jaden Howard
</p>
</div>
<div className='Leads-img-container'>
<img src={ JaredsFace }/>
<img src={ JadensFace }/>
</div>
<div className='Leads-img-container'>
<img src={ AlessiasFace}/>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/robotic-mining/RoboticMiningStyles.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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' },
Expand Down
10 changes: 8 additions & 2 deletions src/pages/sponsors/Sponsors.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,23 @@ import Contact from '../general/contact/Contact'
// Custom styles
import Styles, { SponsorImages } from './SponsorsStyles'


const Sponsors = (): React.ReactElement => {
return (
<Styles.SponsorContainer>
<Styles.TitleContainer className='title-container'>
<h2 className='title'>Sponsors</h2>
<AiOutlineDash/>
</Styles.TitleContainer>
<Styles.SectionHeader>
<div className='button-container'>
<Button text='Become a Sponsor' size='large' source={'https://forms.gle/pAfv3VBYJJXooiU38'}/>
<Button text='Temple Robotics Brochure' size='large' source={`https://1drv.ms/b/s!Amh3vGk
fvOw1c48kx0hFRCY6Hf4?e=OK65qr`}/>
</div>
</Styles.SectionHeader>
<div className='img-container' id='centered-img'>
<h1 className='title'>Current Sponsors</h1>
<Button source={'https://forms.gle/pAfv3VBYJJXooiU38'}
text='become a sponsor' size='large' className='becomeSponsor'/>
</div>
<div className='img-container' style={{background: '#053a92'}}>
<Nasa />
Expand Down
17 changes: 17 additions & 0 deletions src/pages/sponsors/SponsorsStyles.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
`
}
5 changes: 3 additions & 2 deletions src/tools/Constants.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down