Merge branch 'master' into fix-collab-voice-issue

# Conflicts:
#	README.md

Author: GavinSin

PeerPrep/src/frontend/pages/Questions.tsx

@@ -10,7 +10,7 @@ import { NAV_BUTTONS } from '../config/NavConfig';
 import QuestionList from '../components/QuestionList.tsx';
 import { useEffect, useMemo, useState } from 'react';
 import { questionApi, type QuestionsResponse } from '../api/QuestionApi.tsx';
-import {Link, useSearchParams} from 'react-router';
+import { Link, useSearchParams } from 'react-router';
 
 const TOTAL_QUESTIONS = 2650;
 

PeerPrep/src/frontend/pages/auth/Login.tsx

@@ -1,5 +1,4 @@
 import React, { useState, useEffect } from 'react';
-import GitHubLogo from '../../assets/Images/github-logo.png';
 import { Link, useNavigate } from 'react-router';
 import { useAuth } from '../../context/AuthContext';
 
@@ -144,30 +143,6 @@ export default function Login() {
           )}
         </button>
 
-        <div className="divider divider-neutral mt-0">OR</div>
-
-        {/* UI to sign in using other platforms */}
-        {/* Hides Google login btn for now*/}
-        {/*
-         <button
-          type="button"
-          className="btn btn-primary btn-soft w-full font-normal pb-3"
-          disabled
-        >
-          <img className="h-5 w-5" src={GoogleLogo} alt="Google logo" />
-          <span className="ml-2">Continue with Google</span>
-        </button> 
-        */}
-
-        <button
-          type="button"
-          className="btn btn-primary btn-soft w-full font-normal mb-3"
-          disabled // Disable until Github login is set up
-        >
-          <img className="h-5 w-5" src={GitHubLogo} alt="GitHub logo" />
-          <span className="ml-2">Continue with GitHub</span>
-        </button>
-
         {/* Additional Register Link at Bottom */}
         <p className="text-center">
           Don't have an account?&nbsp;

PeerPrep/src/frontend/pages/auth/Register.tsx

@@ -1,5 +1,4 @@
 import React, { useState } from 'react';
-import GitHubLogo from '../../assets/Images/github-logo.png';
 import { Link } from 'react-router';
 import { useAuth } from '../../context/AuthContext';
 
@@ -365,30 +364,6 @@ export default function Register() {
           )}
         </button>
 
-        <div className="divider divider-neutral mt-0">OR</div>
-
-        {/* UI to sign in using other platforms */}
-        {/* Hides Google login btn for now*/}
-        {/*
-         <button
-          type="button"
-          className="btn btn-primary btn-soft w-full font-normal pb-3"
-          disabled
-        >
-          <img className="h-5 w-5" src={GoogleLogo} alt="Google logo" />
-          <span className="ml-2">Continue with Google</span>
-        </button> 
-        */}
-
-        <button
-          type="button"
-          className="btn btn-primary btn-soft w-full font-normal mb-3"
-          disabled // Disable until Github login is set up
-        >
-          <img className="h-5 w-5" src={GitHubLogo} alt="GitHub logo" />
-          <span className="ml-2">Register with GitHub</span>
-        </button>
-
         {/* Additional Register Link at Bottom */}
         <p className="text-center">
           <Link to="/auth/login" className="underline">

README.md

@@ -6,6 +6,10 @@
 - You are required to develop individual microservices within separate folders within this repository.
 - The teaching team should be given access to the repositories as we may require viewing the history of the repository in case of any disputes or disagreements. 
 
-### Declaration:
-- Gavin has adapted server.js inside signaling-svc from node_modules/y-webrtc/bin/server.js and modified it to support audio stream
-- Gavin has used ChatGPT to generate debugging logs to VoiceConnectionManager and signaling server
+### Acknowledgements:
+
+* `qns-svc/tests/conftest.py` and `qns-hist-svc/tests/conftest.py`:
+
+  * Credits to `gxpd-jjh`. Re-used from: https://github.com/tortoise/tortoise-orm/issues/1110#issuecomment-1881967845
+* Gavin has adapted `server.js` inside `signaling-svc` from `node_modules/y-webrtc/bin/server.js` and modified it to support audio stream
+* Gavin has used ChatGPT to generate debugging logs to VoiceConnectionManager and signaling server

qns-hist-svc/tests/conftest.py

@@ -8,7 +8,8 @@
 )
 
 
-# TODO: Acknowledge and credit https://github.com/tortoise/tortoise-orm/issues/1110
+# Acknowledgement and credits to gxpd-jjh
+# Reused from: https://github.com/tortoise/tortoise-orm/issues/1110#issuecomment-1881967845
 @pytest.fixture(scope="module")
 def event_loop():
     loop = asyncio.get_event_loop_policy().new_event_loop()

qns-svc/tests/conftest.py

@@ -8,7 +8,8 @@
 )
 
 
-# TODO: Acknowledge and credit https://github.com/tortoise/tortoise-orm/issues/1110
+# Acknowledgement and credits to gxpd-jjh
+# Reused from: https://github.com/tortoise/tortoise-orm/issues/1110#issuecomment-1881967845
 @pytest.fixture(scope="module")
 def event_loop():
     loop = asyncio.get_event_loop_policy().new_event_loop()