Skip to content

Fixed meeting dates #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
monty2464 merged 5 commits into from
Feb 19, 2025
Merged

Fixed meeting dates #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e6de119
Fixed meeting times
monty2464 Feb 14, 2025
3a581fe
Changed Tanishkas picture
monty2464 Feb 14, 2025
5094a23
fixed weekly meeting times
monty2464 Feb 19, 2025
792ccc7
Fixing weekly dates
monty2464 Feb 19, 2025
91bf9b7
Merge branch 'master' into fixed-meeting-dates
monty2464 Feb 19, 2025
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/Tanishkas_face.jpeg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/assets/pics/Leads/Tanishkas_face.jpg
View file
Open in desktop
Binary file not shown.
Binary file removed src/assets/pics/Leads/roccos_face2.jpg
View file
Open in desktop
Binary file not shown.
8 changes: 4 additions & 4 deletions src/data/EventsDatabase.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { EventObject } from '../tools/CustomTypes'
const semesterEnd = '5/31/25'
const EVENT_INFO: EventObject[] = [
{
title: 'Weekly Solidworks Workshop',
title: 'Weekly SolidWorks Workshop',
description: `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`,
date: new Date('2025-02-17T17:30:00'),
Expand All @@ -21,23 +21,23 @@ const EVENT_INFO: EventObject[] = [
{
title: 'Weekly Programming Meeting',
description: 'The weekly meeting for the programming sub-team. Take a look at the code for the robot',
date: new Date('2025-01-22T17:00:00'),
date: new Date('2025-02-12T17:00:00'),
location: 'The ideas hub (second floor of the engineering building)',
weekly: true,
endDate: new Date(semesterEnd)
},
{
title: 'Weekly Electrical Meeting',
description: 'The weekly meeting for the electrical sub-team. Talk about improved batteries, wiring, and more!',
date: new Date('2025-01-22T18:00:00'),
date: new Date('2025-02-12T18:00:00'),
location: 'The ideas hub (second floor of the engineering building)',
weekly: true,
endDate: new Date(semesterEnd)
},
{
title: 'Weekly Mechanical Meeting',
description: 'The weekly meeting for the mechanical sub-team. Learn about the design aspects of robot and 3D model parts.',
date: new Date('2025-01-22T16:00:00'),
date: new Date('2025-02-12T16:00:00'),
location: 'The ideas hub (second floor of the engineering building)',
weekly: true,
endDate: new Date(semesterEnd)
Expand Down
2 changes: 1 addition & 1 deletion src/pages/meet-the-leads/MeetTheLeads.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Contact from '../general/contact/Contact'
import Styles from './MeetTheLeadsStyles'

// Images
import TanishkasFace from '../../assets/pics/Leads/Tanishkas_face.jpg'
import TanishkasFace from '../../assets/pics/Leads/Tanishkas_face.jpeg'
import RoccosFace from '../../assets/pics/Leads/roccos_face.jpg'
import MalinsFace from '../../assets/pics/Leads/Malins_face.jpg'
import BriansFace from '../../assets/pics/Leads/Brian_face.png'
Expand Down
2 changes: 1 addition & 1 deletion src/tools/Constants.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export const RMC_TEAM = [
require('../assets/pics/Leads/Jadens_face.jpg'),
require('../assets/pics/Leads/Alessia_headshot.png'),
require('../assets/pics/Leads/Brian_face.png'),
require('../assets/pics/Leads/Tanishkas_face.jpg'),
require('../assets/pics/Leads/Tanishkas_face.jpeg'),
require('../assets/pics/Leads/Jonah_Face.jpg')
]

Expand Down