Skip to content

Commit

Permalink
Collab enhancement + Chat + Homepage (CS3219-AY2425S1#76)
Browse files Browse the repository at this point in the history
* Fix css issues
After the change, the content of the components spill over when
it's too long. Now, it should be containted within the boxes
even if the content of each component is long

(cherry picked from commit 6aa266b)

* Add line wrapping for editor

(cherry picked from commit fbb31e7)

* Backbone of Chat Service:
- Basic HTML and CSS for Chat
- Basic Functionality for Chat

(cherry picked from commit 8e153cf)

* Add more languages to codemirror

(cherry picked from commit a5a23c8)

* Add highlight to splitter on hover

(cherry picked from commit 849c37f)

* Fix bug for language selection
Previously, the language selected would disappear if you
refresh the page. Now, it's able to pick up the last language
selected.

(cherry picked from commit e639b21)

* Update CSS and HTML for Chat Service

(cherry picked from commit 951077c)

* Update Chat Service
- Update HTML and CSS for Chat
- Update functionality to include timestamp

(cherry picked from commit 014b85b)

* Update warning message for unsupported language

(cherry picked from commit df9690a)

* Fix bug and refactor codes
The previous commit introduced a bug where the editor's
content is duplicated upon refresh.

(cherry picked from commit d482a65)

* Initialise chat component

(cherry picked from commit 82143f3)

* Refactor codes
Moved websocket and ydoc init to collab component.
This lets the ydoc to be shared to chat component without
affecting the layout. Plus, it makes more sense that collab
handles all this instead of the editor component

(cherry picked from commit 0329971)

* Remove redundant imports

(cherry picked from commit 2da56a9)

* Fix styling issues
Fixed the styling issues introduced by chatbox component

(cherry picked from commit 05d4799)

* Fix css issues
After the change, the content of the components spill over when
it's too long. Now, it should be containted within the boxes
even if the content of each component is long

(cherry picked from commit f959fec)

* Add line wrapping for editor

(cherry picked from commit e4dfed2)

* Add more languages to codemirror

(cherry picked from commit db98a1d)

* Add highlight to splitter on hover

(cherry picked from commit 8672b34)

* Fix bug for language selection
Previously, the language selected would disappear if you
refresh the page. Now, it's able to pick up the last language
selected.

(cherry picked from commit 49c6dd2)

* Update warning message for unsupported language

(cherry picked from commit 2534960)

* Fix bug and refactor codes
The previous commit introduced a bug where the editor's
content is duplicated upon refresh.

(cherry picked from commit 5aec692)

* Fix linting

(cherry picked from commit 2ff3ac0)

* Add indent with tab

(cherry picked from commit c6e6432)

* Update Chat Service
- Added Mute/Unmute Functionality

(cherry picked from commit 807485f)

* Update Chat System
- collaboration.component.ts: Change from user_id to access token
- chat-box.component.ts: Change functionality such that user can`t
see what the other user type during the muted period, even after he/she
unmute

(cherry picked from commit e43f6bc)

* Add Get Rooms Details By User
- roomRoutes: Update routes
- roomController: Add method to get room details by user
- mongoDbService: Update findRoomsByUserId method

(cherry picked from commit c8e5bb8)

* Minor Fix to Method

roomController: Add Users In Room Details Retrieved for method getRoomsByUserIdandStatusController
(cherry picked from commit 92fdb51)

* Add layout for homepage

(cherry picked from commit e6cddff)

* Integrate api calls and functionalities
- Allow retrieval of active room sessions
- Add routing for rejoining room
- Add routing for going to match page

(cherry picked from commit 0d02d28)

* Update routing to direct to /home

(cherry picked from commit bf6dd5e)

* Update Collaboration Service README.md

(cherry picked from commit 1228cea)

* Oops
- Uncommented api call for getting active sessions

(cherry picked from commit 5095e4a)

* Fix linting

* Fix bugs

* Add toast message when user tries to reenter inactive room

* Update get active room response

* Update api call for getting active sessions
Added condition for isForfeited

* Update budget

* Fix linting

* Minor Fix on Collaboration Service

* Remove unnecessary console log

* Fix typos

* Add collab db into compose.dev.yml

* Minor Fix Based On Comments
- Change the API for getting rooms details using isForfeit and roomStatus
- Change the room routes
- Change the client way to call the updated API
- Update README.md

* Readjust chatbox css
- Reduce padding to give more content space

* Remove some languages and fix editor css
- Removed frontend frameworks and data representation languages
- Made the button for editor slightly smaller to match chat, and fix
the spacing.

* Add breakpoints for image size at homepage

* Minor Fix to README.md for Collaboration Service

---------

Co-authored-by: KhoonSun47 <[email protected]>
Co-authored-by: Samuel Lim <[email protected]>
  • Loading branch information
3 people authored Nov 3, 2024
1 parent 33e19d8 commit cf4f491
Show file tree
Hide file tree
Showing 43 changed files with 1,732 additions and 249 deletions.
4 changes: 4 additions & 0 deletions compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ services:
volumes:
- /app/node_modules
- ./services/collaboration:/app

collaboration-db:
ports:
- 27020:27017

broker:
ports:
Expand Down
4 changes: 2 additions & 2 deletions frontend/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
"budgets": [
{
"type": "initial",
"maximumWarning": "2MB",
"maximumError": "3MB"
"maximumWarning": "7MB",
"maximumError": "10MB"
},
{
"type": "anyComponentStyle",
Expand Down
Loading

0 comments on commit cf4f491

Please sign in to comment.