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

update dependencies and improved/fixed meal plan date picker

Browse Source
This commit is contained in:
vabene1111
2025-04-18 13:13:13 +02:00
parent f576aa34e4
commit d7f37e8293
21 changed files with 632 additions and 732 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
vue3/package.json
View File

@@ -9,32 +9,32 @@
"preview": "vite preview"
},
"dependencies": {
"@types/luxon": "^3.4.2",
"@types/luxon": "^3.6.2",
"@vueform/multiselect": "^2.6.11",
"@vueuse/core": "^13.0.0",
"@vueuse/router": "^13.0.0",
"luxon": "^3.6.0",
"@vueuse/core": "^13.1.0",
"@vueuse/router": "^13.1.0",
"luxon": "^3.6.1",
"mavon-editor": "^3.0.1",
"pinia": "3.0.1",
"vue": "3.5.13",
"pinia": "^3.0.2",
"vue": "^3.5.13",
"vue-draggable-plus": "^0.6.0",
"vue-i18n": "11.1.2",
"vue-router": "4.5.0",
"vue-i18n": "^11.1.3",
"vue-router": "^4.5.0",
"vue-simple-calendar": "7.1.0",
"vuedraggable": "^4.1.0",
"vuetify": "^3.7.18"
"vuetify": "^3.8.2"
},
"devDependencies": {
"@fortawesome/fontawesome-free": "^6.6.0",
"@tsconfig/node20": "^20.1.4",
"@types/jsdom": "^21.1.1",
"@types/node": "^20.16.5",
"@vitejs/plugin-vue": "^5.1.4",
"@vue/tsconfig": "^0.5.1",
"jsdom": "^24.1.0",
"typescript": "^5.6.2",
"vite": "^5.4.7",
"vite-plugin-vuetify": "^2.0.4",
"vue-tsc": "^2.0.26"
"@fortawesome/fontawesome-free": "^6.7.2",
"@tsconfig/node22": "^22.0.1",
"@types/jsdom": "^21.1.7",
"@types/node": "^22.14.1",
"@vitejs/plugin-vue": "^5.2.3",
"@vue/tsconfig": "^0.7.0",
"jsdom": "^26.1.0",
"typescript": "^5.8.3",
"vite": "6.2.6",
"vite-plugin-vuetify": "^2.1.1",
"vue-tsc": "^2.2.8"
}
}

1
vue3/src/components/dialogs/AddToShoppingDialog.vue
View File

@@ -42,7 +42,6 @@ import {onMounted, PropType, ref} from "vue";
import VClosableCardTitle from "@/components/dialogs/VClosableCardTitle.vue";
import {ApiApi, Recipe, RecipeFlat, RecipeOverview, type ShoppingListEntryBulkCreate, ShoppingListRecipe} from "@/openapi";
import {ErrorMessageType, PreparedMessage, useMessageStore} from "@/stores/MessageStore";
import {VNumberInput} from 'vuetify/labs/VNumberInput'
import {ShoppingDialogRecipe, ShoppingDialogRecipeEntry} from "@/types/Shopping";
import {calculateFoodAmount} from "@/utils/number_utils";
import {useUserPreferenceStore} from "@/stores/UserPreferenceStore";

1
vue3/src/components/display/RecipeActivity.vue
View File

