Merge pull request #36 from CS3219-AY2425S1/collab-backend

Implement Collab Service

Author: RingoftheKing

Backend/.gitignore

@@ -9,6 +9,7 @@ QuestionService/insert_questions_script.py
 QuestionService/node_modules
 user-service/node_modules
 MatchingService/node_modules
+CollabService/node_modules
 /.pnp
 .pnp.js
 

Backend/CollabService/app.js

@@ -1,16 +1,21 @@
 const express = require('express');
 const http = require('http');
-const { setupWebSocket } = require('./websocket/collabSocket');
-
+const { setupWebSocket } = require('./websocket/roomManagerSocket');
+const { setUpYjsSocket } = require('./websocket/collabSocket');
 const app = express();
+ 
 const server = http.createServer(app);
+const yjsPORT = 1234
 
 // Set up WebSocket server and attach to HTTP server
 setupWebSocket(server);
+setUpYjsSocket(yjsPORT);
 
 // Basic route to test the server
 app.get('/', (req, res) => {
-    res.send('CollabService is running');
+    res.send('CollabService using Yjs is running');
 });
 
-module.exports = { app, server };
+
+
+module.exports = { server };

Backend/CollabService/index.js

@@ -1,6 +1,6 @@
-const app = require('./app')
+const { server } = require('./app')
 
 // Change the port number to listen to a different port but remember to change the port number in frontend too!
-app.listen(3004, () => {
-    console.log("Collab Servicce is Running")
+server.listen(3004, () => {
+    console.log("Collab Service is Running on port 3004")
 })