mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-01 04:10:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

search prototype with keyword filters

Browse Source
This commit is contained in:
vabene1111
2025-03-29 12:09:19 +01:00
parent aa1fa3a40e
commit ebd354bc8d
33 changed files with 116 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
vue3/src/locales/ar.json
View File

@@ -6,6 +6,7 @@
"Activity": "",
"Add": "",
"AddAll": "",
"AddFilter": "",
"AddFoodToShopping": "",
"AddMany": "",
"AddToShopping": "",

1
vue3/src/locales/bg.json
View File

@@ -6,6 +6,7 @@
"Activity": "",
"Add": "Добави",
"AddAll": "",
"AddFilter": "",
"AddFoodToShopping": "Добавете {food} към списъка си за пазаруване",
"AddMany": "",
"AddToShopping": "Добавяне към списъка за пазаруване",

1
vue3/src/locales/ca.json
View File

@@ -8,6 +8,7 @@
"Activity": "",
"Add": "",
"AddAll": "",
"AddFilter": "",
"AddFoodToShopping": "",
"AddMany": "",
"AddToShopping": "",

1
vue3/src/locales/cs.json
View File

@@ -8,6 +8,7 @@
"Activity": "",
"Add": "Přidat",
"AddAll": "",
"AddFilter": "",
"AddFoodToShopping": "Přidat {food} na váš nákupní seznam",
"AddMany": "",
"AddToShopping": "Přidat do nákupního seznamu",

1
vue3/src/locales/da.json
View File

@@ -8,6 +8,7 @@
"Activity": "",
"Add": "Tilføj",
"AddAll": "",
"AddFilter": "",
"AddFoodToShopping": "Tilføj {food} til indkøbsliste",
"AddMany": "",
"AddToShopping": "Tilføj til indkøbsliste",

1
vue3/src/locales/de.json
View File

@@ -8,6 +8,7 @@
"Activity": "Aktivität",
"Add": "Hinzufügen",
"AddAll": "Alle Hinzufügen",
"AddFilter": "Filter Hinzufügen",
"AddFoodToShopping": "Fügen Sie {food} zur Einkaufsliste hinzu",
"AddMany": "Mehrere Hinzufügen",
"AddToShopping": "Zur Einkaufsliste hinzufügen",

1
vue3/src/locales/el.json
View File

@@ -8,6 +8,7 @@
"Activity": "",
"Add": "Προσθήκη",
"AddAll": "",
"AddFilter": "",
"AddFoodToShopping": "Προσθήκη του φαγητού {food} στη λίστα αγορών σας",
"AddMany": "",
"AddToShopping": "Προσθήκη στη λίστα αγορών",

1
vue3/src/locales/en.json
View File

@@ -8,6 +8,7 @@
"Activity": "Activity",
"Add": "Add",
"AddAll": "Add all",
"AddFilter": "Add Filter",
"AddFoodToShopping": "Add {food} to your shopping list",
"AddMany": "Add Many",
"AddToShopping": "Add to shopping list",

1
vue3/src/locales/es.json
View File

@@ -8,6 +8,7 @@
"Activity": "",
"Add": "Añadir",
"AddAll": "",
"AddFilter": "",
"AddFoodToShopping": "Añadir {food} a la lista de la compra",
"AddMany": "",
"AddToShopping": "Añadir a la lista de la compra",

1
vue3/src/locales/fi.json
View File

@@ -6,6 +6,7 @@
"Activity": "",
"Add": "Lisää",
"AddAll": "",
"AddFilter": "",
"AddMany": "",
"Add_Step": "Lisää Vaihe",
"Add_nutrition_recipe": "Lisää ravintoaine reseptiin",

1
vue3/src/locales/fr.json
View File

@@ -8,6 +8,7 @@
"Activity": "",
"Add": "Ajouter",
"AddAll": "",
"AddFilter": "",
"AddFoodToShopping": "Ajouter l’aliment {food} à votre liste de courses",
"AddMany": "",
"AddToShopping": "Ajouter à la liste de courses",

1
vue3/src/locales/he.json
View File

@@ -8,6 +8,7 @@
"Activity": "",
"Add": "הוספה",
"AddAll": "",
"AddFilter": "",
"AddFoodToShopping": "הוסף {מזון} לרשימת הקניות",
"AddMany": "",
"AddToShopping": "הוסף לרשימת קניות",

1
vue3/src/locales/hu.json
View File

@@ -8,6 +8,7 @@
"Activity": "",
"Add": "Hozzáadás",
"AddAll": "",
"AddFilter": "",
"AddFoodToShopping": "{food} hozzáadása bevásárlólistához",
"AddMany": "",
"AddToShopping": "Hozzáadás a bevásárlólistához",

