@@ -30,9 +30,8 @@ let socket;
30
30
const { API_BASE_URL } = config ;
31
31
const RoomsContainer = ( ) => {
32
32
const dispatch = useDispatch ( ) ;
33
- const { state , roomCode, userName, userList, userJoined } = useSelector (
33
+ const { roomCode, userName, userList, userJoined } = useSelector (
34
34
( store : RootState ) => ( {
35
- state : store . appState ,
36
35
roomCode : store . roomSlice . roomCode ,
37
36
userName : store . roomSlice . userName ,
38
37
userList : store . roomSlice . userList ,
@@ -52,30 +51,39 @@ const RoomsContainer = () => {
52
51
53
52
socket . on ( 'connect' , ( ) => {
54
53
console . log ( `You Connected With Id: ${ socket . id } ` ) ;
55
- socket . emit ( 'join-room' , roomCode ) ; // Join the room when connected
54
+ // ????
55
+ //socket.emit('join-room', roomCode); // Join the room when connected
56
56
console . log ( `Your Nickname Is: ${ userName } ` ) ;
57
57
//passing current client nickname to server
58
+ // ???
58
59
socket . emit ( 'joining' , userName , roomCode ) ;
59
60
//listening to back end for updating user list
60
- socket . on ( 'updateUserList' , ( newUserList ) => {
61
- dispatch ( setUserList ( Object . values ( newUserList ) ) ) ;
62
- } ) ;
61
+ } ) ;
62
+
63
+ socket . on ( 'updateUserList' , ( newUserList ) => {
64
+ console . log ( 'received user list from back:' , newUserList ) ;
65
+ dispatch ( setUserList ( Object . values ( newUserList ) ) ) ;
66
+ console . log ( 'client user list updated:' , userList ) ;
63
67
} ) ;
64
68
65
69
// receiving the message from the back end
66
- socket . on ( 'receive message' , ( event ) => {
70
+ socket . on ( 'new state from back' , ( event ) => {
71
+ console . log ( 'front receiving new state' ) ;
67
72
let currentStore : any = JSON . stringify ( store . getState ( ) ) ;
68
73
// console.log('event ', event);
69
74
if ( currentStore !== event ) {
70
75
currentStore = JSON . parse ( currentStore ) ;
71
76
event = JSON . parse ( event ) ;
72
77
if ( currentStore . appState !== event . appState ) {
78
+ console . log ( 'updating app state' ) ;
73
79
store . dispatch ( allCooperativeState ( event . appState ) ) ;
74
80
} else if (
75
81
currentStore . codePreviewSlice !== event . codePreviewCooperative
76
82
) {
83
+ console . log ( 'updating code preview' ) ;
77
84
store . dispatch ( codePreviewCooperative ( event . codePreviewCooperative ) ) ;
78
85
} else if ( currentStore . styleSlice !== event . styleSlice ) {
86
+ console . log ( 'updating style' ) ;
79
87
store . dispatch ( cooperativeStyle ( event . styleSlice ) ) ;
80
88
}
81
89
}
@@ -88,20 +96,22 @@ const RoomsContainer = () => {
88
96
89
97
let previousState = store . getState ( ) ;
90
98
// sending info to backend whenever the redux store changes
91
- const handleStoreChange = debounce ( ( ) => {
92
- const newState = store . getState ( ) ;
93
- const roomCode = newState . roomSlice . roomCode ;
99
+ // const handleStoreChange = debounce(() => {
100
+ // const newState = store.getState();
101
+ // const roomCode = newState.roomSlice.roomCode;
94
102
95
- if ( newState !== previousState ) {
96
- // Send the current state to the server
97
- socket . emit ( 'custom-event' , JSON . stringify ( newState ) , roomCode ) ;
98
- previousState = newState ;
99
- }
100
- } , 100 ) ;
103
+ // if (newState !== previousState) {
104
+ // // Send the current state to the server
105
+ // console.log('front emitting new state')
106
+ // socket.emit('new state from front', JSON.stringify(newState), roomCode);
107
+ // previousState = newState;
108
+ // }
109
+ // }, 100);
101
110
102
111
store . subscribe ( ( ) => {
103
112
if ( socket ) {
104
- handleStoreChange ( ) ;
113
+ console . log ( 'handling store change' ) ;
114
+ //handleStoreChange();
105
115
}
106
116
} ) ;
107
117
@@ -208,7 +218,7 @@ const RoomsContainer = () => {
208
218
variant = "filled"
209
219
size = "small"
210
220
value = { userName }
211
- placeholder = "Input nickname "
221
+ placeholder = "Input Nickname "
212
222
onChange = { ( e ) => dispatch ( setUserName ( e . target . value ) ) }
213
223
/>
214
224
< TextField
0 commit comments