Skip to content
Snippets Groups Projects
Commit a724d78f authored by Petr Kalashnikov's avatar Petr Kalashnikov
Browse files

Merge remote-tracking branch 'origin/master' into UU428

parents e884a1ef ee58dcbd
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
.gitignore
+ 0
− 1
View file @ a724d78f
......@@ -21,5 +21,4 @@ yarn-error.log*
*.sw?
package-lock.json
*.iml
package-lock.json 0 → 100644
+ 28134
− 0
View file @ a724d78f
This diff is collapsed.
src/App.vue
+ 1
− 1
View file @ a724d78f
......@@ -51,7 +51,7 @@
font-family: NotoParen, 'Noto Sans', Helvetica, Arial, sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
color: #2c3e50;
color: var(--v-text-base);
display: flex;
flex-direction: column;
height: 100%;
......
src/components/Article.vue
+ 4
− 4
View file @ a724d78f
......@@ -124,12 +124,12 @@ article {
padding: 24px;
margin: 10px;
border-radius: 30px;
border: solid 1px var(--v-primary-base);
background-color: var(--v-tertiary-base);
border: solid 1px var(--v-border-base);
background-color: #ffffff;
}
#single_article_container article {
border-style: none;
border: solid 2px var(--v-primary-base);
}
.fade {
......@@ -141,7 +141,7 @@ section {
}
h3 {
color: #560027;
color: var(--v-primary-base);
font-variant: small-caps;
}
......
src/components/Autocomplete.vue
+ 85
− 49
View file @ a724d78f
<template>
<div class="autocomplete-container" :class="$vuetify.breakpoint.name" >
<v-autocomplete
<div class="autocomplete-container" :class="$vuetify.breakpoint.name">
<v-combobox
v-model="select"
:loading="loading"
:items="items"
:search-input.sync="search"
item-text="label"
:menu-props="{maxHeight: $vuetify.breakpoint.name === 'xs' ? 190 : 500, transition: 'fade-transition'}"
:menu-props="{maxHeight: $vuetify.breakpoint.name === 'xs' ? 190 : 500, transition: 'fade-transition', allowOverflow: true}"
prepend-inner-icon="search"
:append-icon="null"
return-object
rounded
hide-no-data
auto-select-first
no-filter
hide-details
label="Søk..."
......@@ -19,26 +20,27 @@
full-width
flat
outlined
auto-select-first
placeholder="Søk her"
ref="autocomplete"
color="primary"
:dense="$vuetify.breakpoint.smAndDown"
>
<template v-slot:item="data">
<span class="search-hit">{{data.item.label}} </span> ({{data.item.lang_set ? Array.from(data.item.lang_set).sort().join(', ') : 'fritekstsøk'}})
<span class="search-hit">
{{data.item.label}}
</span>
({{data.item.lang? data.item.lang[1] ? "bm, nn" : {"bob": "bm", "nob": "nn"}[data.item.lang[0]] : 'fritekstsøk'}})
</template>
</v-autocomplete>
</v-combobox>
</div>
</template>
<script>
import axios from "axios"
import debounce from "debounce"
export default {
props: {
endpoint: String
endpoint: String,
},
data: function() {
return {
......@@ -46,42 +48,7 @@
items: [],
search: null,
select: null,
debounced: debounce(function(q, self) {
self.loading = true
return axios.get(self.endpoint + 'suggest?q=' + encodeURIComponent(q))
.then(
function(response) {
let hits = []
if (q == self.search) {
response.data.forEach((item, i) => {
let match = encodeURIComponent(item.match)
if (! hits[0] || hits[0].word != match) {
hits.splice(0, 0, {q: encodeURIComponent(q), lang_set: new Set(), word: match, articles: []})
}
hits[0].lang_set.add(item.dictionary == 'bob' ? 'bm' : 'nn')
hits[0].articles.push(item)
});
hits.forEach(function (hit) {
if (hit.lang_set) {
hit.label = decodeURIComponent(hit.word)
}
});
hits.reverse()
hits = hits.slice(0, 9)
}
hits.sort( (h1, h2) => {
let val1 = h1.label.length * 10 + (h1.label[0].toLowerCase() === h1.label[0] ? 0 : 1)
let val2 = h2.label.length * 10 + (h2.label[0].toLowerCase() === h2.label[0] ? 0 : 1)
return val1 - val2
})
if (q) {
hits.push({q: encodeURIComponent(q), label: q + ' '})
}
self.items = hits
self.loading = false
})
}, 100)
suggesting: null,
}
},
watch: {
......@@ -93,15 +60,84 @@
}
},
select(item) {
this.$emit('submit', item)
let self = this
setTimeout(() => self.$refs.autocomplete.$refs.input.select(), 1)
if (item) {
if (typeof item != 'string') {
let self = this
/*
if (item.articles) {
axios.get(self.endpoint + 'articles?', {params: {lord: item.match,
dict: self.$parent.lang}})
.then(
function(response) {
['bob', 'nob'].forEach((dict_tag) => {
response.data[dict_tag].forEach((article_id) => {
let article = {}
article.article_id = article_id
article.dictionary = dict_tag
article.match = item.match
item.articles.push(article)
})
})
}
)
}
*/
this.items = []
this.suggesting = false
self.$emit('submit', item)
setTimeout(() => {
self.$refs.autocomplete.$refs.input.select()
this.items = []
this.suggesting = false
}, 1)
}
// If blurred
else {
this.items = []
}
}
}
},
methods: {
run_query(q) {
this.debounced(q, this)
}
this.suggesting = true
// Put full text search in the list while processing suggestions
if (this.items[0]) {
if (this.items[0].lang) {
this.items.unshift({q: q, label: q})
}
else {
this.items[0] = {q: q, label: q}
}
}
let self = this
axios.get(self.endpoint + 'suggest?', { params: {q: q,
dict: self.$parent.lang,
n: 9}} )
.then(
function(response) {
if (self.$refs.autocomplete.searchInput == q & self.suggesting) {
let hits = []
response.data.forEach((item, i) => {
let hit = {q: q, match: item[0], label: item[0], articles: []}
hit.lang = item[1]
hits.push(hit)
});
// whitespace necessary because duplicates aren't allowed in the dropdown
hits.push({q: q, label: q + ' '})
self.items = hits
}
self.loading = false
})
},
},
}
</script>
......
src/components/DictionaryView.vue
+ 14
− 5
View file @ a724d78f
......@@ -29,7 +29,7 @@
</v-radio>
</v-radio-group>
</div>
<Autocomplete @submit="select_result" :endpoint="api_pref">
<Autocomplete @submit="select_result" :endpoint="oda_endpoint">
</Autocomplete>
</div>
<div id="spinner" v-if="waiting">
......@@ -74,6 +74,7 @@ import SearchResults from './SearchResults.vue'
import Autocomplete from './Autocomplete.vue'
var api_endpoint = process.env.VUE_APP_API_PREFIX + '/api/dict'
const oda_endpoint = 'https://oda.uib.no/opal-api/'
function compare_by_hgno(lemma_text) {
return function(art1, art2) {
......@@ -188,6 +189,9 @@ export default {
},
api_pref: function() {
return api_endpoint + '/' + this.lang + '/article/'
},
oda_endpoint: function() {
return oda_endpoint
}
},
components: {
......@@ -199,19 +203,24 @@ export default {
select_result: function(event) {
this.event = event
if(event.articles){
let source = '/' + this.lang + '/w/' + event.word
let source = '/' + this.lang + '/w/' + event.match
this.$router.push(source)
this.search_results = event.articles.sort(compare_by_hgno(decodeURIComponent(event.word))).map(a => Object.assign(a, {source: source}))
/*
this.search_results = event.articles.map(a => Object.assign(a, {source: source}))
this.article = null
this.error = null
history.replaceState({article: this.article, search_results: this.search_results, lang: this.lang, error: this.error}, '')
this.$plausible.trackEvent('dropdown selection', {props: {query: event.label, match: event.match}})
*/
this.waiting_for_articles = true
navigate_to_word(this, event.match)
this.$plausible.trackEvent('dropdown selection', {props: {query: event.q, match: event.match}})
}else{
this.waiting_for_articles = true
this.article = null
this.$router.push(`/${this.lang}/search/${event.q}`)
navigate_to_search(this, event.q)
this.$plausible.trackEvent('dropdown selection', {props: {query: event.label, match: '<fritekstsøk>'}})
this.$plausible.trackEvent('dropdown selection', {props: {query: event.q, match: '<fritekstsøk>'}})
}
},
update_lang_form: function(event) {
......
src/components/Header.vue
+ 4
− 6
View file @ a724d78f
......@@ -99,9 +99,6 @@ export default {
<style>
article (table, th, td) {
border: solid 1px;
}
summary {
width: 30em;
......@@ -217,7 +214,7 @@ details > summary::-webkit-details-marker {
background-color: #ffffff;
border: solid 1px;
color: var(--v-primary-base);
border-color: var(--v-primary-base);
border-color: var(--v-border-base);
border-radius: 10px;
padding: 10px;
width: min-content;
......@@ -236,16 +233,17 @@ div.lemma {
table {
border-collapse: collapse;
margin-top: 5px;
border-color: var(--v-primary-base);
}
th, td {
border: solid 1px;
border-color: var(--v-primary-base);
padding: 5px;
}
th {
background-color: var(--v-tertiary-darken1)
background-color: var(--v-tertiary-darken1);
color: var(--v-primary-darken1);
}
.infl-label {
......
src/plugins/vuetify.js
+ 3
− 1
View file @ a724d78f
......@@ -51,7 +51,9 @@ export default new Vuetify({
secondary: '#BC477B',
tertiary: '#FDF4F5',
anchor: '#560027',
error: '#FDF4F5'
error: '#FDF4F5',
border: '#9E9E9E',
text: '#2c3e50'
}
}
},
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment