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 285 commits into
base: feedback
Choose a base branch
from
Open
Changes from 3 commits
Commits
Show all changes
285 commits
Select commit Hold shift + click to select a range
78638d3
update add delete question operations
Sep 26, 2024
001a3c5
update add question error handling
Sep 26, 2024
9f4790f
Replace user question page with admin question page
brendantwh Sep 26, 2024
d24f5f8
Merge pull request #12 from brendantwh/spa-ui
Jiayan-Lim Sep 27, 2024
73b4e37
Merge branch 'main' into question-ui
Jiayan-Lim Sep 27, 2024
79cd70e
Update CORS to allow frontend to fetch data from backend
Jiayan-Lim Sep 27, 2024
9ec04b8
Merge pull request #11 from pewggls/create-questions
pewggls Sep 27, 2024
279112a
Implemented 'C'rud on question: Add question from frontend to backend
Jiayan-Lim Sep 27, 2024
4d9d7af
Implemented cru`D` on question: Delete question from backend
Jiayan-Lim Sep 27, 2024
12af1b5
Implemented cr`U`d on question: Update question to backend
Jiayan-Lim Sep 27, 2024
36561e1
Merge branch 'main' into question-ui
Jiayan-Lim Sep 27, 2024
e9d0286
Create put and patch http methods for question repo
JohnChia123 Sep 27, 2024
51184fb
Create update and patch http methods for question repo
JohnChia123 Sep 27, 2024
742e3b2
Merge pull request #14 from JohnChia123/main
Jiayan-Lim Sep 27, 2024
97b17f3
Debug API handling for question creation & deletion
Jiayan-Lim Sep 27, 2024
19e079b
Merge branch 'main' into question-ui
Jiayan-Lim Sep 27, 2024
321ba63
Debug view operation API
Jiayan-Lim Sep 28, 2024
0a2e35b
Create tests for questionController.js and small fix on db.js
JohnChia123 Sep 28, 2024
da85989
Add test results for PUT and PATCH, update README.md and package.json…
JohnChia123 Sep 28, 2024
f296620
Merge pull request #15 from Jiayan-Lim/question-ui
brendantwh Sep 29, 2024
b4cee15
Add .env.local to repository
Jiayan-Lim Sep 29, 2024
97792b6
Merge pull request #18 from Jiayan-Lim/question-ui
Jiayan-Lim Sep 29, 2024
0e19736
Merge branch 'main' into question-ui
Jiayan-Lim Sep 29, 2024
d50a00c
Add FR3.2.3 Search by description
JohnChia123 Sep 29, 2024
19380e7
Merge pull request #17 from JohnChia123/testingBackend
brendantwh Sep 29, 2024
6d94179
Refactor error handling and display
brendantwh Sep 29, 2024
c87c6ee
Add description on title hover
brendantwh Sep 29, 2024
b9db9dd
Create tests for filterController.js
JohnChia123 Sep 29, 2024
39d65fb
Merge branch 'testingBackend' of https://github.com:/JohnChia123/cs32…
JohnChia123 Sep 29, 2024
a6a8114
Add delete selected rows function
brendantwh Sep 29, 2024
3f5c74d
Add question table data loading state
brendantwh Sep 29, 2024
2f22ecc
Remove summary field
brendantwh Sep 29, 2024
914779d
Merge branch 'main' of github.com:pewggls/cs3219-ay2425s1-project-g44
Sep 29, 2024
79f9917
Debug compile error
Jiayan-Lim Sep 29, 2024
b919ddd
Merge pull request #20 from Jiayan-Lim/question-ui
Jiayan-Lim Sep 29, 2024
83bdb24
Merge branch 'main' into spa-ui
brendantwh Sep 29, 2024
c25303c
Change error message for duplicate questions
Jiayan-Lim Sep 29, 2024
4aac3e6
Update .gitignore and readme
brendantwh Sep 29, 2024
7ff0ffc
Merge pull request #21 from brendantwh/spa-ui
Jiayan-Lim Sep 29, 2024
13cbdbd
Add gitignore
Sep 29, 2024
0a6c74d
Add concurrently script to run all services with one command.
Sep 29, 2024
c6bd257
Configure question service to connect to MongoDB Atlas cloud.
Sep 29, 2024
3c8a44c
Merge branch 'main' into atlas-config
fahim-tazz Sep 29, 2024
341a966
Merge pull request #22 from fahim-tazz/atlas-config
fahim-tazz Sep 29, 2024
d1a6338
Merge branch 'main' of github.com:pewggls/cs3219-ay2425s1-project-g44
Sep 29, 2024
18c763f
Update db.js
fahim-tazz Sep 29, 2024
749cb3d
Merge branch 'main' of github.com:pewggls/cs3219-ay2425s1-project-g44
Sep 29, 2024
861814e
Update db.js
fahim-tazz Sep 29, 2024
b0a8a10
Merge pull request #23 from fahim-tazz/main
fahim-tazz Sep 29, 2024
9380ace
Merge branch 'main' of github.com:pewggls/cs3219-ay2425s1-project-g44
Sep 29, 2024
aeebb7e
Fix error message for category validation
brendantwh Sep 29, 2024
700e694
Merge branch 'CS3219-AY2425S1:main' into spa-ui
brendantwh Sep 29, 2024
c1db6a4
Update README
brendantwh Sep 29, 2024
0f2ec3a
Case insensitive search
JohnChia123 Sep 29, 2024
cd1851f
Merge branch 'main' into question-ui
Jiayan-Lim Sep 29, 2024
22eb06d
change error msg
Jiayan-Lim Sep 29, 2024
3d9c6b3
Merge pull request #25 from JohnChia123/main
Jiayan-Lim Sep 29, 2024
63331e6
Merge pull request #24 from brendantwh/spa-ui
brendantwh Sep 29, 2024
f8a7d55
Merge pull request #26 from Jiayan-Lim/question-ui
Jiayan-Lim Sep 29, 2024
1ab2791
Merge branch 'main' of github.com:pewggls/cs3219-ay2425s1-project-g44
Sep 29, 2024
04d551b
Update README.md
fahim-tazz Sep 29, 2024
dc09e77
fix bug in add question
Sep 29, 2024
b963f7c
Merge pull request #27 from pewggls/add-question-bug
pewggls Sep 29, 2024
f17793f
Change the index to question title to avoid case-insensitive matching.
Sep 29, 2024
a81d0b1
Merge branch 'main' into case-insensitive-titles
fahim-tazz Sep 29, 2024
1a09c86
Merge pull request #28 from fahim-tazz/case-insensitive-titles
fahim-tazz Sep 29, 2024
59ac1a5
Add page refresh after add or edit question
brendantwh Sep 29, 2024
32bcc64
Merge pull request #29 from brendantwh/spa-ui
brendantwh Sep 29, 2024
c05d0ab
Merge pull request #19 from JohnChia123/testingBackend
JohnChia123 Sep 29, 2024
159ab0b
Change error msg for edit
Jiayan-Lim Sep 29, 2024
88e682e
Merge branch 'main' into question-ui
Jiayan-Lim Sep 29, 2024
5cf2406
Add error handling for duplicate title
Sep 29, 2024
443d692
Update questionController.js
fahim-tazz Sep 29, 2024
42d6765
Merge pull request #31 from fahim-tazz/duplicate-key-error-handling
Jiayan-Lim Sep 29, 2024
8ea1849
Merge branch 'main' into question-ui
Jiayan-Lim Sep 29, 2024
75749d9
Change edit error msg
Jiayan-Lim Sep 29, 2024
68c482f
Add duplicate error handling to add and edit
Sep 29, 2024
bd49fc9
Merge branch 'main' into duplicate-key-error-handling-2
fahim-tazz Sep 29, 2024
4dcba97
Merge pull request #32 from fahim-tazz/duplicate-key-error-handling-2
fahim-tazz Sep 29, 2024
aa80080
Merge branch 'main' into question-ui
Jiayan-Lim Sep 29, 2024
6b94801
Change edit error msg
Jiayan-Lim Sep 29, 2024
7599304
Change error code
Jiayan-Lim Sep 29, 2024
71d86d6
Merge pull request #30 from Jiayan-Lim/question-ui
Jiayan-Lim Sep 29, 2024
f0ce21d
Fix bug for README.md for filter
JohnChia123 Sep 29, 2024
bc2fe60
Merge pull request #33 from JohnChia123/main
JohnChia123 Sep 29, 2024
db66ee5
Add Docker files
brendantwh Oct 3, 2024
d3a2d30
Add Docker files for question service
brendantwh Oct 3, 2024
ffe860c
Update README
brendantwh Oct 3, 2024
f17f809
Merge pull request #34 from brendantwh/containerize
JohnChia123 Oct 3, 2024
4bc5016
Automate CI on github
JohnChia123 Oct 6, 2024
f0a7344
Fix branches from master to main
JohnChia123 Oct 6, 2024
860afc2
Fix ci.yml to working directory to backend/question-service
JohnChia123 Oct 6, 2024
0b121a9
Fix ci.yml to working directory to backend/question-service again
JohnChia123 Oct 6, 2024
8977e6e
Add jest to package.json
JohnChia123 Oct 6, 2024
b8b5591
Add package-lock.json too
JohnChia123 Oct 6, 2024
53491bc
Add supertest to dev dependencies
JohnChia123 Oct 6, 2024
1618b67
Merge pull request #35 from JohnChia123/main
JohnChia123 Oct 6, 2024
cbae288
Merge pull request #6 from pewggls/user-service
brendantwh Oct 6, 2024
98a416c
Move user service to backend dir
brendantwh Oct 6, 2024
06254c3
Add user service Dockerfile
brendantwh Oct 6, 2024
8478c94
Merge pull request #36 from brendantwh/containerize
JohnChia123 Oct 6, 2024
16adaaf
Place ci.yml into .gitignore
JohnChia123 Oct 6, 2024
572427c
Remove ci.yml from repository
JohnChia123 Oct 6, 2024
3706309
Merge pull request #37 from JohnChia123/main
JohnChia123 Oct 6, 2024
6a7543b
Re-add ci.yml to the repository
JohnChia123 Oct 8, 2024
009d0f4
Create basic workflow and containerization for backend/matching-service
JohnChia123 Oct 11, 2024
88a42ee
Merge pull request #41 from JohnChia123/main
JohnChia123 Oct 11, 2024
5802a3a
Add basic login and signup page
brendantwh Oct 12, 2024
3b7e5ac
Refactor question SPA to question repo page
brendantwh Oct 12, 2024
bb71f79
Add form validation and submission for login and signup
brendantwh Oct 12, 2024
e3c0748
Refactor login and signup error handling
brendantwh Oct 12, 2024
c7800ce
Add password criteria according to FR1.2.3
brendantwh Oct 12, 2024
c1bb3de
Add user question page
brendantwh Oct 12, 2024
1716121
Merge pull request #42 from brendantwh/auth
brendantwh Oct 12, 2024
e04a7ff
Merge branch 'main' into question-ui
Jiayan-Lim Oct 13, 2024
f891835
Implement forgot password in UI
Jiayan-Lim Oct 14, 2024
b3dcc6e
Implement email verification for signup
Jiayan-Lim Oct 14, 2024
dc85ba0
Add basic profile page
brendantwh Oct 15, 2024
914979f
Refactor pages for organization purposes
brendantwh Oct 15, 2024
571b2df
Merge branch 'CS3219-AY2425S1:main' into auth
brendantwh Oct 15, 2024
262b107
Implement email verification for sign up
Jiayan-Lim Oct 15, 2024
1700ebd
Add forgot and reset password
brendantwh Oct 15, 2024
0a3fc9f
Add temporary landing page
brendantwh Oct 15, 2024
6bdcb3b
Implement OTP for reset password
Jiayan-Lim Oct 16, 2024
ff6e8f1
Refined backend error messages to be clearer for end users.
Jiayan-Lim Oct 16, 2024
81c7011
Add user profile page and add routing
Jiayan-Lim Oct 16, 2024
e44c9a0
Implement logout and allow users to update their account details
Jiayan-Lim Oct 17, 2024
db718d8
Handle email duplication when user update their profile
Jiayan-Lim Oct 17, 2024
2db6ff7
Update navbar to set 'Home' link to Question Repository instead of Lo…
Jiayan-Lim Oct 17, 2024
925621b
Merge pull request #43 from brendantwh/auth
brendantwh Oct 17, 2024
487cb67
Handle duplicate email and username for sign-up
Jiayan-Lim Oct 17, 2024
5f4ace9
Merge branch 'question-ui' into user-ui
Jiayan-Lim Oct 18, 2024
c9f2411
Delete duplicate profile page
Jiayan-Lim Oct 18, 2024
e0f29ef
Merge pull request #44 from Jiayan-Lim/user-ui
Jiayan-Lim Oct 18, 2024
91b3057
Fix docker compose.
Oct 18, 2024
1808d12
Change matching service into a websocket server.
Oct 18, 2024
21c6002
Add WebSocket dependencies.
Oct 18, 2024
c6cebc5
Change route for websocket connection to /
Oct 18, 2024
4f70bb0
Define logic for handling matchmaking + matchmaking algo.
Oct 18, 2024
34ee997
Add matching to question page
brendantwh Oct 18, 2024
2459779
Add disabled buttons during matching
brendantwh Oct 19, 2024
b429426
Merge pull request #46 from brendantwh/matching
brendantwh Oct 19, 2024
f94b659
Integrate matching service frontend with backend:
Jiayan-Lim Oct 19, 2024
8317549
Change queue time to 30s, batch accumulation time to 10s.
Oct 20, 2024
442975a
Add dequeue logic.
Oct 20, 2024
8656dd5
Remove leftover route definition code from Express webserver.
Oct 20, 2024
ab01b31
Add separate function for dequeuing a userId.
Oct 20, 2024
d95ecd3
Update README.md
fahim-tazz Oct 20, 2024
be925fc
Merge pull request #45 from fahim-tazz/add-match-service
fahim-tazz Oct 20, 2024
cdc1574
commit
Oct 20, 2024
22fef7e
Merge branch 'main' into matching-ui
Jiayan-Lim Oct 20, 2024
e0ebfcf
Fix dequeue. Fix username passing into response.
Oct 20, 2024
e4ad18f
Merge pull request #48 from fahim-tazz/add-match-service
Jiayan-Lim Oct 20, 2024
75b188f
Merge branch 'main' into matching-ui
Jiayan-Lim Oct 20, 2024
72000de
Debug for matching
Jiayan-Lim Oct 20, 2024
ec4545f
Merge pull request #47 from Jiayan-Lim/matching-ui
Jiayan-Lim Oct 20, 2024
d38d569
Dummy commit for tagging purposes.
Oct 20, 2024
3476fff
Merge pull request #49 from fahim-tazz/main
fahim-tazz Oct 20, 2024
ca92325
Remove ci.yml
JohnChia123 Oct 20, 2024
d35197f
Merge pull request #50 from JohnChia123/main
JohnChia123 Oct 20, 2024
5ce517f
add user duplication check
Oct 20, 2024
26c4bab
Merge pull request #51 from pewggls/match-service
pewggls Oct 20, 2024
8eac5f9
Add collab page
brendantwh Oct 26, 2024
d319992
Add language and themes to code editor
brendantwh Oct 26, 2024
56db66b
Refactor auth to use cookies
brendantwh Oct 26, 2024
ba1264a
Re-add ci.yml
JohnChia123 Oct 26, 2024
b3c4922
Merge pull request #53 from JohnChia123/main
JohnChia123 Oct 26, 2024
3bb0160
Fix frontend compile errors
brendantwh Oct 27, 2024
513ced5
Add nav confirmation for session page
brendantwh Oct 27, 2024
2b96444
Add question history page
Jiayan-Lim Oct 28, 2024
6a859fb
Update user profile page to show question attempt stats
Jiayan-Lim Oct 28, 2024
51d1e87
Fix empty user info when matching
brendantwh Oct 29, 2024
c05a7a0
Add middleware for protecting routes and session validation
brendantwh Oct 29, 2024
54b6d94
Update Kafka and Zookeeper to version 7.7.1
brendantwh Oct 29, 2024
97e6462
Merge pull request #54 from brendantwh/collab
brendantwh Oct 30, 2024
275c822
Create API for question-service and user-service
JohnChia123 Oct 30, 2024
410a7ab
Merge pull request #55 from JohnChia123/main
JohnChia123 Oct 30, 2024
b64116b
Merge branch 'main' of github.com:pewggls/cs3219-ay2425s1-project-g44
Oct 31, 2024
94ac048
Merge branch 'main' into questionHistory-ui
Jiayan-Lim Oct 31, 2024
591d75a
Debug for user question history page
Jiayan-Lim Oct 31, 2024
cd10c80
Add API call to insert question attempt into backend
Jiayan-Lim Oct 31, 2024
d3883f8
Add UUID-based WebRTC Room Name generation in Matching Service.
Oct 31, 2024
1563ea6
Remove dummy console log
Oct 31, 2024
5636e8b
Initialize signaling service as a relay between connected WebRTC prov…
Oct 31, 2024
bb51e5a
Dockerize signaling-service.
Oct 31, 2024
7d8205e
Merge pull request #57 from fahim-tazz/create-rtc-room
brendantwh Oct 31, 2024
6f5879a
Handle close tab
Jiayan-Lim Oct 31, 2024
01f4742
Merge branch 'main' into questionHistory-ui
Jiayan-Lim Oct 31, 2024
6b1941f
add timer for collab page
Jiayan-Lim Oct 31, 2024
4d46f55
Merge pull request #56 from Jiayan-Lim/questionHistory-ui
Jiayan-Lim Oct 31, 2024
5f31e74
Add collab support for IDE
brendantwh Oct 31, 2024
7b38d0f
Retrieve question from API on session page
brendantwh Oct 31, 2024
a427858
Merge branch 'main' into collab
brendantwh Oct 31, 2024
999aa6c
Fix question history handling error
brendantwh Oct 31, 2024
ec7f544
Merge pull request #58 from brendantwh/collab
brendantwh Oct 31, 2024
ee338cd
Add session validation
brendantwh Nov 4, 2024
63774bb
Merge branch 'main' into questionHistory-ui
Jiayan-Lim Nov 4, 2024
8e4d6b2
Add session end logic for both users
brendantwh Nov 4, 2024
2acf87d
Add collaborative notes editing
brendantwh Nov 4, 2024
c8ce62c
Add button to view code history
Jiayan-Lim Nov 5, 2024
3b46274
Merge branch 'main' of github.com:pewggls/cs3219-ay2425s1-project-g44
Nov 5, 2024
bb1a6d4
Bypass auth for logged in users
brendantwh Nov 5, 2024
bd07530
Display questions using markdown
brendantwh Nov 5, 2024
9284fbc
Update landing page
brendantwh Nov 5, 2024
8f4d184
Store code to backend
Jiayan-Lim Nov 5, 2024
6b87492
Create API to retrieve all details for particular question attempt ma…
JohnChia123 Nov 5, 2024
7aeedd7
Merge pull request #59 from JohnChia123/main
JohnChia123 Nov 5, 2024
cd08441
Merge pull request #60 from brendantwh/collab
brendantwh Nov 6, 2024
8704b41
Add page to view user previous code submissions.
Jiayan-Lim Nov 6, 2024
98fac25
Create .yaml files for kubernetes
Nov 6, 2024
1e50d5c
add deployment of docker images to google artifact registry
Nov 6, 2024
b27aef4
Merge pull request #1 from pewggls/kubernetes
pewggls Nov 6, 2024
4c8161d
Update ci.yml
pewggls Nov 6, 2024
456b08f
Merge branch 'main' into questionHistory-ui
Jiayan-Lim Nov 6, 2024
c0e9fe0
Merge pull request #62 from Jiayan-Lim/questionHistory-ui
Jiayan-Lim Nov 7, 2024
e6fa830
Update batch interval for matching service
brendantwh Nov 7, 2024
02d5966
Fix frontend compile errors
brendantwh Nov 7, 2024
5fc0953
Update cookie handling and layout for session
brendantwh Nov 7, 2024
a91dbbe
Sort question history by date descending
brendantwh Nov 7, 2024
c39c9b9
Merge pull request #63 from brendantwh/main
brendantwh Nov 7, 2024
bba1b89
Add env config and update Docker setup
brendantwh Nov 8, 2024
0e793fb
Update README
brendantwh Nov 8, 2024
2eced45
Merge pull request #64 from brendantwh/main
brendantwh Nov 8, 2024
f7c3c95
Add language synchronization in IDE
brendantwh Nov 8, 2024
221d340
Rename signaling-service to collab-service
brendantwh Nov 8, 2024
1ae5e0c
Add reconnection and improve session end handling
brendantwh Nov 8, 2024
9e83fc9
Merge pull request #65 from brendantwh/collab
brendantwh Nov 8, 2024
37cfbfa
Merge pull request #61 from pewggls/main
pewggls Nov 9, 2024
ecfee41
Add Agora.io for voice chat
brendantwh Nov 10, 2024
b84e9aa
Merge pull request #67 from brendantwh/voice
brendantwh Nov 10, 2024
9110c06
Fix matching disconnect issue
brendantwh Nov 10, 2024
feeb62a
Merge pull request #68 from brendantwh/voice
brendantwh Nov 10, 2024
139c106
Create dummy
Jiayan-Lim Nov 10, 2024
f976204
browser screenshot
Jiayan-Lim Nov 10, 2024
e4e83a9
Delete browser/dummy
Jiayan-Lim Nov 10, 2024
a61d77d
Merge branch 'CS3219-AY2425S1:main' into main
Jiayan-Lim Nov 10, 2024
67df26e
Create dummy
Jiayan-Lim Nov 10, 2024
fea92b8
Add files via upload
Jiayan-Lim Nov 10, 2024
2429fad
Delete OS/dummy
Jiayan-Lim Nov 10, 2024
80bdd9e
Rename chrome.png to windows.png
Jiayan-Lim Nov 10, 2024
6eccc9c
Add files via upload
Jiayan-Lim Nov 10, 2024
da83742
Add files via upload
Jiayan-Lim Nov 10, 2024
7d6e3a8
Rename safari.png to macOS.png
Jiayan-Lim Nov 10, 2024
fa3e2d7
Merge pull request #69 from Jiayan-Lim/main
Jiayan-Lim Nov 10, 2024
df09668
Add synced timers on session page
brendantwh Nov 11, 2024
06ded8b
Add default date desc sort to question history
brendantwh Nov 11, 2024
1bb3b92
Add markdown to question repo description on hover
brendantwh Nov 11, 2024
8a8f536
Fix login redirect issues
brendantwh Nov 13, 2024
f7cabe1
Add prod for frontend
brendantwh Nov 13, 2024
647baa5
Merge pull request #70 from brendantwh/final
brendantwh 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: 2 additions & 1 deletion backend/question-service/config/db.js
Original file line number Diff line number Diff line change
@@ -5,7 +5,8 @@ const Question = require("../models/question");
exports.connectDB = async () => {
try {

const conn = await mongoose.connect("mongodb://oscorp4:[email protected]:27017,ac-fajb3yu-shard-00-01.gshqw1i.mongodb.net:27017,ac-fajb3yu-shard-00-02.gshqw1i.mongodb.net:27017/?ssl=true&replicaSet=atlas-8j9agw-shard-0&authSource=admin&retryWrites=true&w=majority&appName=Cluster0"); console.log(`MongoDB Connected: ${conn.connection.host}`);
const conn = await mongoose.connect("mongodb://oscorp4:[email protected]:27017,ac-fajb3yu-shard-00-01.gshqw1i.mongodb.net:27017,ac-fajb3yu-shard-00-02.gshqw1i.mongodb.net:27017/?ssl=true&replicaSet=atlas-8j9agw-shard-0&authSource=admin&retryWrites=true&w=majority&appName=Cluster0");
console.log(`MongoDB Connected: ${conn.connection.host}`);
} catch (err) {
console.error(`Error: ${err.message}`);
process.exit(1);