Events pagination and fixes for browse pagination

app.rb

@@ -132,12 +132,18 @@ get '/?' do
       @suggestions = current_site.suggestions
     end
 
+    @current_page = params[:current_page].to_i
+    @current_page = 1 if @current_page == 0
+
     if params[:activity] == 'mine'
-      @events = current_site.latest_events
+      events_dataset = current_site.latest_events(@current_page, 10)
     else
-      @events = current_site.news_feed
+      events_dataset = current_site.news_feed(@current_page, 10)
     end
 
+    @page_count = events_dataset.page_count || 1
+    @events = events_dataset.all
+
     halt erb :'home', locals: {site: current_site}
   end
 

models/site.rb

@@ -512,13 +512,13 @@ class Site < Sequel::Model
     'Supporter Plan'
   end
 
-  def latest_events(limit=10, offset=0)
+  def latest_events(current_page=1, limit=10)
-    events_dataset.order(:created_at.desc).limit(limit, offset).all
+    events_dataset.order(:created_at.desc).paginate(current_page, limit)
   end
 
-  def news_feed(limit=10, offset=0)
+  def news_feed(current_page=1, limit=10)
     following_ids = self.followings_dataset.select(:site_id).all.collect {|f| f.site_id}
-    Event.filter(site_id: following_ids+[self.id]).order(:created_at.desc).limit(limit, offset).all
+    Event.filter(site_id: following_ids+[self.id]).order(:created_at.desc).paginate(current_page, limit)
   end
 
   def host

views/_news.erb

@@ -1,3 +1,8 @@
+<script type="text/javascript">
+  function getPage(currentPage) {
+    document.location.href = '?current_page='+currentPage+'&activity=<%= Rack::Utils.escape(params[:activity]) %>'
+  }
+</script>
 <script src="/assets/scripts/news/template.js"></script>
 <script src="/assets/scripts/news/like.js"></script>
 <script src="/assets/scripts/news/comment.js"></script>
@@ -92,4 +97,27 @@
 
 <% end %>
 
+<div class="content">
+  <% if @page_count > 1 %>
+    <div class="txt-Center content eps">
+      <% if @current_page != 1 %>
+        <a href="#" onclick="getPage(<%= @current_page - 1 %>); return false"><i class="icon-arrow-left" style="text-decoration: none"></i></a>&nbsp;
+      <% end %>
+
+      <% 1.upto(@page_count) do |num| %>
+        <% if num == @current_page %>
+          <%= num %>&nbsp;
+        <% else %>
+          <a href="#" onclick="getPage(<%= num %>); return false"><%= num %></a>&nbsp;
+        <% end %>
+
+      <% end %>
+
+      <% if @current_page != @page_count %>
+        <a href="#" onclick="getPage(<%= @current_page + 1 %>); return false"><i class="icon-arrow-right" style="text-decoration: none"></i></a>
+      <% end %>
+    </div>
+  <% end %>
+</div>
+
 <%== erb :'_news_templates', layout: false %>

views/browse.erb

@@ -95,7 +95,11 @@
       <% end %>
 
       <% 1.upto(@page_count) do |num| %>
-        <a href="#" onclick="getPage(<%= num %>); return false" style="<%=  num == @current_page ? 'text-decoration: none' : '' %>"><%= num %></a>&nbsp;
+        <% if num == @current_page %>
+          <%= num %>&nbsp;
+        <% else %>
+          <a href="#" onclick="getPage(<%= num %>); return false"><%= num %></a>&nbsp;
+        <% end %>
       <% end %>
 
       <% if @current_page != @page_count %>