User mangement.

Author: Tomek

game/events.py

@@ -12,26 +12,32 @@
 @Namespace('/users')
 class UserNamespace(BaseNamespace, BroadcastMixin):
     users = []
+    logged_in = {}
 
     def on_join(self, user):
+        #import ipdb; ipdb.set_trace();
+        print "OnJoin SessionId " + self.socket.sessid
         user['gamestate'] = GAME_STATES['AVAILABLE']
         if any(filter(lambda u: u['username'] == user['username'], self.users)):
             self.error("user_connected", "User is connected")     
+            self.logged_in[user['username']] = self.socket.sessid
         else:
+            self.logged_in[user['username']] = self.socket.sessid
             self.users.append(user)
+            print 'JOIN ' + user['username']
             self.broadcast_event_not_me('connected', user)
-        
+        print self.users
         self.emit('join', self.users)
 
 
     def recv_disconnect(self):
-        # Remove nickname from the list.
-        # TODO
-        # self.log('Disconnected')
-        # nickname = self.socket.session['nickname']
-        # self.nicknames.remove(nickname)
-        # self.broadcast_event('announcement', '%s has disconnected' % nickname)
-        # self.broadcast_event('nicknames', self.nicknames)
-        # self.disconnect(silent=True)
-        # return True
-        pass
+        user_list = filter(lambda (user, sessid):sessid==self.socket.sessid, self.logged_in.items())
+
+        if any(user_list):            
+            self.logged_in.pop(user_list[0][0])
+            user = [user for user in self.users if user['username'] == user_list[0][0]][0]
+            self.users.remove(user)
+            self.broadcast_event_not_me('left', user)
+        return True
+    
+    

game/static/js/custom.js

@@ -5,20 +5,21 @@ $(document).ready(function(){
 		usocket.on('join', function(users){
 			var tbl_body = "";
 			for (var i = 0; i < users.length; i++) {
-				tbl_body += "<tr><td>" + users[i].username + "</td>" + "<td>" + users[i].gamestate + "</td>";
-				if(users[i].gamestate == 2  ){
-					tbl_body += "<td></td>";
-				}
-				else{
-					tbl_body += "<td><button>Small button</button></td>";
+				tbl_body += "<tr id='"+ users[i].username +"'><td>" + users[i].username + "</td>" + "<td>" + users[i].gamestate + "</td>";
+				if( users[i].gamestate == 1 ){
+					tbl_body += "<td><button type=\"button\" class=\"btn btn-success\">Free. Invite me to play.</button></td>";
+				}else if(users[i].gamestate == 2){
+					tbl_body += "<td><button type=\"button\" class=\"btn btn-danger\">I'm playing. Click to watch</button></td>";
+				} else {
+					tbl_body += "<td><button type=\"button\" class=\"btn btn-warning\">Waiting</button></td>";
 				}
 			}
 			$('#playerTable').append(tbl_body);	
 		});		
 
 		usocket.on('connected', function(user) {
 			var tbl_body = "";
-			tbl_body += "<tr><td>" + user.username + "</td>" + "<td>" + user.gamestate + "</td>";
+			tbl_body += "<tr id='"+ user.username +"'><td>" + user.username + "</td>" + "<td>" + user.gamestate + "</td>";
 			if(user.gamestate == 2  ){
 				tbl_body += "<td></td>";
 			} else {
@@ -27,7 +28,11 @@ $(document).ready(function(){
 			tbl_body += "</tr>";
 			$('#playerTable').append(tbl_body);	
 		});
-		
+
+
+		usocket.on('left', function(user){
+			$("#"+ user.username).remove();
+		});		
 
 		usocket.emit('join', {'username':username});
-});
+});

game/views.py

@@ -2,6 +2,7 @@
 from django.shortcuts import render_to_response
 from django.template import RequestContext
 from django.views.generic import TemplateView
+from braces.views import LoginRequiredMixin
 
 
 def home_view(request):
@@ -11,5 +12,5 @@ def home_view(request):
 class GameDemoView(TemplateView):
     template_name = "game_demo_ui.html"
 
-class MainView(TemplateView):
+class MainView(LoginRequiredMixin, TemplateView):
     template_name = "main_view.html"

memo/templates/main_view.html

@@ -9,7 +9,7 @@ <h1>Memo GAME</h1>
     <div class="row">
     	<div class="col-md-6">
 	        <table id="playerTable" class="table table-hover">
-				<thead><tr><td><b>Player</b></td><td><b>State</b></td><td>req</td></tr></thead>			
+				<thead><tr><td><b>Player</b></td><td><b>State</b></td><td><b>Invite</b></td></tr></thead>			
 			</table>
 		</div>
 		<div class="col-md-6">

requirements.txt

@@ -5,4 +5,5 @@ Pillow==1.7.8
 dj_database_url==0.2.1
 git+https://github.com/Solution4Future/django-socketio#egg=django-socketio
 django-allauth==0.13.0
-django-crispy-forms==1.4.0
+django-crispy-forms==1.4.0
+django-braces==1.2.2