Skip to content

New search standard and user search #9912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skjnldsv merged 7 commits into from
Jun 19, 2018
Merged

New search standard and user search #9912

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e5f0862
Better design for core search, fixes and style to scss
skjnldsv Jun 18, 2018
2f38f2b
Add user search support
skjnldsv Jun 18, 2018
21441fa
Added new search standard
skjnldsv Jun 19, 2018
0281e9d
Fit user search to new standard
skjnldsv Jun 19, 2018
4fc9bde
Run vue builds in parallel
MorrisJobke Jun 19, 2018
8f88c5a
Debounce search and reset
skjnldsv Jun 19, 2018
259f70d
Apps search
skjnldsv Jun 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Apps search 
Signed-off-by: John Molakvoæ (skjnldsv) <[email protected]>
  • Loading branch information
@skjnldsv
skjnldsv committed Jun 19, 2018
commit 259f70d640507d1134270dcb5b9a6c96d9f781b9
36 changes: 8 additions & 28 deletions settings/js/settings-vue.js
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 1 addition & 5 deletions settings/js/settings-vue.js.map
View file
Open in desktop

Large diffs are not rendered by default.

21 changes: 11 additions & 10 deletions settings/src/views/Apps.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<div id="app">
<app-navigation :menu="menu" />
<div id="app-content" class="app-settings-content" :class="{ 'with-app-sidebar': currentApp, 'icon-loading': loadingList }">
<app-list :category="category" :app="currentApp" :search="search"></app-list>
<app-list :category="category" :app="currentApp" :search="searchQuery"></app-list>
<div id="app-sidebar" v-if="id && currentApp">
<app-details :category="category" :app="currentApp"></app-details>
</div>
Expand Down Expand Up @@ -63,8 +63,11 @@ export default {
appList,
},
methods: {
setSearch(search) {
this.search = search;
setSearch(query) {
this.searchQuery = query;
},
resetSearch() {
this.setSearch('');
}
},
beforeMount() {
Expand All @@ -74,16 +77,14 @@ export default {
this.$store.commit('setUpdateCount', this.$store.getters.getServerData.updateCount)
},
mounted() {
// TODO: remove jQuery once we have a proper standardisation of the search
$('#searchbox').show();
let self = this;
$('#searchbox').change(function(e) {
self.setSearch($('#searchbox').val());
});
/**
* Register search
*/
this.appSearch = new OCA.Search(this.setSearch, this.resetSearch);
},
data() {
return {
search: ''
searchQuery: ''
}
},
watch: {
Expand Down