Skip to content

Commit

Permalink
End :D
Browse files Browse the repository at this point in the history
  • Loading branch information
MacBook Pro committed Jun 25, 2017
1 parent 416cbc1 commit 7f9cf34
Show file tree
Hide file tree
Showing 3 changed files with 145 additions and 31 deletions.
111 changes: 83 additions & 28 deletions Views/chat.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,12 @@
</div>
</div>

<div class="friend-list-area" name="Xpublic">
<div class="friend-list-area" id="public-friend-list-area" name="Xpublic">
<div class="row-b">
<div class="col-md header">Chat with public</div>

<div class="col-md chat-exchange-box">
<ul>

</ul>
</div>
<div class="col-md chat-exchange-box"><div id="public-xchange-area-chat" class="xchange-area-chat"></div></div>
<div class="col-md chat-exchange-actions">
<textarea class="txt-area-chat"></textarea>
<textarea class="txt-area-chat" id="publicMess" ></textarea>
<a href="#" class="send-btn-area-chat" id="sendToPublic">Send Message</a>
</div>
</div>
Expand Down Expand Up @@ -119,30 +114,68 @@

<script>
$(document).ready(function() {
function formatDateNow() {
var date = new Date();
var hours = date.getHours();
var minutes = date.getMinutes();
var secondes = date.getSeconds();
var ampm = hours >= 12 ? 'pm' : 'am';
hours = hours % 12;
hours = hours ? hours : 12; // the hour '0' should be '12'
minutes = minutes < 10 ? '0'+minutes : minutes;
var strTime = hours + ':' + minutes + ':' + secondes + ' ' + ampm;
return date.getMonth()+1 + "/" + date.getDate() + "/" + date.getFullYear() + " " + strTime;
}
var MD5 = function(s){function L(k,d){return(k<<d)|(k>>>(32-d))}function K(G,k){var I,d,F,H,x;F=(G&2147483648);H=(k&2147483648);I=(G&1073741824);d=(k&1073741824);x=(G&1073741823)+(k&1073741823);if(I&d){return(x^2147483648^F^H)}if(I|d){if(x&1073741824){return(x^3221225472^F^H)}else{return(x^1073741824^F^H)}}else{return(x^F^H)}}function r(d,F,k){return(d&F)|((~d)&k)}function q(d,F,k){return(d&k)|(F&(~k))}function p(d,F,k){return(d^F^k)}function n(d,F,k){return(F^(d|(~k)))}function u(G,F,aa,Z,k,H,I){G=K(G,K(K(r(F,aa,Z),k),I));return K(L(G,H),F)}function f(G,F,aa,Z,k,H,I){G=K(G,K(K(q(F,aa,Z),k),I));return K(L(G,H),F)}function D(G,F,aa,Z,k,H,I){G=K(G,K(K(p(F,aa,Z),k),I));return K(L(G,H),F)}function t(G,F,aa,Z,k,H,I){G=K(G,K(K(n(F,aa,Z),k),I));return K(L(G,H),F)}function e(G){var Z;var F=G.length;var x=F+8;var k=(x-(x%64))/64;var I=(k+1)*16;var aa=Array(I-1);var d=0;var H=0;while(H<F){Z=(H-(H%4))/4;d=(H%4)*8;aa[Z]=(aa[Z]| (G.charCodeAt(H)<<d));H++}Z=(H-(H%4))/4;d=(H%4)*8;aa[Z]=aa[Z]|(128<<d);aa[I-2]=F<<3;aa[I-1]=F>>>29;return aa}function B(x){var k="",F="",G,d;for(d=0;d<=3;d++){G=(x>>>(d*8))&255;F="0"+G.toString(16);k=k+F.substr(F.length-2,2)}return k}function J(k){k=k.replace(/rn/g,"n");var d="";for(var F=0;F<k.length;F++){var x=k.charCodeAt(F);if(x<128){d+=String.fromCharCode(x)}else{if((x>127)&&(x<2048)){d+=String.fromCharCode((x>>6)|192);d+=String.fromCharCode((x&63)|128)}else{d+=String.fromCharCode((x>>12)|224);d+=String.fromCharCode(((x>>6)&63)|128);d+=String.fromCharCode((x&63)|128)}}}return d}var C=Array();var P,h,E,v,g,Y,X,W,V;var S=7,Q=12,N=17,M=22;var A=5,z=9,y=14,w=20;var o=4,m=11,l=16,j=23;var U=6,T=10,R=15,O=21;s=J(s);C=e(s);Y=1732584193;X=4023233417;W=2562383102;V=271733878;for(P=0;P<C.length;P+=16){h=Y;E=X;v=W;g=V;Y=u(Y,X,W,V,C[P+0],S,3614090360);V=u(V,Y,X,W,C[P+1],Q,3905402710);W=u(W,V,Y,X,C[P+2],N,606105819);X=u(X,W,V,Y,C[P+3],M,3250441966);Y=u(Y,X,W,V,C[P+4],S,4118548399);V=u(V,Y,X,W,C[P+5],Q,1200080426);W=u(W,V,Y,X,C[P+6],N,2821735955);X=u(X,W,V,Y,C[P+7],M,4249261313);Y=u(Y,X,W,V,C[P+8],S,1770035416);V=u(V,Y,X,W,C[P+9],Q,2336552879);W=u(W,V,Y,X,C[P+10],N,4294925233);X=u(X,W,V,Y,C[P+11],M,2304563134);Y=u(Y,X,W,V,C[P+12],S,1804603682);V=u(V,Y,X,W,C[P+13],Q,4254626195);W=u(W,V,Y,X,C[P+14],N,2792965006);X=u(X,W,V,Y,C[P+15],M,1236535329);Y=f(Y,X,W,V,C[P+1],A,4129170786);V=f(V,Y,X,W,C[P+6],z,3225465664);W=f(W,V,Y,X,C[P+11],y,643717713);X=f(X,W,V,Y,C[P+0],w,3921069994);Y=f(Y,X,W,V,C[P+5],A,3593408605);V=f(V,Y,X,W,C[P+10],z,38016083);W=f(W,V,Y,X,C[P+15],y,3634488961);X=f(X,W,V,Y,C[P+4],w,3889429448);Y=f(Y,X,W,V,C[P+9],A,568446438);V=f(V,Y,X,W,C[P+14],z,3275163606);W=f(W,V,Y,X,C[P+3],y,4107603335);X=f(X,W,V,Y,C[P+8],w,1163531501);Y=f(Y,X,W,V,C[P+13],A,2850285829);V=f(V,Y,X,W,C[P+2],z,4243563512);W=f(W,V,Y,X,C[P+7],y,1735328473);X=f(X,W,V,Y,C[P+12],w,2368359562);Y=D(Y,X,W,V,C[P+5],o,4294588738);V=D(V,Y,X,W,C[P+8],m,2272392833);W=D(W,V,Y,X,C[P+11],l,1839030562);X=D(X,W,V,Y,C[P+14],j,4259657740);Y=D(Y,X,W,V,C[P+1],o,2763975236);V=D(V,Y,X,W,C[P+4],m,1272893353);W=D(W,V,Y,X,C[P+7],l,4139469664);X=D(X,W,V,Y,C[P+10],j,3200236656);Y=D(Y,X,W,V,C[P+13],o,681279174);V=D(V,Y,X,W,C[P+0],m,3936430074);W=D(W,V,Y,X,C[P+3],l,3572445317);X=D(X,W,V,Y,C[P+6],j,76029189);Y=D(Y,X,W,V,C[P+9],o,3654602809);V=D(V,Y,X,W,C[P+12],m,3873151461);W=D(W,V,Y,X,C[P+15],l,530742520);X=D(X,W,V,Y,C[P+2],j,3299628645);Y=t(Y,X,W,V,C[P+0],U,4096336452);V=t(V,Y,X,W,C[P+7],T,1126891415);W=t(W,V,Y,X,C[P+14],R,2878612391);X=t(X,W,V,Y,C[P+5],O,4237533241);Y=t(Y,X,W,V,C[P+12],U,1700485571);V=t(V,Y,X,W,C[P+3],T,2399980690);W=t(W,V,Y,X,C[P+10],R,4293915773);X=t(X,W,V,Y,C[P+1],O,2240044497);Y=t(Y,X,W,V,C[P+8],U,1873313359);V=t(V,Y,X,W,C[P+15],T,4264355552);W=t(W,V,Y,X,C[P+6],R,2734768916);X=t(X,W,V,Y,C[P+13],O,1309151649);Y=t(Y,X,W,V,C[P+4],U,4149444226);V=t(V,Y,X,W,C[P+11],T,3174756917);W=t(W,V,Y,X,C[P+2],R,718787259);X=t(X,W,V,Y,C[P+9],O,3951481745);Y=K(Y,h);X=K(X,E);W=K(W,v);V=K(V,g)}var i=B(Y)+B(X)+B(W)+B(V);return i.toLowerCase()};
function getMD5(value) {
return (MD5(value));
};
function hideXchangeArea() {
$('.friend-list-area').hide();
$('.friend-list-area').addClass('hidden');
}
hideXchangeArea();
function __rebindAll() {
$('.col-md.chat-contact').each(function () {
var contactFrame = $(this);
if (!$(this).hasClass('ele-binded')) {
$(this).on('click', function (e) {
$('.friend-list-area').hide();
if ($(this).hasClass('blink_me')) { $(this).removeClass('blink_me'); }
$('.friend-list-area').addClass('hidden');
var targetName = $(this).attr('id');
console.log(targetName);
$('.friend-list-area').each(function (i,l) {
if($(this).attr('name') === targetName){
$(this).show();
$(this).removeClass('hidden');
}
});
});
$(this).addClass('ele-binded');
$('a.send-btn-area-chat.ele-not-binded').on('click', function () {
var data = new Data();
data.email = $(this).data('email');
data.userSender = user.username;
data.userSenderEmail = user.email;
var textToSendContainer = $('#S'+getMD5(data.email));
data.message = textToSendContainer.val();
textToSendContainer.val('');
if (data.message.length) {
socket.emit('message', data);
var chatContainer = $("div#" + getMD5(data.email));
var message = $('<div class="xchange-chat-from-me">Me [' + formatDateNow() + '] </div><div class="xchange-chat-from-me-txt">'+data.message+'</div>');
chatContainer.append(message);
chatContainer.animate({ scrollTop: $(document).height() }, "slow");
}
});
$('a.send-btn-area-chat.ele-not-binded').removeClass('ele-not-binded');
}
});
};
Expand All @@ -159,7 +192,25 @@
socket.emit('sendInformationUser', user );
$('#sendToPublic').on('click', function(){
var chatContainer = $("div#public-xchange-area-chat");
var data = {};
data.user = user;
data.message = $('#publicMess').val();
socket.emit('publicMessage', data);
$('#publicMess').val('');
chatContainer.animate({ scrollTop: $(document).height() }, "slow");
});
socket.on('broadcasting', function (data) {
var chatContainer = $("div#public-xchange-area-chat");
var message = $('<div class="xchange-chat-from-sender">'+data.user.username+ ' [' + formatDateNow() + '] </div><div class="xchange-chat-from-sender-txt">'+data.message+'</div>');
chatContainer.append(message);
chatContainer.animate({ scrollTop: $(document).height() }, "slow");
var chatFrame = $('#public-friend-list-area');
var chatContactFrame = $('#Xpublic');
if (chatFrame.hasClass('hidden')) { chatContactFrame.addClass('blink_me'); }
});
//recuperation des utilisateurs connectés
Expand All @@ -174,18 +225,17 @@
var test2 = false;
for (var i=0; i < list.length; i++){
if($(this).attr('id') == list[i].email ){
if($(this).attr('id') == 'Xchat-contact-'+getMD5(list[i].email)){
test2 = true;
}
}
//garder le chat public
if( $(this).attr('id') == 'Xpublic'){
test2 = true;
}
if( $(this).attr('id') == 'Xpublic'){ test2 = true; }
//console.log(test2);
if(test2 == false){
$('#Xfriend-list-area-'+getMD5($(this).data('email'))).remove();
$(this).empty();
$(this).remove();
}
Expand All @@ -201,24 +251,18 @@
$('.col-md.chat-contact').each(function () {
if ($(this).attr('id') == "undefined"){
return true;
}
//console.log($(this).attr('id'));
if(list[i].email == $(this).attr('id') ){
zzz = false;
}
if ($(this).attr('id') == "undefined"){ return; }
if('Xchat-contact-'+getMD5(list[i].email) == $(this).attr('id') ) { zzz = false; }
});
//si test = true a la fin de la boucle ca veut dire que l'utilisateur n'existait pas, donc on l'ajoute
if(zzz == true){
var $newEle = $("<div class='col-md chat-contact' id='X"+list[i].email+"'> <p>"+list[i].username+"</p> <p>"+list[i].email+"</p>");
var $newElem = $("<div class='friend-list-area' name='X"+list[i].email+"'> <div class='row-b'> <div class='col-md header'>Chat with "+list[i].username+" </div> <div class='col-md chat-exchange-box'> </div> <div class='col-md chat-exchange-actions'> <textarea class='txt-area-chat'></textarea> <a href='#' class='send-btn-area-chat'>Send Message</a> </div> </div> </div> ");
var $newEle = $("<div class='col-md chat-contact' data-email='" + list[i].email + "' id='Xchat-contact-"+getMD5(list[i].email)+"'> <p>"+list[i].username+"</p> <p>"+list[i].email+"</p>");
var $newElem = $("<div class='friend-list-area' id='Xfriend-list-area-"+getMD5(list[i].email)+"' name='Xchat-contact-"+getMD5(list[i].email)+"'> <div class='row-b'> <div class='col-md header'>Chat with "+list[i].username+" </div> <div class='col-md chat-exchange-box'><div id='" + getMD5(list[i].email) + "' class='xchange-area-chat'></div></div> <div class='col-md chat-exchange-actions'> <textarea class='txt-area-chat' id='S" + getMD5(list[i].email) +"'></textarea> <a href='#' class='send-btn-area-chat ele-not-binded' data-email='"+list[i].email+"'>Send Message</a> </div> </div> </div> ");
$('.friend-list-container').append($newElem);
$('.row').append($newEle);
$newElem.hide();
$newElem.addClass('hidden');
__rebindAll();
}
Expand All @@ -227,9 +271,20 @@
});
socket.on('message', function (data) {
var chatContainer = $("div#" + getMD5(data.userSenderEmail));
var message = $('<div class="xchange-chat-from-sender">'+data.userSender+ ' [' + formatDateNow() + '] </div><div class="xchange-chat-from-sender-txt">'+data.message+'</div>');
chatContainer.append(message);
chatContainer.animate({ scrollTop: $(document).height() }, "slow");
var chatFrame = $('#Xfriend-list-area-'+getMD5(data.userSenderEmail));
var chatContactFrame = $('#Xchat-contact-'+getMD5(data.userSenderEmail));
if (chatFrame.hasClass('hidden')) { chatContactFrame.addClass('blink_me'); }
});
});
</script>