@@ -64,7 +64,6 @@ import {ApiApi, CookLog, Recipe} from "@/openapi";
import {DateTime} from "luxon";
import {ErrorMessageType, useMessageStore} from "@/stores/MessageStore";
import {VDateInput} from 'vuetify/labs/VDateInput'
import {VNumberInput} from 'vuetify/labs/VNumberInput'
const props = defineProps({
recipe: {

1
vue3/src/components/inputs/NumberScalerDialog.vue
View File

@@ -31,7 +31,6 @@
<script setup lang="ts">
import {defineComponent, onMounted, ref, watch} from 'vue'
import {VNumberInput} from 'vuetify/labs/VNumberInput'
import VClosableCardTitle from "@/components/dialogs/VClosableCardTitle.vue"; //TODO remove once component is out of labs
const emit = defineEmits({

1
vue3/src/components/inputs/PropertiesEditor.vue
View File

@@ -41,7 +41,6 @@
<script setup lang="ts">
import {ApiApi, Property} from "@/openapi";
import {VNumberInput} from 'vuetify/labs/VNumberInput'
import ModelEditDialog from "@/components/dialogs/ModelEditDialog.vue";
import ModelSelect from "@/components/inputs/ModelSelect.vue";

1
vue3/src/components/inputs/StepEditor.vue
View File

@@ -239,7 +239,6 @@
import {nextTick, onMounted, ref} from 'vue'
import {ApiApi, Ingredient, ParsedIngredient, Recipe, Step, Unit} from "@/openapi";
import StepMarkdownEditor from "@/components/inputs/StepMarkdownEditor.vue";
import {VNumberInput} from 'vuetify/labs/VNumberInput'
import ModelSelect from "@/components/inputs/ModelSelect.vue";
import {useDisplay} from "vuetify";
import {VueDraggable} from "vue-draggable-plus";

1
vue3/src/components/model_editors/AutomationEditor.vue
View File

@@ -36,7 +36,6 @@ import {Automation} from "@/openapi";
import ModelEditorBase from "@/components/model_editors/ModelEditorBase.vue";
import {useModelEditorFunctions} from "@/composables/useModelEditorFunctions";
import {useI18n} from "vue-i18n";
import {VNumberInput} from "vuetify/labs/VNumberInput";
const {t} = useI18n()

1
vue3/src/components/model_editors/FoodEditor.vue
View File

@@ -121,7 +121,6 @@ import {computed, onMounted, PropType, ref, watch} from "vue";
import {ApiApi, Food, Unit, UnitConversion} from "@/openapi";
import {ErrorMessageType, useMessageStore} from "@/stores/MessageStore";
import ModelSelect from "@/components/inputs/ModelSelect.vue";
import {VNumberInput} from 'vuetify/labs/VNumberInput'
import ModelEditDialog from "@/components/dialogs/ModelEditDialog.vue";
import ModelEditorBase from "@/components/model_editors/ModelEditorBase.vue";
import {useModelEditorFunctions} from "@/composables/useModelEditorFunctions";

10
vue3/src/components/model_editors/MealPlanEditor.vue
View File

@@ -27,6 +27,10 @@
<v-text-field :label="$t('Title')" v-model="editingObj.title"></v-text-field>
<v-date-input
v-model="dateRangeValue"
@update:modelValue="updateDate()"
:display-format="(date: Date) => DateTime.fromJSDate(date).toLocaleString()"
:first-day-of-week="useUserPreferenceStore().deviceSettings.mealplan_startingDayOfWeek"
:show-week="useUserPreferenceStore().deviceSettings.mealplan_displayWeekNumbers"
:label="$t('Date')"
multiple="range"
prepend-icon=""
@@ -99,7 +103,6 @@ import ModelEditorBase from "@/components/model_editors/ModelEditorBase.vue";
import {useModelEditorFunctions} from "@/composables/useModelEditorFunctions";
import {DateTime} from "luxon";
import {adjustDateRangeLength, shiftDateRange} from "@/utils/date_utils";
import {VNumberInput} from "vuetify/labs/VNumberInput";
import ModelSelect from "@/components/inputs/ModelSelect.vue";
import RecipeCard from "@/components/display/RecipeCard.vue";
import {VDateInput} from "vuetify/labs/VDateInput";
@@ -225,6 +228,11 @@ function initializeDateRange() {
}
}
function formatDate(date: Date) {
console.log('called date format')
return DateTime.fromJSDate(date).toLocaleString()
}
</script>
<style scoped>

1
vue3/src/components/model_editors/PropertyEditor.vue
View File

@@ -29,7 +29,6 @@ import {onMounted, PropType} from "vue";
import {Property} from "@/openapi";
import ModelSelect from "@/components/inputs/ModelSelect.vue";
import {VNumberInput} from 'vuetify/labs/VNumberInput' //TODO remove once component is out of labs
import ModelEditorBase from "@/components/model_editors/ModelEditorBase.vue";
import {useModelEditorFunctions} from "@/composables/useModelEditorFunctions";

1
vue3/src/components/model_editors/PropertyTypeEditor.vue
View File

@@ -31,7 +31,6 @@ import {onMounted, PropType, ref} from "vue";
import {PropertyType} from "@/openapi";
import ModelEditorBase from "@/components/model_editors/ModelEditorBase.vue";
import {useModelEditorFunctions} from "@/composables/useModelEditorFunctions";
import {VNumberInput} from "vuetify/labs/VNumberInput";
import {FDC_PROPERTY_TYPES} from "@/utils/fdc";
const props = defineProps({

1
vue3/src/components/model_editors/RecipeBookEditor.vue
View File

@@ -58,7 +58,6 @@
<script setup lang="ts">
import {VNumberInput} from 'vuetify/labs/VNumberInput'
import {onMounted, PropType, ref} from "vue";
import {ApiApi, Recipe, RecipeBook, RecipeBookEntry, User} from "@/openapi";
import {VDataTableUpdateOptions} from "@/vuetify";

1
vue3/src/components/model_editors/ShoppingListEntryEditor.vue
View File

@@ -37,7 +37,6 @@ import {onMounted, PropType} from "vue";
import {ShoppingListEntry} from "@/openapi";
import ModelEditorBase from "@/components/model_editors/ModelEditorBase.vue";
import {useModelEditorFunctions} from "@/composables/useModelEditorFunctions";
import {VNumberInput} from "vuetify/labs/VNumberInput";
import ModelSelect from "@/components/inputs/ModelSelect.vue";
const props = defineProps({

1
vue3/src/components/model_editors/UnitConversionEditor.vue
View File

@@ -51,7 +51,6 @@ import {onMounted, PropType} from "vue";
import {UnitConversion} from "@/openapi";
import ModelSelect from "@/components/inputs/ModelSelect.vue";
import {VNumberInput} from 'vuetify/labs/VNumberInput' //TODO remove once component is out of labs
import {useModelEditorFunctions} from "@/composables/useModelEditorFunctions";
import ModelEditorBase from "@/components/model_editors/ModelEditorBase.vue";

2
vue3/src/components/settings/ShoppingSettings.vue
View File

@@ -63,7 +63,7 @@
import {useUserPreferenceStore} from "@/stores/UserPreferenceStore";
import ModelSelect from "@/components/inputs/ModelSelect.vue";
import {VNumberInput} from 'vuetify/labs/VNumberInput' //TODO remove once component is out of labs
</script>
<style scoped>

1
vue3/src/pages/IngredientEditorPage.vue
View File

@@ -148,7 +148,6 @@ import {onMounted, ref} from "vue";
import {useI18n} from "vue-i18n";
import {ErrorMessageType, useMessageStore} from "@/stores/MessageStore";
import {useUrlSearchParams} from "@vueuse/core";
import {VNumberInput} from 'vuetify/labs/VNumberInput'
import DeleteConfirmDialog from "@/components/dialogs/DeleteConfirmDialog.vue";
import ModelEditDialog from "@/components/dialogs/ModelEditDialog.vue";
import ModelMergeDialog from "@/components/dialogs/ModelMergeDialog.vue";

1
vue3/src/pages/PropertyEditorPage.vue
View File

@@ -187,7 +187,6 @@ import VClosableCardTitle from "@/components/dialogs/VClosableCardTitle.vue";
import {useUrlSearchParams} from "@vueuse/core";
import BtnCopy from "@/components/buttons/BtnCopy.vue";
import FdcSearchDialog from "@/components/dialogs/FdcSearchDialog.vue";
import {VNumberInput} from 'vuetify/labs/VNumberInput'
type IngredientLoading = Ingredient & { loading?: boolean }

1
vue3/src/pages/RecipeImportPage.vue
View File

@@ -455,7 +455,6 @@ import {useRouter} from "vue-router";
import {useUserPreferenceStore} from "@/stores/UserPreferenceStore";
import {VueDraggable} from "vue-draggable-plus";
import VClosableCardTitle from "@/components/dialogs/VClosableCardTitle.vue";
import {VNumberInput} from 'vuetify/labs/VNumberInput'
import {useFileApi} from "@/composables/useFileApi";
import ModelSelect from "@/components/inputs/ModelSelect.vue";
import {useDisplay} from "vuetify";

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

@@ -145,7 +145,6 @@ import {ApiApi, ApiRecipeListRequest, CustomFilter, RecipeOverview} from "@/open
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 {useRouter} from "vue-router";

2
vue3/tsconfig.node.json
View File

@@ -1,5 +1,5 @@
{
"extends": "@tsconfig/node20/tsconfig.json",
"extends": "@tsconfig/node22/tsconfig.json",
"include": [
"vite.config.*",
"vitest.config.*",

1294
vue3/yarn.lock
View File

File diff suppressed because it is too large Load Diff