File tree 2 files changed +17
-55
lines changed
2 files changed +17
-55
lines changed Original file line number Diff line number Diff line change @@ -11,36 +11,23 @@ class AdminPage extends Component {
11
11
12
12
this . state = {
13
13
loading : false ,
14
- error : false ,
15
14
users : [ ] ,
16
15
} ;
17
16
}
18
17
19
18
componentDidMount ( ) {
20
19
this . setState ( { loading : true } ) ;
21
20
22
- this . props . firebase
23
- . users ( )
24
- . once ( 'value' )
25
- . then ( snapshot => {
26
- const usersObject = snapshot . val ( ) ;
27
- const users = Object . keys ( usersObject ) . map ( key => ( {
28
- ...usersObject [ key ] ,
29
- uid : key ,
30
- } ) ) ;
31
-
32
- this . setState ( state => ( {
33
- users,
34
- loading : false ,
35
- } ) ) ;
36
- } )
37
- . catch ( error => {
38
- this . setState ( { error : true , loading : false } ) ;
39
- } ) ;
21
+ this . props . firebase . users ( ) . on ( 'value' , snapshot => {
22
+ const usersObject = snapshot . val ( ) ;
23
+ const users = Object . keys ( usersObject ) . map ( key => ( {
24
+ ...usersObject [ key ] ,
25
+ uid : key ,
26
+ } ) ) ;
40
27
41
- this . props . firebase . users ( ) . on ( 'child_removed' , snapshot => {
42
28
this . setState ( state => ( {
43
- users : state . users . filter ( user => user . uid !== snapshot . key ) ,
29
+ users,
30
+ loading : false ,
44
31
} ) ) ;
45
32
} ) ;
46
33
}
@@ -50,7 +37,7 @@ class AdminPage extends Component {
50
37
} ;
51
38
52
39
render ( ) {
53
- const { users, loading, error } = this . state ;
40
+ const { users, loading } = this . state ;
54
41
55
42
return (
56
43
< div >
@@ -60,7 +47,6 @@ class AdminPage extends Component {
60
47
</ p >
61
48
62
49
{ loading && < div > Loading ...</ div > }
63
- { error && < div > Something went wrong ...</ div > }
64
50
65
51
< UserList users = { users } onRemove = { this . onRemove } />
66
52
</ div >
Original file line number Diff line number Diff line change @@ -22,46 +22,22 @@ class HomePage extends Component {
22
22
componentDidMount ( ) {
23
23
this . setState ( { userLoading : true , messageLoading : true } ) ;
24
24
25
- this . props . firebase
26
- . users ( )
27
- . once ( 'value' )
28
- . then ( snapshot => {
29
- this . setState ( state => ( {
30
- users : snapshot . val ( ) ,
31
- userLoading : false ,
32
- } ) ) ;
33
- } )
34
- . catch ( error => {
35
- this . setState ( { error : true , userLoading : false } ) ;
36
- } ) ;
25
+ this . props . firebase . users ( ) . on ( 'value' , snapshot => {
26
+ this . setState ( state => ( {
27
+ users : snapshot . val ( ) ,
28
+ userLoading : false ,
29
+ } ) ) ;
30
+ } ) ;
37
31
38
32
this . props . firebase
39
33
. messages ( )
40
34
. orderByKey ( )
41
35
. limitToLast ( 100 )
42
- . once ( 'value' )
43
- . then ( snapshot => {
36
+ . on ( 'child_added' , snapshot => {
44
37
this . setState ( state => ( {
45
- messages : Object . values ( snapshot . val ( ) ) ,
38
+ messages : [ snapshot . val ( ) , ... state . messages ] ,
46
39
messageLoading : false ,
47
40
} ) ) ;
48
-
49
- // Listen for updates
50
- this . props . firebase
51
- . messages ( )
52
- . orderByKey ( )
53
- . limitToLast ( 100 )
54
- . on ( 'child_added' , snapshot => {
55
- this . setState ( state => ( {
56
- messages : [ snapshot . val ( ) , ...state . messages ] ,
57
- } ) ) ;
58
- } ) ;
59
- } )
60
- . catch ( error => {
61
- this . setState ( {
62
- error : true ,
63
- messageLoading : false ,
64
- } ) ;
65
41
} ) ;
66
42
}
67
43
You can’t perform that action at this time.
0 commit comments