feat: search + basic engine (wip)
This commit is contained in:
Nick
@@ -151,6 +151,16 @@
|
||||
v-list-tile-action
|
||||
v-btn(icon, href='https://lokalise.co', target='_blank')
|
||||
v-icon(color='grey') public
|
||||
v-divider
|
||||
v-list-tile
|
||||
v-list-tile-avatar(tile)
|
||||
img(src='https://static.requarks.io/logo/netlify.svg', alt='Netlify')
|
||||
v-list-tile-content
|
||||
v-list-tile-title Netlify
|
||||
v-list-tile-sub-title Deploy modern static websites with Netlify. Get CDN, Continuous deployment, 1-click HTTPS, and all the services you need.
|
||||
v-list-tile-action
|
||||
v-btn(icon, href='https://wwwnetlify.com', target='_blank')
|
||||
v-icon(color='grey') public
|
||||
|
||||
</template>
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
img(src='/svg/icon-search.svg', alt='Search Engine', style='width: 80px;')
|
||||
.admin-header-title
|
||||
.headline.primary--text Search Engine
|
||||
.subheading.grey--text Configure the search capabilities of your wiki #[v-chip(label, color='primary', small).white--text coming soon]
|
||||
.subheading.grey--text Configure the search capabilities of your wiki
|
||||
v-spacer
|
||||
v-btn(outline, color='grey', @click='refresh', large)
|
||||
v-icon refresh
|
||||
@@ -17,74 +17,69 @@
|
||||
v-icon(left) check
|
||||
span {{$t('common:actions.apply')}}
|
||||
|
||||
v-card.mt-3
|
||||
v-tabs(color='grey darken-2', fixed-tabs, slider-color='white', show-arrows, dark)
|
||||
v-tab(key='settings'): v-icon settings
|
||||
v-tab(v-for='engine in activeEngines', :key='engine.key') {{ engine.title }}
|
||||
v-flex(lg3, xs12)
|
||||
v-card
|
||||
v-toolbar(flat, color='primary', dark, dense)
|
||||
.subheading Search Engine
|
||||
v-card-text
|
||||
v-radio-group.my-0(v-model='selectedEngine')
|
||||
v-radio.my-1(
|
||||
v-for='(engine, n) in engines'
|
||||
:key='engine.key'
|
||||
:label='engine.title'
|
||||
:value='engine.key'
|
||||
color='primary'
|
||||
hide-details
|
||||
)
|
||||
|
||||
v-tab-item(key='settings', :transition='false', :reverse-transition='false')
|
||||
v-card.pa-3(flat, tile)
|
||||
.body-2.grey--text.text--darken-1 Select which search engine to enable:
|
||||
.caption.grey--text.pb-2 Some search engines require additional configuration in their dedicated tab (when selected).
|
||||
v-form
|
||||
v-radio-group(v-model='selectedEngine')
|
||||
v-radio.my-1(
|
||||
v-for='(engine, n) in engines'
|
||||
:key='engine.key'
|
||||
:label='engine.title'
|
||||
:value='engine.key'
|
||||
color='primary'
|
||||
hide-details
|
||||
disabled
|
||||
)
|
||||
|
||||
v-tab-item(v-for='(engine, n) in activeEngines', :key='engine.key', :transition='false', :reverse-transition='false')
|
||||
v-card.pa-3(flat, tile)
|
||||
v-form
|
||||
.enginelogo
|
||||
img(:src='engine.logo', :alt='engine.title')
|
||||
v-subheader.pl-0 {{engine.title}}
|
||||
.caption {{engine.description}}
|
||||
.caption: a(:href='engine.website') {{engine.website}}
|
||||
v-divider.mt-3
|
||||
v-subheader.pl-0 Engine Configuration
|
||||
.body-1.ml-3(v-if='!engine.config || engine.config.length < 1') This engine has no configuration options you can modify.
|
||||
template(v-else, v-for='cfg in logger.config')
|
||||
v-select(
|
||||
v-if='cfg.value.type === "string" && cfg.value.enum'
|
||||
outline
|
||||
background-color='grey lighten-2'
|
||||
:items='cfg.value.enum'
|
||||
:key='cfg.key'
|
||||
:label='cfg.value.title'
|
||||
v-model='cfg.value.value'
|
||||
prepend-icon='settings_applications'
|
||||
:hint='cfg.value.hint ? cfg.value.hint : ""'
|
||||
persistent-hint
|
||||
:class='cfg.value.hint ? "mb-2" : ""'
|
||||
)
|
||||
v-switch(
|
||||
v-else-if='cfg.value.type === "boolean"'
|
||||
:key='cfg.key'
|
||||
:label='cfg.value.title'
|
||||
v-model='cfg.value.value'
|
||||
color='primary'
|
||||
prepend-icon='settings_applications'
|
||||
:hint='cfg.value.hint ? cfg.value.hint : ""'
|
||||
persistent-hint
|
||||
)
|
||||
v-text-field(
|
||||
v-else
|
||||
outline
|
||||
background-color='grey lighten-2'
|
||||
:key='cfg.key'
|
||||
:label='cfg.value.title'
|
||||
v-model='cfg.value.value'
|
||||
prepend-icon='settings_applications'
|
||||
:hint='cfg.value.hint ? cfg.value.hint : ""'
|
||||
persistent-hint
|
||||
:class='cfg.value.hint ? "mb-2" : ""'
|
||||
)
|
||||
v-flex(lg9, xs12)
|
||||
v-card.wiki-form
|
||||
v-toolbar(color='primary', dense, flat, dark)
|
||||
.subheading {{engine.title}}
|
||||
v-card-text
|
||||
.enginelogo
|
||||
img(:src='engine.logo', :alt='engine.title')
|
||||
.caption.pt-3 {{engine.description}}
|
||||
.caption.pb-3: a(:href='engine.website') {{engine.website}}
|
||||
v-divider.mt-3
|
||||
v-subheader.pl-0 Engine Configuration
|
||||
.body-1.ml-3(v-if='!engine.config || engine.config.length < 1') This engine has no configuration options you can modify.
|
||||
template(v-else, v-for='cfg in engine.config')
|
||||
v-select(
|
||||
v-if='cfg.value.type === "string" && cfg.value.enum'
|
||||
outline
|
||||
background-color='grey lighten-2'
|
||||
:items='cfg.value.enum'
|
||||
:key='cfg.key'
|
||||
:label='cfg.value.title'
|
||||
v-model='cfg.value.value'
|
||||
prepend-icon='settings_applications'
|
||||
:hint='cfg.value.hint ? cfg.value.hint : ""'
|
||||
persistent-hint
|
||||
:class='cfg.value.hint ? "mb-2" : ""'
|
||||
)
|
||||
v-switch.mb-3(
|
||||
v-else-if='cfg.value.type === "boolean"'
|
||||
:key='cfg.key'
|
||||
:label='cfg.value.title'
|
||||
v-model='cfg.value.value'
|
||||
color='primary'
|
||||
prepend-icon='settings_applications'
|
||||
:hint='cfg.value.hint ? cfg.value.hint : ""'
|
||||
persistent-hint
|
||||
)
|
||||
v-text-field(
|
||||
v-else
|
||||
outline
|
||||
background-color='grey lighten-2'
|
||||
:key='cfg.key'
|
||||
:label='cfg.value.title'
|
||||
v-model='cfg.value.value'
|
||||
prepend-icon='settings_applications'
|
||||
:hint='cfg.value.hint ? cfg.value.hint : ""'
|
||||
persistent-hint
|
||||
:class='cfg.value.hint ? "mb-2" : ""'
|
||||
)
|
||||
</template>
|
||||
|
||||
<script>
|
||||
@@ -97,23 +92,16 @@ export default {
|
||||
data() {
|
||||
return {
|
||||
engines: [],
|
||||
selectedEngine: 'db'
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
activeEngines() {
|
||||
return _.filter(this.engines, 'isEnabled')
|
||||
selectedEngine: '',
|
||||
engine: {}
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
selectedEngine(newValue, oldValue) {
|
||||
this.engines.forEach(engine => {
|
||||
if (engine.key === newValue) {
|
||||
engine.isEnabled = true
|
||||
} else {
|
||||
engine.isEnabled = false
|
||||
}
|
||||
})
|
||||
this.engine = _.find(this.engines, ['key', newValue]) || {}
|
||||
},
|
||||
engines(newValue, oldValue) {
|
||||
this.selectedEngine = 'db'
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
@@ -156,7 +144,13 @@ export default {
|
||||
engines: {
|
||||
query: enginesQuery,
|
||||
fetchPolicy: 'network-only',
|
||||
update: (data) => _.cloneDeep(data.search.searchEngines).map(str => ({...str, config: str.config.map(cfg => ({...cfg, value: JSON.parse(cfg.value)}))})),
|
||||
update: (data) => _.cloneDeep(data.search.searchEngines).map(str => ({
|
||||
...str,
|
||||
config: _.sortBy(str.config.map(cfg => ({
|
||||
...cfg,
|
||||
value: JSON.parse(cfg.value)
|
||||
})), [t => t.value.order])
|
||||
})),
|
||||
watchLoading (isLoading) {
|
||||
this.$store.commit(`loading${isLoading ? 'Start' : 'Stop'}`, 'admin-search-refresh')
|
||||
}
|
||||
|
||||
@@ -64,7 +64,6 @@
|
||||
ref='searchField',
|
||||
v-if='searchIsShown && $vuetify.breakpoint.mdAndUp',
|
||||
v-model='search',
|
||||
clearable,
|
||||
color='white',
|
||||
label='Search...',
|
||||
single-line,
|
||||
@@ -74,6 +73,7 @@
|
||||
prepend-inner-icon='search',
|
||||
:loading='searchIsLoading',
|
||||
@keyup.enter='searchEnter'
|
||||
@keyup.esc='search = ``'
|
||||
)
|
||||
v-progress-linear(
|
||||
indeterminate,
|
||||
@@ -81,6 +81,33 @@
|
||||
height='2',
|
||||
color='blue'
|
||||
)
|
||||
v-menu(
|
||||
v-model='searchAdvMenuShown'
|
||||
left
|
||||
offset-y
|
||||
min-width='350'
|
||||
:close-on-content-click='false'
|
||||
)
|
||||
v-btn.nav-header-search-adv(icon, outline, color='grey darken-2', slot='activator')
|
||||
v-icon(color='white') expand_more
|
||||
v-card
|
||||
v-toolbar(flat, :color='$vuetify.dark ? `grey darken-3-d5` : `grey lighten-4`', dense)
|
||||
v-subheader.pl-0 Advanced Search
|
||||
v-card-text
|
||||
v-checkbox.mt-0(
|
||||
label='Restrict to Current Language'
|
||||
color='primary'
|
||||
v-model='searchRestrictLocale'
|
||||
hide-details
|
||||
)
|
||||
v-checkbox(
|
||||
label='Restrict to Below Current Path'
|
||||
color='primary'
|
||||
v-model='searchRestrictPath'
|
||||
hide-details
|
||||
)
|
||||
v-card-actions
|
||||
v-btn(outline, small, color='grey') Save as defaults
|
||||
v-flex(xs6, :md4='searchIsShown', :md6='!searchIsShown')
|
||||
v-toolbar.nav-header-inner(color='black', dark, flat)
|
||||
v-spacer
|
||||
@@ -97,7 +124,7 @@
|
||||
v-btn.btn-animate-rotate(icon, href='/a', slot='activator')
|
||||
v-icon(color='grey') settings
|
||||
span Admin
|
||||
v-menu(v-if='isAuthenticated', offset-y, min-width='300')
|
||||
v-menu(v-if='isAuthenticated', offset-y, min-width='300', left)
|
||||
v-tooltip(bottom, slot='activator')
|
||||
v-btn.btn-animate-grow(icon, slot='activator', outline, color='blue')
|
||||
v-icon(color='grey') account_circle
|
||||
@@ -135,7 +162,7 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { get } from 'vuex-pathify'
|
||||
import { get, sync } from 'vuex-pathify'
|
||||
import _ from 'lodash'
|
||||
import Cookies from 'js-cookie'
|
||||
|
||||
@@ -156,14 +183,17 @@ export default {
|
||||
data() {
|
||||
return {
|
||||
menuIsShown: true,
|
||||
searchIsLoading: false,
|
||||
searchIsShown: true,
|
||||
search: '',
|
||||
searchAdvMenuShown: false,
|
||||
newPageModal: false,
|
||||
deletePageModal: false
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
search: sync('site/search'),
|
||||
searchIsLoading: sync('site/searchIsLoading'),
|
||||
searchRestrictLocale: sync('site/searchRestrictLocale'),
|
||||
searchRestrictPath: sync('site/searchRestrictPath'),
|
||||
isLoading: get('isLoading'),
|
||||
title: get('site/title'),
|
||||
path: get('page/path'),
|
||||
@@ -275,6 +305,25 @@ export default {
|
||||
padding: 0;
|
||||
}
|
||||
}
|
||||
|
||||
&-search-adv {
|
||||
position: absolute;
|
||||
top: 7px;
|
||||
right: 12px;
|
||||
border-radius: 4px !important;
|
||||
|
||||
&::before {
|
||||
border-radius: 4px !important;
|
||||
}
|
||||
|
||||
&:hover, &:focus {
|
||||
position: absolute !important;
|
||||
|
||||
&::before {
|
||||
border-radius: 4px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.navHeaderSearch {
|
||||
|
||||
169
client/components/common/search-results.vue
Normal file
169
client/components/common/search-results.vue
Normal file
@@ -0,0 +1,169 @@
|
||||
<template lang="pug">
|
||||
.search-results(v-if='search.length > 1')
|
||||
.search-results-container
|
||||
.search-results-loader(v-if='searchIsLoading && results.length < 1')
|
||||
orbit-spinner(
|
||||
:animation-duration='1000'
|
||||
:size='100'
|
||||
color='#FFF'
|
||||
)
|
||||
.headline.mt-5 Searching...
|
||||
.search-results-none(v-if='!searchIsLoading && results.length < 1')
|
||||
img(src='/svg/icon-no-results.svg', alt='No Results')
|
||||
.subheading No pages matching your query.
|
||||
template(v-if='results.length > 0')
|
||||
v-subheader.white--text Found {{response.totalHits}} results
|
||||
v-list.radius-7(two-line)
|
||||
template(v-for='(item, idx) of results')
|
||||
v-list-tile(@click='', :key='item.id')
|
||||
v-list-tile-avatar(tile)
|
||||
img(src='/svg/icon-selective-highlighting.svg')
|
||||
v-list-tile-content
|
||||
v-list-tile-title(v-html='item.title')
|
||||
v-list-tile-sub-title(v-html='item.description')
|
||||
.caption.grey--text.mt-1(v-html='item.path')
|
||||
v-list-tile-action
|
||||
v-chip(label) {{item.locale.toUpperCase()}}
|
||||
v-divider(v-if='idx < results.length - 1')
|
||||
v-pagination.mt-3(
|
||||
v-if='paginationLength > 1'
|
||||
dark
|
||||
v-model='pagination'
|
||||
:length='paginationLength'
|
||||
)
|
||||
template(v-if='suggestions.length > 0')
|
||||
v-subheader.white--text.mt-3 Did you mean...
|
||||
v-list.radius-7(dense, dark)
|
||||
template(v-for='(term, idx) of suggestions')
|
||||
v-list-tile(:key='term', @click='setSearchTerm(term)')
|
||||
v-list-tile-avatar
|
||||
v-icon search
|
||||
v-list-tile-content
|
||||
v-list-tile-title(v-html='term')
|
||||
v-divider(v-if='idx < suggestions.length - 1')
|
||||
.text-xs-center.pt-4
|
||||
v-btn(outline, color='orange', @click='search = ``', v-if='results.length > 0')
|
||||
v-icon(left) save
|
||||
span Copy Search Link
|
||||
v-btn(outline, color='pink', @click='search = ``')
|
||||
v-icon(left) clear
|
||||
span Close
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import _ from 'lodash'
|
||||
import { get, sync } from 'vuex-pathify'
|
||||
import { OrbitSpinner } from 'epic-spinners'
|
||||
|
||||
import searchPagesQuery from 'gql/common/common-pages-query-search.gql'
|
||||
|
||||
export default {
|
||||
components: {
|
||||
OrbitSpinner
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
pagination: 1,
|
||||
response: {
|
||||
results: [],
|
||||
suggestions: [],
|
||||
totalHits: 0
|
||||
}
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
search: sync('site/search'),
|
||||
searchIsLoading: sync('site/searchIsLoading'),
|
||||
searchRestrictLocale: sync('site/searchRestrictLocale'),
|
||||
searchRestrictPath: sync('site/searchRestrictPath'),
|
||||
results() {
|
||||
return this.response.results ? this.response.results : []
|
||||
},
|
||||
hits() {
|
||||
return this.response.totalHits ? this.response.totalHits : 0
|
||||
},
|
||||
suggestions() {
|
||||
return this.response.suggestions ? this.response.suggestions : []
|
||||
},
|
||||
paginationLength() {
|
||||
return this.response.totalHits > 0 ? 0 : Math.ceil(this.response.totalHits / 10)
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
setSearchTerm(term) {
|
||||
this.search = term
|
||||
}
|
||||
},
|
||||
apollo: {
|
||||
response: {
|
||||
query: searchPagesQuery,
|
||||
variables() {
|
||||
return {
|
||||
query: this.search
|
||||
}
|
||||
},
|
||||
fetchPolicy: 'cache-and-network',
|
||||
throttle: 1000,
|
||||
skip() {
|
||||
return !this.search || this.search.length < 2
|
||||
},
|
||||
update: (data) => _.get(data, 'pages.search', {}),
|
||||
watchLoading (isLoading) {
|
||||
this.searchIsLoading = isLoading
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
.search-results {
|
||||
position: fixed;
|
||||
top: 64px;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: calc(100% - 64px);
|
||||
background-color: rgba(0,0,0,.9);
|
||||
z-index: 100;
|
||||
text-align: center;
|
||||
animation: searchResultsReveal .6s ease;
|
||||
|
||||
@media #{map-get($display-breakpoints, 'sm-and-down')} {
|
||||
top: 112px;
|
||||
}
|
||||
|
||||
&-container {
|
||||
margin: 12px auto;
|
||||
width: 90vw;
|
||||
max-width: 1024px;
|
||||
}
|
||||
|
||||
&-loader {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
flex-direction: column;
|
||||
padding: 32px 0;
|
||||
color: #FFF;
|
||||
}
|
||||
|
||||
&-none {
|
||||
color: #FFF;
|
||||
|
||||
img {
|
||||
width: 200px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes searchResultsReveal {
|
||||
0% {
|
||||
background-color: rgba(0,0,0,0);
|
||||
padding-top: 32px;
|
||||
}
|
||||
100% {
|
||||
background-color: rgba(0,0,0,.9);
|
||||
padding-top: 0;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
Reference in New Issue
Block a user