basic implementation of endless scroll on dashboard

10 files changed, 129 insertions, 70 deletions

diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index 3908860..8645c78 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -15,6 +15,8 @@
 #= require jquery_ujs
 #= require turbolinks
 #= require jquery.turbolinks
+#= require jquery.endless-scroll
+#= require pager
 #= require nprogress
 #= require nprogress-turbolinks
 #= require jquery_nested_form
diff --git a/app/assets/javascripts/pager.js.coffee b/app/assets/javascripts/pager.js.coffee
new file mode 100644
index 0000000..8d5a264
--- /dev/null
+++ b/app/assets/javascripts/pager.js.coffee
@@ -0,0 +1,42 @@
+@Pager =
+  init: (@url, @limit = 0, preload, @disable = false) ->
+    if preload
+      @offset = 0
+      @getOld()
+    else
+      @offset = @limit
+    @initLoadMore()
+
+  getOld: ->
+    $(".loading").show()
+    $.ajax
+      type: "GET"
+      url: @url
+      data: "limit=" + @limit + "&offset=" + @offset
+      complete: =>
+        $(".loading").hide()
+      success: (data) =>
+        Pager.append(data.count, data.html)
+      dataType: "json"
+
+  append: (count, html) ->
+    if count > 1
+      $(".content-list").append html
+    if count == @limit
+      @offset += count
+    else
+      @disable = true
+
+  initLoadMore: ->
+    $(document).unbind('scroll')
+    $(document).endlessScroll
+      bottomPixels: 400
+      fireDelay: 1000
+      fireOnce: true
+      ceaseFire: ->
+        Pager.disable
+
+      callback: (i) =>
+        unless $(".loading").is(':visible')
+          $(".loading").show()
+          Pager.getOld()
diff --git a/app/assets/stylesheets/sections/projects.scss b/app/assets/stylesheets/sections/projects.scss
index bc9da2f..84ee139 100644
--- a/app/assets/stylesheets/sections/projects.scss
+++ b/app/assets/stylesheets/sections/projects.scss
@@ -55,3 +55,7 @@
     margin-bottom: 0;
   }
 }
+
+.loading{
+  font-size: 20px;
+}
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 316fd63..9852736 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -88,6 +88,20 @@ class ApplicationController < ActionController::Base
     headers['X-XSS-Protection'] = '1; mode=block'
   end
 
+  # JSON for infinite scroll via Pager object
+  def pager_json(partial, count)
+    html = render_to_string(
+      partial,
+      layout: false,
+      formats: [:html]
+    )
+
+    render json: {
+      html: html,
+      count: count
+    }
+  end
+
   def check_config
     redirect_to oauth2_help_path unless valid_config?
   end
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 7051045..def84fd 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -1,5 +1,5 @@
 class ProjectsController < ApplicationController
-  PROJECTS_PER_PAGE = 100
+  PROJECTS_BATCH = 10
 
   before_filter :authenticate_user!, except: [:build, :badge, :index, :show]
   before_filter :authenticate_public_page!, only: :show
@@ -17,13 +17,20 @@ class ProjectsController < ApplicationController
   end
 
   def gitlab
+    @limit, @offset = (params[:limit] || PROJECTS_BATCH).to_i, (params[:offset] || 0).to_i
+    @page = @offset == 0 ? 1 : (@offset / @limit + 1)
+
     current_user.reset_cache if params[:reset_cache]
-    @page = (params[:page] || 1).to_i
-    @per_page = PROJECTS_PER_PAGE
-    @gl_projects = current_user.gitlab_projects(params[:search], @page, @per_page)
+
+    @gl_projects = current_user.gitlab_projects(params[:search], @page, @limit)
     @projects = Project.where(gitlab_id: @gl_projects.map(&:id)).ordered_by_last_commit_date
     @total_count = @gl_projects.size
     @gl_projects.reject! { |gl_project| @projects.map(&:gitlab_id).include?(gl_project.id) }
+    respond_to do |format|
+      format.json do
+        pager_json("projects/gitlab", @total_count)
+      end
+    end
   rescue Network::UnauthorizedError
     raise
   rescue
