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

Feedback #1

Open
wants to merge 353 commits into
base: feedback
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
353 commits
Select commit Hold shift + click to select a range
60480c3
Update accesstoken to be part of cookie
mounilsankar Oct 9, 2024
e087f21
Fix bug
mounilsankar Oct 9, 2024
4de9da9
Update cookie headers
mounilsankar Oct 9, 2024
f2e13c4
Add Registration form component
ryanlimdx Oct 9, 2024
2fef3b9
Add register page and hook
ryanlimdx Oct 9, 2024
2b32d7e
Clean up redundant imports
ryanlimdx Oct 9, 2024
da66c01
Initialised matching service
Bandov Oct 10, 2024
13e691a
Merge pull request #48 from CS3219-AY2425S1/register
mounilsankar Oct 10, 2024
668cc0f
Merge pull request #44 from CS3219-AY2425S1/mounil-be
revdrag Oct 11, 2024
9e44842
Fix cookies and CORS issue and restructure pages
revdrag Oct 11, 2024
71f0b15
Revert docker-compose.yaml changes
revdrag Oct 11, 2024
b7c50fc
Fix links in buttons
revdrag Oct 11, 2024
bb9428d
Add forgetPasswordForm to frontend
mounilsankar Oct 11, 2024
6effb81
Add forgetpassword hooks
mounilsankar Oct 11, 2024
427fccb
Add forget-password page
mounilsankar Oct 11, 2024
77ee817
Add forgot-password route to be
mounilsankar Oct 11, 2024
72a1822
Merge pull request #51 from CS3219-AY2425S1/helin-user-service
mounilsankar Oct 11, 2024
09b256e
Merge branch 'main' into mounil-fe
mounilsankar Oct 11, 2024
26f61ff
Update forget-password page
mounilsankar Oct 11, 2024
378a277
initialised matching service
Bandov Oct 12, 2024
4326aab
Add handleForgetPassword method to fe
mounilsankar Oct 12, 2024
8ca9ce2
Add nodemailer to be
mounilsankar Oct 12, 2024
193039a
Update dependencies for be
mounilsankar Oct 12, 2024
189bc0d
Fix imports
mounilsankar Oct 12, 2024
dbee07e
Remove unused import
mounilsankar Oct 12, 2024
d68916a
Add ResetPasswordForm
mounilsankar Oct 12, 2024
0d993e9
Add resetPassword page
mounilsankar Oct 12, 2024
471c886
Add resetPassword hook
mounilsankar Oct 12, 2024
a721fb6
Update resetUrl link
mounilsankar Oct 12, 2024
20d7ef8
Update frontend error messages
mounilsankar Oct 12, 2024
80967eb
Update form error message
mounilsankar Oct 12, 2024
3031dfc
Fix bug
mounilsankar Oct 12, 2024
1ed12e9
Update dockerfiles
mounilsankar Oct 12, 2024
2eb4b45
Implement profile management and user global context
revdrag Oct 12, 2024
3434de4
Remove console log in user-service
revdrag Oct 12, 2024
c0ae1f1
Revert docker compose changes
revdrag Oct 12, 2024
d118c1b
Update handleVerifyToken
mounilsankar Oct 13, 2024
17fd4e5
Merge pull request #59 from CS3219-AY2425S1/helin-user-service
mounilsankar Oct 13, 2024
6bfd88e
Merge branch 'main' into mounil-fe
mounilsankar Oct 13, 2024
87b25aa
Fix merge conflics
mounilsankar Oct 13, 2024
671b0c4
Merge pull request #56 from CS3219-AY2425S1/mounil-fe
mounilsankar Oct 13, 2024
3690de0
fixed rabbitmq startup issue
Bandov Oct 14, 2024
872f981
Merge branch 'matching-service' of https://github.com/CS3219-AY2425S1…
Bandov Oct 14, 2024
d4b49b0
Stop tracking DS_Store
Bandov Oct 14, 2024
8602bb9
Merge branch 'main' into matching-service
mounilsankar Oct 14, 2024
0262e28
Merge branch 'matching-service' of https://github.com/CS3219-AY2425S1…
mounilsankar Oct 14, 2024
685be76
Remove .DS_Store
mounilsankar Oct 14, 2024
39af543
Merge pull request #60 from CS3219-AY2425S1/fix-dsstore
mounilsankar Oct 14, 2024
6038873
Remove .DS_Store
mounilsankar Oct 14, 2024
71f08d0
add matching service timer and drop down options
Oct 15, 2024
1b3045d
merge main to integrate matching service
Oct 15, 2024
591d097
Merge pull request #52 from CS3219-AY2425S1/matching-service
Bandov Oct 15, 2024
4f89f75
integrate matching service
Oct 15, 2024
b9a8363
Add protected routes and refresh access token logic
revdrag Oct 15, 2024
e735dcd
Revert docker-compose
revdrag Oct 15, 2024
69070c7
Fix UI light mode issue for auth services in frontend
ryanlimdx Oct 15, 2024
1cde13e
"integrate with backend"
Oct 16, 2024
a9c4b14
Fix axios interceptor bug
revdrag Oct 17, 2024
1db9e36
Update accessToken expiry to 1 hour
revdrag Oct 17, 2024
56c3055
update matching svc to use correct api call
Bandov Oct 17, 2024
438665d
Merge pull request #65 from CS3219-AY2425S1/helin-user-service
mounilsankar Oct 17, 2024
48b3dcf
Merge pull request #66 from CS3219-AY2425S1/register
mounilsankar Oct 17, 2024
c44bccd
Merge pull request #68 from CS3219-AY2425S1/update-matching-service
mounilsankar Oct 17, 2024
a04c3e7
added a cancel match feature to ms
Bandov Oct 17, 2024
84dd8f3
Merge pull request #70 from CS3219-AY2425S1/add-cancel-ms
mounilsankar Oct 17, 2024
8f05b25
integrate frontend with backend
Oct 17, 2024
d7e5753
Fix bug where user logout but is not redirected
revdrag Oct 17, 2024
74566f0
merge
Oct 17, 2024
91a0b73
Add authentication of question service requests
mounilsankar Oct 17, 2024
b05cec9
Add authentication of matching service requests
mounilsankar Oct 17, 2024
9e11fca
Merge pull request #71 from CS3219-AY2425S1/helin-user-service
mounilsankar Oct 17, 2024
f932c1d
Merge pull request #73 from CS3219-AY2425S1/authorise-backend
Bandov Oct 18, 2024
2c7669f
Integrate frontend With Matching Backend
Oct 18, 2024
cfaad7c
Integrate cancel user with frontend
Oct 18, 2024
590c7f8
Merge branch 'main' into MatchingServiceFrontend
mounilsankar Oct 18, 2024
bb6211c
add listener to close socket when user refreshes page
Oct 18, 2024
05aa76a
add listener for cancel
Oct 18, 2024
46aeb26
testMerge branch 'main' into MatchingServiceFrontend
Oct 18, 2024
a0b29db
Fix matching bus
Oct 18, 2024
b7ab260
Merge branch 'MatchingServiceFrontend' of https://github.com/CS3219-A…
Oct 18, 2024
d350a94
Fix be authentication bug
mounilsankar Oct 19, 2024
d5d82e9
Merge pull request #74 from CS3219-AY2425S1/MatchingServiceFrontend
ryanlimdx Oct 19, 2024
291c602
Remove refresh token due buggy issues
revdrag Oct 19, 2024
95c6b51
Fix merge conflicts
revdrag Oct 19, 2024
b569834
Merge pull request #76 from CS3219-AY2425S1/bug-fix
mounilsankar Oct 19, 2024
4bd37fb
Fix perpetual login status on incorrect credentials/ email
ryanlimdx Oct 19, 2024
f8ee746
Merge branch 'main' into loginPage
ryanlimdx Oct 20, 2024
7f1ce55
deletes non required users from db
Bandov Oct 20, 2024
f24c2b5
change to manually braodcast msg
Bandov Oct 20, 2024
075c80e
Revert "change to manually braodcast msg"
mounilsankar Oct 20, 2024
57fbf29
Fix route protection bug
revdrag Oct 20, 2024
c6f09c3
Merge pull request #78 from CS3219-AY2425S1/updateMS
ryanlimdx Oct 20, 2024
3f5c6a7
Merge pull request #79 from CS3219-AY2425S1/bug-fix
mounilsankar Oct 20, 2024
65da201
Merge pull request #77 from CS3219-AY2425S1/loginPage
mounilsankar Oct 20, 2024
8f759ef
Revert "Fix perpetual login status on incorrect credentials/ email"
Bandov Oct 20, 2024
f850a95
Merge pull request #80 from CS3219-AY2425S1/revert-77-loginPage
ryanlimdx Oct 20, 2024
780c2a8
Revert "Fix route protection bug"
Bandov Oct 20, 2024
c9df877
Merge pull request #81 from CS3219-AY2425S1/revert-79-bug-fix
mounilsankar Oct 20, 2024
d0738c6
Bug fix for route protection
revdrag Oct 20, 2024
1986dff
Fix merge conflicts
revdrag Oct 20, 2024
867e783
Fix bug
revdrag Oct 20, 2024
730ef70
Add 403 page and verify token api
revdrag Oct 20, 2024
4579b4c
Fix isAdmin bug
revdrag Oct 20, 2024
873fb6c
Merge pull request #82 from CS3219-AY2425S1/bug-fix
mounilsankar Oct 20, 2024
d52e099
created get question by filter api and starting voice chat service
Bandov Oct 23, 2024
4e3ea63
Remove protection for get question routes
mounilsankar Oct 24, 2024
f387637
Make question retrieval case insensitive
mounilsankar Oct 24, 2024
87ecac4
update question service cors
mounilsankar Oct 24, 2024
08369a9
Update matching model
mounilsankar Oct 24, 2024
35ef00a
Update matching model
mounilsankar Oct 24, 2024
ae1b32e
Add consumer logic
mounilsankar Oct 24, 2024
a025eb6
seperated voice chat into own service
Bandov Oct 25, 2024
b8a48cb
Add start socket logic to collab service
mounilsankar Oct 25, 2024
ecd4497
Merge pull request #83 from CS3219-AY2425S1/init-collab-service
mounilsankar Oct 26, 2024
34995cd
Update match response
mounilsankar Oct 26, 2024
cac3598
fix match controller
Bandov Oct 26, 2024
b3e0e08
Fix model branch
mounilsankar Oct 26, 2024
45b1d2f
Update cors
mounilsankar Oct 26, 2024
687a4ac
Merge pull request #90 from CS3219-AY2425S1/setup-collab-socket
mounilsankar Oct 26, 2024
99e1532
Add socket context
revdrag Oct 26, 2024
178d0da
Convert go to ts
mounilsankar Oct 27, 2024
0482bb9
Fix socket connection bug
mounilsankar Oct 27, 2024
75e4f54
Merge branch 'main' into migrate-collab-service
mounilsankar Oct 27, 2024
0871e14
Fix merge conflicts
revdrag Oct 27, 2024
617efca
Merge pull request #91 from CS3219-AY2425S1/migrate-collab-service
revdrag Oct 27, 2024
c80d0c7
Fix merge conflicts from main
revdrag Oct 27, 2024
0ca2ba0
Fix merge conflicts from main
revdrag Oct 27, 2024
b7bb138
migrate to app router
Oct 28, 2024
cee1383
Partial migration to App Router
revdrag Oct 28, 2024
fe9fbf2
Fix UI bug in user-profile page
revdrag Oct 28, 2024
3e0c9a3
Initial Code Editor
Oct 29, 2024
3dbab8a
add code editor
Oct 29, 2024
262cf93
Merge pull request #94 from CS3219-AY2425S1/AppRouterMigrationBranch
revdrag Oct 29, 2024
c6f1e94
Implement socket session in frontend for collab
revdrag Oct 29, 2024
a8fe0c0
Fix merge conflicts and bugs
revdrag Oct 29, 2024
b2a4045
Merge pull request #92 from CS3219-AY2425S1/helin-collab
Bandov Oct 29, 2024
b2c5cb9
update voicechat
Bandov Oct 30, 2024
9cdfe46
updated user control
Bandov Oct 31, 2024
d586820
Merge pull request #89 from CS3219-AY2425S1/match-controller-update
mounilsankar Oct 31, 2024
ced157d
Set up peerjs voice service
mounilsankar Oct 31, 2024
2060b47
fix voice-service
mounilsankar Oct 31, 2024
205dafa
cleanup voice-service
mounilsankar Oct 31, 2024
703a36e
Merge pull request #97 from CS3219-AY2425S1/try-peerjs
Bandov Oct 31, 2024
f7d79bb
add y-server
Oct 31, 2024
78b7608
fix undefined bug
Oct 31, 2024
4e8b773
added code execution functionality
Bandov Oct 31, 2024
e6bea87
Merge pull request #98 from CS3219-AY2425S1/code-execution
ryanlimdx Nov 1, 2024
d57a76d
changed frontend ui
Bandov Nov 1, 2024
1f8d5c1
Fix admin url for questions
ryanlimdx Nov 1, 2024
91dddb8
Implement fetch question and authentication for collab page
revdrag Nov 1, 2024
fbf091b
Fix merge conflicts
revdrag Nov 1, 2024
0b299f4
Add session model
mounilsankar Nov 1, 2024
8806ce3
Update models
mounilsankar Nov 1, 2024
98a9696
Add api for saving and retrieving sessions
mounilsankar Nov 1, 2024
7923b08
Update fe request for match
mounilsankar Nov 1, 2024
895b3b8
Fix bugs
mounilsankar Nov 1, 2024
f4ef7d1
Merge branch 'main' into add-history
mounilsankar Nov 1, 2024
be43523
Add fe call to save code
mounilsankar Nov 1, 2024
3c78171
add awareness
Nov 2, 2024
dce3257
Merge pull request #104 from CS3219-AY2425S1/history
mounilsankar Nov 2, 2024
6671e28
Merge pull request #100 from CS3219-AY2425S1/collab-page-refresh
mounilsankar Nov 2, 2024
936f599
Set up history pages
ryanlimdx Nov 2, 2024
8c2e92f
resolve merge conflict
Nov 2, 2024
c2d20dc
resolve merge conflicts
Nov 2, 2024
441e163
Merge pull request #103 from CS3219-AY2425S1/AddYServerBranch
DingBao-sys Nov 2, 2024
af88ab0
Fix merge conflicts and fix ui
revdrag Nov 2, 2024
595a649
Fix merge conflicts
revdrag Nov 2, 2024
1a86e15
Fix minor bug
revdrag Nov 2, 2024
e7a06e2
Merge pull request #102 from CS3219-AY2425S1/helin-collab
mounilsankar Nov 2, 2024
b63bbd6
Merge branch 'main' of https://github.com/CS3219-AY2425S1/cs3219-ay24…
ryanlimdx Nov 2, 2024
243c6ce
Add getSession route
mounilsankar Nov 2, 2024
986353d
Merge branch 'add-history' of https://github.com/CS3219-AY2425S1/cs32…
mounilsankar Nov 2, 2024
c0e14d0
Protect backend collaboration routes
mounilsankar Nov 2, 2024
ea57f79
Finalise Code Editor Design
Nov 3, 2024
c5ee42a
adjust room session info card
Nov 3, 2024
9fde764
fix minor collab page bug
Nov 3, 2024
7a1145c
Add query hooks for history and session
ryanlimdx Nov 3, 2024
998deea
Integrate hook into page
ryanlimdx Nov 3, 2024
42600f8
Merge pull request #105 from CS3219-AY2425S1/FinalCodeEditorBranch
Bandov Nov 3, 2024
7b6272f
Fix sessions retrieivng type
ryanlimdx Nov 3, 2024
2b5a127
update match controller
Bandov Nov 3, 2024
fc59cee
Merge branch 'main' into add-history
mounilsankar Nov 4, 2024
a939d25
Merge pull request #106 from CS3219-AY2425S1/change_match
mounilsankar Nov 4, 2024
e0fccef
Merge branch 'main' into add-history
mounilsankar Nov 4, 2024
49826cb
updated consumer to include progamming language
Bandov Nov 4, 2024
1093b7d
added programming language to matchSchema
Bandov Nov 4, 2024
360b872
Build history page
ryanlimdx Nov 4, 2024
d128630
Merge branch 'add-history' of https://github.com/CS3219-AY2425S1/cs32…
ryanlimdx Nov 4, 2024
e859d72
Fix matching bugs
mounilsankar Nov 4, 2024
257436e
Merge pull request #107 from CS3219-AY2425S1/update_rabbit_consumer
Bandov Nov 4, 2024
01b5fe3
Add history components
ryanlimdx Nov 4, 2024
8b1f491
Add History to navbar
ryanlimdx Nov 4, 2024
ce1a358
Fix nan bug
ryanlimdx Nov 4, 2024
9fa15fd
Merge branch 'main' into add-history
mounilsankar Nov 4, 2024
0aa9005
Add language and access roomInfo on CollaborationPage
Nov 5, 2024
3bce195
Fix bugs
mounilsankar Nov 5, 2024
b375c97
Fix bugs
mounilsankar Nov 5, 2024
a3fe5ad
Fix language bug
mounilsankar Nov 5, 2024
cf0fb39
Merge pull request #108 from CS3219-AY2425S1/AddLanguageBranch
mounilsankar Nov 5, 2024
492d1f6
Fix merge conflicts
revdrag Nov 5, 2024
3cb4ac9
Fix merge conflicts from main
revdrag Nov 5, 2024
d9d6a44
Fix lint issues and bug with save code
revdrag Nov 5, 2024
8370efe
Merge pull request #109 from CS3219-AY2425S1/Add-History
mounilsankar Nov 5, 2024
444da88
Fix bug in collaboration page
revdrag Nov 5, 2024
6aecacc
Merge pull request #112 from CS3219-AY2425S1/bug-fix
mounilsankar Nov 6, 2024
9ae7df3
Add fe to docker-compose
mounilsankar Nov 6, 2024
1d26c2e
Comment out bug
mounilsankar Nov 6, 2024
4abca5f
Fix collaboration bug
mounilsankar Nov 6, 2024
b888042
Merge pull request #113 from CS3219-AY2425S1/fix-docker
mounilsankar Nov 6, 2024
0b9c574
Fix bugs and update collab page
revdrag Nov 6, 2024
37dd948
Fix merge conflicts
revdrag Nov 6, 2024
eab2fe8
Add room cookie logic
mounilsankar Nov 6, 2024
a6642c6
Merge pull request #115 from CS3219-AY2425S1/bug-fix
mounilsankar Nov 6, 2024
f21d08e
Merge branch 'main' into room-cookie
mounilsankar Nov 6, 2024
d670871
Update save-code logic
mounilsankar Nov 6, 2024
def4bf4
Update socket event
mounilsankar Nov 6, 2024
be73ee8
Integrate backend to frontend for collab session
revdrag Nov 6, 2024
67abb9c
updated voice svc to allow recconnect
Bandov Nov 6, 2024
19b71e0
Add delete cookie handler
mounilsankar Nov 6, 2024
7e17c5a
Update default language logic
mounilsankar Nov 8, 2024
4e1974a
Fix typo
mounilsankar Nov 8, 2024
71d42ab
Implement user exit and rejoin logic
revdrag Nov 8, 2024
962af60
Fix matching logic
mounilsankar Nov 8, 2024
f031e6e
Update language in backend to be string
mounilsankar Nov 8, 2024
dd3a0d7
Merge branch 'room-cookie' of github.com:CS3219-AY2425S1/cs3219-ay242…
revdrag Nov 8, 2024
c231774
Update collab page and eslint config
revdrag Nov 8, 2024
ccb5f1c
Update matching model
mounilsankar Nov 8, 2024
8eef1de
Merge pull request #116 from CS3219-AY2425S1/room-cookie
Bandov Nov 8, 2024
112bfa7
Merge pull request #117 from CS3219-AY2425S1/voice-svc-recco
Bandov Nov 8, 2024
d048427
fix codeEditor bug
Nov 9, 2024
97478fc
Merge pull request #118 from CS3219-AY2425S1/MonacoEditorBugBranch
mounilsankar Nov 9, 2024
3f9e8fc
Route voice request through nginx
mounilsankar Nov 10, 2024
2f5a301
Merge pull request #119 from CS3219-AY2425S1/reroute-voice-service
mounilsankar Nov 10, 2024
1ab16c2
Update cookie for security
ryanlimdx Nov 10, 2024
ff5d9c3
Merge pull request #120 from CS3219-AY2425S1/login
mounilsankar Nov 10, 2024
8bbc1c7
updated matching to get the correct programming language
Bandov Nov 10, 2024
8f7a276
Merge pull request #121 from CS3219-AY2425S1/updated-matching
DingBao-sys Nov 10, 2024
907bcd2
Make row clickable for question and history
ryanlimdx Nov 12, 2024
afa508c
Fix reset password
mounilsankar Nov 12, 2024
6dee1a9
Merge pull request #123 from CS3219-AY2425S1/clickablerow
mounilsankar Nov 13, 2024
21e4c42
Merge pull request #122 from CS3219-AY2425S1/fix-reset-password
mounilsankar Nov 13, 2024
8add3bb
add loading spinner
Nov 13, 2024
7636112
Clean up voice chat UI
mounilsankar Nov 13, 2024
e156d95
Fix auth
mounilsankar Nov 13, 2024
45dd22a
Fix cookie error
mounilsankar Nov 13, 2024
d36f0f9
Update Language UI in code editor
mounilsankar Nov 13, 2024
302a1eb
Merge pull request #124 from CS3219-AY2425S1/AddCodeExecutionSpinnerB…
Bandov Nov 13, 2024
acb036a
Fix bug in add/edit question
revdrag Nov 13, 2024
f5b8b8a
Remove unnecessary console log statement
revdrag Nov 13, 2024
cdd0cc6
Merge pull request #125 from CS3219-AY2425S1/bug-fix
Bandov Nov 13, 2024
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.env
node_modules/
.DS_Store
18 changes: 18 additions & 0 deletions .vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"configurations": [
{
"name": "macos-clang-arm64",
"includePath": [
"${workspaceFolder}/**"
],
"compilerPath": "/usr/bin/clang",
"cStandard": "${default}",
"cppStandard": "${default}",
"intelliSenseMode": "macos-clang-arm64",
"compilerArgs": [
""
]
}
],
"version": 4
}
13 changes: 13 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "C/C++ Runner: Debug Session",
"type": "lldb",
"request": "launch",
"args": [],
"cwd": "/Users/simdinghao/Documents/Y3S1/CS3230/Assignments/PA1",
"program": "/Users/simdinghao/Documents/Y3S1/CS3230/Assignments/PA1/build/Debug/outDebug"
}
]
}
59 changes: 59 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
"C_Cpp_Runner.cCompilerPath": "clang",
"C_Cpp_Runner.cppCompilerPath": "clang++",
"C_Cpp_Runner.debuggerPath": "lldb",
"C_Cpp_Runner.cStandard": "",
"C_Cpp_Runner.cppStandard": "",
"C_Cpp_Runner.msvcBatchPath": "",
"C_Cpp_Runner.useMsvc": false,
"C_Cpp_Runner.warnings": [
"-Wall",
"-Wextra",
"-Wpedantic",
"-Wshadow",
"-Wformat=2",
"-Wcast-align",
"-Wconversion",
"-Wsign-conversion",
"-Wnull-dereference"
],
"C_Cpp_Runner.msvcWarnings": [
"/W4",
"/permissive-",
"/w14242",
"/w14287",
"/w14296",
"/w14311",
"/w14826",
"/w44062",
"/w44242",
"/w14905",
"/w14906",
"/w14263",
"/w44265",
"/w14928"
],
"C_Cpp_Runner.enableWarnings": true,
"C_Cpp_Runner.warningsAsError": false,
"C_Cpp_Runner.compilerArgs": [],
"C_Cpp_Runner.linkerArgs": [],
"C_Cpp_Runner.includePaths": [],
"C_Cpp_Runner.includeSearch": [
"*",
"**/*"
],
"C_Cpp_Runner.excludeSearch": [
"**/build",
"**/build/**",
"**/.*",
"**/.*/**",
"**/.vscode",
"**/.vscode/**"
],
"C_Cpp_Runner.useAddressSanitizer": false,
"C_Cpp_Runner.useUndefinedSanitizer": false,
"C_Cpp_Runner.useLeakSanitizer": false,
"C_Cpp_Runner.showCompilationTime": false,
"C_Cpp_Runner.useLinkTimeOptimization": false,
"C_Cpp_Runner.msvcSecureNoWarnings": false
}
7 changes: 0 additions & 7 deletions README.md

