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

Milestone D4 #47

Merged
merged 79 commits into from
Oct 20, 2024
Merged

Milestone D4 #47

merged 79 commits into from
Oct 20, 2024

Conversation

solomonng2001
Copy link

Merge all commits for milestone D4 into main branch

tituschewxj and others added 30 commits October 9, 2024 02:49
@tituschewxj
feat: add test workflow
33b9753
@tituschewxj
fix: add test for user service
45b9b4b
@tituschewxj
fix: add sleep
9650fc6
@tituschewxj
fix: suppress output of curl
bba2f31
@bensohh
Merge pull request #35 from CS3219-AY2425S1/titus/add-cicd-docker-com…
098224f 
…pose

chore: add cicd docker compose
@bensohh
Create no-auth header and update login and register pages header
f7fb39c
@bensohh
Remove unused styling in login page and update noauth header styling
e17dd20
@bensohh
Remove unused styling for register page and fix register page ui
1b8b96b
@bensohh
Template code for matching page
ff40719
@bensohh
Update Dockerfile to include public files
1cd8647
@bensohh
New home page and shift question page to its own folder
b752332
@tituschewxj
docs: matching service
250acac
@tituschewxj
feat: set up basic matching service websocket
f4a8c7b
@tituschewxj
docs: update env setup
c36b0e7
@tituschewxj
fix: rename module
3e4caa6
@bensohh
Merge pull request #37 from CS3219-AY2425S1/titus/setup-matching-service
408dbb8 
feat: setup matching service backend
@tituschewxj
Merge pull request #36 from CS3219-AY2425S1/ben/improve-frontend-ui
ea0d3ed 
Enhancement: New home page and Fix Ui
@chiaryan
Create and wrap application in context for state of socket
d212d68
@chiaryan
fix: remove "use client"
e6a169e
@chiaryan
Add usewebsocket, basic states for closed channel, open channel, and …
10da8f5 
…transition states
@bensohh
Update instructions on running matching-service with redis
e89f5e5
@bensohh
Update env example and log statements in main
57c4fd9
@chiaryan
Implement functionality for finding a match from message
dbafdf7
@solomonng2001
Add frontend matching modal
a818ea9
@solomonng2001
Remove unecessary imports
542fbcf
@solomonng2001
Remove maskClosable
b1f8e86
@chiaryan
Move websocket logic into services file, add states for finding match…
2557048 
… and timeout
@chiaryan
Merge branch 'staging' into frontend-websocket
82af041
@chiaryan
Merge pull request #38 from CS3219-AY2425S1/solomon/add-frontend-matc…
dae6adb 
…hing-modal

Add frontend matching modal
@chiaryan
Merge branch 'staging' into frontend-websocket
354f47f
bensohh and others added 25 commits October 20, 2024 15:42
@bensohh
Improve websocket test page
5b15263
@tituschewxj
Merge pull request #43 from CS3219-AY2425S1/ben/fix-matching-service
f8e0cda 
fix: error with cleaning up user from global maps
@chiaryan
Add handling of imporper match_found.
6247ae1 
Add handling of match_rejected
@chiaryan
Merge branch 'staging' into frontend-websocket
1d3afe7
@chiaryan
Remove imports from matching-service (was added during merge)
7c36043
@UnwilledTangent
Merge branch 'sean/matching-docker' into frontend-websocket
65d1c45
@chiaryan
Add captions under matched users
e94592d
@chiaryan
match.go changes
c0e2088
@solomonng2001
Merge pull request #40 from CS3219-AY2425S1/frontend-websocket
0b5e5de 
Frontend Websocket
@UnwilledTangent
Add docker-compose.yml for redis and matching service
91f1ee6
@UnwilledTangent
Merge branch 'sean/matching-docker' into frontend-websocket
85ae698
@UnwilledTangent
Merge branch 'frontend-websocket' of https://github.com/CS3219-AY2425…
94669dc 
…S1/cs3219-ay2425s1-project-g24 into frontend-websocket
@UnwilledTangent
Edit readme.md for docker-compose
1871dbc
@solomonng2001
Minor styling to matching buttons and avatar username
8ee7843
@bensohh
Merge pull request #45 from CS3219-AY2425S1/solomon/minor-styling-cha…
fd03903 
…nges-matching-buttons-and-avatar-username

Minor styling edits to matching buttons and avatar username
@bensohh
Update test.yml file
6a11a5b
@bensohh
Change test for websocket
dd66cdb
@bensohh
Temporarily remove test for matching service
8de8677
@bensohh
Test websocat trial 1
ed4e130
@bensohh
Merge pull request #46 from CS3219-AY2425S1/ben/update-ci
443b7de 
Update test.yml file
@UnwilledTangent
Clarified readme.md for matching service
478ffd5
@bensohh
Merge remote-tracking branch 'origin/staging' into frontend-websocket
f8a7759
@UnwilledTangent
Add description for Docker instructions
49b45ca
@bensohh
Update .env.example
d3caf57
@solomonng2001
Merge pull request #44 from CS3219-AY2425S1/frontend-websocket
b7fee12 
Frontend websocket with docker
@solomonng2001 solomonng2001 self-assigned this Oct 20, 2024
tituschewxj
tituschewxj approved these changes Oct 20, 2024
View reviewed changes
Copy link

@tituschewxj tituschewxj left a comment

Choose a reason for hiding this comment

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

LGTM!

@UnwilledTangent UnwilledTangent merged commit 217dc99 into main Oct 20, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tituschewxj tituschewxj tituschewxj approved these changes

Assignees

@solomonng2001 solomonng2001

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@solomonng2001 @tituschewxj @UnwilledTangent @bensohh @chiaryan