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

feat: Shopping list UI overhaul - add label headings per category (#4235)

Browse Source 
Co-authored-by: Kuchenpirat <24235032+Kuchenpirat@users.noreply.github.com>
This commit is contained in:
Cody 2024-09-24 09:29:06 -05:00 committed by GitHub
parent d1e3b64a19
commit 04dc593b16
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/pages/group/data/labels.vue
View File

@ -232,7 +232,7 @@ export default defineComponent({
editLabel.value = item; editLabel.value = item;
if (!editLabel.value.color) { if (!editLabel.value.color) {
editLabel.value.color = "#E0E0E0"; editLabel.value.color = "#959595";
} }
} }

12
frontend/pages/shopping-lists/_id.vue
View File

@ -56,15 +56,11 @@
<!-- View By Label --> <!-- View By Label -->
<div v-else> <div v-else>
<div v-for="(value, key, idx) in itemsByLabel" :key="key" class="mb-6"> <div v-for="(value, key) in itemsByLabel" :key="key" class="mb-6">
<div @click="toggleShowChecked()"> <div class="text-left">
<span v-if="idx || key !== $tc('shopping-list.no-label')"> <v-btn :color="getLabelColor(value[0]) ? getLabelColor(value[0]) : '#959595'">{{ key }}</v-btn>
<v-icon :color="getLabelColor(value[0])">
{{ $globals.icons.tags }}
</v-icon>
</span>
{{ key }}
</div> </div>
<v-divider/>
<draggable :value="value" handle=".handle" delay="250" :delay-on-touch-only="true" @start="loadingCounter += 1" @end="loadingCounter -= 1" @input="updateIndexUncheckedByLabel(key, $event)"> <draggable :value="value" handle=".handle" delay="250" :delay-on-touch-only="true" @start="loadingCounter += 1" @end="loadingCounter -= 1" @input="updateIndexUncheckedByLabel(key, $event)">
<v-lazy v-for="(item, index) in value" :key="item.id" class="ml-2 my-2"> <v-lazy v-for="(item, index) in value" :key="item.id" class="ml-2 my-2">
<ShoppingListItem <ShoppingListItem

2
mealie/schema/labels/multi_purpose_label.py
View File

@ -10,7 +10,7 @@ from mealie.schema.response.pagination import PaginationBase
class MultiPurposeLabelCreate(MealieModel): class MultiPurposeLabelCreate(MealieModel):
name: str name: str
color: str = "#E0E0E0" color: str = "#959595"
class MultiPurposeLabelSave(MultiPurposeLabelCreate): class MultiPurposeLabelSave(MultiPurposeLabelCreate):