@@ -56,12 +56,8 @@ class CovidApp extends Component {
5656 const stateChanges = responses [ 2 ] . data ;
5757
5858 const [ data ] = countryData . cases_time_series . slice ( - 1 ) ;
59- console . log ( data ) ;
6059
61- this . setState ( { todayData : data } ) ;
62- // use/access the results
63- // console.log(data);
64- // console.log(responseOne, responseTwo, responesThree);
60+ this . setState ( { todayData : data , isLoading : false } ) ;
6561 } )
6662 ) ;
6763
@@ -122,45 +118,49 @@ class CovidApp extends Component {
122118 const { classes, setDarkMode, isDarkMode } = this . props ;
123119 const { mapData, tableData, isLoading, data } = this . state ;
124120
121+ if ( isLoading ) {
122+ return (
123+ < div className = { classes . loadingIcon } >
124+ < FontAwesomeIcon icon = { faSyncAlt } className = { classes . refreshIcon } />
125+ </ div >
126+ ) ;
127+ }
128+
125129 return (
126- < Overview
127- isDarkMode = { isDarkMode }
128- data = { this . state . todayData }
129- loadingStatus = { this . loadingStatus }
130- />
130+ < >
131+ < div className = { classes . header } >
132+ < h1 className = { classes . heading } >
133+ < span > Covid-19</ span > India Trend
134+ </ h1 >
135+ < div className = { classes . btnBox } >
136+ < FontAwesomeIcon
137+ icon = { faSyncAlt }
138+ className = { classes . button }
139+ onClick = { this . fetchData }
140+ />
141+ </ div >
142+ < div className = "darkModeButton" >
143+ < label className = "switch" >
144+ < input
145+ type = "checkbox"
146+ onChange = { setDarkMode }
147+ checked = { isDarkMode }
148+ />
149+ < span className = "slider round" > </ span >
150+ </ label >
151+ </ div >
152+ </ div >
153+ < Overview
154+ isDarkMode = { isDarkMode }
155+ data = { this . state . todayData }
156+ loadingStatus = { this . loadingStatus }
157+ />
158+ </ >
131159 ) ;
132160
133- // if (isLoading) {
134- // return (
135- // <div className={classes.loadingIcon}>
136- // <FontAwesomeIcon icon={faSyncAlt} className={classes.refreshIcon} />
137- // </div>
138- // );
139- // }
140161 // return (
141162 // <>
142- // <div className={classes.header}>
143- // <h1 className={classes.heading}>
144- // <span>Covid-19</span> India Trend
145- // </h1>
146- // <div className={classes.btnBox}>
147- // <FontAwesomeIcon
148- // icon={faSyncAlt}
149- // className={classes.button}
150- // onClick={this.fetchData}
151- // />
152- // </div>
153- // <div className="darkModeButton">
154- // <label className="switch">
155- // <input
156- // type="checkbox"
157- // onChange={setDarkMode}
158- // checked={isDarkMode}
159- // />
160- // <span className="slider round"></span>
161- // </label>
162- // </div>
163- // </div>
163+
164164 // <Overview
165165 // isDarkMode={isDarkMode}
166166 // data={this.state.data}
0 commit comments