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.

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

Jump to bottom

Integrate collaboration service with matching service #60

Merged
merged 94 commits into from
Oct 23, 2024
Merged

Integrate collaboration service with matching service #60

merged 94 commits into from
Oct 23, 2024

Conversation

tsulim
Copy link

@tsulim tsulim commented Oct 23, 2024

Changes

  • Remove duplicate route (UserProtectedRoute)
  • Remove temporary match files used for collab
  • Combine socket.js contents
  • Update .env.sample files
  • Rename HOSTNAME to RABBIT_HOSTNAME in rabbitMQ.js
  • Add useSessionStorage
  • Combine usePersistState into useLocalStorage

AndrewOng2066 and others added 30 commits October 6, 2024 14:24
@AndrewOng2066
Merge pull request #12 from CS3219-AY2425S1/merged-user-question
e074bf0 
Pull branch
@AndrewOng2066
Merge pull request #13 from CS3219-AY2425S1/main
03e8cd4 
Merge pull request #36 from CS3219-AY2425S1/merged-user-question
Solve the input box css in the signup page
d8c3500
Create pages for matching services
024e14b
Functions for matching-service
23e4e87
@AndrewOng2066
Merge pull request #43 from AndrewOng2066/matching-service-RabbitMQ-T…
1761e30 
…esting

Implementation for Matching-Service
Comment the code
3e75831
Implement retry matching function in matching-service
74a03c5
@AndrewOng2066
Merge pull request #44 from AndrewOng2066/matching-service-RabbitMQ-T…
a39f56b 
…esting

Implement retry matching function in matching-service
@iynixil
Add logged in route restriction
69e1bba
@iynixil
Add cancel matching functionality
481fd2f
@iynixil
Add username when adding message to message queue, display username i…
1b70d27 
…nstead of email when match found
@iynixil
Update login page css to be contained within login page
534c64b
@iynixil
Add id tag in matching select page
2322b4a
@iynixil
Fix css import in match finding page
1e472fa
@iynixil
Adjust match finding loading text height
0551810
@iynixil
Add navbar to matching selection page
fe1d6dd
@iynixil
Add homepage component and styling
472d2bf
@iynixil
Configure routing to homepage in routes, navbar, login and logout pages
f6f5668
@iynixil
Merge pull request #45 from iynixil/matching-service
ef2e6e4 
Implement more functionalities to matching service and miscellaneous
@AndrewOng2066
Merge pull request #14 from CS3219-AY2425S1/matching-service-xy
82189a1 
Matching service xy
@iynixil
Remove unnecessary code in cancel matching functionality
b5f93db
@iynixil
Merge pull request #46 from iynixil/matching-service
3573680 
Remove unnecessary code in cancel matching functionality
@iynixil
Edit match found message
2955f72
@iynixil
Add options for retrying matching
264934a
@iynixil
Update cancel match functionality, add button to go back to criteria …
b24baa5 
…selection
@iynixil
Merge pull request #47 from iynixil/matching-service
ee2efa1 
Add functionality to add user to different queue after timeout
@iynixil
Fix message shown to user when matching is cancelled
be6177b
@AndrewOng2066
Merge pull request #15 from CS3219-AY2425S1/matching-service-xy
23240a8 
Pull matching service xy
@tsulim
Merge branch 'matching-service-xy' into matching-service-tsu
c85c0a6
AndrewOng2066 and others added 26 commits October 19, 2024 21:02
Remove unnecessary comment
0ca17c7
Remove unnecessary comment
fe9e95e
@iynixil
Remove debugging comments in code
261a2bb
@iynixil
Add docker containerization files for matching service
838614a
@iynixil
Edit cancel matching debugging message
73851af
@iynixil
Update finding match functionality to let user requeue on page refresh
cdfa790
@AndrewOng2066
Merge branch 'matching_final' into matching-service-xy
f64a29a
@AndrewOng2066
Merge pull request #18 from CS3219-AY2425S1/matching-service-xy
88eca8d 
Matching service xy
@iynixil
Add another hostname to rabbitmq connection config
1267f12
@iynixil
Remove unnecessary imports and fix indentations
2919764
@iynixil
Merge remote-tracking branch 'upstream/matching-service-xy' into matc…
8ea938a 
…hing-service
@iynixil
Update timer for rabbitmq, frontend to 60 seconds
e964829
@iynixil
Change log messages for successful match
6b1bae0
@AndrewOng2066
Merge pull request #19 from CS3219-AY2425S1/matching-service-xy
1e72853 
Matching service xy
Print the number of users in the queue when cancelling the match
bb834c9
@AndrewOng2066
Merge pull request #55 from AndrewOng2066/matching_final
8065040 
Matching final
@tsulim
Merge branch 'matching-service-xy' into collaboration-service-tsu
8691d28
@tsulim
Remove duplicate route
d1f06ed
@tsulim
Remove unused rabbitmq
ff93c6e
@tsulim
Remove temporary match files used for collab
f0dd450
@tsulim
Combine socket.js contents
b73c52c
@tsulim
Update .env.sample files
8adc9c3
@tsulim
Rename HOSTNAME to RABBIT_HOSTNAME in rabbitMQ.js
4692a56
@tsulim
Add useSessionStorage
25e7379
@tsulim
Combine usePersistState into useLocalStorage
81a11bf
@tsulim
Integrate collaboration-service with matching-service
51134b9
@tsulim tsulim added the task Something that needs to be done, but not a story, bug, or an epic. label Oct 23, 2024
@tsulim tsulim added this to the Milestone 5 milestone Oct 23, 2024
@tsulim tsulim merged commit 3c21438 into collaboration-service Oct 23, 2024
@tsulim tsulim linked an issue Nov 9, 2024 that may be closed by this pull request
D5: Integration #41
Closed
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
task Something that needs to be done, but not a story, bug, or an epic.
Projects
None yet
Milestone
Milestone 5
Development

Successfully merging this pull request may close these issues.

D5: Integration
3 participants
@tsulim @AndrewOng2066 @iynixil