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 467 commits into
base: feedback
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
467 commits
Select commit Hold shift + click to select a range
70bf554
Add toast variants
jq1836 Sep 27, 2024
710f1f1
Merge pull request #115 from CS3219-AY2425S1/feature/user-service/adm…
jq1836 Sep 27, 2024
c3996fe
Merge branch 'main' into feature/question-service/filter-questions
wr1159 Sep 27, 2024
71a71da
Use absolute import
wr1159 Sep 27, 2024
f725607
Merge branch 'main' into feature/question-service/search-questions
wr1159 Sep 27, 2024
45ee483
Merge pull request #130 from CS3219-AY2425S1/feature/question-service…
wr1159 Sep 27, 2024
7af01ff
Merge branch 'main' into feature/question-service/search-questions
wr1159 Sep 27, 2024
4a7b2b6
Fix build errors
wr1159 Sep 27, 2024
c1e787f
Prevent form submission when no change
jq1836 Sep 27, 2024
4595a9d
Fix handle reset
wr1159 Sep 27, 2024
91e03a8
Merge pull request #129 from CS3219-AY2425S1/feature/question-service…
SelwynAng Sep 27, 2024
925dbf9
Remove unused background colours
wr1159 Sep 27, 2024
07aef49
Standardise icon size
wr1159 Sep 27, 2024
fab9235
Update dialog css
wr1159 Sep 27, 2024
f09d059
Update switch css
wr1159 Sep 27, 2024
d44df46
Question Service: Add exception classes and refactor routers and serv…
SelwynAng Sep 27, 2024
d9b5f74
Move question pages into modal
jq1836 Sep 27, 2024
c1e6147
Delete old pags
jq1836 Sep 27, 2024
32108da
Add exit button to modal
jq1836 Sep 27, 2024
4ee61f5
Merge branch 'main' into feature/question-service/edit-question
jq1836 Sep 27, 2024
30ff492
Merge branch 'main' into fix/standardise-components-style
wr1159 Sep 27, 2024
3994c62
Merge pull request #141 from CS3219-AY2425S1/feature/question-service…
wr1159 Sep 27, 2024
92e4b4d
Merge branch 'main' into fix/standardise-components-style
wr1159 Sep 27, 2024
c5d67b5
Fix css of modal
wr1159 Sep 27, 2024
6eff889
Add key to modals
wr1159 Sep 27, 2024
dbf8f23
Merge pull request #147 from CS3219-AY2425S1/fix/standardise-componen…
jq1836 Sep 27, 2024
0c65e34
Add env.sample
wr1159 Sep 27, 2024
2f899ea
Merge pull request #149 from CS3219-AY2425S1/feature/question-service…
SelwynAng Sep 27, 2024
200cda0
Remove extra user-settings component
SelwynAng Sep 28, 2024
a64451e
Merge pull request #150 from CS3219-AY2425S1/fix/frontend/extra-user-…
dylkaw Sep 28, 2024
b56547b
Standardise AuthWrapper in page.tsx
dylkaw Sep 28, 2024
4b137b9
Fix bug where logged out user sees navbar
dylkaw Sep 28, 2024
61e1ec7
Remove unused imports
dylkaw Sep 28, 2024
bccfed9
Add docker file for question-serviced
wr1159 Oct 1, 2024
5a513dd
Make host and container ports same
jq1836 Oct 1, 2024
f83d28e
Add docker ignore to question-service
jq1836 Oct 2, 2024
ca791a5
Merge pull request #153 from CS3219-AY2425S1/enhancement/docker-quest…
SelwynAng Oct 2, 2024
3713c8b
Containerise user service
SelwynAng Oct 2, 2024
aad8aff
Update spelling
SelwynAng Oct 2, 2024
9f62784
Merge pull request #154 from CS3219-AY2425S1/enhancement/dockerise-us…
wr1159 Oct 3, 2024
678afe5
Add dockerfile for frontend and use port 8000 for question
wr1159 Oct 3, 2024
293e189
Refactor layout
SelwynAng Oct 5, 2024
53eb772
yarn prettier fix
SelwynAng Oct 5, 2024
824c2aa
Merge pull request #156 from CS3219-AY2425S1/refactor/frontend-layout…
jq1836 Oct 5, 2024
b0fb8b3
Merge branch 'feature/frontend-docker' of github.com:CS3219-AY2425S1/…
jq1836 Oct 5, 2024
5afa745
Remove volume and clean up Dockerfile
jq1836 Oct 5, 2024
0dd50c6
Merge pull request #155 from CS3219-AY2425S1/feature/frontend-docker
jq1836 Oct 5, 2024
2e58b03
Docker cleanup (#157)
jq1836 Oct 6, 2024
2b21ae7
Resolve merge conflict
SelwynAng Oct 6, 2024
b219c3b
Remove excess use client statement
SelwynAng Oct 6, 2024
6d9acb5
Fix navbar when logged out
SelwynAng Oct 6, 2024
0dc5b1c
Edit user settings user access
SelwynAng Oct 6, 2024
fb09b02
Merge pull request #151 from CS3219-AY2425S1/enhancement/frontend/ref…
SelwynAng Oct 6, 2024
95c4b74
Fix create qustion bug
SelwynAng Oct 9, 2024
5a92d01
Add redis image
dylkaw Oct 12, 2024
b33fe18
Set up branch
TanPingZhi Oct 12, 2024
1362064
Dockerman this
TanPingZhi Oct 12, 2024
1d94261
Change default port to 6969
TanPingZhi Oct 12, 2024
cf43b98
Merge pull request #162 from CS3219-AY2425S1/feature/matching-service…
SelwynAng Oct 13, 2024
25c800a
Resolve merge conflict
SelwynAng Oct 13, 2024
11a6a56
Clean up matching service setup files
SelwynAng Oct 13, 2024
cdb7119
Merge pull request #163 from CS3219-AY2425S1/feature/matching-service…
SelwynAng Oct 13, 2024
1c9ed32
Replace hardcoded uris in frontend
jq1836 Oct 13, 2024
cdb9c25
Allow for base uri to change
jq1836 Oct 13, 2024
811dc2a
Update CORS
jq1836 Oct 13, 2024
5be93cc
Add BASE_URI env variable
jq1836 Oct 13, 2024
afbc043
Add NGINX API gateway
jq1836 Oct 14, 2024
896e0bb
Remove external access to API
jq1836 Oct 14, 2024
a17a5c2
Merge branch 'chore/server-constants' into enhancement/api-gateway
jq1836 Oct 14, 2024
bb34c54
Update frontend to use new gateway
jq1836 Oct 14, 2024
1de40ea
Merge pull request #166 from CS3219-AY2425S1/chore/server-constants
jq1836 Oct 14, 2024
7ec7121
Update .env.sample
jq1836 Oct 14, 2024
1b45f5f
Remove console log
jq1836 Oct 14, 2024
fe56030
Fix logout bug
jq1836 Oct 14, 2024
2f4b079
Merge branch 'main' into fix/bug/logging-out-bug
jq1836 Oct 14, 2024
3259ce0
Merge pull request #161 from CS3219-AY2425S1/fix/bug/create-question
SelwynAng Oct 15, 2024
677118e
Extract out isPasswordComplex
wr1159 Oct 15, 2024
800f168
Add password complexity check
wr1159 Oct 15, 2024
ab5b9b4
Add matching form
wr1159 Oct 15, 2024
2e505fd
Split matching components into smaller compnents
wr1159 Oct 15, 2024
a6e93c3
Remove faulty use-toast
wr1159 Oct 15, 2024
4878f40
Add indeterminate progress styling
wr1159 Oct 15, 2024
dbbe5ac
Merge pull request #170 from CS3219-AY2425S1/feature/enforce-password
wr1159 Oct 16, 2024
1bede2f
Feature/matching service/queue (#165)
TanPingZhi Oct 16, 2024
a456165
Fix logout
jq1836 Oct 16, 2024
2a9bbc0
Remove unused imports
jq1836 Oct 16, 2024
d7cc8e3
Merge branch 'main' into enhancement/api-gateway
jq1836 Oct 16, 2024
7371211
Remove additional import
jq1836 Oct 16, 2024
b112463
Merge pull request #169 from CS3219-AY2425S1/fix/bug/logging-out-bug
SelwynAng Oct 16, 2024
744a4cd
Add user delete confirmation
dylkaw Oct 16, 2024
a1f17df
Make delete account modal common
dylkaw Oct 16, 2024
d483f9d
Close delete modal after delete confirmation
dylkaw Oct 16, 2024
b0eca14
Clear input field once account deleted
dylkaw Oct 16, 2024
90e53b9
Merge branch 'main' into enhancement/api-gateway
jq1836 Oct 16, 2024
a94fdd4
Update question-service to use category enum
jq1836 Oct 16, 2024
61a7f7d
Modify ComplexityEnum and add enum endpoints
jq1836 Oct 16, 2024
fc538a6
Update frontend to use complexity enums
jq1836 Oct 16, 2024
e061a04
Fix ESLint errors
jq1836 Oct 16, 2024
e745866
Change es lint
jq1836 Oct 16, 2024
cc46901
Disable next line
jq1836 Oct 16, 2024
2db6ce6
Merge pull request #172 from CS3219-AY2425S1/feature/user-management/…
jq1836 Oct 16, 2024
0861bf5
Remove semicolon in user settings
wr1159 Oct 17, 2024
fc4f598
Merge pull request #175 from CS3219-AY2425S1/fix/remove-semicolon-fro…
SelwynAng Oct 17, 2024
92b7f62
Merge branch 'main' into enhancement/api-gateway
jq1836 Oct 17, 2024
1f6ea49
Merge branch 'main' into feat/matching/backend-integration
jq1836 Oct 17, 2024
ed79156
Chaneg login failed toast message
SelwynAng Oct 17, 2024
b41139f
Fix edit question modal bug
SelwynAng Oct 17, 2024
4fc49c1
Implement basic working websocket
jq1836 Oct 18, 2024
a91a65e
Add queue leaving
jq1836 Oct 18, 2024
04a860a
Format frontend
jq1836 Oct 18, 2024
c56d6b4
Add 60s timeout
jq1836 Oct 18, 2024
e8cda63
Update name of matching page
wr1159 Oct 18, 2024
aa881b3
Fix refresh bug
jq1836 Oct 18, 2024
d66ba75
Merge pull request #171 from CS3219-AY2425S1/feat/matching/frontend-ui
jq1836 Oct 18, 2024
39d85cf
Cleanup frontend
jq1836 Oct 18, 2024
bfdd8ec
Merge pull request #177 from CS3219-AY2425S1/fix/bug/edit-question-modal
jq1836 Oct 18, 2024
2c81e6f
Merge branch 'main' into feat/matching/backend-integration
jq1836 Oct 18, 2024
e806e89
Refine login error code handling and description
SelwynAng Oct 19, 2024
d5b092f
Fix linting errors
SelwynAng Oct 19, 2024
7bfea0d
Adjust CategoryEnum names
jq1836 Oct 19, 2024
8996348
Adjust question router
jq1836 Oct 19, 2024
d423ffa
Merge branch 'main' into enhancement/question-cat-enum
jq1836 Oct 19, 2024
f412b3b
Updating return type in questions crud
jq1836 Oct 19, 2024
dc56924
Merge branch 'enhancement/question-cat-enum' of github.com:CS3219-AY2…
jq1836 Oct 19, 2024
c13d229
Merge pull request #176 from CS3219-AY2425S1/fix/bug/login-fail-toast
SelwynAng Oct 20, 2024
49f57f6
Add queue debug
jq1836 Oct 20, 2024
3518f5b
Fix timeout and add logging
jq1836 Oct 20, 2024
c917346
Merge pull request #178 from CS3219-AY2425S1/feat/matching/backend-in…
wr1159 Oct 20, 2024
c9077f6
Merge branch 'main' into enhancement/question-cat-enum
wr1159 Oct 20, 2024
2ef5325
Fix import from api-uri
wr1159 Oct 20, 2024
ff1ceae
Merge pull request #174 from CS3219-AY2425S1/enhancement/question-cat…
jq1836 Oct 20, 2024
3fc4f2c
Merge branch 'main' into enhancement/api-gateway
jq1836 Oct 20, 2024
9218a30
Add support for web sockets to API gateway
jq1836 Oct 20, 2024
b457ce4
Add kubernetes
jq1836 Oct 28, 2024
46ebece
Add ignore secrets.yaml
jq1836 Oct 28, 2024
eb7d5ba
Remove secrets.yaml
jq1836 Oct 28, 2024
57bb938
Update matching service to return common room id for matched users
SelwynAng Oct 31, 2024
0363b51
Create basic collab room skeleton with code editor
dylkaw Oct 31, 2024
6547c1b
Set up redirection logic to collaboration page upon successful matching
SelwynAng Oct 31, 2024
92c793e
Add fetch random question based on selected category and complexity e…
SelwynAng Oct 31, 2024
46682c7
Add chat placeholder
dylkaw Oct 31, 2024
8767ac9
Merge pull request #181 from CS3219-AY2425S1/add-get-random-question-api
dylkaw Oct 31, 2024
78b8180
Add Question placeholder
dylkaw Oct 31, 2024
6ab7b07
Merge pull request #182 from CS3219-AY2425S1/set-up-collab-service-fr…
dylkaw Oct 31, 2024
392d1ab
Merge branch 'main' into feat/collab-service/collab-page
dylkaw Oct 31, 2024
4b8b23e
Add routing to collab room
dylkaw Oct 31, 2024
5428fb8
Fix ESLint issues
dylkaw Oct 31, 2024
17c23e5
Fix prettier issues
dylkaw Oct 31, 2024
332084b
Standardise route with /app
dylkaw Oct 31, 2024
ba98cf9
what the sigma
TanPingZhi Nov 1, 2024
d5b2233
Convert all ts to js because compilation is hard
TanPingZhi Nov 1, 2024
a47ed36
Fix the endpoints
TanPingZhi Nov 1, 2024
456d8b1
Add websockets for chathistory
TanPingZhi Nov 1, 2024
0af5af7
Add prettier script
TanPingZhi Nov 1, 2024
a1268b5
Standardise to use camelCase instead of snake_case
wr1159 Nov 1, 2024
d04f885
use newRoom instead of createRoom
wr1159 Nov 1, 2024
6042804
Add .env.sample for DB and Port
wr1159 Nov 1, 2024
4ea1b08
Merge pull request #184 from CS3219-AY2425S1/collab
TanPingZhi Nov 1, 2024
dec0816
Merge branch 'main' into feat/collab-service/collab-page
SelwynAng Nov 2, 2024
2672ed0
Link up frontend with collab service to redirect to common room
SelwynAng Nov 2, 2024
d04771c
Set up real time communication chat between users in same room
SelwynAng Nov 2, 2024
718cf32
Run yarn prettier fix
SelwynAng Nov 2, 2024
3e36b54
Reorganise utility functions for collab service api
SelwynAng Nov 2, 2024
ab06445
Resolve scroll down bug
SelwynAng Nov 2, 2024
98a2855
Collab: Install y-websocket, socket.io, yjs, ws
wr1159 Nov 2, 2024
2ca0206
frontend: Install yjs related packages
wr1159 Nov 2, 2024
ae65a21
Collab: add .env to gitignore
wr1159 Nov 2, 2024
fd6728a
Collab: Add chat test index.html
wr1159 Nov 2, 2024
dee1c69
Add yjs on server and frontend implementation
wr1159 Nov 2, 2024
d2fff57
Frontend: Fix lint errors
wr1159 Nov 2, 2024
03858fa
Allow matching service to fetch random question from question service
SelwynAng Nov 2, 2024
fd6e676
Enable fetching of question details to the frontend
SelwynAng Nov 2, 2024
f6381fa
Edit collab backend such that room requires question id
SelwynAng Nov 2, 2024
6f8b7f1
Remove excess console log statements
SelwynAng Nov 2, 2024
5b01757
Shift create room logic from frontend to matching service
SelwynAng Nov 2, 2024
295cb00
Merge pull request #185 from CS3219-AY2425S1/feature/collab/yjs-monaco
SelwynAng Nov 2, 2024
608f28d
Resolve merge conflict
SelwynAng Nov 2, 2024
6050f39
Integrate collaborative monaco editor
SelwynAng Nov 2, 2024
c3f9789
Add language switching
dylkaw Nov 3, 2024
8759ff0
Clean up useless heartbeat and add chat-history endpoint.
TanPingZhi Nov 3, 2024
2c6698e
Resolve lint and prettier issues
dylkaw Nov 3, 2024
2bd1ee8
Resolve type issue
dylkaw Nov 3, 2024
b9b5bce
Chat: Fix bug where same user won't see message sent from another window
wr1159 Nov 3, 2024
b1ef5d6
Merge branch 'feat/collab-service/collab-page' of github.com:CS3219-A…
wr1159 Nov 3, 2024
70948a0
Enable toggling of theme for code editor
SelwynAng Nov 3, 2024
759666a
Remove debug statement
SelwynAng Nov 3, 2024
793a964
Add openAI API key to env sample
dylkaw Nov 3, 2024
e500d98
Merge pull request #183 from CS3219-AY2425S1/feat/collab-service/coll…
SelwynAng Nov 3, 2024
ced23b8
Resolve merge conflict
SelwynAng Nov 3, 2024
436888a
Merge pull request #186 from CS3219-AY2425S1/feat/collab-service/add-…
SelwynAng Nov 3, 2024
4d55f1c
Add missing room id extraction
SelwynAng Nov 3, 2024
d8551f3
Merge pull request #187 from CS3219-AY2425S1/fix/bug/collab-service/g…
wr1159 Nov 3, 2024
88d2dfc
Add api call for AI chat
dylkaw Nov 3, 2024
127d784
Ensure persistence of chat history
SelwynAng Nov 3, 2024
08c477a
Edit usersSession-model to include timestamp
SelwynAng Nov 3, 2024
cc02356
Configure docker to accept api key from .env
SelwynAng Nov 4, 2024
49c8e81
Add matching success toast for the 2nd matched user
SelwynAng Nov 4, 2024
2c7cc26
Merge branch 'main' into feat/collab-service/ai-chat
dylkaw Nov 4, 2024
2ac3162
Merge pull request #189 from CS3219-AY2425S1/fix/bug/matching-service…
wr1159 Nov 4, 2024
831a44e
Add rooms by users endpoint
wr1159 Nov 4, 2024
7e372ae
Add leave room to redirect to history
wr1159 Nov 4, 2024
89160d3
Add history to navbar
wr1159 Nov 4, 2024
b2b877d
Add getRoomsByUsers backend function
wr1159 Nov 4, 2024
4b4d3c4
Shift AI call to collab service
dylkaw Nov 4, 2024
3773872
Run prettier
dylkaw Nov 4, 2024
ef13499
Add history rooms
wr1159 Nov 4, 2024
2f9edfe
Make timesalt in creation of room id more precise
SelwynAng Nov 4, 2024
28a5a2a
Merge pull request #191 from CS3219-AY2425S1/feature/collab/get-rooms
SelwynAng Nov 4, 2024
3ecd4f3
Merge pull request #188 from CS3219-AY2425S1/feat/collab-service/pers…
SelwynAng Nov 4, 2024
654b91d
Merge branch 'main' into feat/collab-service/ai-chat
dylkaw Nov 4, 2024
cc7144e
Merge pull request #190 from CS3219-AY2425S1/feat/collab-service/ai-chat
dylkaw Nov 4, 2024
067ed5c
Resolve entire collab page scroll down bug
SelwynAng Nov 4, 2024
24cb0a4
Run prettier fix
SelwynAng Nov 4, 2024
01f9344
Merge pull request #192 from CS3219-AY2425S1/fix/bug/collab-service-e…
wr1159 Nov 4, 2024
c9b9f7b
Get API gateway working with collab service
jq1836 Nov 5, 2024
2bb62d5
Prettier run and cleanup hardcode
jq1836 Nov 5, 2024
9b67930
Add docker compose networking
jq1836 Nov 5, 2024
dda9217
Fix question id not retrieving bug
jq1836 Nov 5, 2024
c90bf92
Add collab service kubernetes
jq1836 Nov 5, 2024
9101141
Delete frontend/package-lock.json
jq1836 Nov 5, 2024
3b89cba
Readd frontend packages
jq1836 Nov 5, 2024
c4094c1
Merge branch 'enhancement/kubernetes' of github.com:CS3219-AY2425S1/c…
jq1836 Nov 5, 2024
d8e439d
Downgrade scaling
jq1836 Nov 5, 2024
6b327f6
Remove console log
jq1836 Nov 5, 2024
076dc5f
Use uuid instead of crypto
wr1159 Nov 5, 2024
5f38f68
Tweak autoscalers
jq1836 Nov 5, 2024
0379b4d
Set deployment to always pull image
jq1836 Nov 5, 2024
43dba5f
Fix deployment yaml files
jq1836 Nov 5, 2024
8e85ae9
Merge pull request #167 from CS3219-AY2425S1/enhancement/api-gateway
jq1836 Nov 5, 2024
b03f149
Merge pull request #193 from CS3219-AY2425S1/enhancement/kubernetes
jq1836 Nov 5, 2024
6d321b4
Replace topics in matching services
wr1159 Nov 5, 2024
2b5a251
Merge pull request #194 from CS3219-AY2425S1/fix/matching/topics
jq1836 Nov 5, 2024
fb9595e
Make AI Chat remember past messages
dylkaw Nov 6, 2024
e197d36
Fix strange error
dylkaw Nov 6, 2024
4076911
Remove unnecessary roomId in collab room
SelwynAng Nov 6, 2024
2736aee
Move getQuestion to collab room
dylkaw Nov 6, 2024
1247d6a
Add context to AI Chat
dylkaw Nov 6, 2024
42f0cc3
Run prettier fix
dylkaw Nov 6, 2024
89a31d4
Merge branch 'main' into feat/collab/ai-chat-enhancements
dylkaw Nov 6, 2024
db0a268
Run prettier fix
dylkaw Nov 6, 2024
70ac0f2
Update welcome message
dylkaw Nov 6, 2024
d953fee
Resolve ESlint issues
dylkaw Nov 6, 2024
a59143f
Provide fallback string in case of empty value
dylkaw Nov 6, 2024
b53140f
Remove roomId from questionDisplay
dylkaw Nov 6, 2024
026b83b
Shift question request back to question display
dylkaw Nov 7, 2024
28fbe4e
Merge pull request #195 from CS3219-AY2425S1/fix/bug/collab-room-id
dylkaw Nov 7, 2024
7e398bf
Merge branch 'main' into feat/collab/ai-chat-enhancements
dylkaw Nov 7, 2024
f7a73d6
Merge pull request #196 from CS3219-AY2425S1/feat/collab/ai-chat-enha…
SelwynAng Nov 10, 2024
71e032d
Collab: Add RoomCount in Websocket
wr1159 Nov 10, 2024
1ba7dd7
Merge pull request #197 from CS3219-AY2425S1/feature/collab/room-count
jq1836 Nov 10, 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
Prev Previous commit
Next Next commit
Delete old pags
  • Loading branch information
jq1836 committed Sep 27, 2024
commit c1e6147ab0200c1d1347857c7992488464a35b48
9 changes: 0 additions & 9 deletions frontend/app/app/questions/[question_id]/page.tsx

This file was deleted.

5 changes: 0 additions & 5 deletions frontend/app/app/questions/create/page.tsx

This file was deleted.

64 changes: 0 additions & 64 deletions frontend/components/questions/question-create.tsx

This file was deleted.

104 changes: 0 additions & 104 deletions frontend/components/questions/question-view-edit.tsx

This file was deleted.