1
vue3/src/locales/hy.json
View File

@@ -6,6 +6,7 @@
"Activity": "",
"Add": "",
"AddAll": "",
"AddFilter": "",
"AddMany": "",
"Add_nutrition_recipe": "Ավելացնել սննդայնություն բաղադրատոմսին",
"Add_to_Book": "",

1
vue3/src/locales/id.json
View File

@@ -8,6 +8,7 @@
"Activity": "",
"Add": "Tambahkan",
"AddAll": "",
"AddFilter": "",
"AddFoodToShopping": "",
"AddMany": "",
"AddToShopping": "",

1
vue3/src/locales/is.json
View File

@@ -8,6 +8,7 @@
"Activity": "",
"Add": "",
"AddAll": "",
"AddFilter": "",
"AddFoodToShopping": "",
"AddMany": "",
"AddToShopping": "",

1
vue3/src/locales/it.json
View File

@@ -8,6 +8,7 @@
"Activity": "",
"Add": "Aggiungi",
"AddAll": "",
"AddFilter": "",
"AddFoodToShopping": "Aggiungi {food} alla tua lista della spesa",
"AddMany": "",
"AddToShopping": "Aggiungi a lista della spesa",

1
vue3/src/locales/lt.json
View File

@@ -8,6 +8,7 @@
"Activity": "",
"Add": "",
"AddAll": "",
"AddFilter": "",
"AddFoodToShopping": "",
"AddMany": "",
"AddToShopping": "",

1
vue3/src/locales/nb_NO.json
View File

@@ -8,6 +8,7 @@
"Activity": "",
"Add": "Legg til",
"AddAll": "",
"AddFilter": "",
"AddFoodToShopping": "Legg til {food] i handlelisten din",
"AddMany": "",
"AddToShopping": "Legg til i handleliste",

1
vue3/src/locales/nl.json
View File

@@ -8,6 +8,7 @@
"Activity": "",
"Add": "Voeg toe",
"AddAll": "",
"AddFilter": "",
"AddFoodToShopping": "Voeg {food} toe aan je boodschappenlijst",
"AddMany": "",
"AddToShopping": "Voeg toe aan boodschappenlijst",

1
vue3/src/locales/pl.json
View File

@@ -8,6 +8,7 @@
"Activity": "",
"Add": "Dodaj",
"AddAll": "",
"AddFilter": "",
"AddFoodToShopping": "Dodaj {food} do swojej listy zakupów",
"AddMany": "",
"AddToShopping": "Dodaj do listy zakupów",

1
vue3/src/locales/pt.json
View File

@@ -6,6 +6,7 @@
"Activity": "",
"Add": "Adicionar",
"AddAll": "",
"AddFilter": "",
"AddFoodToShopping": "Adicionar {food} à sua lista de compras",
"AddMany": "",
"AddToShopping": "Adicionar á lista de compras",

1
vue3/src/locales/pt_BR.json
View File

@@ -8,6 +8,7 @@
"Activity": "",
"Add": "Adicionar",
"AddAll": "",
"AddFilter": "",
"AddFoodToShopping": "Incluir {food} na sua lista de compras",
"AddMany": "",
"AddToShopping": "Incluir na Lista de Compras",

1
vue3/src/locales/ro.json
View File

@@ -8,6 +8,7 @@
"Activity": "",
"Add": "Adaugă",
"AddAll": "",
"AddFilter": "",
"AddFoodToShopping": "Adăugă {food} în lista de cumpărături",
"AddMany": "",
"AddToShopping": "Adaugă la lista de cumpărături",

1
vue3/src/locales/ru.json
View File

@@ -6,6 +6,7 @@
"Activity": "",
"Add": "Добавить",
"AddAll": "",
"AddFilter": "",
"AddFoodToShopping": "Добавить {food} в ваш список покупок",
"AddMany": "",
"AddToShopping": "Добавить в лист покупок",

1
vue3/src/locales/sl.json
View File

@@ -6,6 +6,7 @@
"Activity": "",
"Add": "Dodaj",
"AddAll": "",
"AddFilter": "",
"AddFoodToShopping": "Dodaj {food} v nakupovalni listek",
"AddMany": "",
"AddToShopping": "Dodaj nakupovlanemu listku",

1
vue3/src/locales/sv.json
View File

@@ -8,6 +8,7 @@
"Activity": "",
"Add": "Lägg till",
"AddAll": "",
"AddFilter": "",
"AddFoodToShopping": "Lägg till {food} på din inköpslista",
"AddMany": "",
"AddToShopping": "Lägg till i inköpslista",

