diff options
author | Morlinest <Morlinest@users.noreply.github.com> | 2017-08-17 03:31:34 +0200 |
---|---|---|
committer | Lunny Xiao <xiaolunwen@gmail.com> | 2017-08-17 09:31:34 +0800 |
commit | 951fb572a769acc965ec74b7152334e55b26de80 (patch) | |
tree | 38635bec85581c32a5b1e3fb1c0dab083fe110e3 /public/js | |
parent | 722bcefbbf26f4bca74f160295611cc982b364dc (diff) | |
download | gitea-951fb572a769acc965ec74b7152334e55b26de80.tar.gz gitea-951fb572a769acc965ec74b7152334e55b26de80.zip |
Fix and improve dashboard repo UI (#2285)
* Fix and improve dashboard repo UI
* Change order of scripts loading
* Remove "mirror" tab
* Remove single tab panel for "org user"
* Add localization strings
* Create vue component and change event for search
* Add "mirrors" filter
Diffstat (limited to 'public/js')
-rw-r--r-- | public/js/index.js | 102 |
1 files changed, 82 insertions, 20 deletions
diff --git a/public/js/index.js b/public/js/index.js index d79b94b92c..3152b2a5a4 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -1655,29 +1655,45 @@ $(function () { }); }); -function initDashboardSearch() { - var el = document.getElementById('dashboard-repo-search'); - if (!el) { - return; - } +function initVueComponents(){ + var vueDelimeters = ['${', '}']; - new Vue({ - delimiters: ['${', '}'], - el: el, + Vue.component('repo-search', { + delimiters: vueDelimeters, + template: '#repo-search-template', - data: { - tab: 'repos', - repos: [], - searchQuery: '', - suburl: document.querySelector('meta[name=_suburl]').content, - uid: document.querySelector('meta[name=_context_uid]').content + props: { + searchLimit: { + type: Number, + default: 10 + }, + suburl: { + type: String, + required: true + }, + uid: { + type: Number, + required: true + }, + }, + + data: function() { + return { + tab: 'repos', + repos: [], + reposTotal: 0, + reposFilter: 'all', + searchQuery: '', + isLoading: false + } }, mounted: function() { this.searchRepos(); + var self = this; Vue.nextTick(function() { - document.querySelector('#search_repo').focus(); + self.$refs.search.focus(); }); }, @@ -1686,19 +1702,45 @@ function initDashboardSearch() { this.tab = t; }, - searchKeyUp: function() { - this.searchRepos(); + changeReposFilter: function(filter) { + this.reposFilter = filter; + }, + + showRepo: function(repo, filter) { + switch (filter) { + case 'sources': + return repo.owner.id == this.uid && !repo.mirror && !repo.fork; + case 'forks': + return repo.owner.id == this.uid && !repo.mirror && repo.fork; + case 'mirrors': + return repo.mirror; + case 'collaborative': + return repo.owner.id != this.uid; + default: + return true; + } }, searchRepos: function() { var self = this; - $.getJSON(this.searchURL(), function(result) { - self.repos = result.data; + this.isLoading = true; + var searchedQuery = this.searchQuery; + $.getJSON(this.searchURL(), function(result, textStatus, request) { + if (searchedQuery == self.searchQuery) { + self.repos = result.data; + if (searchedQuery == "") { + self.reposTotal = request.getResponseHeader('X-Total-Count'); + } + } + }).always(function() { + if (searchedQuery == self.searchQuery) { + self.isLoading = false; + } }); }, searchURL: function() { - return this.suburl + '/api/v1/repos/search?uid=' + this.uid + '&q=' + this.searchQuery; + return this.suburl + '/api/v1/repos/search?uid=' + this.uid + '&q=' + this.searchQuery + '&limit=' + this.searchLimit; }, repoClass: function(repo) { @@ -1713,5 +1755,25 @@ function initDashboardSearch() { } } } + }) +} + +function initDashboardSearch() { + var el = document.getElementById('dashboard-repo-search'); + if (!el) { + return; + } + + initVueComponents(); + + new Vue({ + delimiters: ['${', '}'], + el: el, + + data: { + searchLimit: document.querySelector('meta[name=_search_limit]').content, + suburl: document.querySelector('meta[name=_suburl]').content, + uid: document.querySelector('meta[name=_context_uid]').content, + }, }); } |