Skip to content

Listen to music while in Office Hours Queue. #161

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.

Sign up for GitHub

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

Open
JoshuaW0 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Listen to music while in Office Hours Queue. #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 15 additions & 3 deletions nginx/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,34 @@
<body>

<br/>

<h3 id="message">Welcome!</h3>

<p>Name</p>
<h3 style = "color:blue;">Name</h3>
<input type="text" id="name"/>
<button onclick="enterQueue();">Enter Queue</button>
<br/><br/>

<button onclick="readyToHelp();">TA Ready to Help</button>

<h3 style = "color:blue;">Waiting Music</h3>
<input type="hidden" id="song"/>
<button onclick="Music();">Generate Music Link</button>

<br/>

<div id="queue"></div>

<script src="officeHours.js"></script>


</body>
</html>

<html>
<head>
<style>
body{
background: steelblue;
}
</style>
</head>
</html>
23 changes: 23 additions & 0 deletions nginx/public/officeHours.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ const socket = io.connect("http://localhost:8080", {transports: ['websocket']});

socket.on('queue', displayQueue);
socket.on('message', displayMessage);
socket.on('Waiting_music', displayMusic)

function displayMusic(newMusic){
document.getElementById("music").innerHTML = newMusic;
}

function displayMessage(newMessage) {
document.getElementById("message").innerHTML = newMessage;
Expand All @@ -26,3 +31,21 @@ function enterQueue() {
function readyToHelp() {
socket.emit("ready_for_student");
}

function Music(){
var SongPlaylist = [];
SongPlaylist[0] = "https://www.youtube.com/watch?v=3FsrPEUt2Dg";
SongPlaylist[1] = "https://www.youtube.com/watch?v=IxuThNgl3YA";
SongPlaylist[2] = "https://www.youtube.com/watch?v=rblt2EtFfC4";
SongPlaylist[3] = "https://www.youtube.com/watch?v=DtVBCG6ThDk";
SongPlaylist[4] = "https://www.youtube.com/watch?v=bEea624OBzM";
SongPlaylist[5] = "https://www.youtube.com/watch?v=5XcKBmdfpWs";
SongPlaylist[6] = "https://www.youtube.com/watch?v=EFMD7Usflbg";
SongPlaylist[7] = "https://www.youtube.com/watch?v=wccRif2DaGs";
SongPlaylist[8] = "https://www.youtube.com/watch?v=e5MAg_yWsq8";
SongPlaylist[9] = "https://www.youtube.com/watch?v=SyNt5zm3U_M";
SongPlaylist[10] = "https://www.youtube.com/watch?v=gxEPV4kolz0";

window.open(SongPlaylist[Math.floor(Math.random() * SongPlaylist.length)], '_blank')
socket.emit("music")
}
10 changes: 9 additions & 1 deletion src/main/scala/model/OfficeHoursServer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ class OfficeHoursServer() {
server.addDisconnectListener(new DisconnectionListener(this))
server.addEventListener("enter_queue", classOf[String], new EnterQueueListener(this))
server.addEventListener("ready_for_student", classOf[Nothing], new ReadyForStudentListener(this))
server.addEventListener("music", classOf[Nothing], new MusicListener())

server.start()

Expand All @@ -49,7 +50,7 @@ class DisconnectionListener(server: OfficeHoursServer) extends DisconnectListene
override def onDisconnect(socket: SocketIOClient): Unit = {
if (server.socketToUsername.contains(socket)) {
val username = server.socketToUsername(socket)
server.socketToUsername -= socket
server.socketToUsername -= socket
if (server.usernameToSocket.contains(username)) {
server.usernameToSocket -= username
}
Expand Down Expand Up @@ -83,4 +84,11 @@ class ReadyForStudentListener(server: OfficeHoursServer) extends DataListener[No
}
}

class MusicListener extends DataListener[Nothing]{
override def onData(socket: SocketIOClient, music: Nothing, ackRequest: AckRequest): Unit = {
socket.sendEvent("Waiting_music")
//Listen to music while waiting in Queue!
}
}