From a2814ce2f2ea3ec58db155c74614da5fe61b8ce3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20Volds=C3=A6ter?= <ole.voldsater@uib.no>
Date: Wed, 5 Aug 2020 12:40:26 +0200
Subject: [PATCH] nob & nno -> bob & nob

---
 src/App.vue                      | 14 +++++++-------
 src/components/Article.vue       |  1 -
 src/components/Preview.vue       |  4 ++--
 src/components/SearchResults.vue | 14 +++++++-------
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 73d9201..7565e7b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -11,12 +11,12 @@
         </template>
       </autocomplete>
       <span class="lang-select-intro">SØK PÅ</span>
-      <input type="radio" id="radio_both" value="nob,nno" v-model="lang">
+      <input type="radio" id="radio_both" value="bob,nob" v-model="lang">
       <label for="radio_both">Begge</label>
+      <input type="radio" id="radio_bob" value="bob" v-model="lang">
+      <label for="radio_bob">Bokmål</label>
       <input type="radio" id="radio_nob" value="nob" v-model="lang">
-      <label for="radio_nob">Bokmål</label>
-      <input type="radio" id="radio_nno" value="nno" v-model="lang">
-      <label for="radio_nno">Nynorsk</label>
+      <label for="radio_nob">Nynorsk</label>
       -
       <input type="radio" id="radio_norsk" value="norsk_ordbok" v-model="lang">
       <label for="radio_norsk">Norsk Ordbok</label>
@@ -72,7 +72,7 @@ export default {
     return {
       article_key: 0,
       search_results: [],
-      lang: 'nob',
+      lang: 'bob,nob',
       waiting: true,
       article: {lemmas: [], body:{pronunciation: [], definitions: [], etymology: []}}
     }
@@ -153,7 +153,7 @@ export default {
     }
   },
   mounted: function(){
-    this.lang = this.$route.params.lang || this.$route.query.lang || 'nob,nno'
+    this.lang = this.$route.params.lang || this.$route.query.lang || 'bob,nob'
     var self = this;
     if(this.$route.query.q) {
       axios.get(api_endpoint + '/' + self.lang + '/_search?q=' + self.$route.query.q + ' ' + self.$route.query.q + '*&size=20')
@@ -177,7 +177,7 @@ export default {
   },
   watch: {
     $route(to, from) {
-      this.lang = this.$route.params.lang || this.$route.query.lang || 'nob,nno'
+      this.lang = this.$route.params.lang || this.$route.query.lang || 'bob,nob'
     }
   }
 }
diff --git a/src/components/Article.vue b/src/components/Article.vue
index 99f6fa3..9fbad94 100644
--- a/src/components/Article.vue
+++ b/src/components/Article.vue
@@ -23,7 +23,6 @@
 </template>
 
 <script>
-//import axios from "axios";
 import DefElement from './DefElement.vue'
 import Definition from './Definition.vue'
 import Header from './Header.vue'
diff --git a/src/components/Preview.vue b/src/components/Preview.vue
index 07e62f7..9d6cd5a 100644
--- a/src/components/Preview.vue
+++ b/src/components/Preview.vue
@@ -14,8 +14,8 @@ import languages from '../utils/languages.js'
 import helpers from '../utils/helpers.js'
 
 let labels = {
-  'nob': 'Bokmål',
-  'nno': 'Nynorsk',
+  'bob': 'Bokmål',
+  'nob': 'Nynorsk',
   'norsk_ordbok': 'Norsk Ordbok'
 }
 
diff --git a/src/components/SearchResults.vue b/src/components/SearchResults.vue
index 573199b..7004671 100644
--- a/src/components/SearchResults.vue
+++ b/src/components/SearchResults.vue
@@ -2,14 +2,14 @@
   <section>
     <h2 v-if="hits.length">Søkeresultater</h2>
     <div class="flex-container">
-      <ul class="hits" v-if="results_nob.length">
+      <ul class="hits" v-if="results_bob.length">
         <li><h4>Bokmål</h4></li>
-        <Preview v-for="(result, index) in results_nob" :key="index" :searchHit="result" @click.native="article_link_click(result)">
+        <Preview v-for="(result, index) in results_bob" :key="index" :searchHit="result" @click.native="article_link_click(result)">
         </Preview>
       </ul>
-      <ul class="hits" v-if="results_nno.length">
+      <ul class="hits" v-if="results_nob.length">
         <li><h4>Nynorsk</h4></li>
-        <Preview v-for="(result, index) in results_nno" :key="index" :searchHit="result" @click.native="article_link_click(result)">
+        <Preview v-for="(result, index) in results_nob" :key="index" :searchHit="result" @click.native="article_link_click(result)">
         </Preview>
       </ul>
       <ul class="hits" v-if="results_norsk.length">
@@ -32,12 +32,12 @@ export default {
     lang: String
   },
   computed: {
+    results_bob: function(){
+      return this.hits.filter(hit => hit._index == 'bob')
+    },
     results_nob: function(){
       return this.hits.filter(hit => hit._index == 'nob')
     },
-    results_nno: function(){
-      return this.hits.filter(hit => hit._index == 'nno')
-    },
     results_norsk: function(){
       return this.hits.filter(hit => hit._index == 'norsk_ordbok')
     }
-- 
GitLab