github/mealie
1
0
Fork 0
mirror of https://github.com/hay-kot/mealie.git synced 2025-08-22 06:23:34 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Resolved more merge conflicts

Browse source
This commit is contained in:
Kenneth Rasmussen 2021-01-14 23:14:50 +01:00
commit 98acdf5fc6
7 changed files with 11 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

9
frontend/src/components/MealPlan/MealPlanEditor.vue
View file

@ -1,13 +1,8 @@
<template>
<v-card>
<<<<<<< HEAD:frontend/src/components/MealPlan/EditPlan.vue
<v-card-title class="secondary white--text"> {{$t('meal-plan.edit-meal-plan')}} </v-card-title>
<v-card-text> </v-card-text>
=======
<v-card-title class="headline"> Edit Meal Plan </v-card-title>
<v-card-title class="headline"> {{$t('meal-plan.edit-meal-plan')}} </v-card-title>
<v-divider></v-divider>
>>>>>>> 5f25b2492e0263defdf1723cbb47ba536a1a7511:frontend/src/components/MealPlan/MealPlanEditor.vue
<v-card-text>
<MealPlanCard v-model="mealPlan.meals" />
<v-row align="center" justify="end">

6
frontend/src/components/MealPlan/MealPlanNew.vue
View file

@ -1,13 +1,9 @@
<template>
<v-card>
<<<<<<< HEAD:frontend/src/components/MealPlan/NewMeal.vue
<v-card-title class="secondary white--text">
<v-card-title class="headline">
{{$t('meal-plan.create-a-new-meal-plan')}}
</v-card-title>
=======
<v-card-title class="headline"> Create a New Meal Plan </v-card-title>
<v-divider></v-divider>
>>>>>>> 5f25b2492e0263defdf1723cbb47ba536a1a7511:frontend/src/components/MealPlan/MealPlanNew.vue
<v-card-text>
<v-row dense>
<v-col cols="12" lg="6" md="6" sm="12">

7
frontend/src/components/Settings/Backup/index.vue
View file

@ -1,14 +1,9 @@
<template>
<<<<<<< HEAD:frontend/src/components/Admin/Backup.vue
<v-card :loading="backupLoading" class="mt-3" min-height="410px">
<v-card-title class="secondary white--text">
<v-card-title class="headline">
{{$t('settings.backup-and-exports')}}
</v-card-title>
=======
<v-card :loading="backupLoading">
<v-card-title class="headline"> Backup and Exports </v-card-title>
<v-divider></v-divider>
>>>>>>> 5f25b2492e0263defdf1723cbb47ba536a1a7511:frontend/src/components/Settings/Backup/index.vue
<v-card-text>
<p>

14
frontend/src/components/Settings/Theme/NewThemeDialog.vue
View file

@ -1,10 +1,6 @@
<template>
<div>
<<<<<<< HEAD:frontend/src/components/Admin/ThemeUI/NewTheme.vue
<v-btn text color="success" @click="dialog = true"> {{$t('general.new')}} </v-btn>
=======
<v-btn text color="info" @click="dialog = true"> New </v-btn>
>>>>>>> 5f25b2492e0263defdf1723cbb47ba536a1a7511:frontend/src/components/Settings/Theme/NewThemeDialog.vue
<v-btn text color="info" @click="dialog = true"> {{$t('general.new')}} </v-btn>
<v-dialog v-model="dialog" width="400">
<v-card>
<v-card-title> {{$t('settings.add-a-new-theme')}} </v-card-title>
@ -16,15 +12,11 @@
></v-text-field>
</v-card-text>
<v-card-actions>
<<<<<<< HEAD:frontend/src/components/Admin/ThemeUI/NewTheme.vue
<v-btn color="success" text @click="Select"> {{$t('general.create')}} </v-btn>
=======
<v-spacer></v-spacer>
<v-btn color="grey" text @click="dialog = false"> Cancel </v-btn>
<v-btn color="grey" text @click="dialog = false"> {{$t('general.cancel')}} </v-btn>
<v-btn color="success" text @click="Select" :disabled="!themeName">
Create
{{$t('general.create')}}
</v-btn>
>>>>>>> 5f25b2492e0263defdf1723cbb47ba536a1a7511:frontend/src/components/Settings/Theme/NewThemeDialog.vue
</v-card-actions>
</v-card>
</v-dialog>

7
frontend/src/components/Settings/Webhook/index.vue
View file

@ -1,12 +1,7 @@
<template>
<v-card>
<<<<<<< HEAD:frontend/src/components/Admin/Webhooks.vue
<v-card-title class="secondary white--text mt-1">
{{$t('settings.webhooks.meal-planner-webhooks')}}
=======
<v-card-title class="headline">
Meal Planner Webhooks
>>>>>>> 5f25b2492e0263defdf1723cbb47ba536a1a7511:frontend/src/components/Settings/Webhook/index.vue
{{$t('settings.webhooks.meal-planner-webhooks')}}
</v-card-title>
<v-card-text>
<p v-html="$t('settings.webhooks.the-urls-listed-below-will-recieve-webhooks-containing-the-recipe-data-for-the-meal-plan-on-its-scheduled-day-currently-webhooks-will-execute-at', {time: time})"></p>

8
frontend/src/components/UI/AddRecipeFab.vue
View file

@ -18,12 +18,8 @@
<v-card-actions>
<v-spacer></v-spacer>
<<<<<<< HEAD:frontend/src/components/AddRecipe.vue
<v-btn color="primary" text @click="createRecipe"> {{ $t('general.submit') }} </v-btn>
=======
<v-btn color="grey" text @click="reset"> Close </v-btn>
<v-btn color="success" text @click="createRecipe"> Submit </v-btn>
>>>>>>> 5f25b2492e0263defdf1723cbb47ba536a1a7511:frontend/src/components/UI/AddRecipeFab.vue
<v-btn color="grey" text @click="reset"> {{$t('general.close')}} </v-btn>
<v-btn color="success" text @click="createRecipe"> {{ $t('general.submit') }} </v-btn>
</v-card-actions>
</v-card>
</v-dialog>

12
frontend/src/pages/MealPlanThisWeekPage.vue
View file

@ -22,9 +22,9 @@
<v-card-text> {{ meal.description }} </v-card-text>
<<<<<<< HEAD:frontend/src/components/MealPlan/ThisWeek.vue
<v-card-actions>
<v-btn
align="center"
color="secondary"
text
@click="$router.push(`/recipe/${meal.slug}`)"
@ -32,16 +32,6 @@
{{$t('recipe.view-recipe')}}
</v-btn>
</v-card-actions>
=======
<v-btn
align="center"
color="secondary"
text
@click="$router.push(`/recipe/${meal.slug}`)"
>
View Recipe
</v-btn>
>>>>>>> 5f25b2492e0263defdf1723cbb47ba536a1a7511:frontend/src/pages/MealPlanThisWeekPage.vue
</v-card>
</v-col>
<v-col order-sm="0" :order-md="getOrder(index)" md="6" sm="12">