Skip to content

Commit e627392

Browse files
authored
Merge pull request #44 from templerobotics/fixing_leadsSpacing
Fixing leads spacing
2 parents 8b92dec + e05818d commit e627392

File tree

4 files changed

+25
-18
lines changed

4 files changed

+25
-18
lines changed
270 KB
Loading

src/data/EventsDatabase.tsx

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
import { EventObject } from '../tools/CustomTypes'
22

33
const semesterEnd = '5/31/25'
4-
4+
const descriptionForSDW = `The goal of these classes is to equip you with the skills to model and design on a professional
5+
level, as well as create a common ground for all engineers to work together more efficiently and effectively`
56
const EVENT_INFO: EventObject[] = [
7+
{
8+
title: 'Weekly Solidworks Workshop',
9+
description: descriptionForSDW,
10+
date: new Date('2025-02-17T17:30:00'),
11+
location: 'The ideas hub (second floor of the engineering building)',
12+
weekly: true,
13+
endDate: new Date(semesterEnd)
14+
},
615
{
716
title: 'General Body Meeting',
817
description: 'Updates on what happened since the last GBM and the plan for the rest of the semester as well as an activity',

src/pages/home/Home.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ const Home = (): React.ReactElement => {
3838

3939
<Styles.SectionHeaderGradient>
4040
<Styles.SectionHeader>
41-
<h2>Sign up and contact us on teams!</h2>
41+
<h2>Sign up for volunteering and contact us on teams!</h2>
4242
<div className='button-container'>
43-
<Button text={'Sign up here!'} size={'large'} source={'https://forms.gle/rp6BY6h4doLkZQ2E8'}/>
43+
<Button text={'Sign up for volunteering here!'} 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: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,12 @@ import Styles from './MeetTheLeadsStyles'
1111

1212
// Images
1313
import JaredsFace from '../../assets/pics/Leads/jareds_face.jpg'
14-
//import StevensFace from '../../assets/pics/Leads/Stevens_Face.jpg'
1514
import TanishkasFace from '../../assets/pics/Leads/Tanishkas_face.jpg'
1615
import RoccosFace from '../../assets/pics/Leads/roccos_face.jpg'
17-
import NasiersFace from '../../assets/pics/Leads/Nasiers_face.jpg'
1816
import MalinsFace from '../../assets/pics/Leads/Malins_face.jpg'
1917
import BriansFace from '../../assets/pics/Leads/Brians_face.jpg'
2018
import AlessiasFace from '../../assets/pics/Leads/Alessia_headshot.png'
19+
import JonahsFace from '../../assets/pics/Leads/Jonah_Face.jpeg'
2120
// a separator is needed for some reason, troubleshoot this or create a very small section div or style this like the robotics page
2221
//use robotics format
2322
//bakround is implemented but sections are not made to be compatible, change to gallery sections
@@ -29,7 +28,6 @@ const MeetTheLeads = (): React.ReactElement => {
2928
<h2 className='title'>Meet The Leads</h2>
3029
<AiOutlineDash/>
3130
</Styles.TitleContainer>
32-
3331
<Styles.SpaceBackground>
3432
<Styles.LeadsGallery>
3533
<div className='leads-slide'>
@@ -45,15 +43,16 @@ const MeetTheLeads = (): React.ReactElement => {
4543
<img src={ MalinsFace }/>
4644
</div>
4745
<div className='leads-slide'>
48-
<h2>Meet our Vice President!</h2>
46+
<h2>Meet our Vice President</h2>
47+
<h2> and Website Manager!</h2>
4948
<p>
5049
Malin Kussi
5150
</p>
5251
</div>
5352
<div className='leads-slide'>
5453
<h2>Meet our Electrical Lead!</h2>
5554
<p>
56-
Jared Levin
55+
Jared Levin
5756
</p>
5857
</div>
5958
<div className='Leads-img-container'>
@@ -69,33 +68,32 @@ const MeetTheLeads = (): React.ReactElement => {
6968
</p>
7069
</div>
7170
<div className='leads-slide'>
72-
<h2>Meet our Web Manager!</h2>
71+
<h2>Meet our Programming Lead!</h2>
7372
<p>
74-
Nasier Fowlkes
73+
Brian Ervin
7574
</p>
7675
</div>
7776
<div className='Leads-img-container'>
78-
<img src={ NasiersFace }/>
77+
<img src={ BriansFace }/>
7978
</div>
8079
<div className='Leads-img-container'>
81-
<img src={ BriansFace }/>
80+
<img src={ TanishkasFace }/>
8281
</div>
8382
<div className='leads-slide'>
84-
<h2>Meet our Programming Lead!</h2>
83+
<h2>Meet our Project Manager!</h2>
8584
<p>
86-
Brian Ervin
85+
Tanishka Shah
8786
</p>
8887
</div>
8988
<div className='leads-slide'>
90-
<h2>Meet our Project Manager!</h2>
89+
<h2>Meet our Shop Manager!</h2>
9190
<p>
92-
Tanishka Shah
91+
Jonah Tesler
9392
</p>
9493
</div>
9594
<div className='Leads-img-container'>
96-
<img src={ TanishkasFace }/>
95+
<img src={ JonahsFace }/>
9796
</div>
98-
9997
</Styles.LeadsGallery>
10098
</Styles.SpaceBackground>
10199
<Contact/>

0 commit comments

Comments
 (0)