1
vue3/src/locales/tr.json
View File

@@ -8,6 +8,7 @@
"Activity": "",
"Add": "Ekle",
"AddAll": "",
"AddFilter": "",
"AddFoodToShopping": "{food}'ı alışveriş listenize ekleyin",
"AddMany": "",
"AddToShopping": "Alışveriş listesine ekle",

1
vue3/src/locales/uk.json
View File

@@ -6,6 +6,7 @@
"Activity": "",
"Add": "Додати",
"AddAll": "",
"AddFilter": "",
"AddFoodToShopping": "Додати {food} до вашого списку покупок",
"AddMany": "",
"AddToShopping": "Додати до списку покупок",

1
vue3/src/locales/zh_Hans.json
View File

@@ -8,6 +8,7 @@
"Activity": "",
"Add": "添加",
"AddAll": "",
"AddFilter": "",
"AddFoodToShopping": "添加 {food} 到购物清单",
"AddMany": "",
"AddToShopping": "添加到购物清单",

1
vue3/src/locales/zh_Hant.json
View File

@@ -6,6 +6,7 @@
"Activity": "",
"Add": "",
"AddAll": "",
"AddFilter": "",
"AddMany": "",
"Add_nutrition_recipe": "為食譜添加營養資訊",
"Add_to_Plan": "加入計劃",

90
vue3/src/pages/SearchPage.vue
View File

