Refactor explore area

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

4 files changed, 21 insertions, 28 deletions

diff --git a/app/controllers/public/groups_controller.rb b/app/controllers/explore/groups_controller.rb
index e22d0837035..f8e1a31e0b3 100644
--- a/app/controllers/public/groups_controller.rb
+++ b/app/controllers/explore/groups_controller.rb
@@ -1,9 +1,9 @@
-class Public::GroupsController < ApplicationController
+class Explore::GroupsController < ApplicationController
   skip_before_filter :authenticate_user!,
                      :reject_blocked, :set_current_user_for_observers,
                      :add_abilities
 
-  layout "public"
+  layout "explore"
 
   def index
     @groups = GroupsFinder.new.execute(current_user)
diff --git a/app/controllers/explore/projects_controller.rb b/app/controllers/explore/projects_controller.rb
new file mode 100644
index 00000000000..05b3289682b
--- /dev/null
+++ b/app/controllers/explore/projects_controller.rb
@@ -0,0 +1,19 @@
+class Explore::ProjectsController < ApplicationController
+  skip_before_filter :authenticate_user!,
+    :reject_blocked,
+    :add_abilities
+
+  layout 'explore'
+
+  def index
+    @projects = ProjectsFinder.new.execute(current_user)
+    @projects = @projects.search(params[:search]) if params[:search].present?
+    @projects = @projects.sort(@sort = params[:sort])
+    @projects = @projects.includes(:namespace).page(params[:page]).per(20)
+  end
+
+  def trending
+    @trending_projects = TrendingProjectsFinder.new.execute(current_user)
+    @trending_projects = @trending_projects.page(params[:page]).per(10)
+  end
+end
diff --git a/app/controllers/public/explore_controller.rb b/app/controllers/public/explore_controller.rb
deleted file mode 100644
index aa781dc998d..00000000000
--- a/app/controllers/public/explore_controller.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class Public::ExploreController < ApplicationController
-  skip_before_filter :authenticate_user!,
-    :reject_blocked,
-    :add_abilities
-
-  layout "public"
-
-  def index
-    @trending_projects = TrendingProjectsFinder.new.execute(current_user)
-    @trending_projects = @trending_projects.page(params[:page]).per(10)
-  end
-end
diff --git a/app/controllers/public/projects_controller.rb b/app/controllers/public/projects_controller.rb
deleted file mode 100644
index d6238f79547..00000000000
--- a/app/controllers/public/projects_controller.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-class Public::ProjectsController < ApplicationController
-  skip_before_filter :authenticate_user!,
-                     :reject_blocked, :set_current_user_for_observers,
-                     :add_abilities
-
-  layout 'public'
-
-  def index
-    @projects = Project.publicish(current_user)
-    @projects = @projects.search(params[:search]) if params[:search].present?
-    @projects = @projects.sort(@sort = params[:sort])
-    @projects = @projects.includes(:namespace).page(params[:page]).per(20)
-  end
-end