Skip to content

Commit ae665bd

Browse files
monty2464monty2464
authored
Merge pull request #46 from templerobotics/addedBrochure
Added brochure
2 parents f66b1a2 + e260163 commit ae665bd

File tree

12 files changed

+54
-27
lines changed

12 files changed

+54
-27
lines changed

‎src/assets/pics/Leads/Jadens_face.jpg‎

252 KB
Loading

src/assets/pics/Leads/Jonah_Face.jpeg renamed to src/assets/pics/Leads/Jonah_Face.jpg

File renamed without changes.

‎src/assets/pics/Leads/roccos_face2.jpg‎

2.59 MB
Loading

‎src/assets/pics/photo-gallery/rmc/comp-team-2024.jpg‎

2.01 MB
Loading

‎src/data/RoboticsPhotoGalleryInfo.tsx‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,30 @@ import { GalleryImage } from '../pages/general/photo-gallery/PhotoGalleryStyles'
33

44
// eslint-disable-next-line id-length
55
const ROBOTICS_PHOTO_GALLERY_INFO: GalleryImage[] = [
6-
{ image: RMC_PHOTO_GALLERY[0], title: '2023', description: 'The team after our first competition run at the University of Alabama.' },
7-
{ image: RMC_PHOTO_GALLERY[1], title: '2023', description: `The leads in front of the project after finishing
6+
{ image: RMC_PHOTO_GALLERY[0], title: '2024', description: `The team before our first competition run at the University of
7+
Central Florida.`},
8+
{ image: RMC_PHOTO_GALLERY[1], title: '2023', description: 'The team after our first competition run at the University of Alabama.' },
9+
{ image: RMC_PHOTO_GALLERY[2], title: '2023', description: `The leads in front of the project after finishing
810
the outside construction.` },
9-
{ image: RMC_PHOTO_GALLERY[2], title: '2023', description: `The team worked hard on the design in the fall semester,
11+
{ image: RMC_PHOTO_GALLERY[3], title: '2023', description: `The team worked hard on the design in the fall semester,
1012
then built the arena over winter break.` },
11-
{ image: RMC_PHOTO_GALLERY[3], title: '2023', description: `A major goal of 2023 was to construct a practice arena
13+
{ image: RMC_PHOTO_GALLERY[4], title: '2023', description: `A major goal of 2023 was to construct a practice arena
1214
for the robot. Here is the team hard at work!` },
13-
{ image: RMC_PHOTO_GALLERY[4], title: '2022', description: `The 2022 robot is coming together! No belts yet but the
15+
{ image: RMC_PHOTO_GALLERY[5], title: '2022', description: `The 2022 robot is coming together! No belts yet but the
1416
chasses is complete.` },
15-
{ image: RMC_PHOTO_GALLERY[5], title: '2022', description: 'I guess our team has never heard of cable management...' },
16-
{ image: RMC_PHOTO_GALLERY[6], title: '2022', description: `Us showing off JPL at the 30th anniversary of the NASA
17+
{ image: RMC_PHOTO_GALLERY[6], title: '2022', description: 'I guess our team has never heard of cable management...' },
18+
{ image: RMC_PHOTO_GALLERY[7], title: '2022', description: `Us showing off JPL at the 30th anniversary of the NASA
1719
Space Grant.` },
18-
{ image: RMC_PHOTO_GALLERY[7], title: '2018', description: 'Our ME\'s filing away to make sure everything fits perfectly.' },
19-
{ image: RMC_PHOTO_GALLERY[8], title: '2018', description: 'BoxBot, of course we still love you.' },
20-
{ image: RMC_PHOTO_GALLERY[9], title: '2017', description: `Our team plugged the ethernet cable into the wrong port.
20+
{ image: RMC_PHOTO_GALLERY[8], title: '2018', description: 'Our ME\'s filing away to make sure everything fits perfectly.' },
21+
{ image: RMC_PHOTO_GALLERY[9], title: '2018', description: 'BoxBot, of course we still love you.' },
22+
{ image: RMC_PHOTO_GALLERY[10], title: '2017', description: `Our team plugged the ethernet cable into the wrong port.
2123
Good thing duct tape fixes everything!` },
22-
{ image: RMC_PHOTO_GALLERY[10], title: '2017', description: `Our hotel didn't like us working on the robot in our rooms.
24+
{ image: RMC_PHOTO_GALLERY[11], title: '2017', description: `Our hotel didn't like us working on the robot in our rooms.
2325
I guess we'll just use our vans.` },
24-
{ image: RMC_PHOTO_GALLERY[11], title: '2011', description: `The year our team's autonomous was so good they had to
26+
{ image: RMC_PHOTO_GALLERY[12], title: '2011', description: `The year our team's autonomous was so good they had to
2527
change the rules.` },
26-
{ image: RMC_PHOTO_GALLERY[12], title: '2010', description: 'Scoops was born.' },
27-
{ image: RMC_PHOTO_GALLERY[13], title: '2009', description: 'Our first team at the very first Robotics Mining Competition.' }
28+
{ image: RMC_PHOTO_GALLERY[13], title: '2010', description: 'Scoops was born.' },
29+
{ image: RMC_PHOTO_GALLERY[14], title: '2009', description: 'Our first team at the very first Robotics Mining Competition.' }
2830
]
2931

3032
export default ROBOTICS_PHOTO_GALLERY_INFO

‎src/pages/general/contact/Contact.tsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import React from 'react'
22
import { BsHeartFill } from 'react-icons/bs'
3-
import { FiFacebook, FiInstagram, FiMail, FiTwitter, FiYoutube } from 'react-icons/fi'
3+
import { FiFacebook, FiInstagram, FiLinkedin, FiMail, FiTwitter, FiYoutube } from 'react-icons/fi'
44
import { RiSnapchatLine } from 'react-icons/ri'
55

66
import IconButton from '../button/IconButton'
77
import Styles from './ContactStyles'
88

9+
910
export default class Contact extends React.Component<Record<string, never>, never> {
1011
render (): React.ReactElement {
1112
return (
@@ -18,6 +19,7 @@ export default class Contact extends React.Component<Record<string, never>, neve
1819
<IconButton icon={<RiSnapchatLine/>} source={'https://snapchat.com/add/templerobotics'} />
1920
<IconButton icon={<FiYoutube/>} source={'https://www.youtube.com/channel/UCv59XUAVDLtgk0KA9r4RTsA'} />
2021
<IconButton icon={<FiMail/>} source={'Mailto:Temple.Robotics@outlook.com'} />
22+
<IconButton icon={<FiLinkedin/>} source={ 'https://www.linkedin.com/company/temple-robotics/posts/?feedView=all'}/>
2123
</div>
2224
</Styles.ContactContainer>
2325
)

‎src/pages/home/Home.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const Home = (): React.ReactElement => {
4040
<Styles.SectionHeader>
4141
<h2>Sign up for volunteering and contact us on teams!</h2>
4242
<div className='button-container'>
43-
<Button text={'Sign up for volunteering here!'} size={'large'} source={'https://forms.gle/1RcJw5DNXHVX2YzD8'}/>
43+
<Button text={'Sign up to Volunteer'} size={'large'} source={'https://forms.gle/1RcJw5DNXHVX2YzD8'}/>
4444
<Button text='Join Teams Here!' source={TEAMS}/>
4545
</div>
4646
</Styles.SectionHeader>

‎src/pages/meet-the-leads/MeetTheLeads.tsx‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ import Contact from '../general/contact/Contact'
1010
import Styles from './MeetTheLeadsStyles'
1111

1212
// Images
13-
import JaredsFace from '../../assets/pics/Leads/jareds_face.jpg'
1413
import TanishkasFace from '../../assets/pics/Leads/Tanishkas_face.jpg'
1514
import RoccosFace from '../../assets/pics/Leads/roccos_face.jpg'
1615
import MalinsFace from '../../assets/pics/Leads/Malins_face.jpg'
1716
import BriansFace from '../../assets/pics/Leads/Brians_face.jpg'
1817
import AlessiasFace from '../../assets/pics/Leads/Alessia_headshot.png'
19-
import JonahsFace from '../../assets/pics/Leads/Jonah_Face.jpeg'
18+
import JonahsFace from '../../assets/pics/Leads/Jonah_Face.jpg'
19+
import JadensFace from '../../assets/pics/Leads/Jadens_face.jpg'
2020
// a separator is needed for some reason, troubleshoot this or create a very small section div or style this like the robotics page
2121
//use robotics format
2222
//bakround is implemented but sections are not made to be compatible, change to gallery sections
@@ -43,20 +43,19 @@ const MeetTheLeads = (): React.ReactElement => {
4343
<img src={ MalinsFace }/>
4444
</div>
4545
<div className='leads-slide'>
46-
<h2>Meet our Vice President</h2>
47-
<h2> and Website Manager!</h2>
46+
<h2>Meet our Vice President!</h2>
4847
<p>
4948
Malin Kussi
5049
</p>
5150
</div>
5251
<div className='leads-slide'>
5352
<h2>Meet our Electrical Lead!</h2>
5453
<p>
55-
Jared Levin
54+
Jaden Howard
5655
</p>
5756
</div>
5857
<div className='Leads-img-container'>
59-
<img src={ JaredsFace }/>
58+
<img src={ JadensFace }/>
6059
</div>
6160
<div className='Leads-img-container'>
6261
<img src={ AlessiasFace}/>

‎src/pages/robotic-mining/RoboticMiningStyles.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export const MEET_THE_TEAM: GalleryImage[] = [
88
{ image: RMC_TEAM[0], title: 'Dr. John Helferty', description: 'Head Advisor' },
99
{ image: RMC_TEAM[1], title: 'Rocco Gruzman', description: 'Robotic\'s President' },
1010
{ image: RMC_TEAM[2], title: 'Malin Kussi', description: 'Vice President' },
11-
{ image: RMC_TEAM[3], title: 'Jared Levin', description: 'Electrical Lead' },
11+
{ image: RMC_TEAM[3], title: 'Jaden Howard', description: 'Electrical Lead' },
1212
{ image: RMC_TEAM[4], title: 'Alessia Smith', description: 'Mechanical Lead' },
1313
{ image: RMC_TEAM[5], title: 'Brian Ervin', description: 'Programming Lead' },
1414
{ image: RMC_TEAM[6], title: 'Tanishka Shah', description: 'Project Manager' },

‎src/pages/sponsors/Sponsors.tsx‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,23 @@ import Contact from '../general/contact/Contact'
1515
// Custom styles
1616
import Styles, { SponsorImages } from './SponsorsStyles'
1717

18+
1819
const Sponsors = (): React.ReactElement => {
1920
return (
2021
<Styles.SponsorContainer>
2122
<Styles.TitleContainer className='title-container'>
2223
<h2 className='title'>Sponsors</h2>
2324
<AiOutlineDash/>
2425
</Styles.TitleContainer>
26+
<Styles.SectionHeader>
27+
<div className='button-container'>
28+
<Button text='Become a Sponsor' size='large' source={'https://forms.gle/pAfv3VBYJJXooiU38'}/>
29+
<Button text='Temple Robotics Brochure' size='large' source={`https://1drv.ms/b/s!Amh3vGk
30+
fvOw1c48kx0hFRCY6Hf4?e=OK65qr`}/>
31+
</div>
32+
</Styles.SectionHeader>
2533
<div className='img-container' id='centered-img'>
2634
<h1 className='title'>Current Sponsors</h1>
27-
<Button source={'https://forms.gle/pAfv3VBYJJXooiU38'}
28-
text='become a sponsor' size='large' className='becomeSponsor'/>
2935
</div>
3036
<div className='img-container' style={{background: '#053a92'}}>
3137
<Nasa />

0 commit comments

Comments
 (0)