Added sort by stars (fix #21), Downloads is now default sort (fix #32)

coreos · Apr 20, 2016 · 6c2b6e1 · 6c2b6e1
1 parent e2d808c
commit 6c2b6e1
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 13 deletions.
diff --git a/src/app/modules/packages/list.html b/src/app/modules/packages/list.html
@@ -8,16 +8,18 @@
   <p class="error-notice" ng-if="error">
     {{error}}
   </p>
-  <p>
+  <md-input-container>
     <md-select
-      placeholder="sort package list"
-      ng-model="querySort"
-      md-on-close="applySort(querySort)">
+      ng-model="selectedSort"
+      md-on-close="applySort(selectedSort)">
       <md-option ng-repeat="(label, params) in availableSorts" ng-value="params">
-        {{label}}
+        <i class="fa fa-{{params.icon}}"></i> {{label}}
       </md-option>
     </md-select>
-  </p>
+    <md-tooltip>
+      Sort packages
+    </md-tooltip>
+  </md-input-container>
   <div
     ng-include="'app/modules/packages/preview.html'"
     ng-repeat="package in packages"

diff --git a/src/app/modules/packages/package_controller.js b/src/app/modules/packages/package_controller.js
@@ -59,7 +59,6 @@ app.controller('PackageController', function($scope, $state, $stateParams,
   };
 
   $scope.setPackage = function(object) {
-    console.log("set package");
     $scope.package = new Package(object);
   };
 

diff --git a/src/app/modules/packages/package_list_controller.js b/src/app/modules/packages/package_list_controller.js
@@ -4,11 +4,14 @@ app.controller('PackageListController', function($scope, $stateParams, KpmApi,
       Package) {
 
   $scope.availableSorts = {
-    'Downloads': {sort_descending: true, sort_order: 'downloads'},
-    'Last update': {sort_descending: true, sort_order: 'updated_at'},
-    'Name': {sort_order: 'default'}
+    'Downloads': {sort_descending: true, sort_order: 'downloads', icon: 'download'},
+    'Stars': {sort_descending: true, sort_order: 'stars', icon: 'star'},
+    'Last update': {sort_descending: true, sort_order: 'updated_at', icon: 'clock-o'},
+    'Name': {sort_order: 'default', icon: 'font'}
   };
 
+  $scope.selectedSort = $scope.availableSorts['Downloads'];
+
   // Filtering and sorting parameters
   $scope.queryParams = {};
 
@@ -36,6 +39,6 @@ app.controller('PackageListController', function($scope, $stateParams, KpmApi,
     $scope.queryParams.named_like = $stateParams.search;
   };
 
-  // Init
-  $scope.getPackages();
+  // Init (get package list with default sort)
+  $scope.applySort($scope.selectedSort);
 });
diff --git a/src/app/modules/user/user_controller.js b/src/app/modules/user/user_controller.js
@@ -10,7 +10,7 @@ app.controller('UserController', function($scope, $stateParams, KpmApi, User) {
     .success(function(data) {
       $scope.user = new User(data);
       // Get packages for user
-      KpmApi.get('packages/' + username)
+      KpmApi.get('packages', {username: username})
       .success(function(data) {
         $scope.user.packages = data;
       })

diff --git a/src/style/sass/app.scss b/src/style/sass/app.scss
@@ -193,6 +193,12 @@ md-tooltip {
   font-size: 14px;
 }
 
+md-select-menu, md-select-value {
+  i.fa {
+    color: #555;
+    margin-right: 1em;
+  }
+}
 a:not(.md-button),
 a:not(.md-button):hover {
   color: $link_color;