Cutlery/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2025-07-09 03:04:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: general bug fixes (#1547)

Browse Source 
* grouped "instructions" header with first section

* fixed sort by last updated date

* somewhat-hacky bugfix for large screens

* modified page size to be divisible by 4

* fixed missing export for new data forms
This commit is contained in:
Michael Genson 2022-08-14 00:44:11 -05:00 committed by GitHub
parent 54c4f19a5c
commit 238f555f5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/components/Domain/Recipe/RecipeCardSection.vue
View File

@ -248,7 +248,7 @@ export default defineComponent({
}
const page = ref(1);
const perPage = ref(30);
const perPage = ref(32);
const hasMore = ref(true);
const ready = ref(false);
const loading = ref(false);
@ -259,10 +259,16 @@ export default defineComponent({
if (props.usePagination) {
const newRecipes = await fetchMore(
page.value,
perPage.value,
// we double-up the first call to avoid a bug with large screens that render the entire first page without scrolling, preventing additional loading
perPage.value*2,
preferences.value.orderBy,
preferences.value.orderDirection
);
// since we doubled the first call, we also need to advance the page
page.value = page.value + 1;
context.emit(REPLACE_RECIPES_EVENT, newRecipes);
ready.value = true;
}
@ -325,7 +331,7 @@ export default defineComponent({
setter("created_at", $globals.icons.sortCalendarAscending, $globals.icons.sortCalendarDescending);
break;
case EVENTS.updated:
setter("updated_at", $globals.icons.sortClockAscending, $globals.icons.sortClockDescending);
setter("update_at", $globals.icons.sortClockAscending, $globals.icons.sortClockDescending);
break;
default:
console.log("Unknown Event", sortType);

2
frontend/components/Domain/Recipe/RecipePrintView.vue
View File

@ -35,12 +35,12 @@
<!-- Instructions -->
<section>
<v-card-title class="headline pl-0">{{ $t("recipe.instructions") }}</v-card-title>
<div
v-for="(instructionSection, sectionIndex) in instructionSections"
:key="`instruction-section-${sectionIndex}`"
:class="{ 'print-section': instructionSection.sectionName }"
>
<v-card-title v-if="!sectionIndex" class="headline pl-0">{{ $t("recipe.instructions") }}</v-card-title>
<div v-for="(step, stepIndex) in instructionSection.instructions" :key="`instruction-${stepIndex}`">
<div class="print-section">
<h4 v-if="step.title" :key="`instruction-title-${stepIndex}`" class="instruction-title mb-2">

3
frontend/pages/group/data/foods.vue
View File

@ -92,7 +92,7 @@
@submit="editSaveFood"
>
<v-card-text v-if="editTarget">
<v-form ref="domNewFoodForm">
<v-form ref="domEditFoodForm">
<v-text-field v-model="editTarget.name" label="Name" :rules="[validators.required]"></v-text-field>
<v-text-field v-model="editTarget.description" label="Description"></v-text-field>
<v-autocomplete
@ -324,6 +324,7 @@ export default defineComponent({
validators,
// Create
createDialog,
domNewFoodForm,
createEventHandler,
createFood,
createTarget,

3
frontend/pages/group/data/units.vue
View File

@ -55,7 +55,7 @@
@submit="editSaveUnit"
>
<v-card-text v-if="editTarget">
<v-form ref="domCreateUnitForm">
<v-form ref="domEditUnitForm">
<v-text-field v-model="editTarget.name" label="Name" :rules="[validators.required]"></v-text-field>
<v-text-field v-model="editTarget.abbreviation" label="Abbreviation"></v-text-field>
<v-text-field v-model="editTarget.description" label="Description"></v-text-field>
@ -329,6 +329,7 @@ export default defineComponent({
validators,
// Create
createDialog,
domNewUnitForm,
createEventHandler,
createUnit,
createTarget,