Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
588 commits
Select commit Hold shift + click to select a range
96622a4
anti linting preventative measures
JoshuaGoldberg Dec 3, 2025
774e4c6
#3636 Fix merge
EddieTheEgg Dec 3, 2025
7d927d4
better button look
JoshuaGoldberg Dec 3, 2025
cab4b20
still need to lint anyways
JoshuaGoldberg Dec 3, 2025
fcdb661
test...?
JoshuaGoldberg Dec 3, 2025
e16de76
#3636 Changed event name to eventtype and updated calendar to function
EddieTheEgg Dec 3, 2025
c50afc2
#3636 added more toggable fields
EddieTheEgg Dec 3, 2025
acbadc1
#3636 styling thing
EddieTheEgg Dec 3, 2025
08618af
#3636 minor change to allow only one calendar selection for types
EddieTheEgg Dec 3, 2025
a884a92
#3636 for some reason tests failed? attempting to recommit
EddieTheEgg Dec 3, 2025
62ed592
#3636 merge fix
EddieTheEgg Dec 3, 2025
1c19895
test again
JoshuaGoldberg Dec 3, 2025
1c7ad8b
defaults
JoshuaGoldberg Dec 3, 2025
596a436
defaults 2
JoshuaGoldberg Dec 3, 2025
1dec6a5
Merge branch 'feature/calendar-improvements' of https://github.com/No…
saulmanz Dec 3, 2025
635559e
#3775 prettier fixed
saulmanz Dec 3, 2025
db83e6a
Merge pull request #3780 from Northeastern-Electric-Racing/3775-Delet…
saulmanz Dec 3, 2025
b1e5189
Merge branch '#3636-editcreate-event-modal' of https://github.com/Nor…
EddieTheEgg Dec 3, 2025
78e4f79
#3706 Finish requested changes
Santiordon Dec 3, 2025
8590b44
Merge branch 'feature/calendar-improvements' into #3706-your-events-page
Santiordon Dec 3, 2025
61d0a8a
#3706 Fix conflict
Santiordon Dec 3, 2025
5f4b08b
File Combine
Santiordon Dec 3, 2025
0defbf1
#3636 attempt to fix up some of the merge slack conflicts
EddieTheEgg Dec 3, 2025
3823938
#3706 Prettier check
Santiordon Dec 3, 2025
b7fc018
Merge branch 'develop' into feature/calendar-improvements
JoshuaGoldberg Dec 3, 2025
7f26353
#3636 fixed requested changes
EddieTheEgg Dec 3, 2025
268108d
#3636 minor refactor of imports
EddieTheEgg Dec 3, 2025
afe6d9b
delete modal UI added
richard-feng07 Dec 4, 2025
d3dcfa4
#3636 Final fix of everything with event types
EddieTheEgg Dec 4, 2025
3bcdae7
#3636 fix calendar merge conflict
EddieTheEgg Dec 4, 2025
54dfeea
move file
JoshuaGoldberg Dec 6, 2025
81d9d2a
abstraction
JoshuaGoldberg Dec 6, 2025
68465c3
test failure?
JoshuaGoldberg Dec 6, 2025
42603c3
requested fixes
JoshuaGoldberg Dec 6, 2025
d0c57a0
#3774: delete button removes events
richard-feng07 Dec 7, 2025
7f4428a
#3774: delete button removes events
richard-feng07 Dec 7, 2025
81035a2
some requested changes
JoshuaGoldberg Dec 8, 2025
d052fd8
more updates (woohoo!)
JoshuaGoldberg Dec 8, 2025
270150d
another round of requested changes
JoshuaGoldberg Dec 8, 2025
aa32275
forgot about this error
JoshuaGoldberg Dec 8, 2025
555021e
Revert "File Combine"
JoshuaGoldberg Dec 9, 2025
019f50e
seed data test
JoshuaGoldberg Dec 9, 2025
9587a95
updates
JoshuaGoldberg Dec 9, 2025
7268461
temp removal
JoshuaGoldberg Dec 9, 2025
4c4868e
weather update. just kiddings its a warning tooltip
JoshuaGoldberg Dec 9, 2025
c84279c
oops
JoshuaGoldberg Dec 9, 2025
194deb3
filter update
JoshuaGoldberg Dec 9, 2025
5b2ea93
Merge pull request #3781 from Northeastern-Electric-Racing/#3636-edit…
chpy04 Dec 9, 2025
e695966
updated stuff
JoshuaGoldberg Dec 10, 2025
e0cde88
refactor due to errors
JoshuaGoldberg Dec 10, 2025
7152ff9
Merge branch 'feature/calendar-improvements' into #3706-your-events-a…
JoshuaGoldberg Dec 10, 2025
aee3f99
repeats
JoshuaGoldberg Dec 10, 2025
a71a4ff
api/hook update
JoshuaGoldberg Dec 10, 2025
077e00a
minor workaround
JoshuaGoldberg Dec 10, 2025
12f04c9
#3706 migration change
wavehassman Dec 10, 2025
846b588
loading updates
JoshuaGoldberg Dec 10, 2025
ef5abf1
Merge remote-tracking branch 'origin/feature/calendar-improvements' i…
EddieTheEgg Dec 10, 2025
1e94314
#3774 Added delete event types
EddieTheEgg Dec 10, 2025
b35aa3f
#3774 fixing linting issues
EddieTheEgg Dec 10, 2025
654f4cd
#3774 fixed requested changes with delete event type
EddieTheEgg Dec 10, 2025
e880f53
added modal and logic for uploading and downloading documents
wavehassman Dec 10, 2025
503c1ab
Merge branch 'feature/calendar-improvements' into #3816-event-modal
wavehassman Dec 11, 2025
00cb6aa
#3774 updated route call method
EddieTheEgg Dec 11, 2025
62c9219
Merge branch 'feature/calendar-improvements' into #3705-event-filter-…
JoshuaGoldberg Dec 11, 2025
ae172fd
refactor
JoshuaGoldberg Dec 11, 2025
a510bb1
refactor 2
JoshuaGoldberg Dec 11, 2025
38e8f9f
Merge pull request #3810 from Northeastern-Electric-Racing/#3774-dele…
wavehassman Dec 11, 2025
032c51a
update 1
JoshuaGoldberg Dec 11, 2025
a8e79a8
update 2
JoshuaGoldberg Dec 11, 2025
217a01d
Merge pull request #3796 from Northeastern-Electric-Racing/#3705-even…
wavehassman Dec 11, 2025
f1953da
Merge branch 'feature/calendar-improvements' into #3706-your-events-a…
JoshuaGoldberg Dec 11, 2025
534903b
#3798 initial updated popup
Steph375 Dec 11, 2025
5edec8e
#3798 Error Fix
Steph375 Dec 11, 2025
8e1d923
Merge branch 'feature/calendar-improvements' into #3816-event-modal
wavehassman Dec 11, 2025
d9075a4
#3816 everthing but warnings
wavehassman Dec 11, 2025
05b5345
#3816 linting
wavehassman Dec 11, 2025
7b8294a
#3816 fix query keys
wavehassman Dec 12, 2025
1451516
#3816 fix migration
wavehassman Dec 12, 2025
dd43af2
#3814 fixed google calendar integration
wavehassman Dec 12, 2025
bb56ff6
Merge branch 'feature/calendar-improvements' into #3706-your-events-a…
JoshuaGoldberg Dec 13, 2025
49b114e
#minorupdate
JoshuaGoldberg Dec 13, 2025
b7da61c
update
JoshuaGoldberg Dec 13, 2025
0a066c1
refactoring
JoshuaGoldberg Dec 13, 2025
b26d96c
minor change to calendar day card so I don't forget
JoshuaGoldberg Dec 13, 2025
faff8cd
naming update
JoshuaGoldberg Dec 13, 2025
48b4dc6
Update .editorconfig
JoshuaGoldberg Dec 13, 2025
b2eeb8d
delete file
JoshuaGoldberg Dec 13, 2025
532144f
Ticket #3702: all calendar view
samshr27 Dec 11, 2025
1cea724
Ticket #3702: merge conflicts
samshr27 Dec 12, 2025
f4e3ef3
docs
JoshuaGoldberg Dec 13, 2025
c7973ad
#3702: all-calendar-view pre-lint
samshr27 Dec 12, 2025
ad5d707
prettier check
samshr27 Dec 12, 2025
dd6b138
Merge pull request #3821 from Northeastern-Electric-Racing/#3706-your…
JoshuaGoldberg Dec 13, 2025
c2f1393
Adding the availability button
Steph375 Dec 13, 2025
fac24e7
#3798 prettier
Steph375 Dec 13, 2025
65a1bce
Merge branch 'feature/calendar-improvements' into #3798-Event-View-Ch…
Steph375 Dec 13, 2025
19ad7ee
#3798 Merge Fix
Steph375 Dec 13, 2025
133f64b
#3798 TeamTypes fix
Steph375 Dec 13, 2025
c5b7979
#3798 fixes
Steph375 Dec 13, 2025
0c54af2
#3798 fixes
Steph375 Dec 13, 2025
25c1173
#3798 Undoing reset
Steph375 Dec 13, 2025
619b985
#3798 add the button functions
Steph375 Dec 14, 2025
97217eb
#3798 fixing zoom label
Steph375 Dec 14, 2025
f9d0447
#3798 Prettier fix
Steph375 Dec 14, 2025
d7e2eac
#3789 adding back the availability conditional
Steph375 Dec 14, 2025
3da26bb
#3798 fix
Steph375 Dec 14, 2025
e1263f6
#3798 fix
Steph375 Dec 14, 2025
7c07610
#3798 prettier again
Steph375 Dec 14, 2025
f8163a8
a short list of changes
JoshuaGoldberg Dec 14, 2025
351e83f
comment not needed
JoshuaGoldberg Dec 14, 2025
de6a227
lint
JoshuaGoldberg Dec 14, 2025
d0474ef
Merge branch 'feature/calendar-improvements' into #3816-event-modal
wavehassman Dec 14, 2025
87aa614
#3816 requested changes
wavehassman Dec 14, 2025
215910f
alteration to calendar population (unrelated to this ticket but it ne…
JoshuaGoldberg Dec 14, 2025
ddcdaf1
#3798 removed set reminder button changed route for availability button
Steph375 Dec 14, 2025
982c3f5
#3798 route change again
Steph375 Dec 14, 2025
83d035e
#3798 prettier
Steph375 Dec 14, 2025
80acd97
#3798 small change
Steph375 Dec 15, 2025
4c87083
#3816 requested changes
wavehassman Dec 15, 2025
e1b9b6b
utils and minor nitpicks
JoshuaGoldberg Dec 15, 2025
f8e8d7a
note to self
JoshuaGoldberg Dec 15, 2025
40b20dd
fun stuff
JoshuaGoldberg Dec 15, 2025
ba74a40
more notes to self (or notes to all???)
JoshuaGoldberg Dec 15, 2025
2f7c00d
even more notes to self
JoshuaGoldberg Dec 15, 2025
bb64665
filtering fixed
Dec 15, 2025
610f436
lint/prettier check
Dec 15, 2025
4596662
additional lint
Dec 15, 2025
1cce236
last fix promise
Dec 15, 2025
20ee6b3
sike prettier check
Dec 15, 2025
d3f1c13
#3703 Added Upcoming Meetings to calendar
saulmanz Dec 15, 2025
e6fe843
#3400 scheduling conflicts implementation
EddieTheEgg Dec 16, 2025
e2ccfe7
#3816 added handleClose, no frozenRef
wavehassman Dec 16, 2025
743b968
#3819 minor component adjustment
EddieTheEgg Dec 16, 2025
0ba7595
#3798 small changes
Steph375 Dec 16, 2025
9ae4890
#3798 comments fix
Steph375 Dec 16, 2025
7d829bd
#3798 prettier fix
Steph375 Dec 16, 2025
e6a7836
new filtering ideas
JoshuaGoldberg Dec 16, 2025
250b4c7
#3798 removing team-type import
Steph375 Dec 16, 2025
3f29b25
oops
JoshuaGoldberg Dec 16, 2025
685e8fa
#3798 another prettier fix
Steph375 Dec 16, 2025
8f3fb73
#3703 Added suggestions
saulmanz Dec 16, 2025
d1d2b38
OR
JoshuaGoldberg Dec 16, 2025
71f8f3b
#3819 used existing filteredevents endpoint for getting conflict stat…
EddieTheEgg Dec 16, 2025
eabcab5
#3819 Utilized existing hook instead of making new custom hook for pe…
EddieTheEgg Dec 16, 2025
81be9ed
minor filtering changes
JoshuaGoldberg Dec 16, 2025
a2d17ec
#3819 Passed in the filters from new calendar to get correct conflcits
EddieTheEgg Dec 16, 2025
a55946e
Merge pull request #3830 from Northeastern-Electric-Racing/#3798-Even…
wavehassman Dec 16, 2025
193c5d7
#3703 Now shows team and team types when no members are available
saulmanz Dec 16, 2025
269845b
#3819 lil changes in prop passing
EddieTheEgg Dec 16, 2025
adfcce3
Merge branch 'feature/calendar-improvements' into #3816-event-modal
wavehassman Dec 16, 2025
a9b116c
Merge branch 'feature/calendar-improvements' into #3817-review-bookings
JoshuaGoldberg Dec 16, 2025
5916cec
requests part 2 done
Dec 17, 2025
543d3ca
lint fixes
Dec 17, 2025
affcfbb
functionality
JoshuaGoldberg Dec 17, 2025
878ee4d
#3819 minor fix
EddieTheEgg Dec 17, 2025
faf71c1
minor fix
JoshuaGoldberg Dec 17, 2025
d272fa5
Revert "functionality"
JoshuaGoldberg Dec 17, 2025
2fa932c
Revert "minor fix"
JoshuaGoldberg Dec 17, 2025
5a401a3
Reapply "functionality"
JoshuaGoldberg Dec 17, 2025
b6d7852
Reapply "minor fix"
JoshuaGoldberg Dec 17, 2025
ab8c984
minor adjustment maybe
JoshuaGoldberg Dec 17, 2025
43b2960
readability changes
JoshuaGoldberg Dec 17, 2025
a94011d
formatting 2
JoshuaGoldberg Dec 17, 2025
2c715a5
time changes
JoshuaGoldberg Dec 17, 2025
61be6f0
documentation
JoshuaGoldberg Dec 17, 2025
3303d4b
easir logic
JoshuaGoldberg Dec 17, 2025
4754031
comment fix
JoshuaGoldberg Dec 17, 2025
1c9ac01
reversion
JoshuaGoldberg Dec 17, 2025
6b4a2e5
re-update
JoshuaGoldberg Dec 17, 2025
7d0e652
basic errors
JoshuaGoldberg Dec 17, 2025
78aaad2
fun updates
JoshuaGoldberg Dec 17, 2025
3c3fea2
getting things to work as intended
JoshuaGoldberg Dec 17, 2025
02c10ab
better review warnings
JoshuaGoldberg Dec 18, 2025
fb9518a
little pieces of lint, swept away into the great beyond, never to be …
JoshuaGoldberg Dec 18, 2025
9daee87
Merge branch 'develop' into feature/calendar-improvements
wavehassman Dec 18, 2025
8014b74
Merge branch 'feature/calendar-improvements' into #3816-event-modal
wavehassman Dec 18, 2025
985e660
minor fixes
JoshuaGoldberg Dec 19, 2025
a9da238
even more changes
JoshuaGoldberg Dec 19, 2025
4051836
test failing?
JoshuaGoldberg Dec 19, 2025
624792c
Merge pull request #3831 from Northeastern-Electric-Racing/#3703-Upco…
wavehassman Dec 19, 2025
61c2126
Merge branch 'feature/calendar-improvements' into #3817-review-bookings
JoshuaGoldberg Dec 20, 2025
cd84a66
Merge branch 'feature/calendar-improvements' into #3817-review-bookings
JoshuaGoldberg Dec 20, 2025
fc22153
fix conflicts
JoshuaGoldberg Dec 20, 2025
d9dcf26
oops
JoshuaGoldberg Dec 20, 2025
48564ac
#3817 Add merge conflict resolution changes
EddieTheEgg Dec 20, 2025
1e49b0d
#3817 Merge feature/calendar-improvements
EddieTheEgg Dec 20, 2025
2c6ebb0
#3817 Fix conflicts
EddieTheEgg Dec 20, 2025
8494bb7
Merge pull request #3834 from Northeastern-Electric-Racing/#3400-cale…
wavehassman Dec 20, 2025
9824e44
Merge branch 'feature/calendar-improvements' into #3816-event-modal
wavehassman Dec 20, 2025
babc185
Merge pull request #3824 from Northeastern-Electric-Racing/#3816-even…
wavehassman Dec 20, 2025
51011cc
Merge branch 'feature/calendar-improvements' into #3817-review-bookings
JoshuaGoldberg Dec 21, 2025
668f334
changes
JoshuaGoldberg Dec 21, 2025
d590f9f
oops
JoshuaGoldberg Dec 21, 2025
c2fd3e7
Merge remote-tracking branch 'origin/feature/calendar-improvements' i…
Dec 22, 2025
1bee933
lint issues
Dec 22, 2025
5873779
isolate the render
JoshuaGoldberg Dec 24, 2025
b943e1c
minor logic update
JoshuaGoldberg Dec 24, 2025
8c2ae07
Merge pull request #3837 from Northeastern-Electric-Racing/#3817-revi…
JoshuaGoldberg Dec 24, 2025
d91b1eb
small edits
JoshuaGoldberg Dec 27, 2025
17fb736
#3818 first round of changes
wavehassman Dec 28, 2025
67fe6c4
#3818 fixed UI and isUserOnEvent
wavehassman Dec 29, 2025
e9c8369
#3818 add routes
wavehassman Dec 29, 2025
f0feaee
Merge branch 'feature/calendar-improvements' into #3702-all-calendar-…
JoshuaGoldberg Dec 29, 2025
95ec291
fix merge conflicts
JoshuaGoldberg Dec 29, 2025
c5dcf8f
lint
JoshuaGoldberg Dec 29, 2025
ad309c2
accidentally removed a feature in a prior merge, oops
JoshuaGoldberg Dec 29, 2025
c96484e
Merge pull request #3828 from Northeastern-Electric-Racing/#3702-all-…
JoshuaGoldberg Dec 30, 2025
04a0b35
Merge branch 'develop' into feature/calendar-improvements
JoshuaGoldberg Dec 30, 2025
9a7b9ca
ideas
JoshuaGoldberg Dec 30, 2025
011e23d
Merge branch 'feature/calendar-improvements' into small-edits
JoshuaGoldberg Dec 30, 2025
249871c
#3818 bug fixes
wavehassman Dec 31, 2025
e709927
Merge branch '#3818-availability-view-potential-changes' into #3818-a…
wavehassman Dec 31, 2025
87e010d
#3818 ui changes
wavehassman Dec 31, 2025
43d12cb
minor fix
JoshuaGoldberg Jan 1, 2026
9015080
test
JoshuaGoldberg Jan 1, 2026
4c933b7
fix the edit
JoshuaGoldberg Jan 1, 2026
1d2d90b
delete modal update
JoshuaGoldberg Jan 1, 2026
59abbd6
abstract just in case
JoshuaGoldberg Jan 1, 2026
525869e
remove unnecessary files
JoshuaGoldberg Jan 1, 2026
24c2809
text matches mock
JoshuaGoldberg Jan 1, 2026
5be453a
removal
JoshuaGoldberg Jan 2, 2026
e4420b2
hook up edit + comment
JoshuaGoldberg Jan 2, 2026
de5d780
linting
JoshuaGoldberg Jan 2, 2026
f1a43f9
easier to remove warnings
JoshuaGoldberg Jan 3, 2026
b3bb2ff
typo
JoshuaGoldberg Jan 3, 2026
683a865
Merge pull request #3851 from Northeastern-Electric-Racing/small-edits
wavehassman Jan 4, 2026
6255c82
Merge branch 'feature/calendar-improvements' into #3818-availability
wavehassman Jan 4, 2026
c2e7a7e
#3818 requested changes + changing edit modal logic
wavehassman Jan 4, 2026
b02f445
#3818 files
wavehassman Jan 4, 2026
080f551
#3818 typescript fixes
wavehassman Jan 4, 2026
94d7b52
#3818 copied over wrong version of file
wavehassman Jan 4, 2026
3916417
Merge pull request #3849 from Northeastern-Electric-Racing/#3818-avai…
JoshuaGoldberg Jan 5, 2026
27cb8aa
#3767 onboarding impreovements
chpy04 Jan 7, 2026
dacc8cc
#3767 migrated away from description blocks
chpy04 Jan 7, 2026
79e155e
#3767 minor fixes
chpy04 Jan 7, 2026
faef604
#3767 more consistent enum usage
chpy04 Jan 7, 2026
290e744
#3767 toooltip to tell users they have to complete subtasks
chpy04 Jan 7, 2026
10aa571
#3767 displayOrder -> displayIndex
chpy04 Jan 8, 2026
21399f1
#3767 misc changes
chpy04 Jan 8, 2026
e037e02
#3767 prettier
chpy04 Jan 8, 2026
a63bd32
#3860 don't include assemblies in materials
chpy04 Jan 5, 2026
8732a85
#3860 add back missing date deleted field
chpy04 Jan 8, 2026
06c05a5
changed from enum to const for compilation hot fix
chpy04 Jan 8, 2026
39f0636
Change to string literals as temporaryt solution
chpy04 Jan 8, 2026
6bf56ec
merge with develop
chpy04 Jan 16, 2026
8f82952
Move migration back, show work package events on that work packages t…
chpy04 Jan 16, 2026
7dffbc1
all work package previews endpoint and lazy load create form data
chpy04 Jan 16, 2026
471ac8d
team previews without users for faster dropdowns
chpy04 Jan 17, 2026
07f22a7
refactor schedule slots to not store recurrances
chpy04 Jan 20, 2026
912fcf8
event modal correct abstraction
chpy04 Jan 20, 2026
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
4 changes: 2 additions & 2 deletions src/backend/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import descriptionBulletsRouter from './src/routes/description-bullets.routes.js
import tasksRouter from './src/routes/tasks.routes.js';
import reimbursementRequestsRouter from './src/routes/reimbursement-requests.routes.js';
import notificationsRouter from './src/routes/notifications.routes.js';
import designReviewsRouter from './src/routes/design-reviews.routes.js';
import wbsElementTemplatesRouter from './src/routes/wbs-element-templates.routes.js';
import carsRouter from './src/routes/cars.routes.js';
import organizationRouter from './src/routes/organizations.routes.js';
Expand All @@ -25,6 +24,7 @@ import statisticsRouter from './src/routes/statistics.routes.js';
import retrospectiveRouter from './src/routes/retrospective.routes.js';
import partsRouter from './src/routes/parts.routes.js';
import financeRouter from './src/routes/finance.routes.js';
import calendarRouter from './src/routes/calendar.routes.js';

const app = express();

Expand Down Expand Up @@ -90,7 +90,6 @@ app.use('/change-requests', changeRequestsRouter);
app.use('/description-bullets', descriptionBulletsRouter);
app.use('/tasks', tasksRouter);
app.use('/reimbursement-requests', reimbursementRequestsRouter);
app.use('/design-reviews', designReviewsRouter);
app.use('/notifications', notificationsRouter);
app.use('/templates', wbsElementTemplatesRouter);
app.use('/cars', carsRouter);
Expand All @@ -103,6 +102,7 @@ app.use('/statistics', statisticsRouter);
app.use('/retrospective', retrospectiveRouter);
app.use('/parts', partsRouter);
app.use('/finance', financeRouter);
app.use('/calendar', calendarRouter);
app.use('/', (_req, res) => {
res.status(200).json('Welcome to FinishLine');
});
Expand Down
Loading
Loading