+
diff --git a/vue3/src/components/inputs/GlobalSearchDialog.vue b/vue3/src/components/inputs/GlobalSearchDialog.vue
index 601869216..0a438b5e4 100644
--- a/vue3/src/components/inputs/GlobalSearchDialog.vue
+++ b/vue3/src/components/inputs/GlobalSearchDialog.vue
@@ -51,7 +51,7 @@
- {{ $t('Advanced') }}
+ {{ $t('Advanced') }}
{{ $t('Close') }}
@@ -71,6 +71,7 @@ import VClosableCardTitle from "@/components/dialogs/VClosableCardTitle.vue";
import {useDebounceFn} from "@vueuse/core";
import {ErrorMessageType, useMessageStore} from "@/stores/MessageStore";
import {useI18n} from "vue-i18n";
+import SearchPage from "@/pages/SearchPage.vue";
const router = useRouter()
const {mobile} = useDisplay()
@@ -218,11 +219,11 @@ function goToSelectedRecipe(index: number) {
let searchResult = searchResults.value[index]
if (searchResult.type == 'link_advanced_search') {
- router.push({name: 'view_search', query: {'query': searchQuery.value}})
+ router.push({name: 'SearchPage', query: {'query': searchQuery.value}})
} else {
console.log('going to', searchResult.recipeId)
if (searchResult.recipeId != null) {
- router.push({name: 'view_recipe', params: {'id': searchResult.recipeId}})
+ router.push({name: 'RecipeViewPage', params: {'id': searchResult.recipeId}})
}
}
diff --git a/vue3/src/components/model_editors/RecipeEditor.vue b/vue3/src/components/model_editors/RecipeEditor.vue
index 84f1df9b9..cb0e0634a 100644
--- a/vue3/src/components/model_editors/RecipeEditor.vue
+++ b/vue3/src/components/model_editors/RecipeEditor.vue
@@ -110,7 +110,7 @@
{{$t('SpaceLimitReached')}}
- {{ $t('SpaceSettings') }}
+ {{ $t('SpaceSettings') }}
@@ -150,6 +150,7 @@ import ClosableHelpAlert from "@/components/display/ClosableHelpAlert.vue";
import {useDisplay} from "vuetify";
import {isSpaceAtRecipeLimit} from "@/utils/logic_utils";
import {useUserPreferenceStore} from "@/stores/UserPreferenceStore";
+import SpaceSettings from "@/components/settings/SpaceSettings.vue";
const props = defineProps({
diff --git a/vue3/src/pages/IngredientEditorPage.vue b/vue3/src/pages/IngredientEditorPage.vue
index f9b50e8e0..9b92ffd12 100644
--- a/vue3/src/pages/IngredientEditorPage.vue
+++ b/vue3/src/pages/IngredientEditorPage.vue
@@ -95,7 +95,7 @@
|
-
+
{{ r.name }} (#{{ r.id }})
|
diff --git a/vue3/src/pages/RecipeEditPage.vue b/vue3/src/pages/RecipeEditPage.vue
deleted file mode 100644
index 3aec216f3..000000000
--- a/vue3/src/pages/RecipeEditPage.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-
-
-
-
-
- {{ recipe.name }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Save
- View
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/vue3/src/pages/RecipeImportPage.vue b/vue3/src/pages/RecipeImportPage.vue
index dbbb2b735..b888c2472 100644
--- a/vue3/src/pages/RecipeImportPage.vue
+++ b/vue3/src/pages/RecipeImportPage.vue
@@ -39,7 +39,7 @@
{{ $t('Duplicate') }}
{{ $t('DuplicateFoundInfo') }}
- {{ r.name }}
+ {{ r.name }}
(#{{ r.id }})
@@ -294,7 +294,7 @@ function createRecipeFromImport() {
api.apiRecipeCreate({recipe: importResponse.value.recipe}).then(recipe => {
updateRecipeImage(recipe.id!, null, importResponse.value.recipe?.imageUrl).then(r => {
- router.push({name: 'view_recipe', params: {id: recipe.id}})
+ router.push({name: 'RecipeViewPage', params: {id: recipe.id}})
})
}).catch(err => {
useMessageStore().addError(ErrorMessageType.CREATE_ERROR, err)
diff --git a/vue3/src/pages/SearchPage.vue b/vue3/src/pages/SearchPage.vue
index a2379af04..e59fdf808 100644
--- a/vue3/src/pages/SearchPage.vue
+++ b/vue3/src/pages/SearchPage.vue
@@ -199,7 +199,7 @@ function reset() {
}
function handleRowClick(event: PointerEvent, data: any) {
- router.push({name: 'view_recipe', params: {id: recipes.value[data.index].id}})
+ router.push({name: 'RecipeViewPage', params: {id: recipes.value[data.index].id}})
}
/**
diff --git a/vue3/src/pages/SettingsPage.vue b/vue3/src/pages/SettingsPage.vue
index 2bb4f60f4..8ed209bbd 100644
--- a/vue3/src/pages/SettingsPage.vue
+++ b/vue3/src/pages/SettingsPage.vue
@@ -3,22 +3,22 @@
- {{ $t('Profile') }}
+ {{ $t('Profile') }}
{{ $t('Settings') }}
- {{ $t('Cosmetic') }}
- {{ $t('Shopping_list') }}
- {{ $t('Meal_Plan') }}
+ {{ $t('Cosmetic') }}
+ {{ $t('Shopping_list') }}
+ {{ $t('Meal_Plan') }}
{{ $t('Search') }}
Space
- {{ $t('YourSpaces') }}
- {{ $t('SpaceSettings') }}
- {{ $t('SpaceMembers') }}
+ {{ $t('YourSpaces') }}
+ {{ $t('SpaceSettings') }}
+ {{ $t('SpaceMembers') }}
Admin
- {{ $t('API') }}
+ {{ $t('API') }}
{{ $t('System') }}
diff --git a/vue3/src/pages/StartPage.vue b/vue3/src/pages/StartPage.vue
index a0e736ffa..1b4c5b51c 100644
--- a/vue3/src/pages/StartPage.vue
+++ b/vue3/src/pages/StartPage.vue
@@ -23,7 +23,7 @@
- {{ $t('View_Recipes') }}
+ {{ $t('View_Recipes') }}
@@ -36,6 +36,7 @@ import {onMounted, ref} from "vue"
import {ApiApi} from "@/openapi"
import HorizontalRecipeScroller from "@/components/display/HorizontalRecipeWindow.vue"
import HorizontalMealPlanWindow from "@/components/display/HorizontalMealPlanWindow.vue"
+import SearchPage from "@/pages/SearchPage.vue";
const totalRecipes = ref(-1)