Merge branch 'forge' of https://bdgit.educoder.net/Hjqreturn/educoder into forge

app/controllers/application_controller.rb

@@ -603,7 +603,7 @@ class ApplicationController < ActionController::Base
 	end
 
 	def paginate(relation)
-		limit  = params[:limit].to_i.zero? ? 20 : params[:limit].to_i
+		limit  = params[:limit].to_i.zero? ? 15 : params[:limit].to_i
 		page   = params[:page].to_i.zero? ? 1 : params[:page].to_i
 		offset = (page - 1) * limit
 

app/controllers/projects_controller.rb

@@ -4,6 +4,7 @@ class ProjectsController < ApplicationController
 
   def index
     scope = Projects::ListQuery.call(params)
+    @total_count = scope.size
     @projects = paginate(scope)
   end
 

app/views/projects/index.json.jbuilder

@@ -1,23 +1,26 @@
-json.array! @projects do |project|
-  json.partial! 'project', project: project
-  json.author do
-    json.name project.owner.login
-    json.image_url url_to_avatar(project.owner)
-  end
-  json.category do
-    if project.project_category.blank?
-      json.nil!
-    else
-      json.id project.project_category.id
-      json.name project.project_category.name
+json.total_count @total_count
+json.projects do
+  json.array! @projects do |project|
+    json.partial! 'project', project: project
+    json.author do
+      json.name project.owner.login
+      json.image_url url_to_avatar(project.owner)
     end
-  end
-  json.language do
-    if project.project_language.blank?
-      json.nil!
-    else
-      json.id project.project_language.id
-      json.name project.project_language.name
+    json.category do
+      if project.project_category.blank?
+        json.nil!
+      else
+        json.id project.project_category.id
+        json.name project.project_category.name
+      end
+    end
+    json.language do
+      if project.project_language.blank?
+        json.nil!
+      else
+        json.id project.project_language.id
+        json.name project.project_language.name
+      end
     end
   end
 end