From ce9ffb79543106f1e830c1711040849238abd6d5 Mon Sep 17 00:00:00 2001 From: Xevion Date: Thu, 6 Aug 2020 03:27:55 -0500 Subject: [PATCH] add CharacterList to Episode 'description', improve Search Results with result Highlighting (messy), attempts at route #hash scene/quote scrolling --- client/package-lock.json | 13 + client/src/App.vue | 4 +- client/src/components/CharacterList.vue | 41 + client/src/components/Episode.vue | 11 +- client/src/components/SearchResults.vue | 24 +- client/src/main.js | 2 + client/src/router.js | 13 + server/data/data.json | 4014 +++++++++++++++++++++++ 8 files changed, 4117 insertions(+), 5 deletions(-) create mode 100644 client/src/components/CharacterList.vue diff --git a/client/package-lock.json b/client/package-lock.json index f589b87..2b73a94 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -2591,6 +2591,11 @@ "tweetnacl": "^0.14.3" } }, + "bezier-easing": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/bezier-easing/-/bezier-easing-2.1.0.tgz", + "integrity": "sha1-wE3+i5JtbsrKGBPWn/F5t8ICXYY=" + }, "bfj": { "version": "6.1.2", "resolved": "https://registry.npm.taobao.org/bfj/download/bfj-6.1.2.tgz?cache=0&sync_timestamp=1577112259978&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbfj%2Fdownload%2Fbfj-6.1.2.tgz", @@ -11461,6 +11466,14 @@ "resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.3.4.tgz?cache=0&sync_timestamp=1596470252029&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.3.4.tgz", "integrity": "sha1-Tjirw0oRxBtsPYJERJouNjumJQs=" }, + "vue-scrollto": { + "version": "2.18.2", + "resolved": "https://registry.npmjs.org/vue-scrollto/-/vue-scrollto-2.18.2.tgz", + "integrity": "sha512-LQOsuCfDJ5JXsRBb6frM85sCFABZdkwwwchLh4k3wbp8P6URRDcQvwp31U4cTnbyYEOo6JFP7+3p0wkvwy7MdA==", + "requires": { + "bezier-easing": "2.1.0" + } + }, "vue-server-renderer": { "version": "2.6.11", "resolved": "https://registry.npmjs.org/vue-server-renderer/-/vue-server-renderer-2.6.11.tgz", diff --git a/client/src/App.vue b/client/src/App.vue index 2911051..cf601a1 100644 --- a/client/src/App.vue +++ b/client/src/App.vue @@ -4,7 +4,7 @@ - + @@ -68,7 +68,7 @@ export default { }, methods: { showResults() { - if (this.$route.path !== '/search_results') { + if (this.$refs.searchbox.currentRefinement !== '' && this.$route.path !== '/search_results') { this.$router.push({ name: 'SearchResults' }); } }, diff --git a/client/src/components/CharacterList.vue b/client/src/components/CharacterList.vue new file mode 100644 index 0000000..5a35da3 --- /dev/null +++ b/client/src/components/CharacterList.vue @@ -0,0 +1,41 @@ + + + + + diff --git a/client/src/components/Episode.vue b/client/src/components/Episode.vue index c9b0ab2..c693f6c 100644 --- a/client/src/components/Episode.vue +++ b/client/src/components/Episode.vue @@ -5,9 +5,10 @@ {{ episode.description }} +
- @@ -24,10 +25,14 @@