</body>
Expand Down
7 changes: 4 additions & 3 deletions newServer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,10 @@ io.on('connection', function(socket){
});


socket.on('broadcast', function (data) {
socket.on('publicMessage', function (data) {
socket.broadcast.emit('broadcasting', data);
})
socket.emit('broadcasting', data);
});



Expand All @@ -237,7 +238,7 @@ io.on('connection', function(socket){
function sendForUser(data) {
for (var i = 0; i < listUserConnected.length; i++) {
if (listUserConnected[i].email == data.email) {
listUserConnected[i].sock.emit('message', data.userSender +' : '+ data.message);
listUserConnected[i].sock.emit('message', data);
}

}
Expand Down
58 changes: 58 additions & 0 deletions public/chat.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,3 +143,61 @@ ul.horizontal li a.active {
.hidden {
display: none;
}


.xchange-area-chat {
width: 98%;
height: 97%;
outline: none !important;
border:0px none;
box-shadow: 0 0 10px #719ECE;
font-size: 18px;
letter-spacing: 0px;
line-height: 1.5;
text-align: left;
margin-left: 1%;
overflow: auto;
}

textarea {
resize: none;
}


.xchange-chat-from-sender {
text-decoration: underline;
font-size: 20px;
color: red;
text-align: left;
margin-left: 10px;
}

.xchange-chat-from-sender-txt {
margin-left: 10px;
margin-bottom: 20px;
}

.xchange-chat-from-me {
text-decoration: underline;
font-size: 20px;
color: green;
text-align: right;
margin-right: 10px;
}

.xchange-chat-from-me-txt {
font-size: 17px;
text-align: right;
margin-right: 10px;
margin-bottom: 20px;
}


.blink_me {
background-color: green;
animation: blinker 1s linear infinite;
}

@keyframes blinker {
50% { opacity: 0; }
}

0 comments on commit 7f9cf34

Please sign in to comment.