Add some extra filter options

ecosyste-ms · Sep 13, 2023 · 8edd496 · 8edd496
1 parent a201f9f
commit 8edd496
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 10 deletions.
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
@@ -6,6 +6,18 @@ def show
   def index
     @scope = Project.reviewed
 
+    if params[:keyword].present?
+      @scope = @scope.keyword(params[:keyword])
+    end
+
+    if params[:owner].present?
+      @scope = @scope.owner(params[:owner])
+    end
+
+    if params[:language].present?
+      @scope = @scope.language(params[:language])
+    end
+
     if params[:sort]
       @scope = @scope.order("#{params[:sort]} #{params[:order]}")
     else
@@ -27,6 +39,18 @@ def lookup
   def review
     @scope = Project.unreviewed.matching_criteria.where('vote_score > ?', -3).includes(:votes)
 
+    if params[:keyword].present?
+      @scope = @scope.keyword(params[:keyword])
+    end
+
+    if params[:owner].present?
+      @scope = @scope.owner(params[:owner])
+    end
+
+    if params[:language].present?
+      @scope = @scope.language(params[:language])
+    end
+
     if params[:sort]
       @scope = @scope.order("#{params[:sort]} #{params[:order]}")
     else

diff --git a/app/models/project.rb b/app/models/project.rb
@@ -7,6 +7,7 @@ class Project < ApplicationRecord
   has_many :votes, dependent: :destroy
 
   scope :language, ->(language) { where("(repository ->> 'language') = ?", language) }
+  scope :owner, ->(owner) { where("(repository ->> 'owner') = ?", owner) }
   scope :keyword, ->(keyword) { where("keywords @> ARRAY[?]::varchar[]", keyword) }
   scope :reviewed, -> { where(reviewed: true) }
   scope :unreviewed, -> { where(reviewed: nil) }

diff --git a/app/views/projects/_project.html.erb b/app/views/projects/_project.html.erb
@@ -15,7 +15,7 @@
           <p>
             <% project.keywords.each do |keyword| %>
               <span class="badge bg-light text-dark">
-                <%= keyword %>
+                <%= link_to keyword, url_for(keyword: keyword) %>
               </span>
             <% end %>
           </p>

diff --git a/app/views/projects/_project_review.html.erb b/app/views/projects/_project_review.html.erb
@@ -14,7 +14,7 @@
             <br/>
             <% project.keywords.each do |keyword| %>
               <span class="badge bg-light text-dark">
-                <%= keyword %>
+                <%= link_to keyword, url_for(keyword: keyword) %>
               </span>
             <% end %>
           <% end %>
@@ -28,7 +28,7 @@
         </p>  
 
         <div class='row small'>
-          <div class='col-6'>
+          <div class='col-4'>
             <ul>
               <li>
                 Relevant topics? <span title='<%= project.matching_topics.join(', ') %>'><%= project.good_topics? %></span>
@@ -42,30 +42,45 @@
               <li>
                 Active? <%= project.active? %>
               </li>
+            </ul>
+          </div>
+          <div class='col-4'>
+            <ul>
+
               <li>
-                Fork? <%= project.fork? %>
+                Commits: <%= project.commits && project.commits['total_commits'] %>
+              </li>
+              <li>
+                Committers: <%= project.commits && project.commits['total_committers'] %>
+              </li>
+              <li>
+                Issues: <%= project.issues && project.issues['issues_count'] %>
+              </li>
+              <li>
+                Pull Requests: <%= project.issues && project.issues['pull_requests_count'] %>
               </li>
             </ul>
           </div>
-          <div class='col-6'>
+          <div class='col-4'>
             <ul>
               <li>
-                Stars: <%= project.repository['stargazers_count'] %>
+                Main Language: <%= link_to project.language, url_for(language: project.language) %>
               </li>
               <li>
-                Forks: <%= project.repository['forks_count'] %>
+                Owner: <%= link_to project.owner_name, url_for(owner: project.owner_name) %>
               </li>
               <li>
-                Commits: <%= project.commits && project.commits['total_commits'] %>
+                Stars: <%= project.repository['stargazers_count'] %>
               </li>
               <li>
-                Issues: <%= project.issues && project.issues['issues_count'] %>
+                Forks: <%= project.repository['forks_count'] %>
               </li>
               <li>
-                Pull Requests: <%= project.issues && project.issues['pull_requests_count'] %>
+                Fork? <%= project.fork? %>
               </li>
             </ul>
           </div>
+
         </div>
 
         <%= button_to "👍 #{project.votes.select{|v| v.score > 0}.length}", project_votes_path(project_id: project, vote: {score: 1}), class: "btn btn-light", form_class: 'd-inline' %>