File tree Expand file tree Collapse file tree 3 files changed +47
-12
lines changed Expand file tree Collapse file tree 3 files changed +47
-12
lines changed Original file line number Diff line number Diff line change 1
1
# content {
2
+ width : 750px ;
3
+ height : 500px ;
4
+ margin : 0 auto;
5
+ }
6
+
7
+ # content # chat # messages {
2
8
width : 500px ;
3
- height : 300px ;
9
+ }
10
+
11
+ # content # users {
12
+ width : 200px ;
13
+ height : 300px ;
14
+ padding : 0 ;
15
+ margin : 0 0 0 20px ;
16
+ list-style : none;
17
+ border : 1px solid black;
18
+ }
19
+
20
+ # content # users li {
21
+ padding-left : 10px ;
22
+ width : 95% ;
23
+ height : 20px ;
24
+ }
25
+
26
+ # content # users li .odd {
27
+ background-color : # ccc ;
28
+ }
29
+
30
+ # content # chat # messages {
31
+ min-height : 300px ;
4
32
margin : 0 0 20px 0 ;
5
33
border : solid 1px # 999 ;
6
34
overflow-y : scroll;
7
35
}
8
36
9
- input .field {
10
- width : 350px ;
37
+ # content # chat , # content # users {
38
+ float : left;
39
+ }
40
+
41
+ .controls input # field {
42
+ width : 86% ;
11
43
}
Original file line number Diff line number Diff line change @@ -5,14 +5,14 @@ var users = [];
5
5
module . exports = function ( socket ) {
6
6
7
7
socket . on ( 'disconnect' , function ( ) {
8
- socket . broadcast . emit ( 'send:message' , { message : new_user . name + ' a quitté la discussion ' } ) ;
8
+ socket . broadcast . emit ( 'send:message' , { message : new_user . name + ' left the conversation ' } ) ;
9
9
deleteUser ( new_user ) ;
10
10
} ) ;
11
11
12
12
var new_user = addUser ( ) ;
13
- socket . emit ( 'send:message' , { message : '*** Bienvenue sur le chat ' + new_user . name + ' ***' } ) ;
13
+ socket . emit ( 'send:message' , { message : '*** Welcome ' + new_user . name + ' ! ***' } ) ;
14
14
15
- socket . broadcast . emit ( 'send:message' , { message : new_user . name + ' a rejoint la discussion ' } ) ;
15
+ socket . broadcast . emit ( 'send:message' , { message : new_user . name + ' join the conversation ' } ) ;
16
16
17
17
socket . emit ( 'user:join' , { list : users , new_one : new_user } ) ;
18
18
socket . broadcast . emit ( 'user:join' , { list : users } ) ;
Original file line number Diff line number Diff line change @@ -10,9 +10,12 @@ html(ng-app="tchat")
10
10
script( src ='/socket.io/socket.io.js' )
11
11
body( ng-controller ='TchatCtrl' )
12
12
#content
13
- div( ng-repeat ="msg in messages" ) {{msg}}
14
- .controls
15
- input#field ( ng-model ='message' )
16
- input#send ( type ='button' , value ='Envoyer' , ng-click ='sendMessage()' )
17
- #users
18
- div( ng-repeat ="user in users" ) {{user}}
13
+ #chat
14
+ #messages
15
+ div( ng-repeat ="msg in messages" ) {{msg}}
16
+ div.clearer
17
+ .controls
18
+ input#field ( ng-model ='message' )
19
+ input#send ( type ='button' , value ='Envoyer' , ng-click ='sendMessage()' )
20
+ ul#users
21
+ li( ng-repeat ="user in users" ng-class-odd ="'odd'" ) {{user.name}}
You can’t perform that action at this time.
0 commit comments