Merge pull request #72 from profcomff/order-by-weighted

Author: Temmmmmo

src/components/TheSearchBar.vue

@@ -85,7 +85,7 @@ const propsParent = defineProps({
 const searchQuery = defineModel('searchQuery', { type: String });
 const subject = defineModel('subject', { type: String });
 const order = defineModel('order', { type: String });
-const orderTypes = ['по общей оценке', 'по доброте', 'по халявности', 'по понятности', 'по фамилии'];
+const orderTypes = ['по релевантности', 'по общей оценке', 'по доброте', 'по халявности', 'по понятности', 'по фамилии'];
 const iconAscDesc = ref<string>('');
 
 const emits = defineEmits({

src/models/index.ts

@@ -15,8 +15,9 @@ export interface Toast {
 	description?: string;
 }
 
-export type Order = 'mark_general' | 'mark_kindness' | 'mark_freebie' | 'mark_clarity' | 'last_name' | undefined;
+export type Order = 'mark_general' | 'mark_kindness' | 'mark_freebie' | 'mark_clarity' | 'mark_weighted' | 'last_name' | undefined;
 export enum OrderFromText {
+	'по релевантности' = 'mark_weighted',
 	'по общей оценке' = 'mark_general',
 	'по доброте' = 'mark_kindness',
 	'по халявности' = 'mark_freebie',

src/pages/MainPage.vue

@@ -23,7 +23,7 @@ const totalPages: Ref<number> = ref(1);
 // search state
 const name = ref(searchStore.name);
 const subject: Ref<Subject> = ref(searchStore.subject);
-let order = ref(searchStore.order);
+let order = ref(searchStore.order || 'по релевантности');
 const orderValues: Ref<Order> = ref(OrderFromText[order.value as keyof typeof OrderFromText]);
 const ascending = ref(searchStore.ascending);
 const page = ref(searchStore.page);