Sort packages by installs

Author: retlehs

internal/http/handlers.go

@@ -51,7 +51,7 @@ func handleIndex(a *app.App, tmpl *templateSet) http.HandlerFunc {
 			Sort:   r.URL.Query().Get("sort"),
 		}
 		if filters.Sort == "" {
-			filters.Sort = "downloads"
+			filters.Sort = "composer_installs"
 		}
 		page, _ := strconv.Atoi(r.URL.Query().Get("page"))
 		if page < 1 {
@@ -108,7 +108,7 @@ func handleIndexPartial(a *app.App, tmpl *templateSet) http.HandlerFunc {
 			Sort:   r.URL.Query().Get("sort"),
 		}
 		if filters.Sort == "" {
-			filters.Sort = "downloads"
+			filters.Sort = "composer_installs"
 		}
 		page, _ := strconv.Atoi(r.URL.Query().Get("page"))
 		if page < 1 {
@@ -557,10 +557,10 @@ func queryPackages(ctx context.Context, db *sql.DB, f publicFilters, page, limit
 		args = append(args, f.Type)
 	}
 
-	orderBy := "active_installs DESC"
+	orderBy := "wp_composer_installs_total DESC"
 	switch f.Sort {
-	case "composer_installs":
-		orderBy = "wp_composer_installs_total DESC"
+	case "active_installs":
+		orderBy = "active_installs DESC"
 	case "updated":
 		orderBy = "last_committed DESC NULLS LAST"
 	case "name":

internal/http/templates.go

@@ -111,7 +111,7 @@ func paginateURL(f publicFilters, page int) string {
 	if f.Type != "" {
 		v.Set("type", f.Type)
 	}
-	if f.Sort != "" && f.Sort != "downloads" {
+	if f.Sort != "" && f.Sort != "composer_installs" {
 		v.Set("sort", f.Sort)
 	}
 	if page > 1 {
@@ -132,7 +132,7 @@ func paginatePartialURL(f publicFilters, page int) string {
 	if f.Type != "" {
 		v.Set("type", f.Type)
 	}
-	if f.Sort != "" && f.Sort != "downloads" {
+	if f.Sort != "" && f.Sort != "composer_installs" {
 		v.Set("sort", f.Sort)
 	}
 	if page > 1 {

internal/http/templates/index.html

@@ -67,8 +67,8 @@ <h2 class="text-lg text-gray-500 max-w-xl mx-auto mb-8 text-balance">A modern, c
 </select>
 <label for="filter-sort" class="sr-only">Sort by</label>
 <select id="filter-sort" name="sort" class="h-10 pl-3 pr-8 text-sm border border-gray-200 rounded-lg bg-white select-chevron focus:outline-none focus:ring-2 focus:ring-brand-primary/20 focus:border-brand-primary">
-<option value="active_installs"{{if eq .Filters.Sort "active_installs"}} selected{{end}}>Active installs</option>
 <option value="composer_installs"{{if eq .Filters.Sort "composer_installs"}} selected{{end}}>Composer installs</option>
+<option value="active_installs"{{if eq .Filters.Sort "active_installs"}} selected{{end}}>Active installs</option>
 <option value="name"{{if eq .Filters.Sort "name"}} selected{{end}}>Name</option>
 <option value="updated"{{if eq .Filters.Sort "updated"}} selected{{end}}>Recently updated</option>
 </select>