diff --git a/webapp/components/generic/SearchableInput/SearchableInput.vue b/webapp/components/generic/SearchableInput/SearchableInput.vue index 8c29366da..5ec97d573 100644 --- a/webapp/components/generic/SearchableInput/SearchableInput.vue +++ b/webapp/components/generic/SearchableInput/SearchableInput.vue @@ -109,6 +109,7 @@ export default { path: '/search/search-results', query: { item: this.unprocessedSearchInput }, }) + this.clear() } else { this.$router.replace({ path: '/search/search-results', diff --git a/webapp/graphql/Search.js b/webapp/graphql/Search.js index 9b142b429..22babb452 100644 --- a/webapp/graphql/Search.js +++ b/webapp/graphql/Search.js @@ -1,15 +1,17 @@ import gql from 'graphql-tag' -import { userFragment, postFragment } from './Fragments' +import { userFragment, postFragment, tagsCategoriesAndPinnedFragment } from './Fragments' export const findResourcesQuery = gql` ${userFragment} ${postFragment} + ${tagsCategoriesAndPinnedFragment} query($query: String!) { findResources(query: $query, limit: 5) { __typename ... on Post { ...post + ...tagsCategoriesAndPinned commentsCount shoutedCount author { diff --git a/webapp/pages/search/search-results.vue b/webapp/pages/search/search-results.vue index 60b5fb560..54a5b7cb7 100644 --- a/webapp/pages/search/search-results.vue +++ b/webapp/pages/search/search-results.vue @@ -3,69 +3,111 @@
- - close - + {{ searchResults.length }} + Results for: + {{ value }} - - {{ searchResults.length }} - Results for: - {{ value }} - - - - - - Beiträge - - - User - - + + {{ posts.length }} + Beiträge + + + {{ users.length }} + User + + close
- -
- {{ index + 1 }} - - - {{ searchResults.__typename }} - - {{ searchResults }} -
-
- {{ index + 1 }} - - - {{ searchResults.__typename }} - - {{ searchResults }} + + no Result + + +
+ + + + Menschen + + +
+ + + {{ users.name }} +
+ Beiträge + Kommentare +
+
+
+
+
+ + + Beiträge + + +
+ {{ posts.title }} + +
+
+ + + {{ posts.author.name }}- + + + +
+
+
+ + + + + + {{ posts.language.toUpperCase() }} + +
+
+
+
+
+
+ +