From fd12d5c6eec23855ee30e6a1e4a9a629195e25f8 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 5 Mar 2020 08:31:26 +0100 Subject: [PATCH 01/76] merge: backend/yarn.lock --- backend/yarn.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/yarn.lock b/backend/yarn.lock index c67347424..a54711c84 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -1923,7 +1923,7 @@ apollo-server-caching@^0.5.1: dependencies: lru-cache "^5.0.0" -apollo-server-core@^2.10.1, apollo-server-core@^2.11.0: +apollo-server-core@^2.11.0: version "2.11.0" resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.11.0.tgz#91a055ce6cf12a8b43e8a4811d465d97fa324eac" integrity sha512-jHLOqwTRlyWzqWNRlwr2M/xfrt+lw2pHtKYyxUGRjWFo8EM5TX1gDcTKtbtvx9p5m+ZBDAhcWp/rpq0vSz4tqg== From cbacbec7249985b15745cd2e8633a203473a354e Mon Sep 17 00:00:00 2001 From: ogerly Date: Sat, 14 Mar 2020 07:21:22 +0100 Subject: [PATCH 02/76] feat: search on a new search page --- .../SearchableInput/SearchableInput.vue | 21 +++-- webapp/pages/search/search-results.vue | 89 +++++++++++++++++++ webapp/store/search.js | 17 ++++ 3 files changed, 120 insertions(+), 7 deletions(-) create mode 100644 webapp/pages/search/search-results.vue create mode 100644 webapp/store/search.js diff --git a/webapp/components/generic/SearchableInput/SearchableInput.vue b/webapp/components/generic/SearchableInput/SearchableInput.vue index 3260ff082..8c29366da 100644 --- a/webapp/components/generic/SearchableInput/SearchableInput.vue +++ b/webapp/components/generic/SearchableInput/SearchableInput.vue @@ -99,14 +99,21 @@ export default { this.$emit('query', this.value) }, this.delay) }, - /** - * TODO: on enter we should go to a dedicated search page!? - */ onEnter(event) { - clearTimeout(this.searchProcess) - if (!this.loading) { - this.previousSearchTerm = this.unprocessedSearchInput - this.$emit('query', this.unprocessedSearchInput) + if (this.$router.history.current.path === '/search/search-results') { + this.$store.commit('search/SET_VALUE', { + searchValue: this.unprocessedSearchInput, + }) + + this.$router.replace({ + path: '/search/search-results', + query: { item: this.unprocessedSearchInput }, + }) + } else { + this.$router.replace({ + path: '/search/search-results', + query: { item: this.unprocessedSearchInput }, + }) } }, onDelete(event) { diff --git a/webapp/pages/search/search-results.vue b/webapp/pages/search/search-results.vue new file mode 100644 index 000000000..abfe8c1e4 --- /dev/null +++ b/webapp/pages/search/search-results.vue @@ -0,0 +1,89 @@ + + + + + diff --git a/webapp/store/search.js b/webapp/store/search.js new file mode 100644 index 000000000..a10649de1 --- /dev/null +++ b/webapp/store/search.js @@ -0,0 +1,17 @@ +export const state = () => { + return { + searchValue: '', + } +} + +export const mutations = { + SET_VALUE(state, ctx) { + state.searchValue = ctx.searchValue || '' + }, +} + +export const getters = { + searchValue(state) { + return state.searchValue + }, +} From ed506622b4e5ddb52350176e84ebaa8ddc32e4b9 Mon Sep 17 00:00:00 2001 From: ogerly Date: Sat, 14 Mar 2020 13:00:04 +0100 Subject: [PATCH 03/76] sorting search results to post and user --- webapp/pages/search/search-results.vue | 78 +++++++++++++++++++++----- 1 file changed, 63 insertions(+), 15 deletions(-) diff --git a/webapp/pages/search/search-results.vue b/webapp/pages/search/search-results.vue index abfe8c1e4..60b5fb560 100644 --- a/webapp/pages/search/search-results.vue +++ b/webapp/pages/search/search-results.vue @@ -1,22 +1,64 @@ @@ -40,8 +82,11 @@ export default { selected: '', pending: false, searchResults: [], + userOnly: true, + postOnly: true, } }, + computed: { ...mapGetters({ searchValue: 'search/searchValue', @@ -82,6 +127,9 @@ export default { this.pending = false } }, + closeSearch() { + this.$router.replace('/') + }, }, } From bba5a09ba9828c9b55457cc58aaff39c321199d7 Mon Sep 17 00:00:00 2001 From: ogerly Date: Sun, 15 Mar 2020 10:11:16 +0100 Subject: [PATCH 04/76] search query extended to categories, sorting of results, first graphical display --- .../SearchableInput/SearchableInput.vue | 1 + webapp/graphql/Search.js | 4 +- webapp/pages/search/search-results.vue | 161 ++++++++++++------ 3 files changed, 114 insertions(+), 52 deletions(-) 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() }} + +
+
+
+
+
+
+ + - - + \ No newline at end of file From 7a818a04a700727d7f7d3e57a542e95982d2121d Mon Sep 17 00:00:00 2001 From: Alina Beck Date: Wed, 18 Mar 2020 14:33:01 +0100 Subject: [PATCH 06/76] refactor and design search results page (wip) Co-authored-by: mattwr18 Co-authored-by: Raphael Beer --- webapp/assets/_new/styles/resets.scss | 7 + .../generic/TabNavigation/TabNavigation.vue | 20 +++ webapp/pages/search/search-results.vue | 143 +++++------------- 3 files changed, 63 insertions(+), 107 deletions(-) create mode 100644 webapp/components/_new/generic/TabNavigation/TabNavigation.vue diff --git a/webapp/assets/_new/styles/resets.scss b/webapp/assets/_new/styles/resets.scss index 144f22d10..4e8b0a952 100644 --- a/webapp/assets/_new/styles/resets.scss +++ b/webapp/assets/_new/styles/resets.scss @@ -19,3 +19,10 @@ h6, p { margin: 0; } + +ol, +ul { + list-style-type: none; + margin: 0; + padding: 0; +} diff --git a/webapp/components/_new/generic/TabNavigation/TabNavigation.vue b/webapp/components/_new/generic/TabNavigation/TabNavigation.vue new file mode 100644 index 000000000..c20a53dba --- /dev/null +++ b/webapp/components/_new/generic/TabNavigation/TabNavigation.vue @@ -0,0 +1,20 @@ + + + diff --git a/webapp/pages/search/search-results.vue b/webapp/pages/search/search-results.vue index e72285207..388890d73 100644 --- a/webapp/pages/search/search-results.vue +++ b/webapp/pages/search/search-results.vue @@ -1,111 +1,30 @@ - \ No newline at end of file From 56f37702b1bd746cf17c87d44a29805bff37b67a Mon Sep 17 00:00:00 2001 From: roschaefer Date: Wed, 18 Mar 2020 15:09:59 +0100 Subject: [PATCH 07/76] refactor: Prefer router.push over router.replace push maintains the history --- webapp/pages/search/search-results.vue | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/webapp/pages/search/search-results.vue b/webapp/pages/search/search-results.vue index 388890d73..ba47dba31 100644 --- a/webapp/pages/search/search-results.vue +++ b/webapp/pages/search/search-results.vue @@ -1,6 +1,6 @@