@@ -7,6 +7,7 @@
:loading="loading"
@submit="searchRecipes({page: 1})"
@keydown.enter="searchRecipes({page: 1})"
@click:clear="search_query = ''"
clearable hide-details>
<template v-slot:append>
<v-btn @click="panel ='search' " v-if="panel == ''" color="primary" icon><i class="fa-solid fa-caret-down"></i></v-btn>
@@ -22,7 +23,36 @@
<v-expansion-panel-text>
<v-form :disabled="loading" class="mt-4">
<model-select model="Keyword" mode="tags" v-model="search_keywords" density="compact" :object="false" search-on-load></model-select>
<model-select model="Keyword" mode="tags" v-model="search_keywords" density="compact" :object="false" search-on-load
v-if="filters.keywords.enabled" :hint="filters.keywords.help">
<template #append>
<v-btn icon="fa-solid fa-times" size="small" variant="plain" @click="search_keywords = []; filters.keywords.enabled = false"></v-btn>
</template>
</model-select>
<model-select model="Keyword" mode="tags" v-model="search_keywords_and" density="compact" :object="false" search-on-load
v-if="filters.keywords_and.enabled">
<template #append>
<v-btn icon="fa-solid fa-times" size="small" variant="plain" @click="search_keywords_and = []; filters.keywords_and.enabled = false"></v-btn>
</template>
</model-select>
<model-select model="Keyword" mode="tags" v-model="search_keywords_or_not" density="compact" :object="false" search-on-load
v-if="filters.keywords_or_not.enabled">
<template #append>
<v-btn icon="fa-solid fa-times" size="small" variant="plain" @click="search_keywords_or_not = []; filters.keywords_or_not.enabled = false"></v-btn>
</template>
</model-select>
<model-select model="Keyword" mode="tags" v-model="search_keywords_and_not" density="compact" :object="false" search-on-load
v-if="filters.keywords_and_not.enabled">
<template #append>
<v-btn icon="fa-solid fa-times" size="small" variant="plain" @click="search_keywords_and_not = []; filters.keywords_and_not.enabled = false"></v-btn>
</template>
</model-select>
<v-divider class="mt-2 mb-2"></v-divider>
<v-autocomplete :items="availableFilters" @update:model-value="(item:string) =>{ filters[item].enabled = true; nextTick(() => {addFilterSelect = ''})}" density="compact" :label="$t('AddFilter')" v-model="addFilterSelect"></v-autocomplete>
<!-- <model-select model="Food" mode="tags" v-model="urlSearchParams.foods" density="compact" :object="false"></model-select>-->
<!-- <model-select model="Unit" mode="tags" v-model="urlSearchParams.units" density="compact" :object="false"></model-select>-->
<!-- <model-select model="RecipeBook" mode="tags" v-model="urlSearchParams.books" density="compact" :object="false"></model-select>-->
@@ -134,42 +164,63 @@
import {computed, nextTick, onMounted, ref, watch} from "vue";
import {ApiApi, ApiRecipeListRequest, CustomFilter, RecipeOverview} from "@/openapi";
import {useUrlSearchParams} from "@vueuse/core";
import {useI18n} from "vue-i18n";
import {ErrorMessageType, useMessageStore} from "@/stores/MessageStore";
import ModelSelect from "@/components/inputs/ModelSelect.vue";
import {VNumberInput} from 'vuetify/labs/VNumberInput'
import {VDateInput} from 'vuetify/labs/VDateInput'
import RecipeContextMenu from "@/components/inputs/RecipeContextMenu.vue";
import {LocationQueryValue, useRoute, useRouter} from "vue-router";
import {useRouter} from "vue-router";
import KeywordsBar from "@/components/display/KeywordsBar.vue";
import {VDataTableUpdateOptions} from "@/vuetify";
import VClosableCardTitle from "@/components/dialogs/VClosableCardTitle.vue";
import RecipeCard from "@/components/display/RecipeCard.vue";
import {useDisplay} from "vuetify";
import {useUserPreferenceStore} from "@/stores/UserPreferenceStore";
import * as url from "node:url";
import {useRouteQuery} from "@vueuse/router";
import {toNumberArray} from "@/utils/utils";
const {t} = useI18n()
const router = useRouter()
const route = useRoute()
const {mdAndUp} = useDisplay()
//const urlSearchParams = useUrlSearchParams('history', {})
const toArray = (param: String | String[]) =>
Array.isArray(param) ? param : [param];
const search_query = useRouteQuery('query', "",)
const search_page = useRouteQuery('page', 1, {transform: Number})
const search_pageSize = useRouteQuery('pageSize', useUserPreferenceStore().deviceSettings.general_tableItemsPerPage, {transform: Number})
const search_keywords = useRouteQuery('keywords', [], {transform: toArray})
const search_keywords = useRouteQuery('keywords', [], {transform: toNumberArray})
const search_keywords_or_not = useRouteQuery('keywords_or_not', [], {transform: toNumberArray})
const search_keywords_and = useRouteQuery('keywords_and', [], {transform: toNumberArray})
const search_keywords_and_not = useRouteQuery('keywords_and_not', [], {transform: toNumberArray})
/**
* all filters available to enable
*/
const filters = ref({
keywords: {value: 'keywords', title: 'Keywords', help: 'Any of the keywords', enabled: false, default: []},
keywords_and: {value: 'keywords_and', title: 'Keywords And', help: 'All of the keywords', enabled: false, default: []},
keywords_or_not: {value: 'keywords_or_not', title: 'Keywords Or Not', help: 'None of the given keywords', enabled: false, default: []},
keywords_and_not: {value: 'keywords_and_not', title: 'Keywords And Not', help: 'Not all of the given keywords', enabled: false, default: []},
})
/**
* filters that are not yet enabled
*/
const availableFilters = computed(() => {
let f = []
Object.entries(filters.value).forEach((entry) => {
let [key, value] = entry
if (!value.enabled) {
f.push({value: value.value, title: value.title})
}
})
return f
})
const loading = ref(false)
const dialog = ref(false)
const panel = ref('')
const viewMode = ref('table')
const addFilterSelect = ref('')
const tableHeaders = computed(() => {
let headers = [
@@ -191,16 +242,25 @@ const recipes = ref([] as RecipeOverview[])
const selectedCustomFilter = ref({} as CustomFilter)
const newFilterName = ref('')
// handle query updates when using the GlobalSearchDialog on the search page directly
/**
* handle query updates when using the GlobalSearchDialog on the search page directly
*/
// TODO this also makes the search update on every stroke, do we want this?
watch(() => search_query.value, () => {
searchRecipes({page: 1})
})
/**
* perform initial search on mounted
*/
onMounted(() => {
console.log(search_keywords.value)
searchRecipes({page: search_page.value})
})
/**
* perform the recipe search with the given options
* @param options
*/
function searchRecipes(options: VDataTableUpdateOptions) {
let api = new ApiApi()
loading.value = true
@@ -215,6 +275,8 @@ function searchRecipes(options: VDataTableUpdateOptions) {
page: search_page.value,
pageSize: search_pageSize.value,
keywords: search_keywords.value,
foods: search_keywords.value,
books: search_keywords.value,
} as ApiRecipeListRequest
api.apiRecipeList(searchParameters).then((r) => {

10
vue3/src/utils/utils.ts
View File

@@ -47,5 +47,13 @@ export function uploadRecipeImage(recipeId: number, file: File) {
}).finally(() => {
})
}
}
/**
* convert a string or an array of strings into an array of numbers
* useful for query parameter transformation
* @param param
*/
export function toNumberArray(param: string | string[]): number[]{
return Array.isArray(param) ? param.map(Number) : [parseInt(param)];
}