This file was deleted.

7 changes: 7 additions & 0 deletions backend/api-gateway/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
FROM nginx:alpine

COPY nginx.conf /etc/nginx/nginx.conf

EXPOSE 80

CMD ["nginx", "-g", "daemon off;"]
109 changes: 109 additions & 0 deletions backend/api-gateway/nginx.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
worker_processes 1;

events {
worker_connections 1024;
}

http {
include /etc/nginx/mime.types;
default_type application/json;

sendfile on;
keepalive_timeout 65;

# Upstream configuration for the question-service
upstream question-service {
server question-service:5050; # Docker service name, running on port 5050
}

# Upstream configuration for the user-service
upstream user-service {
server user-service:3001; # Docker service name, running on port 3001
}

# Upstream configuration for the matching-service
upstream matching-service {
server matching-service:3002; # Docker service name, running on port 3002
}

# Upstream configuration for the voice-service
upstream voice-service {
server voice-service:8085;
}

# Upstream configuration for the collaboration-service
upstream collaboration-service {
server collaboration-service:8080;
}

# Server configuration
server {
listen 80;

# Pass requests to question-service
location /api/question-service/ {
proxy_pass http://question-service/;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
}

# Pass requests to user-service
location /api/user-service/ {
proxy_pass http://user-service/;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;

# Forward Set-Cookie header from user service to the browser
proxy_pass_header Set-Cookie;
}

# Pass requests to the matching-service
location /api/matching-service/ {
proxy_pass http://matching-service/;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
}

# Pass requests to the voice-service
location /api/voice-service/ {
proxy_pass http://voice-service/;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
}

location /api/collaboration-service/socket.io/ {
proxy_pass http://collaboration-service;

proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;

proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
}

location /api/collaboration-service/ {
proxy_pass http://collaboration-service/;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
}

# Custom error page configuration
error_page 500 502 503 504 /50x.html;
location = /50x.html {
root /usr/share/nginx/html;
}
}
}
22 changes: 22 additions & 0 deletions backend/collaboration-service/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Use Node.js base image
FROM node:18-alpine

# Set working directory inside the container
WORKDIR /app

# Copy package.json and package-lock.json to the container
COPY package*.json ./

# Install dependencies
RUN npm install

# Copy the rest of the application files
COPY . .

# Expose the port the app runs on
EXPOSE 8080
EXPOSE 2501

# Run the app using ts-node
CMD ["npx", "ts-node", "app.ts"]

Loading