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

Final PR #37

Merged
merged 184 commits into from
Nov 14, 2024
Merged

Final PR #37

merged 184 commits into from
Nov 14, 2024

Conversation

abstxn
Copy link

@abstxn abstxn commented Nov 14, 2024

No description provided.

meowwtama and others added 30 commits October 18, 2024 00:05
@meowwtama
Add collaboration service
e9879d0
@meowwtama
Update MonacoEditor.tsx
9c6b141
@abstxn
show username when logged in
d2bbcbf
@abstxn
add logout feature
eb4257c
@abstxn
prompt user to sign in again if signed out when matching
60af46a
@meowwtama
Merge branch 'CS3219-AY2425S1:main' into feature/collaboration-service
d3ee932
@meowwtama
Update request param
817d901 
No longer require roomId for API calls, just userId.
@techjay-c
Install firebase
356b1ff
@techjay-c
Add frontend component for collaboration code editor page
2cdf9b7
@techjay-c
Add profile page functionality to login flow
bca4325
@techjay-c
Remove old navbar component and modify new navbar
3424e10
@techjay-c
Update usage of variables from local variables to session variables a…
0232f67 
…nd add logout function
@techjay-c
Add About Us page
cc67a47
@techjay-c
Revert to use local storage instead of session storage
cdc04d6
@techjay-c
Update typescript error to fix question list fetch bug
a40f7ba
@techjay-c
Add About Us page ref to nav bar
a4abe25
@techjay-c
Add Change Password page and functionality
39e3a42
@meowwtama
Add JWT authentication
2e4d595
@techjay-c
Update nav bar to show match me tab only if user is authenticated
fea1754
@techjay-c
Merge pull request #17 from meowwtama/feature/collaboration-service
8483d75 
Feature/collaboration service
@techjay-c
Merge branch 'feature/collab-backend' of https://github.com/CS3219-AY…
1cd79d5 
…2425S1/cs3219-ay2425s1-project-g21 into feature/collab-env
@ruth-lim
Added add question modal for admin role
58debd4
@ruth-lim
Refresh table upon adding question
d1f7256
@ruth-lim
Added delete question function
afdf545
@techjay-c
Enhance dequeue service with status based timer handling for match ev…
63be5f5 
…ents
@ruth-lim
Added edit question function
5af59c2
@meowwtama
Fix return
23bf935
@meowwtama
Merge pull request #18 from CS3219-AY2425S1/feature/collab-env
879b37c 
Feature/collab env
@abstxn
dequeue timeout is relative to match request time
5ea572e
@abstxn
Merge branch 'feature/collab-env' into feature/profile-page
2e3bd38
alyssaongyx and others added 26 commits November 10, 2024 10:17
@alyssaongyx
add tests for question-service
d2dfd91
@alyssaongyx
add tests for history-service
77992e3
@alyssaongyx
update tests
5a0e4d6
@alyssaongyx
update jenkins
b1a6abe
@ruth-lim
Merge branch 'develop' into kubernetes
c3ef17a
@ruth-lim
Added cors for request service
d353c79
@alyssaongyx
store chat messages in local storage
bde28a9
@abstxn
Merge branch 'feature/matching-algorithm' into develop
965d91c
@ruth-lim
Update correct endpoints for local dev
d32803d
@ruth-lim
Merge branch 'develop' into kubernetes
78c16ab
@ruth-lim
Add logging
84cbd31
@techjay-c
Update room model to include userLanguage field
faab1a6
@techjay-c
Update code editor to implement user confirmation when language switc…
cb668e9 
…hing
@ruth-lim
Add root route for health check
5c0ce03
@techjay-c
Fix bug that current user will still receive language toast even if h…
d6a70c1 
…e is already on the same language that peer wants to switch to
@techjay-c
Fix more bugs for code language switching
91f6c06
@ruth-lim
Update cors
d7c54a2
@techjay-c
Merge branch 'develop' into feature/collab-new-enhance
8e8d67e
@techjay-c
Merge pull request #36 from CS3219-AY2425S1/feature/collab-new-enhance
5dea56f 
Feature/collab new enhance
@techjay-c
Fix duplicate const declaration in code editor file
7f386b6
@techjay-c
Fix bug for multiple toast messages when code language is spammed
e681a61
@techjay-c
Remove unused declarations
37ef707
@ruth-lim
Merge branch 'develop' into kubernetes
1d4c156
@ruth-lim
Update import
d7b7b60
@ruth-lim
Merge branch 'develop' into kubernetes
fb5e31e
@ruth-lim
Update deployment configuration
d5a877a
ruth-lim
ruth-lim approved these changes Nov 14, 2024
View reviewed changes
Copy link

@ruth-lim ruth-lim left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

meowwtama
meowwtama approved these changes Nov 14, 2024
View reviewed changes
Copy link

@meowwtama meowwtama left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@abstxn abstxn merged commit 956275b into main Nov 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ruth-lim ruth-lim ruth-lim approved these changes

@meowwtama meowwtama meowwtama approved these changes

@alyssaongyx alyssaongyx alyssaongyx approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@abstxn @ruth-lim @meowwtama @alyssaongyx @techjay-c