From 1669a21adda11c7d551af43d98c6252a5cc08ff0 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Thu, 27 Oct 2022 14:36:55 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9C=D0=B5=D0=BB=D0=BA=D0=B8=D0=B9=20=D1=80?=
 =?UTF-8?q?=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE=D1=80=D0=B8=D0=BD=D0=B3,?=
 =?UTF-8?q?=20=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D1=86?=
 =?UTF-8?q?=D0=B2=D0=B5=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/Search/Search.vue           | 19 +++++++++++++------
 .../components/Search/TitleList/TitleList.vue |  2 +-
 client/router.js                              |  2 +-
 client/share/utils.js                         |  1 +
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/client/components/Search/Search.vue b/client/components/Search/Search.vue
index 3c6042b..951a70f 100644
--- a/client/components/Search/Search.vue
+++ b/client/components/Search/Search.vue
@@ -49,7 +49,7 @@
                 <div class="row q-mx-md q-mb-sm items-center">
                     <q-input
                         ref="authorInput" v-model="search.author" :maxlength="5000" :debounce="inputDebounce"
-                        class="bg-white q-mt-xs" style="width: 300px;" label="Автор" stack-label outlined dense clearable
+                        class="q-mt-xs" :bg-color="inputBgColor('author')" style="width: 200px;" label="Автор" stack-label outlined dense clearable
                     >
                         <q-tooltip v-if="search.author" :delay="500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
                             {{ search.author }}
@@ -58,7 +58,7 @@
                     <div class="q-mx-xs" />
                     <q-input
                         v-model="search.series" :maxlength="inputMaxLength" :debounce="inputDebounce"
-                        class="bg-white q-mt-xs" style="width: 200px;" label="Серия" stack-label outlined dense clearable
+                        class="q-mt-xs" :bg-color="inputBgColor('series')" style="width: 200px;" label="Серия" stack-label outlined dense clearable
                     >
                         <q-tooltip v-if="search.series" :delay="500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
                             {{ search.series }}
@@ -67,7 +67,7 @@
                     <div class="q-mx-xs" />
                     <q-input
                         v-model="search.title" :maxlength="inputMaxLength" :debounce="inputDebounce"
-                        class="bg-white q-mt-xs" style="width: 200px;" label="Название" stack-label outlined dense clearable
+                        class="q-mt-xs" :bg-color="inputBgColor('title')" style="width: 200px;" label="Название" stack-label outlined dense clearable
                     >
                         <q-tooltip v-if="search.title" :delay="500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
                             {{ search.title }}
@@ -76,7 +76,7 @@
                     <div class="q-mx-xs" />
                     <q-input
                         v-model="genreNames" :maxlength="inputMaxLength" :debounce="inputDebounce"
-                        class="bg-white q-mt-xs" input-style="cursor: pointer" style="width: 200px;" label="Жанр" stack-label outlined dense clearable readonly
+                        class="q-mt-xs" :bg-color="inputBgColor()" input-style="cursor: pointer" style="width: 200px;" label="Жанр" stack-label outlined dense clearable readonly
                         @click="selectGenre"
                     >
                         <template v-if="genreNames" #append>
@@ -90,7 +90,7 @@
                     <div class="q-mx-xs" />
                     <q-input
                         v-model="search.lang" :maxlength="inputMaxLength" :debounce="inputDebounce"
-                        class="bg-white q-mt-xs" input-style="cursor: pointer" style="width: 80px;" label="Язык" stack-label outlined dense clearable readonly
+                        class="q-mt-xs" :bg-color="inputBgColor()" input-style="cursor: pointer" style="width: 80px;" label="Язык" stack-label outlined dense clearable readonly
                         @click="selectLang"
                     >
                         <q-tooltip v-if="search.lang && showTooltips" :delay="500" anchor="bottom middle" content-style="font-size: 80%" max-width="400px">
@@ -187,7 +187,7 @@ import _ from 'lodash';
 const route2component = {
     'author': {component: 'AuthorList', label: 'Авторы'},
     'series': {component: 'SeriesList', label: 'Серии'},
-    'book': {component: 'TitleList', label: 'Книги'},
+    'title': {component: 'TitleList', label: 'Книги'},
 };
 
 const componentOptions = {
@@ -452,6 +452,13 @@ class Search {
         return result;
     }
 
+    inputBgColor(inp) {
+        if (inp === this.selectedList)
+            return 'white';
+        else
+            return 'yellow-1';
+    }
+
     async updateListFromRoute(to) {
         const newPath = to.path;
         let newList = this.getListRoute(newPath);
diff --git a/client/components/Search/TitleList/TitleList.vue b/client/components/Search/TitleList/TitleList.vue
index d9c0376..018becd 100644
--- a/client/components/Search/TitleList/TitleList.vue
+++ b/client/components/Search/TitleList/TitleList.vue
@@ -43,7 +43,7 @@ import _ from 'lodash';
 
 class TitleList extends BaseList {
     get foundCountMessage() {
-        return `Найден${utils.wordEnding(this.list.totalFound, 4)} ${this.list.totalFound} уникальн${utils.wordEnding(this.list.totalFound, 6)} назван${utils.wordEnding(this.list.totalFound, 3)}`;
+        return `Найден${utils.wordEnding(this.list.totalFound, 7)} ${this.list.totalFound} уникальн${utils.wordEnding(this.list.totalFound, 6)} назван${utils.wordEnding(this.list.totalFound, 3)}`;
     }
 
     async updateTableData() {
diff --git a/client/router.js b/client/router.js
index c1a0204..24cbe4d 100644
--- a/client/router.js
+++ b/client/router.js
@@ -7,7 +7,7 @@ const myRoutes = [
     ['/', Search],
     ['/author', Search],
     ['/series', Search],
-    ['/book', Search],
+    ['/title', Search],
     ['/:pathMatch(.*)*', null, null, '/'],
 ];
 
diff --git a/client/share/utils.js b/client/share/utils.js
index 0cfc4b3..849b2e0 100644
--- a/client/share/utils.js
+++ b/client/share/utils.js
@@ -42,6 +42,7 @@ export function wordEnding(num, type = 0) {
         ['о', 'а', 'о', 'о', 'о', 'о', 'о', 'о', 'о', 'о'],
         ['ок', 'ка', 'ки', 'ки', 'ки', 'ок', 'ок', 'ок', 'ок', 'ок'],
         ['ых', 'ое', 'ых', 'ых', 'ых', 'ых', 'ых', 'ых', 'ых', 'ых'],
+        ['о', 'о', 'о', 'о', 'о', 'о', 'о', 'о', 'о', 'о'],
     ];
     const deci = num % 100;
     if (deci > 10 && deci < 20) {