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/Jonah_Face.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 10 additions & 1 deletion src/data/EventsDatabase.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
import { EventObject } from '../tools/CustomTypes'

const semesterEnd = '5/31/25'

const descriptionForSDW = `The goal of these classes is to equip you with the skills to model and design on a professional
level, as well as create a common ground for all engineers to work together more efficiently and effectively`
const EVENT_INFO: EventObject[] = [
{
title: 'Weekly Solidworks Workshop',
description: descriptionForSDW,
date: new Date('2025-02-17T17:30:00'),
location: 'The ideas hub (second floor of the engineering building)',
weekly: true,
endDate: new Date(semesterEnd)
},
{
title: 'General Body Meeting',
description: 'Updates on what happened since the last GBM and the plan for the rest of the semester as well as an activity',
Expand Down
4 changes: 2 additions & 2 deletions src/pages/home/Home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ const Home = (): React.ReactElement => {

<Styles.SectionHeaderGradient>
<Styles.SectionHeader>
<h2>Sign up and contact us on teams!</h2>
<h2>Sign up for volunteering and contact us on teams!</h2>
<div className='button-container'>
<Button text={'Sign up here!'} size={'large'} source={'https://forms.gle/rp6BY6h4doLkZQ2E8'}/>
<Button text={'Sign up for volunteering here!'} size={'large'} source={'https://forms.gle/1RcJw5DNXHVX2YzD8'}/>
<Button text='Join Teams Here!' source={TEAMS}/>
</div>
</Styles.SectionHeader>
Expand Down
28 changes: 13 additions & 15 deletions src/pages/meet-the-leads/MeetTheLeads.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,12 @@ import Styles from './MeetTheLeadsStyles'

// Images
import JaredsFace from '../../assets/pics/Leads/jareds_face.jpg'
//import StevensFace from '../../assets/pics/Leads/Stevens_Face.jpg'
import TanishkasFace from '../../assets/pics/Leads/Tanishkas_face.jpg'
import RoccosFace from '../../assets/pics/Leads/roccos_face.jpg'
import NasiersFace from '../../assets/pics/Leads/Nasiers_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'
// 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 @@ -29,7 +28,6 @@ const MeetTheLeads = (): React.ReactElement => {
<h2 className='title'>Meet The Leads</h2>
<AiOutlineDash/>
</Styles.TitleContainer>

<Styles.SpaceBackground>
<Styles.LeadsGallery>
<div className='leads-slide'>
Expand All @@ -45,15 +43,16 @@ const MeetTheLeads = (): React.ReactElement => {
<img src={ MalinsFace }/>
</div>
<div className='leads-slide'>
<h2>Meet our Vice President!</h2>
<h2>Meet our Vice President</h2>
<h2> and Website Manager!</h2>
<p>
Malin Kussi
</p>
</div>
<div className='leads-slide'>
<h2>Meet our Electrical Lead!</h2>
<p>
Jared Levin
Jared Levin
</p>
</div>
<div className='Leads-img-container'>
Expand All @@ -69,33 +68,32 @@ const MeetTheLeads = (): React.ReactElement => {
</p>
</div>
<div className='leads-slide'>
<h2>Meet our Web Manager!</h2>
<h2>Meet our Programming Lead!</h2>
<p>
Nasier Fowlkes
Brian Ervin
</p>
</div>
<div className='Leads-img-container'>
<img src={ NasiersFace }/>
<img src={ BriansFace }/>
</div>
<div className='Leads-img-container'>
<img src={ BriansFace }/>
<img src={ TanishkasFace }/>
</div>
<div className='leads-slide'>
<h2>Meet our Programming Lead!</h2>
<h2>Meet our Project Manager!</h2>
<p>
Brian Ervin
Tanishka Shah
</p>
</div>
<div className='leads-slide'>
<h2>Meet our Project Manager!</h2>
<h2>Meet our Shop Manager!</h2>
<p>
Tanishka Shah
Jonah Tesler
</p>
</div>
<div className='Leads-img-container'>
<img src={ TanishkasFace }/>
<img src={ JonahsFace }/>
</div>

</Styles.LeadsGallery>
</Styles.SpaceBackground>
<Contact/>
Expand Down