From 30bec63b644fbfef243553586d7bd7360f4fa9c5 Mon Sep 17 00:00:00 2001
From: Johannes Zellner <johannes@cloudron.io>
Date: Sat, 4 Jul 2015 17:12:17 +0200
Subject: [PATCH] We replaced categories with tags

The UI now just lists some manually selected tags as categories

Fixes #410
---
 webadmin/src/views/appstore.html | 12 +++---------
 webadmin/src/views/appstore.js   |  4 ++--
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/webadmin/src/views/appstore.html b/webadmin/src/views/appstore.html
index 6066fbaf0..d8122eccd 100644
--- a/webadmin/src/views/appstore.html
+++ b/webadmin/src/views/appstore.html
@@ -95,16 +95,10 @@
         <div class="col-md-2">
             <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === '' }" category="">All</a>
             <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'blog' }" category="blog">Blog</a>
-            <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'communication' }" category="communication">Communication</a>
-            <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'content-management' }" category="content-management')">Content Management</a>
-            <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'games' }" category="games">Games</a>
-            <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'media-sync' }" category="media-sync">Media Sync</a>
-            <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'office' }" category="office">Office</a>
-            <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'project-management' }" category="project-management')">Project Management</a>
-            <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'productivity' }" category="productivity">Productivity</a>
+            <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'chat' }" category="chat">Chat</a>
+            <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'sync' }" category="sync">Media Sync</a>
+            <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'git' }" category="git')">Code Hosting</a>
             <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'wiki' }" category="wiki">Wiki</a>
-            <br/>
-            <a href="" class="appstore-category-link" ng-click="showCategory($event)" category="other">Other</a>
         </div>
         <div class="col-md-10" ng-show="ready && apps.length">
             <div class="row-no-margin">
diff --git a/webadmin/src/views/appstore.js b/webadmin/src/views/appstore.js
index 10bb19b29..78833b3aa 100644
--- a/webadmin/src/views/appstore.js
+++ b/webadmin/src/views/appstore.js
@@ -35,6 +35,7 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
                 if (app.manifest.id.toUpperCase().indexOf(token) !== -1) return true;
                 if (app.manifest.title.toUpperCase().indexOf(token) !== -1) return true;
                 if (app.manifest.tagline.toUpperCase().indexOf(token) !== -1) return true;
+                if (app.manifest.tags.join().toUpperCase().indexOf(token) !== -1) return true;
                 if (app.manifest.description.toUpperCase().indexOf(token) !== -1) return true;
                 return false;
             });
@@ -56,8 +57,7 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
                 $scope.apps = apps;
             } else {
                 $scope.apps = apps.filter(function (app) {
-                    if ($scope.category === 'other') return !app.manifest.category;
-                    return $scope.category === app.manifest.category;
+                    return app.manifest.tags.some(function (tag) { return $scope.category === tag; });
                 });
             }