Refactor package search and discover page

- Use compact table for package listing - Redesign package search template Signed-off-by: Keshav Priyadarshi <[email protected]>
aboutcode-org · Jan 3, 2025 · c7ed8c6 · c7ed8c6
1 parent 83d5dae
commit c7ed8c6
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 26 deletions.
diff --git a/fedcode/forms.py b/fedcode/forms.py
@@ -110,9 +110,8 @@ class SearchPackageForm(forms.Form):
         label=False,
         widget=forms.TextInput(
             attrs={
-                "placeholder": "Please enter a valid purl ex: pkg:maven/org.apache.commons/io",
-                "class": "input is-rounded",
-                "style": "width: 90%;",
+                "placeholder": "Search a package...",
+                "class": "input ",
             },
         ),
     )

diff --git a/fedcode/models.py b/fedcode/models.py
@@ -295,6 +295,10 @@ def __str__(self):
     def followers_count(self):
         return Follow.objects.filter(package=self).count()
 
+    @property
+    def notes_count(self):
+        return Note.objects.filter(acct=self.acct).count()
+
     @property
     def followers(self):
         return Follow.objects.filter(package=self).values("person_id")

diff --git a/fedcode/pipes/utils.py b/fedcode/pipes/utils.py
@@ -19,6 +19,8 @@
 
 
 def create_note(pkg, note_dict):
+    # TODO: also take argument for source of the note ideally github blob for 
+    # for file.
     note, _ = Note.objects.get_or_create(acct=pkg.acct, content=saneyaml.dump(note_dict))
     pkg.notes.add(note)
     create_activity = CreateActivity(actor=pkg.to_ap, object=note.to_ap)

diff --git a/fedcode/templates/pkg_list.html b/fedcode/templates/pkg_list.html
@@ -4,37 +4,82 @@
 All Packages
 {% endblock %}
 
+{% block extra-head %}
+<style>
+  /* Remove the border below the table header */
+  thead th {
+    border-bottom: none !important;
+  }
+
+  tbody tr:hover {
+    background-color: #e0e0e0 !important;
+    cursor: pointer;
+  }
+
+  tbody tr:nth-child(even):hover {
+    background-color: #d3d3d3 !important;
+  }
+</style>
+{% endblock %}
+
 {% block content %}
 <div class="columns">
   <div class="column">
   </div>
 
   <div class="column is-two-thirds">
     <div class="content is-normal">
-      <h1>Package List</h1>
+      <h1>Discover Packages</h1>
       <hr />
     </div>
-    <form method="get" class="has-text-centered box" action="">
-      {{ form }}
-      <button type="submit" class="button is-link is-rounded">Search</button>
-    </form>
-    {% for package in package_list %}
-    <article class="media box mt-4 ">
-      <div class="media-left has-text-centered">
-        <h4>Number of Followers</h4>
-        <p>{{ package.followers_count }}</p>
-      </div>
-      <div class="media-content ">
-        <div class="content" style="border-left: 4px solid black;">
-          <h4 class="ml-3 mr-3"><a href="{% url 'purl-profile' package.purl %}"> {{ package.purl }} </a></h4>
-          <small class="ml-2">Created by @{{ package.service.user.username }}</small>
-          <br>
+    <form method="get" class="box px-6 mx-0" action="">
+      <div class="field has-addons">
+        <div class="control is-expanded">
+          {{ form.search }}
+        </div>
+        <div class="control">
+          <button type="submit" class="button is-info">Search</button>
         </div>
       </div>
-    </article>
-    {% endfor %}
+    </form>
+    <div class="box">
+      <table class="table is-striped  is-hoverable is-fullwidth">
+        <thead>
+          <tr>
+            <th colspan="3">
+              <div class="box is-small">
+                <div class="columns">
+                  <div class="column is-three-fifths">Package URL</div>
+                  <div class="column is-one-fifth">Activity</div>
+                  <div class="column is-one-fifth">Followers</div>
+                </div>
+              </div>
+            </th>
+          </tr>
+        </thead>
+        <tbody>
+          {% for package in package_list %}
+          <tr>
+            <td colspan="3">
+              <a href="{% url 'purl-profile' package.purl %}" class="has-text-info">
+                <div class="columns px-5">
+                  <div class="column is-three-fifths">{{ package.purl }}</div>
+                  <div class="column is-one-fifth">{{ package.notes_count }}</div>
+                  <div class="column is-one-fifth">{{ package.followers_count }}</div>
+                </div>
+              </a>
+            </td>
+          </tr>
+          {% empty %}
+          <tr>
+            <td colspan="3" class="has-text-centered">No packages found.</td>
+          </tr>
+          {% endfor %}
+        </tbody>
+      </table>
+    </div>
     {% if is_paginated %}
-    <nav class="pagination is-centered" role="navigation" aria-label="pagination">
+    <nav class="pagination is-centered px-5" role="navigation" aria-label="pagination">
       {% if page_obj.has_previous %}
       <a class="pagination-previous" href="?page={{ page_obj.previous_page_number }}">Previous</a>
       {% endif %}
@@ -51,7 +96,6 @@ <h4 class="ml-3 mr-3"><a href="{% url 'purl-profile' package.purl %}"> {{ packag
     </nav>
     {% endif %}
   </div>
-
   <div class="column"></div>
 </div>
 {% endblock %}
diff --git a/fedcode/templates/user_profile.html b/fedcode/templates/user_profile.html
@@ -22,17 +22,15 @@
           <i class="fas fa-external-link-alt fa-xs"></i>
         </span>
       </a>
-      to generate your profile picture based on your email address — {{ person.user.email }}
+      to create your profile picture using your email address — {{ person.user.email }}
     </p>
-
     <nav class="level">
       <div class="level-item has-text-centered">
         <div>
           <p class="heading">Following</p>
           <p class="title">{{ follow_count }}</p>
         </div>
       </div>
-
       <div class="level-item has-text-centered">
         <div>
           <p class="heading">reputation</p>