Skip to content
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.

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

Feature/homepage redesign #3106

Closed
wants to merge 459 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
459 commits
Select commit Hold shift + click to select a range
6ae13e3
#2998-wrote tests
caiodasilva2005 Nov 19, 2024
6875955
#3000-set up hooks
caiodasilva2005 Nov 19, 2024
8eec4f3
#2793: Aligned the title, description, and buttons
vindema Nov 20, 2024
d55f556
#2793: Removed GuestOrganizationInfo component from AdminHomePage
vindema Nov 20, 2024
650266b
Merge https://github.com/Northeastern-Electric-Racing/FinishLine into…
vindema Nov 20, 2024
77f0770
#2793: Merged changes into branch
vindema Nov 20, 2024
83ea95d
#2793: Fixed merge conflicts
vindema Nov 20, 2024
c54b9b2
#2793: Fixed merged conflicts
vindema Nov 20, 2024
03c72c6
#2793: Fixed Prettier issue
vindema Nov 20, 2024
fc44a6c
#3000-created notification card
caiodasilva2005 Nov 20, 2024
fe2593d
Merge pull request #2941 from Northeastern-Electric-Racing/#2940-Caio…
walker-sean Nov 20, 2024
375df2e
#2817 added card and section files
jessegarcia1 Nov 21, 2024
d0c8d8c
#3000-fixed styling
caiodasilva2005 Nov 21, 2024
d2e9cdc
#2821-separated into two files
caiodasilva2005 Nov 22, 2024
2b8bbb2
Merge branch 'feature/homepage-redesign' into #2997-Caio-SendNotifica…
caiodasilva2005 Nov 22, 2024
93728de
#2997-created migration
caiodasilva2005 Nov 22, 2024
845a83f
Merge branch 'feature/homepage-redesign' of https://github.com/Northe…
caiodasilva2005 Nov 22, 2024
0771afc
#2801 uses util function and checks for active wps
chpy04 Nov 25, 2024
4cc35ff
Merge branch 'feature/homepage-redesign' into #2803-Chris-UnreviewedCRs
chpy04 Nov 25, 2024
83d83af
#2803 merge conflict resolution
chpy04 Nov 25, 2024
a817b75
#2809 fixed scrollbar color in firefox
chpy04 Nov 25, 2024
d919f32
#2809 changed example on homepage to correct width
chpy04 Nov 25, 2024
b6e1f2e
Merge pull request #2891 from Northeastern-Electric-Racing/#2793-Gues…
walker-sean Nov 25, 2024
3c1291d
#2803-added height to scrollable page block
caiodasilva2005 Nov 26, 2024
f8b5b73
#2817-added button
jessegarcia1 Nov 26, 2024
7c30f0a
#2803 all components are dynamically sized
caiodasilva2005 Nov 26, 2024
ba997b1
refactor lead page
caiodasilva2005 Nov 26, 2024
90d733f
Merge branch 'feature/homepage-redesign' of https://github.com/Northe…
caiodasilva2005 Nov 26, 2024
cd01bae
All componenets on homepage can now be dynamically sized
caiodasilva2005 Nov 26, 2024
45d0574
#2997-creates only one notifcation and sends to multiple users
caiodasilva2005 Nov 26, 2024
598d8fe
created tests for sending notifications
caiodasilva2005 Nov 27, 2024
810fbe0
#2998-merged sending notifications
caiodasilva2005 Nov 27, 2024
c6d44a7
fixed wrapping issues on member encouragement
caiodasilva2005 Nov 27, 2024
aa2c580
Merge pull request #3045 from Northeastern-Electric-Racing/Dynamic-Si…
Peyton-McKee Nov 29, 2024
e4cc7ac
#2809 merge with feature/homepage-redesign
chpy04 Nov 29, 2024
e48a579
#2809 removed redundant code and used addWeeks func
chpy04 Nov 29, 2024
9dfafde
#2801 remove duplicate WPs
chpy04 Nov 29, 2024
6e47bfe
#2801 merge with feature/homepage-redesign
chpy04 Nov 29, 2024
f15b734
#2801 style error fix
chpy04 Nov 29, 2024
c909c86
#2803 merge with feature/homepage-redesign
chpy04 Nov 29, 2024
21a90bc
#2803 changed title to Change Requests to Review
chpy04 Nov 29, 2024
2f87c01
Merge branch '#2998-Caio-GetUnreadNotifications' into #3000-Caio-Disp…
caiodasilva2005 Nov 30, 2024
bef883a
#3000-animation is working
caiodasilva2005 Nov 30, 2024
18931ef
#2809-fixed dynamic sizing
caiodasilva2005 Dec 2, 2024
76ca13b
#2801-Fixed dynamic sizing
caiodasilva2005 Dec 2, 2024
038ae11
#2803-up to date
caiodasilva2005 Dec 2, 2024
b50eabb
#2803-adding to home page
caiodasilva2005 Dec 3, 2024
2d494e1
fixed flex issue
caiodasilva2005 Dec 3, 2024
8cef4f3
added min height to projects card
caiodasilva2005 Dec 4, 2024
580f417
#2817 updated conditions that show reviews
jessegarcia1 Dec 5, 2024
52fab51
#2817 some stuff
jessegarcia1 Dec 5, 2024
c833136
#2803-adjusted home pages
caiodasilva2005 Dec 5, 2024
ab2a456
Merge pull request #2845 from Northeastern-Electric-Racing/#2801-Team…
walker-sean Dec 5, 2024
d72ec1a
merged orign develop
caiodasilva2005 Dec 5, 2024
2c10a86
merged develop, upgraded node versions and dependencies
caiodasilva2005 Dec 5, 2024
5e9280c
Merge branch 'feature/homepage-redesign' into #2809-Workpackage-Selec…
caiodasilva2005 Dec 5, 2024
5b235b1
#2809-small refactoring
caiodasilva2005 Dec 5, 2024
b75c53f
#2809-added comments
caiodasilva2005 Dec 5, 2024
9105d39
merged develop
caiodasilva2005 Dec 5, 2024
33d090f
#2817-fixed filtering
caiodasilva2005 Dec 5, 2024
95e722e
#2817-confirmed members
caiodasilva2005 Dec 5, 2024
81afabf
Merge branch 'feature/homepage-redesign' into #3000-Caio-DisplayNotif…
caiodasilva2005 Dec 5, 2024
5b99236
#3000-updated controller
caiodasilva2005 Dec 5, 2024
79472b4
Merge pull request #3057 from Northeastern-Electric-Racing/merge-develop
Peyton-McKee Dec 5, 2024
24bc0e2
#2795-created hooks for logo
caiodasilva2005 Dec 6, 2024
0ddfc1d
#2803-merged feature/homepage
caiodasilva2005 Dec 6, 2024
832ec1a
#2803-renamed component
caiodasilva2005 Dec 6, 2024
ce2a4d7
Merge branch 'feature/homepage-redesign' into #2817-Upcoming-Design-R…
caiodasilva2005 Dec 6, 2024
5cfe9d8
Merge pull request #2873 from Northeastern-Electric-Racing/#2803-Chri…
Peyton-McKee Dec 6, 2024
4ae2563
#2817-added zoom link and fixed confirmation
caiodasilva2005 Dec 6, 2024
f0e1cb4
fixed typo
caiodasilva2005 Dec 6, 2024
127df5f
#2809-merged feature branch
caiodasilva2005 Dec 6, 2024
606be36
#2809-fixed merge conflicts
caiodasilva2005 Dec 6, 2024
86e033f
Merge pull request #2888 from Northeastern-Electric-Racing/#2809-Work…
walker-sean Dec 8, 2024
dc18abe
#2821-reversed changes to card
caiodasilva2005 Dec 8, 2024
e829700
#2821-merged feature branch
caiodasilva2005 Dec 8, 2024
a987afc
#2821-fixed changes on wp card
caiodasilva2005 Dec 8, 2024
6e8bc4b
#2821-Added to admin homepage
caiodasilva2005 Dec 8, 2024
9117237
#2821-fixed spacings
caiodasilva2005 Dec 8, 2024
8f60928
#2821-fixed margins on empty
caiodasilva2005 Dec 8, 2024
afd33a0
#2821-reverted updates
caiodasilva2005 Dec 8, 2024
b9f9308
Merge branch '#2821-Updated-OverdueWps' into #2821-Caio-OverdueWPs
caiodasilva2005 Dec 8, 2024
e682f08
Merge branch 'feature/homepage-redesign' into #2817-Upcoming-Design-R…
jessegarcia1 Dec 8, 2024
0d27cb3
#2817 prettier
jessegarcia1 Dec 8, 2024
3188722
#2817 linting
jessegarcia1 Dec 8, 2024
df2865b
#2817 linting again
jessegarcia1 Dec 8, 2024
314b2bb
#2817-added components
caiodasilva2005 Dec 8, 2024
0547881
Merge branch '#2817-Upcoming-Design-Reviews' of https://github.com/No…
caiodasilva2005 Dec 8, 2024
2da092d
#2817-added to lead home page
caiodasilva2005 Dec 8, 2024
f7b3973
#2817-linting
caiodasilva2005 Dec 8, 2024
b71ec00
#2821-yarn install
caiodasilva2005 Dec 8, 2024
b3718e0
#2821-up to date
caiodasilva2005 Dec 8, 2024
db222ba
#3060-created hooks
caiodasilva2005 Dec 9, 2024
ef3f81e
Merge pull request #2927 from Northeastern-Electric-Racing/#2821-Caio…
Peyton-McKee Dec 10, 2024
32e23a4
#3060-created forms
caiodasilva2005 Dec 10, 2024
7edbe77
#2795-up to date
caiodasilva2005 Dec 10, 2024
907e54d
#3060-updated logo fom
caiodasilva2005 Dec 10, 2024
94d8342
#2997-reset to service
caiodasilva2005 Dec 11, 2024
f77b213
Merge branch '#2997-Caio-SendNotifications' of https://github.com/Nor…
caiodasilva2005 Dec 11, 2024
a63ae1f
Merge branch 'feature/homepage-redesign' into Send-Notification-Update
caiodasilva2005 Dec 11, 2024
edb600c
#2997-added endpoints for notifications
caiodasilva2005 Dec 11, 2024
1650ab8
#2997-send notifications endpoint tested
caiodasilva2005 Dec 11, 2024
abe2400
#2997-created tests for notifications
caiodasilva2005 Dec 11, 2024
150175e
#2997-up to date
caiodasilva2005 Dec 11, 2024
2200256
#2997-small issues
caiodasilva2005 Dec 11, 2024
151ce73
#2997-removed duplicates
caiodasilva2005 Dec 11, 2024
e7df823
#2997-removed utils
caiodasilva2005 Dec 11, 2024
2d011f4
#2769-added loading check
caiodasilva2005 Dec 11, 2024
91b5429
#2997-include only notification service
caiodasilva2005 Dec 11, 2024
d53dc2e
#2997-removed route
caiodasilva2005 Dec 11, 2024
af59d26
#2769-fixed loading check
caiodasilva2005 Dec 11, 2024
d68b106
Merge pull request #3036 from Northeastern-Electric-Racing/#2769-Caio…
Peyton-McKee Dec 11, 2024
46c34ea
Merge pull request #3035 from Northeastern-Electric-Racing/#2997-Caio…
Peyton-McKee Dec 11, 2024
b4e3cc5
Merge branch 'feature/homepage-redesign' into #2998-Caio-GetUnreadNot…
caiodasilva2005 Dec 12, 2024
da6e24f
#2998-upated endpoint
caiodasilva2005 Dec 12, 2024
f2e10f9
#3060-merged feature branch
caiodasilva2005 Dec 12, 2024
e59e07b
#3060-removed unnneeded migration
caiodasilva2005 Dec 12, 2024
327d893
#2817 added 1 to date and design review creator to userIDs
jessegarcia1 Dec 12, 2024
6b8863e
#3044 challenge handshake and event verification
chpy04 Dec 13, 2024
d085200
Merge pull request #3063 from Northeastern-Electric-Racing/#2998-Caio…
walker-sean Dec 13, 2024
eec9ffd
#3060-created edit logo
caiodasilva2005 Dec 13, 2024
ed36d21
#3060-small fix
caiodasilva2005 Dec 14, 2024
3ffe659
#3060-default logo showing
caiodasilva2005 Dec 14, 2024
b466c25
#3060-small fix
caiodasilva2005 Dec 14, 2024
61b6cf8
#3060-await
caiodasilva2005 Dec 14, 2024
0e2fed5
#3060-fixed tests
caiodasilva2005 Dec 14, 2024
7a45b07
Merge branch 'feature/homepage-redesign' of https://github.com/Northe…
caiodasilva2005 Dec 14, 2024
bcf1057
#2817 fixed scrolling on firefox
caiodasilva2005 Dec 14, 2024
b477480
#2817-linting
caiodasilva2005 Dec 14, 2024
f429ccc
#2820-added overdue days to new overdue work package card
caiodasilva2005 Dec 14, 2024
f5ed749
2820-unused import
caiodasilva2005 Dec 14, 2024
95f8685
Merge pull request #3066 from Northeastern-Electric-Racing/#2820-Caio…
Peyton-McKee Dec 14, 2024
5c2f759
#2817 added datetime util to fix timezone offset
jessegarcia1 Dec 14, 2024
ba44349
Merge branch 'feature/homepage-redesign' into #3044-slack-endpoint-li…
caiodasilva2005 Dec 14, 2024
2e7aabd
Merge branch 'feature/homepage-redesign' into #2817-Upcoming-Design-R…
caiodasilva2005 Dec 14, 2024
e84cf52
#2817-fxied mistake
caiodasilva2005 Dec 14, 2024
11291e8
event-listening
caiodasilva2005 Dec 15, 2024
3369a6e
#2999-remove notification endpoint created
caiodasilva2005 Dec 15, 2024
4ad0bef
#2999-created tests
caiodasilva2005 Dec 15, 2024
bc42004
#2999-javadocs
caiodasilva2005 Dec 15, 2024
7a9985d
#3044-slack event received
caiodasilva2005 Dec 16, 2024
989ffd7
Merge branch 'feature/homepage-redesign' into Slack-Events
caiodasilva2005 Dec 16, 2024
5516efd
#3044-receiving events
caiodasilva2005 Dec 16, 2024
e2327d6
Merge pull request #3068 from Northeastern-Electric-Racing/#2999-Caio…
walker-sean Dec 16, 2024
822f572
#200-merged feature branch
caiodasilva2005 Dec 16, 2024
46b80c7
#3000-created remove hook
caiodasilva2005 Dec 16, 2024
6b4c7a9
#3000-mulitple notifications showing
caiodasilva2005 Dec 16, 2024
56e668c
#3000-added notifications to sercives
caiodasilva2005 Dec 16, 2024
e5f2a44
#3000-removed test notifications
caiodasilva2005 Dec 16, 2024
07180f9
#2817 functions to const and removed line
jessegarcia1 Dec 16, 2024
8477e87
#3060-removed default image
caiodasilva2005 Dec 17, 2024
53d5e72
#3060-removed check for no logo
caiodasilva2005 Dec 17, 2024
55f17f4
#3060-prettier
caiodasilva2005 Dec 17, 2024
2722e7d
#3060-added onboarding endpoints
caiodasilva2005 Dec 17, 2024
8806ff1
#3000-goes to link on click
caiodasilva2005 Dec 18, 2024
0ea4075
#3000-javadocs
caiodasilva2005 Dec 18, 2024
382e65b
#3000-linting
caiodasilva2005 Dec 18, 2024
c12b8ed
#3000-small fix
caiodasilva2005 Dec 18, 2024
47da71e
#3000-consolidated migraations
caiodasilva2005 Dec 18, 2024
bc93cf1
Merge pull request #3070 from Northeastern-Electric-Racing/#3000-Caio…
Peyton-McKee Dec 18, 2024
2f337d9
#3074-created get unread announcements endpoint
caiodasilva2005 Dec 18, 2024
6446202
#3075-created get unread announcements endpoint
caiodasilva2005 Dec 18, 2024
4913d91
block processing for slack message event
chpy04 Dec 18, 2024
35e2a27
#2823 merge with getUnreadAnnouncements and slack message processing …
chpy04 Dec 18, 2024
882fcde
up to date
caiodasilva2005 Dec 19, 2024
cc6e643
#3074-updated announcements in schema
caiodasilva2005 Dec 19, 2024
49be622
#3074-tests
caiodasilva2005 Dec 19, 2024
4b28cc8
Merge pull request #3058 from Northeastern-Electric-Racing/#2817-Upco…
walker-sean Dec 19, 2024
0dfedd2
#2074-javadocs
caiodasilva2005 Dec 20, 2024
763183f
Merge branch '#3074-GetUnreadAnnouncements' into #3075-RemoveAnnounce…
caiodasilva2005 Dec 20, 2024
8cf7ff1
#3075-added test
caiodasilva2005 Dec 20, 2024
66f5837
#3074-using current user
caiodasilva2005 Dec 20, 2024
b9206bd
#3060-removed finance get image
caiodasilva2005 Dec 20, 2024
06df950
#3060-fixed issues
caiodasilva2005 Dec 20, 2024
a1d8637
#3060-merged feature-branch
caiodasilva2005 Dec 20, 2024
e80337e
#2823 slack service comments and tests
chpy04 Dec 20, 2024
acbb022
#2823 merge with #3074-GetUnreadAnnouncements to have announcement se…
chpy04 Dec 20, 2024
5a7cb3d
#3074-set date created to now in schema
caiodasilva2005 Dec 20, 2024
e71442b
#3074-fixed service
caiodasilva2005 Dec 20, 2024
43b9bd0
#3074-fixed seed
caiodasilva2005 Dec 20, 2024
811b608
#2823 slack id to organization schema change, service funcs, and slac…
chpy04 Dec 20, 2024
147b5dd
#2823 announcement service function tests
chpy04 Dec 20, 2024
9ce32f9
#3074-refactored notifications for route change
caiodasilva2005 Dec 20, 2024
51c9a04
up to date
caiodasilva2005 Dec 20, 2024
fd4f299
#3074-fixed transformer
caiodasilva2005 Dec 20, 2024
d982e2e
created endpoint to set workspace id
caiodasilva2005 Dec 21, 2024
3baf84c
created hook to set workspace if
caiodasilva2005 Dec 21, 2024
99fb4d1
created text field for setting workspace id
caiodasilva2005 Dec 21, 2024
c4774e0
javadocs
caiodasilva2005 Dec 21, 2024
388ad7e
added link for where to find workspace id
caiodasilva2005 Dec 21, 2024
7e22e61
#2795-up to date
caiodasilva2005 Dec 21, 2024
97a33e7
#2795-updated component for changes
caiodasilva2005 Dec 21, 2024
4b7f4ae
#3075-up to date
caiodasilva2005 Dec 21, 2024
b0e6b87
Merge pull request #3065 from Northeastern-Electric-Racing/#3060-Caio…
Peyton-McKee Dec 21, 2024
0673cdf
#3074-refactored notifications to separate router
caiodasilva2005 Dec 21, 2024
962e88c
#3074-refactored announcements to be on separate route
caiodasilva2005 Dec 21, 2024
05e984c
#3044 refactoring and minor fixes
chpy04 Dec 21, 2024
d95527d
#3074-fixed issues
caiodasilva2005 Dec 21, 2024
b3132f0
#3074-small fix
caiodasilva2005 Dec 21, 2024
bd671c1
Merge branch 'feature/homepage-redesign' into #2795-Caio-OrgLogo
caiodasilva2005 Dec 21, 2024
fb0f3a2
#2795-removed log
caiodasilva2005 Dec 21, 2024
a81a106
#3074-merged feature branch
caiodasilva2005 Dec 21, 2024
96c103d
fixes
caiodasilva2005 Dec 21, 2024
f670021
merged feature branch
caiodasilva2005 Dec 22, 2024
e1d11fe
#2795-small fix
caiodasilva2005 Dec 22, 2024
349e60a
#3075-up to date
caiodasilva2005 Dec 22, 2024
9d8ed90
#3075-moved to announcements router
caiodasilva2005 Dec 22, 2024
988b9aa
Merge pull request #3093 from Northeastern-Electric-Racing/#2795-Caio…
Peyton-McKee Dec 22, 2024
170c3cb
Merge pull request #3091 from Northeastern-Electric-Racing/OrgWsId
Peyton-McKee Dec 22, 2024
f8f166d
#3074-fix endpoint
caiodasilva2005 Dec 22, 2024
2be6d82
#3074-linting
caiodasilva2005 Dec 22, 2024
c1a5f7e
Merge branch '#3074-GetUnreadAnnouncements' into #3075-RemoveAnnounce…
caiodasilva2005 Dec 22, 2024
ecc5609
#3075-fixed endpoint
caiodasilva2005 Dec 22, 2024
c36bc65
#3044-up to date
caiodasilva2005 Dec 22, 2024
2882d54
#3044-merged feature branch
caiodasilva2005 Dec 22, 2024
329b60f
#3074-refactored notifications into pop-ups
caiodasilva2005 Dec 22, 2024
02bde93
Merge branch '#3074-GetUnreadAnnouncements' into #3075-RemoveAnnounce…
caiodasilva2005 Dec 22, 2024
74b287f
#3044 checking for notFound error and changed how we get org id
chpy04 Dec 22, 2024
f101571
Merge branch '#3044-slack-endpoint-listener' of https://github.com/No…
caiodasilva2005 Dec 22, 2024
c8392e9
#3075-fixed tests
caiodasilva2005 Dec 22, 2024
127c319
#3044-up to date
caiodasilva2005 Dec 22, 2024
dc35d6d
#3074-fixed pop up card
caiodasilva2005 Dec 22, 2024
42ef1f9
Merge branch '#3074-GetUnreadAnnouncements' into #3075-RemoveAnnounce…
caiodasilva2005 Dec 22, 2024
76e94cf
Merge branch '#3074-GetUnreadAnnouncements' into #3044-slack-endpoint…
caiodasilva2005 Dec 22, 2024
505e858
Merge pull request #3076 from Northeastern-Electric-Racing/#3074-GetU…
Peyton-McKee Dec 24, 2024
decdcbc
Merge branch 'feature/homepage-redesign' into #3075-RemoveAnnouncement
walker-sean Dec 24, 2024
10a97bb
Merge pull request #3095 from Northeastern-Electric-Racing/#3075-Remo…
caiodasilva2005 Dec 24, 2024
5f16229
#3044-up to date
caiodasilva2005 Dec 24, 2024
1bd863a
#3044-fixed date
caiodasilva2005 Dec 24, 2024
c94172f
#3044-fixed tests
caiodasilva2005 Dec 24, 2024
4d18129
#3044-small mistake
caiodasilva2005 Dec 24, 2024
3019b55
#3099-hook and api
caiodasilva2005 Dec 26, 2024
64965db
#3099-created api
caiodasilva2005 Dec 26, 2024
b8ea0ab
#3099-created announcements display
caiodasilva2005 Dec 26, 2024
2b1f55a
#3099-Organizing pages
caiodasilva2005 Dec 26, 2024
3d2c816
#3099-error check
caiodasilva2005 Dec 27, 2024
1dbb550
#3044 refactoring prisma queries and misc changes
chpy04 Dec 27, 2024
1b411a1
#3099-fixed issues
caiodasilva2005 Dec 28, 2024
21d33d5
#3099-transform result of api call
caiodasilva2005 Dec 29, 2024
ecc4548
Merge pull request #3100 from Northeastern-Electric-Racing/#3099-Disp…
Peyton-McKee Dec 30, 2024
659f88c
#3044-added organization to announcements and pop-ups
caiodasilva2005 Dec 30, 2024
1d118e0
#3044-fixed tests
caiodasilva2005 Dec 30, 2024
5a6990e
Merge pull request #3089 from Northeastern-Electric-Racing/#3044-slac…
Peyton-McKee Jan 2, 2025
9d159d2
up to date
caiodasilva2005 Jan 2, 2025
5d4bdfb
fixed merge conflicts
caiodasilva2005 Jan 4, 2025
43e4bc8
adjusted for task deadline change
caiodasilva2005 Jan 4, 2025
2e085d7
small fix
caiodasilva2005 Jan 4, 2025
224143a
Merge pull request #3107 from Northeastern-Electric-Racing/merge-feat…
Peyton-McKee Jan 4, 2025
00c220e
mistake
caiodasilva2005 Jan 4, 2025
c529710
Merge pull request #3108 from Northeastern-Electric-Racing/fix-fronte…
Peyton-McKee Jan 6, 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
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
"@types/react-dom": "17.0.1"
},
"dependencies": {
"@slack/events-api": "^3.0.1",
"mitt": "^3.0.1",
"react-hook-form-persist": "^3.0.0",
"typescript": "^4.1.5"
Expand Down
11 changes: 11 additions & 0 deletions src/backend/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ import workPackageTemplatesRouter from './src/routes/work-package-templates.rout
import carsRouter from './src/routes/cars.routes';
import organizationRouter from './src/routes/organizations.routes';
import recruitmentRouter from './src/routes/recruitment.routes';
import { slackEvents } from './src/routes/slack.routes';
import announcementsRouter from './src/routes/announcements.routes';
import onboardingRouter from './src/routes/onboarding.routes';
import popUpsRouter from './src/routes/pop-up.routes';

const app = express();

Expand All @@ -40,6 +44,10 @@ const options: cors.CorsOptions = {
allowedHeaders
};

// so we can listen to slack messages
// NOTE: must be done before using json
app.use('/slack', slackEvents.requestListener());

// so that we can use cookies and json
app.use(cookieParser());
app.use(express.json());
Expand Down Expand Up @@ -68,6 +76,9 @@ app.use('/templates', workPackageTemplatesRouter);
app.use('/cars', carsRouter);
app.use('/organizations', organizationRouter);
app.use('/recruitment', recruitmentRouter);
app.use('/pop-ups', popUpsRouter);
app.use('/announcements', announcementsRouter);
app.use('/onboarding', onboardingRouter);
app.use('/', (_req, res) => {
res.status(200).json('Welcome to FinishLine');
});
Expand Down
34 changes: 34 additions & 0 deletions src/backend/src/controllers/announcements.controllers.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import { NextFunction, Request, Response } from 'express';
import AnnouncementService from '../services/announcement.service';

export default class AnnouncementController {
static async getUserUnreadAnnouncements(req: Request, res: Response, next: NextFunction) {
try {
const { organization, currentUser } = req;

const unreadAnnouncements = await AnnouncementService.getUserUnreadAnnouncements(
currentUser.userId,
organization.organizationId
);
res.status(200).json(unreadAnnouncements);
} catch (error: unknown) {
next(error);
}
}

static async removeUserAnnouncement(req: Request, res: Response, next: NextFunction) {
try {
const { announcementId } = req.params;
const { organization, currentUser } = req;

const unreadAnnouncements = await AnnouncementService.removeUserAnnouncement(
currentUser.userId,
announcementId,
organization.organizationId
);
res.status(200).json(unreadAnnouncements);
} catch (error: unknown) {
next(error);
}
}
}
21 changes: 21 additions & 0 deletions src/backend/src/controllers/onboarding.controller.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { NextFunction, Request, Response } from 'express';
import OnboardingServices from '../services/onboarding.services';

export default class OnboardingController {
static async downloadImage(req: Request, res: Response, next: NextFunction) {
try {
const { fileId } = req.params;

const imageData = await OnboardingServices.downloadImage(fileId);

// Set the appropriate headers for the HTTP response
res.setHeader('content-type', String(imageData.type));
res.setHeader('content-length', imageData.buffer.length);

// Send the Buffer as the response body
res.send(imageData.buffer);
} catch (error: unknown) {
return next(error);
}
}
}
75 changes: 75 additions & 0 deletions src/backend/src/controllers/organizations.controllers.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { NextFunction, Request, Response } from 'express';
import OrganizationsService from '../services/organizations.services';
import { HttpException } from '../utils/errors.utils';

export default class OrganizationsController {
static async getCurrentOrganization(req: Request, res: Response, next: NextFunction) {
Expand Down Expand Up @@ -60,4 +61,78 @@ export default class OrganizationsController {
next(error);
}
}

static async setOrganizationFeaturedProjects(req: Request, res: Response, next: NextFunction) {
try {
const { projectIds } = req.body;
const featuredProjects = await OrganizationsService.setFeaturedProjects(projectIds, req.organization, req.currentUser);

res.status(200).json(featuredProjects);
} catch (error: unknown) {
next(error);
}
}

static async setLogoImage(req: Request, res: Response, next: NextFunction) {
try {
if (!req.file) {
throw new HttpException(400, 'Invalid or undefined image data');
}

const updatedOrg = await OrganizationsService.setLogoImage(req.file, req.currentUser, req.organization);

res.status(200).json(updatedOrg);
} catch (error: unknown) {
next(error);
}
}

static async getOrganizationLogoImage(req: Request, res: Response, next: NextFunction) {
try {
const { organization } = req;

const logoImageId = await OrganizationsService.getLogoImage(organization.organizationId);
res.status(200).json(logoImageId);
} catch (error: unknown) {
next(error);
}
}

static async setOrganizationDescription(req: Request, res: Response, next: NextFunction) {
try {
const updatedOrg = await OrganizationsService.setOrganizationDescription(
req.body.description,
req.currentUser,
req.organization
);

res.status(200).json(updatedOrg);
} catch (error: unknown) {
next(error);
}
}

static async getOrganizationFeaturedProjects(req: Request, res: Response, next: NextFunction) {
try {
const featuredProjects = await OrganizationsService.getOrganizationFeaturedProjects(req.organization.organizationId);
res.status(200).json(featuredProjects);
} catch (error: unknown) {
next(error);
}
}

static async setSlackWorkspaceId(req: Request, res: Response, next: NextFunction) {
try {
const { workspaceId } = req.body;

const updatedOrg = await OrganizationsService.setSlackWorkspaceId(
workspaceId,
req.currentUser,
req.organization.organizationId
);
res.status(200).json(updatedOrg);
} catch (error: unknown) {
next(error);
}
}
}
27 changes: 27 additions & 0 deletions src/backend/src/controllers/popUps.controllers.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import { NextFunction, Request, Response } from 'express';
import { PopUpService } from '../services/pop-up.services';

export default class PopUpsController {
static async getUserUnreadPopUps(req: Request, res: Response, next: NextFunction) {
try {
const { organization, currentUser } = req;

const unreadPopUps = await PopUpService.getUserUnreadPopUps(currentUser.userId, organization.organizationId);
res.status(200).json(unreadPopUps);
} catch (error: unknown) {
next(error);
}
}

static async removeUserPopUps(req: Request, res: Response, next: NextFunction) {
try {
const { popUpId } = req.params;
const { organization, currentUser } = req;

const unreadPopUps = await PopUpService.removeUserPopUp(currentUser.userId, popUpId, organization.organizationId);
res.status(200).json(unreadPopUps);
} catch (error: unknown) {
next(error);
}
}
}
18 changes: 18 additions & 0 deletions src/backend/src/controllers/slack.controllers.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import { getWorkspaceId } from '../integrations/slack';
import OrganizationsService from '../services/organizations.services';
import SlackServices from '../services/slack.services';

export default class SlackController {
static async processMessageEvent(event: any) {
try {
const organizations = await OrganizationsService.getAllOrganizations();
const nerSlackWorkspaceId = await getWorkspaceId();
const relatedOrganization = organizations.find((org) => org.slackWorkspaceId === nerSlackWorkspaceId);
if (relatedOrganization) {
SlackServices.processMessageSent(event, relatedOrganization.organizationId);
}
} catch (error: unknown) {
console.log(error);
}
}
}
66 changes: 10 additions & 56 deletions src/backend/src/controllers/teams.controllers.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { NextFunction, Request, Response } from 'express';
import TeamsService from '../services/teams.services';
import { HttpException } from '../utils/errors.utils';

export default class TeamsController {
static async getAllTeams(req: Request, res: Response, next: NextFunction) {
Expand All @@ -13,16 +12,6 @@ export default class TeamsController {
}
}

static async getAllArchivedTeams(req: Request, res: Response, next: NextFunction) {
try {
const teams = await TeamsService.getAllArchivedTeams(req.organization);

res.status(200).json(teams);
} catch (error: unknown) {
next(error);
}
}

static async getSingleTeam(req: Request, res: Response, next: NextFunction) {
try {
const { teamId } = req.params;
Expand Down Expand Up @@ -125,14 +114,12 @@ export default class TeamsController {
}
}

static async setTeamType(req: Request, res: Response, next: NextFunction) {
static async createTeamType(req: Request, res: Response, next: NextFunction) {
try {
const { teamTypeId } = req.body;
const { teamId } = req.params;
const { name, iconName } = req.body;

const updatedTeam = await TeamsService.setTeamType(req.currentUser, teamId, teamTypeId, req.organization);

res.status(200).json(updatedTeam);
const createdTeamType = await TeamsService.createTeamType(req.currentUser, name, iconName, req.organization);
res.status(200).json(createdTeamType);
} catch (error: unknown) {
next(error);
}
Expand All @@ -155,51 +142,18 @@ export default class TeamsController {
const teamTypes = await TeamsService.getAllTeamTypes(req.organization);
res.status(200).json(teamTypes);
} catch (error: unknown) {
next(error);
}
}

static async createTeamType(req: Request, res: Response, next: NextFunction) {
try {
const { name, iconName, description } = req.body;

const createdTeamType = await TeamsService.createTeamType(
req.currentUser,
name,
iconName,
description,
req.organization
);
res.status(200).json(createdTeamType);
} catch (error: unknown) {
next(error);
return next(error);
}
}

static async editTeamType(req: Request, res: Response, next: NextFunction) {
static async setTeamType(req: Request, res: Response, next: NextFunction) {
try {
const { name, iconName, description } = req.body;
const { teamTypeId } = req.body;
const { teamId } = req.params;

const teamType = await TeamsService.editTeamType(
req.currentUser,
req.params.teamTypeId,
name,
iconName,
description,
req.organization
);
res.status(200).json(teamType);
} catch (error: unknown) {
next(error);
}
}
const updatedTeam = await TeamsService.setTeamType(req.currentUser, teamId, teamTypeId, req.organization);

static async setTeamTypeImage(req: Request, res: Response, next: NextFunction) {
try {
const { file } = req;
if (!file) throw new HttpException(400, 'Invalid or undefined image data');
const teamType = await TeamsService.setTeamTypeImage(req.currentUser, req.params.teamTypeId, file, req.organization);
res.status(200).json(teamType);
res.status(200).json(updatedTeam);
} catch (error: unknown) {
next(error);
}
Expand Down
24 changes: 24 additions & 0 deletions src/backend/src/controllers/users.controllers.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { NextFunction, Request, Response } from 'express';
import UsersService from '../services/users.services';
import { AccessDeniedException } from '../utils/errors.utils';
import { Task } from 'shared';

export default class UsersController {
static async getAllUsers(_req: Request, res: Response, next: NextFunction) {
Expand Down Expand Up @@ -167,4 +168,27 @@ export default class UsersController {
next(error);
}
}

static async getUserTasks(req: Request, res: Response, next: NextFunction) {
try {
const { userId } = req.params;
const { organization } = req;

const userTasks = await UsersService.getUserTasks(userId, organization);
res.status(200).json(userTasks);
} catch (error: unknown) {
next(error);
}
}

static async getManyUserTasks(req: Request, res: Response, next: NextFunction) {
try {
const { userIds } = req.body;

const tasks: Task[] = await UsersService.getManyUserTasks(userIds, req.organization);
res.status(200).json(tasks);
} catch (error: unknown) {
next(error);
}
}
}
Loading
Loading