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

Merge branch 'master' into feature/vue3

Browse Source 
# Conflicts:
#	requirements.txt
This commit is contained in:
vabene1111
2024-03-05 14:45:53 +01:00
parent e0f7ce5de9 a626bda1ab
commit 9fe3eeb823
17 changed files with 117 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
vue/src/apps/ShoppingListView/ShoppingListView.vue
View File

@@ -9,15 +9,15 @@
<b-tabs content-class="mt-2" v-model="current_tab" class="mt-md-1" style="margin-bottom: 20vh">
<template #tabs-end>
<li class="nav-item flex-grow-1" >
<li class="nav-item flex-grow-1">
</li>
<li class="nav-item" >
<li class="nav-item">
<a href="#" class="nav-link" @click="useShoppingListStore().undoChange()"> <i class="fas fa-undo fa-fw"></i>&nbsp;</a>
</li>
<li class="nav-item dropdown d-none d-md-inline-block" >
<li class="nav-item dropdown d-none d-md-inline-block">
<a class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-expanded="false">
<i class="fas fa-download" ></i>&nbsp;
<i class="fas fa-download"></i>&nbsp;
</a>
<div class="dropdown-menu">
<DownloadPDF dom="#shoppinglist" name="shopping.pdf" :label="$t('download_pdf')"
@@ -34,7 +34,7 @@
</li>
<li class="nav-item">
<a href="#" class="nav-link" id="id_filters_button">
<i class="fas fa-filter fa-fw"/>&nbsp;
<i class="fas fa-filter fa-fw"/>&nbsp;
</a>
</li>
</template>
@@ -59,7 +59,7 @@
<b-row class="d-lg-block d-print-none d-none mb-3 mt-3">
<b-col cols="12">
<b-input-group>
<b-form-input type="text" :placeholder="$t('Food')"
<b-form-input type="text" :placeholder="$t('Shopping_input_placeholder')"
v-model="new_item.ingredient"
@keyup.enter="addItem"
ref="amount_input_simple"></b-form-input>
@@ -351,7 +351,7 @@
<template #title>
<div class="d-print-none">
<i class="fas fa-user-cog fa-fw"></i>
<!-- <span class="d-none d-lg-inline-block ml-1">{{ $t('Settings') }}</span>-->
<!-- <span class="d-none d-lg-inline-block ml-1">{{ $t('Settings') }}</span>-->
</div>
</template>
<div class="row justify-content-center">
@@ -430,7 +430,7 @@
<b-col cols="12">
<template v-if="current_tab===0">
<b-input-group>
<b-form-input v-model="new_item.ingredient" :placeholder="$t('Food')"
<b-form-input v-model="new_item.ingredient" :placeholder="$t('Shopping_input_placeholder')"
@keyup.enter="addItem"></b-form-input>
<b-input-group-append>
<b-button @click="addItem" variant="success">
@@ -562,6 +562,16 @@ export default {
this.shopping_list_store.refreshFromAPI()
useUserPreferenceStore().loadUserSettings(true)
useUserPreferenceStore().loadDeviceSettings()
// update selected supermarkt because local setting become stale otherwise
if (useUserPreferenceStore().device_settings.shopping_selected_supermarket != null) {
let api = new ApiApiFactory()
api.retrieveSupermarket(useUserPreferenceStore().device_settings.shopping_selected_supermarket.id).then(r => {
useUserPreferenceStore().device_settings.shopping_selected_supermarket = r.data
useUserPreferenceStore().updateDeviceSettings()
})
}
this.autoSyncLoop()
},
methods: {
@@ -693,6 +703,10 @@ export default {
apiClient.updateSupermarket(this.shopping_list_store.supermarkets[index].id, this.shopping_list_store.supermarkets[index]).then((r) => {
StandardToasts.makeStandardToast(this, StandardToasts.SUCCESS_UPDATE)
this.shopping_list_store.refreshFromAPI()
if (r.data.id === useUserPreferenceStore().device_settings.shopping_selected_supermarket.id){
useUserPreferenceStore().device_settings.shopping_selected_supermarket = r.data
}
}).catch((err) => {
StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err)
})

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

@@ -178,6 +178,7 @@
"Ignore_Shopping": "Ignore Shopping",
"Shopping_Category": "Shopping Category",
"Shopping_Categories": "Shopping Categories",
"Shopping_input_placeholder": "e.g. Potato/100 Potatoes/100 g Potatoes",
"Edit_Food": "Edit Food",
"Move_Food": "Move Food",
"New_Food": "New Food",

21
vue/src/locales/fr.json
View File

@@ -521,5 +521,24 @@
"Transpose_Words": "Transposer les mots",
"Name_Replace": "Remplacer le Nom",
"Food_Replace": "Remplacer l'aliment",
"Unit_Replace": "Remplacer l'Unité"
"Unit_Replace": "Remplacer l'Unité",
"ShowRecentlyCompleted": "Afficher les éléments récemment complétés",
"Input": "Entrée",
"Undo": "annuler",
"NoMoreUndo": "Aucun changement à annuler.",
"Delete_All": "Supprimer tout",
"created_by": "Créé par",
"ShoppingBackgroundSyncWarning": "Mauvais réseau, en attente de synchronisation ...",
"make_now_count": "Ingrédients manquants au maximum",
"CustomTheme": "Thème personnalisé",
"CustomThemeHelp": "Remplacer les styles du thème sélectionné en téléchargeant un fichier CSS personnalisé.",
"CustomImageHelp": "Téléchargez une image à afficher dans l'aperçu de l'espace.",
"CustomNavLogoHelp": "Téléchargez une image à utiliser comme logo de la barre de navigation.",
"CustomLogoHelp": "Téléchargez des images carrées de différentes tailles pour les transformer en logo dans l'onglet du navigateur et dans l'application web installée.",
"CustomLogos": "Logos personnalisés",
"Calculator": "Calculatrice",
"Created": "Créé",
"Updated": "Mis à jour",
"Unchanged": "Inchangé",
"Error": "Erreur"
}