@@ -119,7 +119,7 @@ export const HomepagePhy = () => {
119
119
120
120
const user = useAppSelector ( selectors . user . orNull ) ;
121
121
122
- const { data : news } = useGetNewsPodListQuery ( { subject : "physics" } ) ;
122
+ const newsQuery = useGetNewsPodListQuery ( { subject : "physics" } ) ;
123
123
124
124
const [ dashboardView , setDashboardView ] = useState < "student" | "teacher" | undefined > ( undefined ) ;
125
125
@@ -190,12 +190,15 @@ export const HomepagePhy = () => {
190
190
</ div >
191
191
< ShowLoadingQuery
192
192
query = { eventsQuery }
193
- defaultErrorTitle = { "Error loading events list" }
193
+ ifError = { ( ( ) => < p > There was an error loading the events list. Please try again later! </ p > ) }
194
194
thenRender = { ( { events} ) => {
195
195
return < Row className = "h-100" >
196
- { events . map ( event => < Col key = { event . id } >
197
- < EventCard event = { event } />
198
- </ Col > ) }
196
+ { events . length
197
+ ? events . map ( event => < Col key = { event . id } >
198
+ < EventCard event = { event } />
199
+ </ Col > )
200
+ : < p > No events available. Check back soon!</ p > }
201
+
199
202
</ Row > ;
200
203
} } />
201
204
</ div >
@@ -205,11 +208,20 @@ export const HomepagePhy = () => {
205
208
< Link to = "/news" className = "news-events-link" > More news</ Link >
206
209
< div className = "section-divider-bold" />
207
210
</ div >
208
- { news && < Row className = "h-100" >
209
- { news . slice ( 0 , 2 ) . map ( newsItem => < Col key = { newsItem . id } >
210
- < NewsCard newsItem = { newsItem } />
211
- </ Col > ) }
212
- </ Row > }
211
+ < ShowLoadingQuery
212
+ query = { newsQuery }
213
+ ifError = { ( ( ) => < p > There was an error loading the news list. Please try again later!</ p > ) }
214
+ thenRender = { ( news ) => {
215
+ return < Row className = "h-100" >
216
+ { news . length
217
+ ? news . slice ( 0 , 2 ) . map ( newsItem => < Col key = { newsItem . id } >
218
+ < NewsCard newsItem = { newsItem } />
219
+ </ Col > )
220
+ : < p > No news available. Check back soon!</ p >
221
+ }
222
+ </ Row > ;
223
+ } }
224
+ />
213
225
</ div >
214
226
</ Row >
215
227
</ section >
0 commit comments