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

Final Submission #128

Merged
merged 506 commits into from
Nov 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
506 commits
Select commit Hold shift + click to select a range
3b1646c
wip: add console log
HollaG Nov 4, 2024
abdb2a2
fix: hardcoded socket
HollaG Nov 4, 2024
c35a31e
fix: matching service get question before delete user
HollaG Nov 4, 2024
1519a44
wip: add console log
HollaG Nov 4, 2024
0affd4f
feat: set up ai-chat-service backend
peienlim Nov 4, 2024
437466d
feat: ai-chat-service frontend component (wip)
peienlim Nov 4, 2024
60a2d99
chore: Add userId to tokens
pzl111 Nov 4, 2024
2a7e6db
Merge branch 'user-service_refresh-tokens' of https://github.com/CS32…
pzl111 Nov 4, 2024
06749be
chore: add Dockerfile
georgetayqy Nov 4, 2024
bec6f9e
feat(history-service)!: change endpoints
elaineshijie Nov 4, 2024
32ea7d9
chore: remove debugging statements
elaineshijie Nov 4, 2024
8a9c2d6
chore: restore user service
elaineshijie Nov 4, 2024
5dcbf79
wip: reduce bundle size
HollaG Nov 4, 2024
8424dfc
fix: pin tabler-icons
HollaG Nov 4, 2024
8d31d84
nit: add loading to button when searching
HollaG Nov 4, 2024
62f6734
fix: showing numbers instead of categories in search page
HollaG Nov 4, 2024
e204c77
nit: make session full width
HollaG Nov 4, 2024
b96cc8c
feat: add notifications on leave/rejoin
HollaG Nov 4, 2024
bebc6a4
feat: draggable video chat window
HollaG Nov 5, 2024
e65b17a
chore: fix bugs with collab service
georgetayqy Nov 5, 2024
7bc8f82
feat(run-service)!: implement sse for 2 users
elaineshijie Nov 5, 2024
520a894
chore: delete from redis
elaineshijie Nov 5, 2024
195a7f6
fix: add ability to use ws for vps
HollaG Nov 5, 2024
8ccae70
test: add test cases and fixed bugs
georgetayqy Nov 5, 2024
7a1bf6c
Merge remote-tracking branch 'upstream/user-service_testing' into fro…
georgetayqy Nov 5, 2024
905c14d
test: add test cases
georgetayqy Nov 5, 2024
ed68ff9
fix: add language selector to switch languages for syntax highlighting
peienlim Nov 5, 2024
c0bc269
Merge pull request #107 from CS3219-AY2425S1/frontend_dev-fix_dev
HollaG Nov 5, 2024
024263d
test
HollaG Nov 5, 2024
9ecf57e
Merge branch 'frontend_support-yjs-websockets' into temp-branch
HollaG Nov 5, 2024
c66924d
chore: cleanup console.log
HollaG Nov 5, 2024
ba77a92
nit: remove console.log
HollaG Nov 5, 2024
0e8b5f6
Merge branch 'frontend_dev' into frontend_history-service
peienlim Nov 5, 2024
96ab233
Merge branch 'history-service_CRUD' into frontend_history-service
peienlim Nov 5, 2024
d81ca46
chore: modify test to test edge cases
elaineshijie Nov 5, 2024
fc72b10
Merge remote-tracking branch 'upstream/run-service_dual-user' into fr…
georgetayqy Nov 5, 2024
accc38b
fix: no testcase found error
elaineshijie Nov 5, 2024
9826c81
Merge remote-tracking branch 'upstream/devops_update-ci' into fronten…
georgetayqy Nov 5, 2024
7b31172
chore: disable tests for some services
georgetayqy Nov 5, 2024
cfa5f43
chore: add builds for new services and frontend
georgetayqy Nov 5, 2024
ab82db1
fix: modify response to include questionId
elaineshijie Nov 6, 2024
fddcac0
chore: hide private testcases outputs
elaineshijie Nov 6, 2024
9c67826
nit: change to use personal TURN server
HollaG Nov 6, 2024
d099bf6
chore: modify response format
elaineshijie Nov 6, 2024
0f5b9fc
feat: add back stun server
HollaG Nov 6, 2024
019262d
Merge branch 'run-service_dual-user' into frontend_dev-integrate_run_…
HollaG Nov 6, 2024
27e2f63
fix: removed function wrongly while resolving merge conflicts
peienlim Nov 6, 2024
f12a8cb
feat(run-service)!: change status to statusCode
elaineshijie Nov 6, 2024
f9c5663
chore: check code attempt in test
elaineshijie Nov 6, 2024
22acf22
feat: run test case (send to server only)
HollaG Nov 6, 2024
acd302c
Merge remote-tracking branch 'origin/run-service_dual-user' into fron…
HollaG Nov 6, 2024
3dc6649
chore: modify cors
elaineshijie Nov 6, 2024
650cb2a
feat: execution with loading
HollaG Nov 6, 2024
cba2229
fix: history service url for useApi
peienlim Nov 6, 2024
148117a
fix: accidentally removed mongoose import while fixing merge conflicts
peienlim Nov 6, 2024
b8798e4
feat: session summary page
peienlim Nov 6, 2024
b64d00c
feat: display past attempts on dashboard (wip)
peienlim Nov 6, 2024
870d762
feat: test case results
HollaG Nov 6, 2024
d25af0e
feat: add old code submission entry
HollaG Nov 6, 2024
35efc12
chore: add error handling when one client disconnects
elaineshijie Nov 6, 2024
33d0276
chore: create test for disconnect
elaineshijie Nov 6, 2024
190c625
fix: add event for start of execution
elaineshijie Nov 6, 2024
946f7de
wip
HollaG Nov 6, 2024
18425ee
Merge remote-tracking branch 'origin/run-service_status' into fronten…
HollaG Nov 6, 2024
97a55cd
nit: fix error message
HollaG Nov 6, 2024
b37ae7a
feat: enable parallel processing
HollaG Nov 6, 2024
e59f002
fix: fix executing question after both clients connects error
elaineshijie Nov 6, 2024
950c26d
Merge branch 'communication-service' into frontend_dev
HollaG Nov 6, 2024
f8d0031
chore: update ci and docker compose
georgetayqy Nov 6, 2024
29d6124
Merge remote-tracking branch 'upstream/run-service_dual-user' into fr…
georgetayqy Nov 6, 2024
16fbfa9
wip: first working version of peerjs
HollaG Nov 6, 2024
7e580b8
fix: attempt details displayed on attempt card
peienlim Nov 6, 2024
70223ff
fix: collaborator details for attempt card and session summary page
peienlim Nov 6, 2024
9b2d14b
chore: delete kubernetes files
georgetayqy Nov 6, 2024
07441b8
Merge branch 'frontend_history-service' into frontend_dev-integrate_r…
peienlim Nov 6, 2024
58c0ccb
fix: history service merge conflict issues
peienlim Nov 6, 2024
4700efc
Merge branch 'frontend_dev-integrate_run_service' of https://github.c…
peienlim Nov 6, 2024
ba72bbf
fix: add statusCode 204
elaineshijie Nov 7, 2024
3b88efa
fix: 204 statusCode in filtered question
elaineshijie Nov 7, 2024
055a9e0
feat: final working version
HollaG Nov 7, 2024
e553ca0
Merge branch 'frontend_dev-integrate_run_service' of github.com:CS321…
HollaG Nov 7, 2024
c8e9faf
fix: add userId to accessToken
elaineshijie Nov 7, 2024
140704e
fix: correct error message
elaineshijie Nov 7, 2024
6fd25f4
fix: id in accessToken
elaineshijie Nov 7, 2024
52a5c25
wip: debug
HollaG Nov 7, 2024
6b2ac3a
fix: different channelId issue
elaineshijie Nov 7, 2024
117d5ce
Merge branch 'frontend_dev-peerjs' into ai-chat-service
HollaG Nov 7, 2024
4e9954c
wip: update FE to start supporting integrations
HollaG Nov 7, 2024
56e0d1d
fix: add statusCode 204 (#108)
elaineshijie Nov 7, 2024
acfdf0b
chore: update docker files
georgetayqy Nov 7, 2024
9533741
chore: add dockerignore file
georgetayqy Nov 7, 2024
2133c68
feat: highlight Gemini
HollaG Nov 7, 2024
297b4cb
Merge branch 'frontend_dev-integrate_run_service' of github.com:CS321…
HollaG Nov 7, 2024
5c9e917
fix: add input for questions
HollaG Nov 7, 2024
cc85870
fix: add type
HollaG Nov 7, 2024
e2a9bad
wip: query and display ai response
peienlim Nov 7, 2024
ee0b026
feat: prettify integrations
HollaG Nov 7, 2024
9cef837
Merge branch 'frontend_collab-service' into frontend_dev
peienlim Nov 7, 2024
3a2ccb0
fix: ensure code editor language correspond to selected language
peienlim Nov 7, 2024
d767bb2
Merge branch 'ai-chat-service' of github.com:CS3219-AY2425S1/cs3219-a…
HollaG Nov 7, 2024
8e27d06
feat: add loading preventers
HollaG Nov 7, 2024
647ee0f
Merge branch 'ai-chat-service' into frontend_dev-integrate_run_service
HollaG Nov 7, 2024
0772d52
Merge remote-tracking branch 'origin/run-service_dual-user' into fron…
HollaG Nov 7, 2024
c7735a3
chore: dockerise ai chat service
georgetayqy Nov 7, 2024
37bf39e
chore: add dockerignore file
georgetayqy Nov 7, 2024
4697292
fix: run service cannot double execute, cannot refresh
HollaG Nov 7, 2024
ad0e54f
Merge branch 'frontend_dev' of github.com:CS3219-AY2425S1/cs3219-ay24…
HollaG Nov 7, 2024
6a07648
Merge branch 'frontend_dev-integrate_run_service' into frontend_dev
HollaG Nov 7, 2024
3fdb818
Merge remote-tracking branch 'origin/ai-chat-service' into frontend_dev
HollaG Nov 7, 2024
44c7571
wip: attempt to fix video call not ending
HollaG Nov 7, 2024
4330212
feat: update code viewer
HollaG Nov 7, 2024
a98cb00
Merge remote-tracking branch 'origin/history-service_status-code' int…
HollaG Nov 7, 2024
9ab6ec3
fix: working history
HollaG Nov 7, 2024
6ec892c
nit: update access token to expire in 1d
HollaG Nov 7, 2024
a611dd3
fix: revert attempt to close camera
HollaG Nov 7, 2024
a30239d
fix: dom ready
HollaG Nov 7, 2024
b600c5d
nit: enable long polling
HollaG Nov 7, 2024
4265bf4
chore: update CI
georgetayqy Nov 7, 2024
b86aaed
chore: update run scripts for development
HollaG Nov 8, 2024
cb568cf
feat(run-service): disable block when one user not connected to execu…
HollaG Nov 8, 2024
1d7ee37
feat(communication-service):
HollaG Nov 8, 2024
a870f70
feat(communication-service):
HollaG Nov 8, 2024
db1f4b0
chore: update collab
georgetayqy Nov 8, 2024
1276e92
Merge remote-tracking branch 'origin/frontend_dev-update-collab-behav…
HollaG Nov 8, 2024
9760d1d
feat(collaboration-service):
HollaG Nov 8, 2024
2a151fe
nit(ui): change buttons to be light variant by default
HollaG Nov 8, 2024
053a24b
fix(matching-service):
HollaG Nov 8, 2024
7904165
nit(ui): add loading state for history
HollaG Nov 8, 2024
f33dd34
chore(communication-service): clean up unused functions
HollaG Nov 8, 2024
fe76ae9
fix(collaboration-service): change to params instead of query
HollaG Nov 8, 2024
4c6e86d
chore: update test code
georgetayqy Nov 8, 2024
1a0f4c0
chore: remove /filter endpoint
elaineshijie Nov 9, 2024
63a5307
chore: remove file
georgetayqy Nov 9, 2024
6813360
chore: change categoriesId to enum
elaineshijie Nov 9, 2024
7ac68fc
chore: remove meta from testCase schema
elaineshijie Nov 9, 2024
5d4105c
chore: update validation for testCases
elaineshijie Nov 9, 2024
f7a7c35
fix(ui): show correct error message when expired
HollaG Nov 9, 2024
708c490
fix(collaboration-service): enable awareness cursors
HollaG Nov 9, 2024
c11b7c1
Merge branch 'frontend_dev' of github.com:CS3219-AY2425S1/cs3219-ay24…
HollaG Nov 9, 2024
5ed1d06
Merge remote-tracking branch 'origin/frontend_dev' into question-serv…
elaineshijie Nov 9, 2024
bad9f7d
nit(question-service): make testcode and input required
HollaG Nov 9, 2024
168a248
fix(communication-service): remove unused reference variable
HollaG Nov 9, 2024
ac610ee
chore: refactor code to follow repository pattern
elaineshijie Nov 9, 2024
646aa62
chore: update github actions
georgetayqy Nov 9, 2024
e121cb6
fix: templateCode and solutionCode is now required
elaineshijie Nov 9, 2024
a299ab8
Merge remote-tracking branch 'origin/frontend_dev' into question-serv…
elaineshijie Nov 9, 2024
90da5fd
feat(communication-service): add expanding chat bot
HollaG Nov 9, 2024
217c1ea
wip: fancier code highlighting in chat
HollaG Nov 9, 2024
e9f3bea
feat(communication-service): add code block formatting
HollaG Nov 9, 2024
ee8050f
feat(communication-service): add more qol
HollaG Nov 9, 2024
c8a2183
Merge branch 'frontend_dev' of github.com:CS3219-AY2425S1/cs3219-ay24…
HollaG Nov 9, 2024
4e70c00
feat: updated ai service backend
peienlim Nov 9, 2024
f7dd4f3
feat: integration of analysis endpoints
peienlim Nov 9, 2024
4d6ac63
chore: change ai-chat-service name and update ci
georgetayqy Nov 9, 2024
06f2118
chore: disable user service test
georgetayqy Nov 9, 2024
edc8c39
chore: fix ci
georgetayqy Nov 9, 2024
06ae985
bug: change name of AI service
georgetayqy Nov 9, 2024
6aa0d84
chore: update generic ci
georgetayqy Nov 9, 2024
035d830
chore: merge changes from frontend_dev
elaineshijie Nov 10, 2024
f6e3ab7
chore: add service.js
elaineshijie Nov 10, 2024
61095b5
chore: fix ci environments
georgetayqy Nov 10, 2024
c253e1e
feat: Add matching svc authentication
pzl111 Nov 10, 2024
6101082
fix: periodically remove inactive chat sessions
peienlim Nov 10, 2024
0e7bf56
feat(communication-service): enable room id based calling
HollaG Nov 10, 2024
81bea4b
nit(communication-service): change event name to match convention
HollaG Nov 10, 2024
3fd0dcb
chore: authentication needed for get question(s)
elaineshijie Nov 10, 2024
405666d
fix: Refactor matching service authentication
pzl111 Nov 10, 2024
d03dd61
chore: Add nginx config for tracking
pzl111 Nov 10, 2024
2c488ee
ui(user-service): add change password (stub)
HollaG Nov 10, 2024
c35c1da
chore: fix deploy scripts
georgetayqy Nov 10, 2024
75006d2
chore: update ci
georgetayqy Nov 10, 2024
64d3f41
bug: remove -b flag
georgetayqy Nov 10, 2024
28c2602
chore: remove frontend container from docker compose
georgetayqy Nov 10, 2024
6b93566
nit(ui): change some text
HollaG Nov 10, 2024
d93f540
Merge branch 'frontend_dev' of github.com:CS3219-AY2425S1/cs3219-ay24…
HollaG Nov 10, 2024
3e5dc1b
wip: gen ai service
peienlim Nov 10, 2024
a163960
Merge branch 'frontend_dev' into ai-chat-service
peienlim Nov 10, 2024
9c2a2c9
chore: remove unused page
HollaG Nov 10, 2024
fc7ab21
nit: change topic to category
HollaG Nov 10, 2024
4c8673d
Merge pull request #116 from CS3219-AY2425S1/nginx_config
pzl111 Nov 11, 2024
bbe3448
fix: introduce create-session endpoint
peienlim Nov 11, 2024
818ecf3
chore: update ci and remove aws files
georgetayqy Nov 12, 2024
730c411
chore: fix ci pipeline
georgetayqy Nov 12, 2024
785fa48
fix: ensure all endpoints integrated well with error handling
peienlim Nov 12, 2024
1c850f1
fix: check if api key has been sent already on page load
peienlim Nov 12, 2024
d97a199
chore: delete attempt function
peienlim Nov 13, 2024
e18f7d7
fix: display question description html
peienlim Nov 13, 2024
d673e61
nit: update start script to use new AI service name
HollaG Nov 13, 2024
dcf5e92
Merge branch 'frontend_dev' of github.com:CS3219-AY2425S1/cs3219-ay24…
HollaG Nov 13, 2024
e28c1e3
nit: rename to useAi for consistency sake
peienlim Nov 13, 2024
f4b8686
fix: rename to gen-ai-service
peienlim Nov 13, 2024
a0aa16f
Merge branch 'ai-chat-service' into frontend_dev
peienlim Nov 13, 2024
091f50f
Merge remote-tracking branch 'origin/user-service_refresh-tokens' int…
HollaG Nov 13, 2024
77c126c
nit: fix to useAi
peienlim Nov 13, 2024
1aa40e1
Merge branch 'ai-chat-service' into frontend_dev
peienlim Nov 13, 2024
c41dc36
wip
HollaG Nov 13, 2024
0784217
feat(user-service): integrate refresh token with frontend
HollaG Nov 13, 2024
16e1323
fix: enable env
HollaG Nov 13, 2024
371f5b8
Merge branch 'frontend_dev-integrate-refresh-token' into frontend_dev
HollaG Nov 13, 2024
edf144a
chore: cleanup yaml
HollaG Nov 13, 2024
a2c4edf
Merge remote-tracking branch 'origin/matching-service_authentication'…
HollaG Nov 13, 2024
9ba3105
Squashed commit of the following:
HollaG Nov 13, 2024
19d1f61
chore: Update Collaboration Service with JWT Authorization (#115)
georgetayqy Nov 13, 2024
989ce2b
ui: cleaned up mobile navbar
HollaG Nov 13, 2024
ccce413
fix: ai assist buttons loading ui
peienlim Nov 13, 2024
ef9371c
Merge branch 'frontend_dev' into ai-chat-service
HollaG Nov 13, 2024
c91095e
chore(gen-ai-service): refactor code
HollaG Nov 13, 2024
5171b36
Merge branch 'ai-chat-service' into frontend_dev
HollaG Nov 13, 2024
b968989
fix: set code editor to dark mode
HollaG Nov 13, 2024
ca59c91
nit: cleanup dark mode
HollaG Nov 13, 2024
e3066f4
chore: update test cases
georgetayqy Nov 13, 2024
c3fc4e2
chore: update ci env variable
georgetayqy Nov 13, 2024
3a42384
chore: add error message when user tries to navigate
HollaG Nov 13, 2024
786840e
Merge branch 'frontend_dev' of github.com:CS3219-AY2425S1/cs3219-ay24…
HollaG Nov 13, 2024
b64c2e3
chore: delete unused Dockerfile
georgetayqy Nov 13, 2024
5a42234
fix: #122, #123
HollaG Nov 13, 2024
30f31d1
fix: #124 by removing repeated requests
HollaG Nov 13, 2024
2013a9e
fix: #125
HollaG Nov 13, 2024
cf35867
feat: change password page
peienlim Nov 13, 2024
4c08081
fix: issues with positioning
HollaG Nov 13, 2024
d81efc6
Merge branch 'ai-chat-service' into frontend_dev
peienlim Nov 13, 2024
6b8cc76
fix: gen ai service edge cases
HollaG Nov 13, 2024
fb098e0
fix: include in previous commit
HollaG Nov 13, 2024
b092ac5
Merge branch 'frontend_dev-fix-bugs' into frontend_dev
HollaG Nov 13, 2024
12b4bde
Merge branch 'frontend_dev' into question-service_fix
HollaG Nov 13, 2024
9e7f41c
chore: update ci to update correct env file
georgetayqy Nov 13, 2024
6da0172
Merge pull request #112 from CS3219-AY2425S1/question-service_fix
HollaG Nov 13, 2024
0bc565f
chore: add continue on error for docker builds
georgetayqy Nov 13, 2024
2517ebc
fix: video call stuff
HollaG Nov 13, 2024
e612a8a
wip: video call
HollaG Nov 13, 2024
3ce85bb
Merge branch 'frontend_dev' of github.com:CS3219-AY2425S1/cs3219-ay24…
HollaG Nov 13, 2024
4cd0bef
fix: disable test case running for database questions
HollaG Nov 13, 2024
dddc3ef
chore: unblock deployment
georgetayqy Nov 13, 2024
515c625
Merge branch 'frontend_dev' of https://github.com/CS3219-AY2425S1/cs3…
georgetayqy Nov 13, 2024
3915c1c
bug: fix bug with rendering = signs
georgetayqy Nov 13, 2024
7ed03e9
fix: run test case when end session
HollaG Nov 13, 2024
503fe66
Merge branch 'frontend_dev' of github.com:CS3219-AY2425S1/cs3219-ay24…
HollaG Nov 13, 2024
5438143
chore: remove 403 errors
georgetayqy Nov 13, 2024
ae302d8
fix: edit redis expiry and checking token
pzl111 Nov 13, 2024
e8d3807
Push changes to Staging In Preparation for Final Submission (#110)
georgetayqy Nov 13, 2024
b79d97e
fix: attempt test program not showing due to bug
peienlim Nov 13, 2024
21c3132
Merge branch 'frontend_dev' of https://github.com/CS3219-AY2425S1/cs3…
peienlim Nov 13, 2024
c666c51
fix: format code
HollaG Nov 13, 2024
59c5d17
Merge branch 'frontend_dev' of github.com:CS3219-AY2425S1/cs3219-ay24…
HollaG Nov 13, 2024
7636840
fix: incorrect input
elaineshijie Nov 13, 2024
d49ffc5
Merge branch 'frontend_dev' into staging
HollaG Nov 13, 2024
10afc06
Merge branch 'staging' of github.com:CS3219-AY2425S1/cs3219-ay2425s1-…
HollaG Nov 13, 2024
ecbf72a
fix: ai chat
HollaG Nov 13, 2024
7fef99a
Merge branch 'frontend_dev' into staging
HollaG Nov 13, 2024
ffa0803
fix: wrong highlight
HollaG 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
70 changes: 55 additions & 15 deletions .github/workflows/generic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,64 @@ jobs:
steps:
- name: Checkout Codebase
uses: actions/checkout@v4

- name: Setup Node ${{ matrix.node }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}

scans:
# do code scanning stuff here
needs: test
name: Code Scanning
runs-on: ubuntu-latest
steps:
- name: Checkout Codebase
uses: actions/checkout@v4
- name: Install Frontend Node Dependencies
working-directory: peer-prep
run: npm ci

images:
# build images here
name: Build Production Images
runs-on: ubuntu-latest
steps:
- name: Checkout Codebase
uses: actions/checkout@v4
- name: Test Build on Frontend
working-directory: peer-prep
run: npm run build

- name: Test User Service
working-directory: user-service
run: |
npm ci
npm run test
- name: Test Question Service
working-directory: question-service
run: |
npm ci
npm run test
- name: Test Matching Service
working-directory: matching-service
run: |
npm ci
npm run test
- name: Test Collaboration Service
working-directory: collaboration-service
run: |
npm ci
npm run test
- name: Test Communication Service
working-directory: communication-service
run: |
npm ci
npm run test
- name: Test Run Service
working-directory: run-service
run: |
npm ci
npm run test
- name: Test History Service
working-directory: history-service
run: |
npm ci
npm run test
- name: Test Gen AI Service
working-directory: gen-ai-service
run: |
npm ci
npm run test
Loading