diff --git a/app/views/projects/_gitlab.html.haml b/app/views/projects/_gitlab.html.haml
deleted file mode 100644
index bc7ff0c..0000000
--- a/app/views/projects/_gitlab.html.haml
+++ /dev/null
@@ -1,58 +0,0 @@
-.clearfix.light
-  .pull-left.fetch-status
-    Fetched from GitLab (#{link_to GitlabCi.config.gitlab_server.url, GitlabCi.config.gitlab_server.url, no_turbolink})
-    - if params[:search].present?
-      by keyword: "#{params[:search]}",
-    #{time_ago_in_words(current_user.sync_at)} ago.
-    = link_to gitlab_projects_path(reset_cache: true, search: params[:search]), remote: true, class: 'sync-now btn btn-small btn-default' do
-      %i.icon-refresh
-      Sync now
-    %br
-
-  .pull-right
-    #{@total_count} projects, #{@projects.size} of them added to CI
-%br
-
-%table.table.projects-table
-  %thead
-    %tr
-      %th Project Name
-      %th Last commit
-      %th Access
-      %th Commits
-
-  = render @projects
-
-  - @gl_projects.sort_by(&:name_with_namespace).each do |project|
-    %tr.light
-      %td
-        = project.name_with_namespace
-      %td
-        %small Not added to CI
-      %td
-      %td
-        - if Project.already_added?(project)
-          %strong.cgreen
-            Added
-        - else
-          = form_tag projects_path do
-            = hidden_field_tag :project, project.to_yaml
-            = submit_tag 'Add project to CI', class: 'btn btn-default btn-small'
-
-%ul.pagination.gitlab-projects-pagination
-  - if @page > 1
-    %li
-      = link_to gitlab_projects_path(page: @page - 1), class: 'btn', remote: true do
-        %i.icon-angle-left
-        Previous
-  &nbsp;
-  - if @total_count == @per_page
-    %li
-      = link_to gitlab_projects_path(page: @page + 1, search: params[:search]), class: 'btn', remote: true do
-        Next
-        %i.icon-angle-right
-
-:coffeescript
-  NProgress.done()
-  $('.gitlab-projects-pagination').on 'ajax:before', ->
-    $('.projects').html('<h1><i class="icon-spinner icon-spin"/></h1>')
diff --git a/app/views/projects/_gl_projects.html.haml b/app/views/projects/_gl_projects.html.haml
new file mode 100644
index 0000000..15cd3f0
--- /dev/null
+++ b/app/views/projects/_gl_projects.html.haml
@@ -0,0 +1,15 @@
+- @gl_projects.sort_by(&:name_with_namespace).each do |project|
+  %tr.light
+    %td
+      = project.name_with_namespace
+    %td
+      %small Not added to CI
+    %td
+    %td
+      - if Project.already_added?(project)
+        %strong.cgreen
+          Added
+      - else 
+        = form_tag projects_path do
+          = hidden_field_tag :project, project.to_yaml
+          = submit_tag 'Add project to CI', class: 'btn btn-default btn-small'
\ No newline at end of file
diff --git a/app/views/projects/gitlab.html.haml b/app/views/projects/gitlab.html.haml
new file mode 100644
index 0000000..2ce795f
--- /dev/null
+++ b/app/views/projects/gitlab.html.haml
@@ -0,0 +1,35 @@
+- if @offset == 0
+  .clearfix.light
+    .pull-left.fetch-status
+      Fetched from GitLab (#{link_to GitlabCi.config.gitlab_server.url, GitlabCi.config.gitlab_server.url, no_turbolink})
+      - if params[:search].present?
+        by keyword: "#{params[:search]}",
+      #{time_ago_in_words(current_user.sync_at)} ago.
+      = link_to gitlab_projects_path(reset_cache: true, search: params[:search]), remote: true, class: 'sync-now btn btn-small btn-default' do
+        %i.icon-refresh
+        Sync now
+      %br
+
+    .pull-right
+      #{@total_count} projects, #{@projects.size} of them added to CI
+  %br
+
+  %table.table.projects-table.content-list
+    %thead
+      %tr
+        %th Project Name
+        %th Last commit
+        %th Access
+        %th Commits
+
+    = render @projects
+
+    = render "gl_projects"
+
+  %p.text-center.hide.loading
+    %i.icon-refresh.icon-spin
+
+- else
+  = render @projects
+
+  = render "gl_projects"
\ No newline at end of file
diff --git a/app/views/projects/gitlab.js.haml b/app/views/projects/gitlab.js.haml
deleted file mode 100644
index c7bdefb..0000000
--- a/app/views/projects/gitlab.js.haml
+++ /dev/null
@@ -1,6 +0,0 @@
-- if @error
-  :plain
-    $(".projects").html("#{@error}");
-- else
-  :plain
-    $(".projects").html("#{escape_javascript(render("gitlab"))}");
diff --git a/app/views/projects/index.html.haml b/app/views/projects/index.html.haml
index 4ec8f68..7be5439 100644
--- a/app/views/projects/index.html.haml
+++ b/app/views/projects/index.html.haml
@@ -9,7 +9,11 @@
     %p.fetch-status.light
       %i.icon-refresh.icon-spin
       Please wait while we fetch from GitLab (#{GitlabCi.config.gitlab_server.url})
-  :javascript
-    $.get("#{gitlab_projects_path}")
+  :coffeescript
+    $.get '#{gitlab_projects_path}', (data) ->
+      $(".projects").html data.html
+    Pager.init "#{gitlab_projects_path}", #{ProjectsController::PROJECTS_BATCH}, false
+    
 - else
   = render 'public'
+