Skip to content

Commit 662cc07

Browse files
NasierFNasierF
committed
working website version as of 8/7/2024
1 parent 559a811 commit 662cc07

File tree

8 files changed

+103
-36
lines changed

8 files changed

+103
-36
lines changed

‎src/assets/pics/sponsors/Amtrack-png.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎src/assets/pics/sponsors/Amtrack.svg‎

Lines changed: 7 additions & 0 deletions
Loading

‎src/assets/pics/sponsors/Amtrak.svg‎

Lines changed: 26 additions & 0 deletions
Loading

‎src/assets/pics/sponsors/image.png‎

4.68 KB
Loading

‎src/data/EventsDatabase.tsx‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const EVENT_INFO: EventObject[] = [
77
title: 'Weekly Programming Meeting',
88
description: 'The weekly meeting for the programming sub-team. Take a look at the code for the robot and ',
99
date: new Date(''),
10-
time: '',
10+
time: '5:30pm Fridays',
1111
location: 'The ideas hub (second floor of the engineering building)',
1212
weekly: true,
1313
// endDate: new Date(semesterEnd)
@@ -16,7 +16,7 @@ const EVENT_INFO: EventObject[] = [
1616
title: 'Weekly Electrical Meeting',
1717
description: 'The weekly meeting for the electrical sub-team. Talk about improved batteries, wiring, and more!',
1818
date: new Date(''),
19-
time: '',
19+
time: '5:00pm Modays',
2020
location: 'The ideas hub (second floor of the engineering building)',
2121
weekly: true,
2222
// endDate: new Date(semesterEnd)
@@ -25,41 +25,41 @@ const EVENT_INFO: EventObject[] = [
2525
title: 'Weekly Mechanical Meeting',
2626
description: 'The weekly meeting for the mechanical sub-team. Learn about the design aspects of robot and 3D model parts.',
2727
date: new Date(''),
28-
time: '',
28+
time: '6:00pm Wednesday',
2929
location: 'The ideas hub (second floor of the engineering building)',
3030
weekly: true,
3131
// endDate: new Date(semesterEnd)
3232
},
3333
{
34-
title: 'First GBM of the Fall Semester',
34+
title: 'First GBM of the Spring Semester',
3535
description: `Learn more about the club and what we do! If you have any interest at all,
3636
we highly recommend you joining us!`,
37-
date: new Date(''),
37+
date: new Date('1/29/24'),
3838
time: '',
39-
location: 'The ideas hub (second floor of the engineering building)'
39+
location: 'The Fish Bowl (first floor of the engineering building)'
4040
},
41-
{
42-
title: 'General Body Meeting',
43-
description: `Learn more about the club and what we do! If you have any interest at all,
44-
we highly recommend you joining us!`,
45-
date: new Date(''),
46-
time: '6:00 PM',
47-
location: 'The ideas hub (second floor of the engineering building)'
48-
},
49-
{
50-
title: 'Engineering Week Showcase',
51-
description: 'Meet us to see the robot in action and learn about the club!',
52-
date: new Date(''),
53-
time: '11:00 AM',
54-
location: 'SERC Main Lobbby'
55-
},
56-
{
57-
title: 'Temple Ambler Showcase',
58-
description: 'Meet us to see the robot in action and learn about the club!',
59-
date: new Date(''),
60-
time: '9:15 AM',
61-
location: 'Temple Ambler Widener'
62-
}
41+
// {
42+
// title: 'General Body Meeting',
43+
// description: `Learn more about the club and what we do! If you have any interest at all,
44+
// we highly recommend you joining us!`,
45+
// date: new Date(''),
46+
// time: '',
47+
// location: 'The ideas hub (second floor of the engineering building)'
48+
// },
49+
// {
50+
// title: 'Engineering Week Showcase',
51+
// description: 'Meet us to see the robot in action and learn about the club!',
52+
// date: new Date(''),
53+
// time: '11:00 AM',
54+
// location: 'SERC Main Lobbby'
55+
// },
56+
// {
57+
// title: 'Temple Ambler Showcase',
58+
// description: 'Meet us to see the robot in action and learn about the club!',
59+
// date: new Date(''),
60+
// time: '9:15 AM',
61+
// location: 'Temple Ambler Widener'
62+
// }
6363
]
6464

6565
export default EVENT_INFO

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ const MeetTheLeads = (): React.ReactElement => {
3434
<div className='leads-slide'>
3535
<h2>Meet our President!</h2>
3636
<p>
37-
Jared Levin and any info
37+
Jared Levin
3838
</p>
3939
</div>
4040
<div className='Leads-img-container'>
@@ -44,7 +44,7 @@ const MeetTheLeads = (): React.ReactElement => {
4444
<img src={ JaysFace }/>
4545
</div>
4646
<div className='leads-slide'>
47-
<h2>Meet our vice president!</h2>
47+
<h2>Meet our Vice President!</h2>
4848
<p>
4949
Jay Pande
5050
</p>
@@ -80,13 +80,13 @@ const MeetTheLeads = (): React.ReactElement => {
8080
<img src={ RoccosFace }/>
8181
</div>
8282
<div className='leads-slide'>
83-
<h2>Meet our Workshop Manager</h2>
83+
<h2>Meet our Workshop Manager!</h2>
8484
<p>
8585
Rocco Guzman
8686
</p>
8787
</div>
8888
<div className='leads-slide'>
89-
<h2>Meet our project Manager</h2>
89+
<h2>Meet our Project Manager!</h2>
9090
<p>
9191
Tanishka Shah
9292
</p>

‎src/pages/sponsors/Sponsors.tsx‎

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ import { AiOutlineDash } from 'react-icons/ai'
44
import { ReactComponent as Lockheed } from '../../assets/pics/sponsors/lockheed-martin-logo.svg'
55
import { ReactComponent as Nasa } from '../../assets/pics/sponsors/nasa-logo.svg'
66
import { ReactComponent as Arrow } from '../../assets/pics/sponsors/arrow-logo.svg'
7+
import { ReactComponent as Amtrack } from '../../assets/pics/sponsors/Amtrack-png.svg'
8+
import Button from '../general/button/Button'
9+
//import HStyles from '../home/HomeStyles'
10+
711

812
// Custom components
913
import Contact from '../general/contact/Contact'
@@ -18,10 +22,26 @@ const Sponsors = (): React.ReactElement => {
1822
<h2 className='title'>Sponsors</h2>
1923
<AiOutlineDash/>
2024
</Styles.TitleContainer>
21-
25+
26+
<div className='img-container' style={{background: '#000000a0', display: 'flex', justifyContent: 'center', alignItems: 'center', flexDirection: 'column',
27+
rowGap: '3rem',
28+
}}>
29+
<h1 className='title'>Current Sponsors</h1>
30+
<Button source={'https://forms.gle/pAfv3VBYJJXooiU38'}
31+
text='become a sponsor' size='large' className='becomeSponsor'/>
32+
</div>
2233
<div className='img-container' style={{background: '#053a92'}}>
2334
<Nasa />
2435
</div>
36+
<div className='img-container' style={{background: 'white'}}>
37+
<Amtrack/>
38+
</div>
39+
40+
<div className='img-container' style={{background: '#000000b5', display: 'flex', justifyContent: 'center', alignItems: 'center', flexDirection: 'column',
41+
rowGap: '3rem'}}>
42+
<h1 className='title'>Previous Sponsors</h1>
43+
</div>
44+
2545
<div className='img-container' style={{background: 'white'}}>
2646
<Lockheed />
2747
</div>
@@ -31,9 +51,10 @@ const Sponsors = (): React.ReactElement => {
3151
<div className='img-container' style={{background: 'white'}}>
3252
<img src={SponsorImages.hillock} style={{width: '60%'}}/>
3353
</div>
34-
<div className='ing-container' style={{background: 'wihte'}}>
35-
{/* call amtrak image here, make sure it has been transerred into an svg */}
36-
</div>
54+
{/* <div className='img-container' style={{background: 'wihte'}}>
55+
call amtrak image here, make sure it has been transerred into an svg
56+
</div> */}
57+
3758

3859
<Contact/>
3960
</Styles.SponsorContainer>

‎src/pages/sponsors/SponsorsStyles.tsx‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ export class SponsorImages {
55
static readonly arrow = require('../../assets/pics/sponsors/arrow.png')
66
static readonly nasa = require('../../assets/pics/sponsors/nasa-name.png')
77
static readonly hillock = require('../../assets/pics/sponsors/hillock-anodizing.png')
8+
static readonly Amtrack = require('../../assets/pics/sponsors/Amtrack-png.svg')
89
}
910

1011
export default class SponsorsStyles {
@@ -32,8 +33,19 @@ export default class SponsorsStyles {
3233
height: 100%;
3334
align-self: center;
3435
}
36+
37+
& > .section-container {
38+
display: flex;
39+
background: black;
40+
padding: 5%;
41+
justify-content: center;
42+
text-align: center;
43+
}
44+
3545
`
3646

47+
48+
3749
static readonly TitleContainer = styled.div`
3850
width: 100%;
3951
& > .title {

0 commit comments

Comments
 (0)