Skip to content

Commit dd44fcc

Browse files
kushthedudeabhinavk96
authored andcommitted
Pagination and redirection to in mobile view (#3123)
1 parent f44bfd6 commit dd44fcc

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

app/routes/explore.js

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,16 @@ export default Route.extend({
145145
});
146146
}
147147

148-
return this.store.query('event', {
149-
sort : 'starts-at',
150-
filter : filterOptions,
151-
include : 'event-topic,event-sub-topic,event-type'
148+
return this.infinity.model('event', {
149+
include : 'event-topic,event-sub-topic,event-type',
150+
filter : filterOptions,
151+
sort : 'starts-at',
152+
perPage : 6,
153+
startingPage : 1,
154+
perPageParam : 'page[size]',
155+
pageParam : 'page[number]'
152156
});
157+
153158
},
154159

155160
async model(params) {

app/templates/components/side-bar.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="ui left inverted vertical menu sidebar {{if sidebarVisible 'visible'}}">
2-
{{#link-to 'index' class='item' activeClass=''}}{{t 'Browse Events'}}{{/link-to}}
2+
{{#link-to 'explore' class='item' activeClass=''}}{{t 'Browse Events'}}{{/link-to}}
33
{{#if session.isAuthenticated}}
44
<div class="item">
55
{{widgets/safe-image isAvatar=true class='ui avatar round image side-bar' src=(if authManager.currentUser.avatarUrl authManager.currentUser.avatarUrl

app/templates/explore.hbs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,10 @@
4343
<div class="ui disabled header">{{t 'No events found for selected filters'}}</div>
4444
{{/each}}
4545
{{modals/event-share-modal isOpen=isShareModalOpen event=eventToShare}}
46+
{{#infinity-loader infinityModel=filteredEvents}}
47+
<div class="ui loading very padded basic segment">
48+
</div>
49+
{{infintyModel.reachedInfinity}}
50+
{{/infinity-loader}}
4651
</div>
4752
</div>

0 commit comments

Comments
 (0)