michael/enrecipes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

added back try later, adding meal planner

Browse source
This commit is contained in:
Vishnu Raghav B 2020-11-18 02:51:08 +05:30
parent bb54dd67c9
commit 4621821597
10 changed files with 465 additions and 354 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
app/app.scss
View file

@ -14,6 +14,11 @@ $gray9: #212529;
$orange: #ff5200; $orange: #ff5200;
$fabRipple: #ff864d; $fabRipple: #ff864d;
$red: #c92a2a; $red: #c92a2a;
$breakfast: #ffb180;
$lunch: #ceff80;
$dinner: #80ceff;
$snacks: #b180ff;
// Global SCSS styling // Global SCSS styling
// @see https://docs.nativescript.org/ui/styling // @see https://docs.nativescript.org/ui/styling
@ -79,11 +84,13 @@ Page,
color: $gray4; color: $gray4;
background: $gray3; background: $gray3;
} }
.count { .count,
.marker {
color: $gray1; color: $gray1;
background: $gray9; background: $gray9;
} }
.instruction { .instruction,
.dayContainer {
border-color: $gray9; border-color: $gray9;
} }
MDProgress { MDProgress {
@ -142,11 +149,13 @@ Page,
color: $gray8; color: $gray8;
background: #111; background: #111;
} }
.count { .count,
.marker {
color: $gray9; color: $gray9;
background: $gray1; background: $gray1;
} }
.instruction { .instruction,
.dayContainer {
border-color: $gray1; border-color: $gray1;
} }
MDProgress { MDProgress {
@ -362,6 +371,7 @@ RadListView {
// ----------------------------- // -----------------------------
// SETTINGS // SETTINGS
.group-header { .group-header {
text-transform: uppercase;
padding: 8; padding: 8;
} }
.main-container { .main-container {
@ -533,6 +543,52 @@ TextField.combinationToken {
border-width: 0; border-width: 0;
} }
// ----------------------------- // -----------------------------
// MEAL PLANNER
.mealPlanner {
padding: 16 16 128;
width: 100%;
.dayContainer {
padding: 8 0;
color: $gray9;
&.breakfast {
border-radius: 4 4 0 0;
background: $breakfast;
}
&.lunch {
background: $lunch;
}
&.dinner {
background: $dinner;
}
&.snacks {
border-radius: 0 0 4 4;
background: $snacks;
}
.periodLabel {
text-transform: uppercase;
vertical-alignment: center;
font-size: 16;
padding: 0 0 0 16;
}
.recipes {
margin: 8 8 0;
.recipeTitle {
font-size: 14;
padding: 6 8;
line-height: 4;
}
.closeBtn {
margin: 0 8;
vertical-alignment: top;
}
}
MDRipple,
MDButton {
ripple-color: rgba($gray6, 0.2);
}
}
}
// -----------------------------
// DIALOGS // DIALOGS
.dialogContainer { .dialogContainer {
width: 100%; width: 100%;

12
app/components/App.vue
View file

@ -32,7 +32,7 @@
<Label col="0" row="0" class="bx" :text="icon[item.icon]" /> <Label col="0" row="0" class="bx" :text="icon[item.icon]" />
<Label col="2" row="0" :text="item.title" /> <Label col="2" row="0" :text="item.title" />
</GridLayout> </GridLayout>
<!-- <StackLayout class="hr m-8"></StackLayout> --> <StackLayout class="hr m-8"></StackLayout>
<GridLayout <GridLayout
rows="48" rows="48"
columns="auto, 24, *" columns="auto, 24, *"
@ -180,11 +180,11 @@ export default {
component: "Favorites", component: "Favorites",
icon: "heart", icon: "heart",
}, },
// { {
// title: "Try Later", title: "Try Later",
// component: "Try Later", component: "Try Later",
// icon: "trylater", icon: "trylater",
// }, },
], ],
bottommenu: [ bottommenu: [
{ {

510
app/components/EditRecipe.vue
View file

@ -22,273 +22,271 @@
<MDActivityIndicator col="2" v-if="imageLoading" :busy="imageLoading" /> <MDActivityIndicator col="2" v-if="imageLoading" :busy="imageLoading" />
</GridLayout> </GridLayout>
</ActionBar> </ActionBar>
<GridLayout rows="*" columns="*"> <ScrollView
<ScrollView width="100%"
row="0" height="100%"
col="0" @scroll="onScroll"
@scroll="onScroll" scrollBarIndicatorVisible="false"
scrollBarIndicatorVisible="false" >
> <StackLayout width="100%" padding="0 0 128">
<StackLayout width="100%" padding="0 0 128"> <AbsoluteLayout>
<AbsoluteLayout> <StackLayout
<StackLayout width="100%"
:height="screenWidth"
class="imageHolder"
verticalAlignment="center"
>
<Image
v-if="recipeContent.imageSrc"
:src="recipeContent.imageSrc"
stretch="aspectFill"
width="100%" width="100%"
:height="screenWidth" :height="screenWidth"
class="imageHolder" />
verticalAlignment="center" <Label
> v-else
<Image horizontalAlignment="center"
v-if="recipeContent.imageSrc" class="bx"
:src="recipeContent.imageSrc" fontSize="160"
stretch="aspectFill" :text="icon.image"
width="100%" />
:height="screenWidth" </StackLayout>
/> <transition :name="recipeContent.imageSrc ? 'null' : 'bounce'">
<Label <MDFloatingActionButton
v-else v-if="showFab"
horizontalAlignment="center" :top="screenWidth - 44"
class="bx" :left="screenWidth - 88"
fontSize="160" class="bx"
:text="icon.image" src="res://camera"
/> @tap="imageHandler"
</StackLayout> />
<transition :name="recipeContent.imageSrc ? 'null' : 'bounce'"> </transition>
<MDFloatingActionButton </AbsoluteLayout>
v-if="showFab"
:top="screenWidth - 44" <StackLayout margin="0 16">
:left="screenWidth - 88" <AbsoluteLayout class="inputField">
class="bx" <TextField
src="res://camera" hint="My Healthy Recipe"
@tap="imageHandler" v-model="recipeContent.title"
/> @loaded="setInputTypeText($event, 'words')"
</transition> />
<Label top="0" class="fieldLabel" text="Title" />
</AbsoluteLayout> </AbsoluteLayout>
<AbsoluteLayout class="inputField">
<StackLayout margin="0 16"> <TextField
<AbsoluteLayout class="inputField"> :text="recipeContent.category"
editable="false"
@focus="modalOpen === false && showCategories(true)"
@tap="showCategories(false)"
/>
<Label top="0" class="fieldLabel" text="Category" />
</AbsoluteLayout>
<GridLayout columns="*, 8, *">
<AbsoluteLayout class="inputField" col="0">
<TextField <TextField
hint="My Healthy Recipe" ref="yieldQuantity"
v-model="recipeContent.title" v-model="recipeContent.yield.quantity"
@loaded="setInputTypeText($event, 'words')" hint="1"
/>
<Label top="0" class="fieldLabel" text="Title" />
</AbsoluteLayout>
<AbsoluteLayout class="inputField">
<TextField
:text="recipeContent.category"
editable="false"
@focus="modalOpen === false && showCategories(true)"
@tap="showCategories(false)"
/>
<Label top="0" class="fieldLabel" text="Category" />
</AbsoluteLayout>
<GridLayout columns="*, 8, *">
<AbsoluteLayout class="inputField" col="0">
<TextField
ref="yieldQuantity"
v-model="recipeContent.yield.quantity"
hint="1"
keyboardType="number"
/>
<Label top="0" class="fieldLabel" text="Yield quantity" />
</AbsoluteLayout>
<AbsoluteLayout class="inputField" col="2">
<TextField
:text="recipeContent.yield.unit"
editable="false"
@focus="modalOpen === false && showYieldUnits(true)"
@tap="showYieldUnits(false)"
/>
<Label top="0" class="fieldLabel" text="Yield measured in" />
</AbsoluteLayout>
</GridLayout>
<GridLayout columns="*, 8, *">
<AbsoluteLayout class="inputField" col="0">
<TextField
ref="timeRequired"
:text="timeRequired"
editable="false"
@focus="modalOpen === false && setTimeRequired(true)"
@tap="setTimeRequired(false)"
/>
<Label top="0" class="fieldLabel" text="Time required" />
</AbsoluteLayout>
</GridLayout>
<StackLayout class="hr" margin="24 16"></StackLayout>
</StackLayout>
<StackLayout margin="0 16">
<Label text="Ingredients" class="sectionTitle" />
<GridLayout
columns="*,8,auto,8,auto,8,auto"
v-for="(ingredient, index) in recipeContent.ingredients"
:key="index"
>
<TextField
ref="ingredient"
@loaded="focusField($event, 'sentence')"
col="0"
v-model="recipeContent.ingredients[index].item"
:hint="`Item ${index + 1}`"
returnKeyType="next"
/>
<TextField
width="68"
col="2"
v-model="recipeContent.ingredients[index].quantity"
hint="1.00"
keyboardType="number" keyboardType="number"
returnKeyType="next"
/> />
<Label top="0" class="fieldLabel" text="Yield quantity" />
</AbsoluteLayout>
<AbsoluteLayout class="inputField" col="2">
<TextField <TextField
width="68" :text="recipeContent.yield.unit"
col="4"
v-model="recipeContent.ingredients[index].unit"
hint="Unit"
editable="false" editable="false"
@focus="modalOpen === false && showUnits($event, true, index)" @focus="modalOpen === false && showYieldUnits(true)"
@tap="showUnits($event, false, index)" @tap="showYieldUnits(false)"
/> />
<MDButton <Label top="0" class="fieldLabel" text="Yield measured in" />
variant="text" </AbsoluteLayout>
col="6" </GridLayout>
class="bx closeBtn" <GridLayout columns="*, 8, *">
:text="icon.close" <AbsoluteLayout class="inputField" col="0">
@tap="removeIngredient(index)"
/>
</GridLayout>
<MDButton
variant="text"
class="text-btn orkm"
text="+ ADD INGREDIENT"
@tap="addIngredient()"
/>
<StackLayout class="hr" margin="24 16"></StackLayout>
</StackLayout>
<StackLayout margin="0 16">
<Label text="Instructions" class="sectionTitle" />
<GridLayout
columns="*,8,auto"
v-for="(instruction, index) in recipeContent.instructions"
:key="index"
>
<TextView
@loaded="focusField($event, 'multiLine')"
col="0"
:hint="`Step ${index + 1}`"
v-model="recipeContent.instructions[index]"
/>
<MDButton
variant="text"
col="2"
class="bx closeBtn"
:text="icon.close"
@tap="removeInstruction(index)"
/>
</GridLayout>
<MDButton
variant="text"
class="text-btn orkm"
text="+ ADD STEP"
@tap="addInstruction"
/>
<StackLayout class="hr" margin="24 16"></StackLayout>
</StackLayout>
<StackLayout margin="0 16">
<Label text="Notes" class="sectionTitle" />
<GridLayout
columns="*,8,auto"
v-for="(note, index) in recipeContent.notes"
:key="index"
>
<TextView
@loaded="focusField($event, 'multiLine')"
col="0"
:hint="`Note ${index + 1}`"
v-model="recipeContent.notes[index]"
/>
<MDButton
variant="text"
col="2"
class="bx closeBtn"
:text="icon.close"
@tap="removeNote(index)"
/>
</GridLayout>
<MDButton
variant="text"
class="text-btn orkm"
text="+ ADD NOTE"
@tap="addNote"
/>
<StackLayout class="hr" margin="24 16"></StackLayout>
</StackLayout>
<StackLayout margin="0 16">
<Label text="References" class="sectionTitle" />
<GridLayout
columns="*,8,auto"
v-for="(reference, index) in recipeContent.references"
:key="index"
>
<TextView
@loaded="focusField($event, 'multiLine')"
col="0"
v-model="recipeContent.references[index]"
hint="Text or Website/Video URL"
/>
<MDButton
variant="text"
col="2"
class="bx closeBtn"
:text="icon.close"
@tap="removeReference(index)"
/>
</GridLayout>
<MDButton
variant="text"
class="text-btn orkm"
text="+ ADD REFERENCE"
@tap="addReference"
/>
<StackLayout class="hr" margin="24 16"></StackLayout>
</StackLayout>
<StackLayout margin="0 16 24" v-if="recipes.length">
<Label text="Combinations" class="sectionTitle" />
<GridLayout
columns="*,8,auto"
v-for="(combination, index) in recipeContent.combinations"
:key="index"
>
<TextField <TextField
class="combinationToken" ref="timeRequired"
col="0" :text="timeRequired"
:text="getCombinationTitle(combination)"
editable="false" editable="false"
@focus="modalOpen === false && setTimeRequired(true)"
@tap="setTimeRequired(false)"
/> />
<MDButton <Label top="0" class="fieldLabel" text="Time required" />
variant="text" </AbsoluteLayout>
col="2" </GridLayout>
class="bx closeBtn"
:text="icon.close" <StackLayout class="hr" margin="24 16"></StackLayout>
@tap="removeCombination(combination)"
/>
</GridLayout>
<MDButton
variant="text"
class="text-btn orkm"
text="+ ADD COMBINATION"
@tap="showCombinations"
/>
</StackLayout>
</StackLayout> </StackLayout>
</ScrollView>
</GridLayout> <StackLayout margin="0 16">
<Label text="Ingredients" class="sectionTitle" />
<GridLayout
columns="*,8,auto,8,auto,8,auto"
v-for="(ingredient, index) in recipeContent.ingredients"
:key="index"
>
<TextField
ref="ingredient"
@loaded="focusField($event, 'sentence')"
col="0"
v-model="recipeContent.ingredients[index].item"
:hint="`Item ${index + 1}`"
returnKeyType="next"
/>
<TextField
width="68"
col="2"
v-model="recipeContent.ingredients[index].quantity"
hint="1.00"
keyboardType="number"
returnKeyType="next"
/>
<TextField
width="68"
col="4"
v-model="recipeContent.ingredients[index].unit"
hint="Unit"
editable="false"
@focus="modalOpen === false && showUnits($event, true, index)"
@tap="showUnits($event, false, index)"
/>
<MDButton
variant="text"
col="6"
class="bx closeBtn"
:text="icon.close"
@tap="removeIngredient(index)"
/>
</GridLayout>
<MDButton
variant="text"
class="text-btn orkm"
text="+ ADD INGREDIENT"
@tap="addIngredient()"
/>
<StackLayout class="hr" margin="24 16"></StackLayout>
</StackLayout>
<StackLayout margin="0 16">
<Label text="Instructions" class="sectionTitle" />
<GridLayout
columns="*,8,auto"
v-for="(instruction, index) in recipeContent.instructions"
:key="index"
>
<TextView
@loaded="focusField($event, 'multiLine')"
col="0"
:hint="`Step ${index + 1}`"
v-model="recipeContent.instructions[index]"
/>
<MDButton
variant="text"
col="2"
class="bx closeBtn"
:text="icon.close"
@tap="removeInstruction(index)"
/>
</GridLayout>
<MDButton
variant="text"
class="text-btn orkm"
text="+ ADD STEP"
@tap="addInstruction"
/>
<StackLayout class="hr" margin="24 16"></StackLayout>
</StackLayout>
<StackLayout margin="0 16">
<Label text="Notes" class="sectionTitle" />
<GridLayout
columns="*,8,auto"
v-for="(note, index) in recipeContent.notes"
:key="index"
>
<TextView
@loaded="focusField($event, 'multiLine')"
col="0"
:hint="`Note ${index + 1}`"
v-model="recipeContent.notes[index]"
/>
<MDButton
variant="text"
col="2"
class="bx closeBtn"
:text="icon.close"
@tap="removeNote(index)"
/>
</GridLayout>
<MDButton
variant="text"
class="text-btn orkm"
text="+ ADD NOTE"
@tap="addNote"
/>
<StackLayout class="hr" margin="24 16"></StackLayout>
</StackLayout>
<StackLayout margin="0 16">
<Label text="References" class="sectionTitle" />
<GridLayout
columns="*,8,auto"
v-for="(reference, index) in recipeContent.references"
:key="index"
>
<TextView
@loaded="focusField($event, 'multiLine')"
col="0"
v-model="recipeContent.references[index]"
hint="Text or Website/Video URL"
/>
<MDButton
variant="text"
col="2"
class="bx closeBtn"
:text="icon.close"
@tap="removeReference(index)"
/>
</GridLayout>
<MDButton
variant="text"
class="text-btn orkm"
text="+ ADD REFERENCE"
@tap="addReference"
/>
<StackLayout class="hr" margin="24 16"></StackLayout>
</StackLayout>
<StackLayout margin="0 16 24" v-if="recipes.length">
<Label text="Combinations" class="sectionTitle" />
<GridLayout
columns="*,8,auto"
v-for="(combination, index) in recipeContent.combinations"
:key="index"
>
<TextField
class="combinationToken"
col="0"
:text="getCombinationTitle(combination)"
editable="false"
/>
<MDButton
variant="text"
col="2"
class="bx closeBtn"
:text="icon.close"
@tap="removeCombination(combination)"
/>
</GridLayout>
<MDButton
variant="text"
class="text-btn orkm"
text="+ ADD COMBINATION"
@tap="showCombinations"
/>
</StackLayout>
</StackLayout>
</ScrollView>
</Page> </Page>
</template> </template>
@ -760,9 +758,7 @@ export default {
removeInstruction(index) { removeInstruction(index) {
if (this.recipeContent.instructions[index].length) { if (this.recipeContent.instructions[index].length) {
this.fieldDeletionConfirm("instruction").then((res) => { this.fieldDeletionConfirm("instruction").then((res) => {
if (res) { res && this.recipeContent.instructions.splice(index, 1)
this.recipeContent.instructions.splice(index, 1)
}
}) })
} else this.recipeContent.instructions.splice(index, 1) } else this.recipeContent.instructions.splice(index, 1)
}, },

12
app/components/EnRecipes.vue
View file

@ -71,7 +71,7 @@
columns="112, *" columns="112, *"
androidElevation="1" androidElevation="1"
> >
<MDRipple colSpan="2" @tap="viewRecipe(recipe)" /> <MDRipple colSpan="2" @tap="viewRecipe(recipe.id)" />
<GridLayout class="imageHolder card" rows="112" columns="112"> <GridLayout class="imageHolder card" rows="112" columns="112">
<Image <Image
row="0" row="0"
@ -361,11 +361,6 @@ export default {
this.showFAB = false this.showFAB = false
this.releaseGlobalBackEvent() this.releaseGlobalBackEvent()
this.$navigateTo(EditRecipe, { this.$navigateTo(EditRecipe, {
// transition: {
// name: "fade",
// duration: 200,
// curve: "easeOut",
// },
props: { props: {
selectedCategory: this.selectedCategory, selectedCategory: this.selectedCategory,
openAppSettingsPage: this.openAppSettingsPage, openAppSettingsPage: this.openAppSettingsPage,
@ -373,8 +368,7 @@ export default {
}, },
}) })
}, },
viewRecipe(item) { viewRecipe(recipeID) {
let index = this.recipes.indexOf(item)
this.showFAB = false this.showFAB = false
this.$navigateTo(ViewRecipe, { this.$navigateTo(ViewRecipe, {
// transition: { // transition: {
@ -384,7 +378,7 @@ export default {
// }, // },
props: { props: {
filterTrylater: this.filterTrylater, filterTrylater: this.filterTrylater,
recipeID: item.id, recipeID,
hijackGlobalBackEvent: this.hijackGlobalBackEvent, hijackGlobalBackEvent: this.hijackGlobalBackEvent,
releaseGlobalBackEvent: this.releaseGlobalBackEvent, releaseGlobalBackEvent: this.releaseGlobalBackEvent,
}, },

183
app/components/MealPlanner.vue
View file

@ -13,77 +13,49 @@
<Label class="title orkm" text="Meal Planner" col="1" /> <Label class="title orkm" text="Meal Planner" col="1" />
</GridLayout> </GridLayout>
</ActionBar> </ActionBar>
<AbsoluteLayout> <ScrollView
<TabView width="100%" height="100%"> width="100%"
<TabViewItem title="Today"> height="100%"
<ScrollView> scrollBarIndicatorVisible="false"
<StackLayout> @scroll="onScroll"
<Label text="Today" textWrap="true" /> >
</StackLayout> <StackLayout class="mealPlanner">
</ScrollView> <RadCalendar ref="calendar" @dateSelected="onDateSelected">
</TabViewItem> </RadCalendar>
<TabViewItem title="Tomorrow"> <StackLayout
<ScrollView> v-for="(meal, indexB) in mealTimes"
<StackLayout> :key="'meal' + indexB"
<Label text="Today" textWrap="true" /> class="dayContainer"
</StackLayout> :class="meal"
</ScrollView> >
</TabViewItem> <GridLayout columns="*, auto" class="header">
<TabViewItem title="In 2 days"> <Label col="0" class="periodLabel orkm" :text="meal" />
<ScrollView> <MDButton
<StackLayout> col="1"
<Label text="Today" textWrap="true" /> variant="text"
</StackLayout> class="bx addMeal"
</ScrollView> :text="icon.plus"
</TabViewItem> />
<TabViewItem title="In 3 days"> </GridLayout>
<ScrollView> <GridLayout class="recipes" columns="*, auto">
<StackLayout> <MDRipple />
<Label text="Today" textWrap="true" /> <Label
</StackLayout> verticalAlignment="center"
</ScrollView> class="recipeTitle"
</TabViewItem> col="0"
<TabViewItem title="In 4 days"> text="getRecipeTitle(recipeID, indexA, meal)"
<ScrollView> textWrap="true"
<StackLayout> />
<Label text="Today" textWrap="true" /> <MDButton
</StackLayout> variant="text"
</ScrollView> col="1"
</TabViewItem> class="bx closeBtn"
<TabViewItem title="In 5 days"> :text="icon.close"
<ScrollView> />
<StackLayout> </GridLayout>
<Label text="Today" textWrap="true" /> </StackLayout>
</StackLayout> </StackLayout>
</ScrollView> </ScrollView>
</TabViewItem>
<TabViewItem title="In 6 days">
<ScrollView>
<StackLayout>
<Label text="Today" textWrap="true" />
</StackLayout>
</ScrollView>
</TabViewItem>
</TabView>
<GridLayout id="btnFabContainer" rows="*, auto" columns="*, auto">
<MDFloatingActionButton
row="1"
col="1"
src="res://check"
@tap="recipeTried"
v-if="filterTrylater"
/>
<transition name="dolly" appear>
<MDFloatingActionButton
row="1"
col="1"
src="res://share"
@tap="shareHandler"
v-if="!filterTrylater && showFab"
/>
</transition>
</GridLayout>
</AbsoluteLayout>
<!-- <GridLayout rows="*, auto, *, 88" columns="*" class="emptyStateContainer"> <!-- <GridLayout rows="*, auto, *, 88" columns="*" class="emptyStateContainer">
<StackLayout row="1" class="emptyState"> <StackLayout row="1" class="emptyState">
<Label class="title orkm" text="Coming soon!" textWrap="true" /> <Label class="title orkm" text="Coming soon!" textWrap="true" />
@ -95,12 +67,19 @@
<script> <script>
import { ApplicationSettings, Color } from "@nativescript/core" import { ApplicationSettings, Color } from "@nativescript/core"
import { mapState, mapActions } from "vuex" import { mapState, mapActions } from "vuex"
import ViewRecipe from "./ViewRecipe.vue"
import ActionDialogWithSearch from "./modal/ActionDialogWithSearch.vue"
import ConfirmDialog from "./modal/ConfirmDialog.vue"
export default { export default {
props: ["showDrawer", "releaseGlobalBackEvent"], props: ["showDrawer", "hijackGlobalBackEvent", "releaseGlobalBackEvent"],
data() { data() {
return { return {
viewIsScrolled: false, viewIsScrolled: false,
appTheme: "Light", appTheme: "Light",
mealTimes: ["breakfast", "lunch", "dinner", "snacks"],
} }
}, },
computed: { computed: {
@ -119,8 +98,66 @@ export default {
? (this.viewIsScrolled = true) ? (this.viewIsScrolled = true)
: (this.viewIsScrolled = false) : (this.viewIsScrolled = false)
}, },
getDate(index) {
let date = new Date()
date.setDate(date.getDate() + index)
return date.getTime()
},
getDateString(days) {
let date = new Date()
date.setDate(date.getDate() + days)
return date.toDateString().slice(0, -5)
},
getRecipeTitle(id) {
return this.recipes.filter((e) => e.id === id)[0].title
},
// CALENDAR EVENTS // NAVIGATION HANDLERS
viewRecipe(recipeID) {
this.$navigateTo(ViewRecipe, {
props: {
filterTrylater: true,
recipeID,
hijackGlobalBackEvent: this.hijackGlobalBackEvent,
releaseGlobalBackEvent: this.releaseGlobalBackEvent,
},
})
},
// DATA HANDLERS
addRecipe(indexA, meal) {
let existingRecipes = [...this.meals[indexA][meal]]
let filteredRecipes = this.recipes.filter(
(e) => !existingRecipes.includes(e.id)
)
this.$showModal(ActionDialogWithSearch, {
props: {
title: "Select a recipe",
recipes: filteredRecipes,
},
}).then((res) => {
res && this.meals[indexA][meal].push(res)
})
},
removeRecipeConfirm() {
return this.$showModal(ConfirmDialog, {
props: {
title: `Remove recipe`,
cancelButtonText: "CANCEL",
okButtonText: "REMOVE",
},
})
},
removeRecipe(indexA, meal, indexC) {
this.removeRecipeConfirm().then((res) => {
res && this.meals[indexA][meal].splice(indexC, 1)
})
},
// CALENDAR
onDateSelected() {
console.log("hello")
},
}, },
created() { created() {
this.appTheme = ApplicationSettings.getString("appTheme", "Light") this.appTheme = ApplicationSettings.getString("appTheme", "Light")

14
app/components/ViewRecipe.vue
View file

@ -39,16 +39,16 @@
:text="recipe.isFavorite ? icon.heart : icon.heartOutline" :text="recipe.isFavorite ? icon.heart : icon.heartOutline"
@tap="toggleFavorite" @tap="toggleFavorite"
/> />
<!-- <MDButton <MDButton
variant="text"
v-if="!filterTrylater" v-if="!filterTrylater"
variant="text"
class="bx" class="bx"
:text="recipe.tried ? icon.trylaterOutline : icon.trylater" :text="recipe.tried ? icon.trylaterOutline : icon.trylater"
@tap="toggleTrylater" @tap="toggleTrylater"
/> --> />
<MDButton <MDButton
v-else
variant="text" variant="text"
v-if="filterTrylater"
class="bx" class="bx"
:text="icon.share" :text="icon.share"
@tap="shareHandler" @tap="shareHandler"
@ -557,6 +557,7 @@ export default {
"toggleStateAction", "toggleStateAction",
"setCurrentComponentAction", "setCurrentComponentAction",
"overwriteRecipeAction", "overwriteRecipeAction",
"setRecipeAsTriedAction",
]), ]),
onPageLoad() { onPageLoad() {
this.releaseGlobalBackEvent() this.releaseGlobalBackEvent()
@ -781,7 +782,10 @@ export default {
this.toggle("tried") this.toggle("tried")
}, },
recipeTried() { recipeTried() {
this.toggle("tried", true) this.setRecipeAsTriedAction({
id: this.currentRecipeID,
recipe: this.recipe,
})
this.$navigateBack() this.$navigateBack()
}, },

3
app/main.js
View file

@ -20,6 +20,9 @@ Vue.use(FloatingActionButtonPlugin)
import ProgressPlugin from "@nativescript-community/ui-material-progress/vue" import ProgressPlugin from "@nativescript-community/ui-material-progress/vue"
Vue.use(ProgressPlugin) Vue.use(ProgressPlugin)
import CalendarView from "nativescript-ui-calendar/vue"
Vue.use(CalendarView)
Vue.registerElement( Vue.registerElement(
"RadSideDrawer", "RadSideDrawer",
() => require("nativescript-ui-sidedrawer").RadSideDrawer () => require("nativescript-ui-sidedrawer").RadSideDrawer

11
app/store.js
View file

@ -334,6 +334,14 @@ export default new Vuex.Store({
if (setDate) state.recipes[index].lastTried = new Date() if (setDate) state.recipes[index].lastTried = new Date()
EnRecipesDB.updateDocument(id, recipe) EnRecipesDB.updateDocument(id, recipe)
}, },
setRecipeAsTried(state, { id, recipe }) {
let index = state.recipes.indexOf(
state.recipes.filter((e) => e.id === id)[0]
)
state.recipes[index].tried = true
state.recipes[index].lastTried = new Date()
EnRecipesDB.updateDocument(id, recipe)
},
setLastTriedDate(state, index) { setLastTriedDate(state, index) {
state.recipes[index].lastTried = new Date() state.recipes[index].lastTried = new Date()
EnRecipesDB.updateDocument(state.recipes[index].id, state.recipes[index]) EnRecipesDB.updateDocument(state.recipes[index].id, state.recipes[index])
@ -406,6 +414,9 @@ export default new Vuex.Store({
toggleStateAction({ commit }, toggledRecipe) { toggleStateAction({ commit }, toggledRecipe) {
commit("toggleState", toggledRecipe) commit("toggleState", toggledRecipe)
}, },
setRecipeAsTriedAction({ commit }, recipe) {
commit("setRecipeAsTried", recipe)
},
setLastTriedDateAction({ commit }, index) { setLastTriedDateAction({ commit }, index) {
commit("setLastTriedDate", index) commit("setLastTriedDate", index)
}, },

9
package-lock.json generated
View file

@ -5893,6 +5893,15 @@
"resolved": "https://registry.npmjs.org/nativescript-toast/-/nativescript-toast-2.0.0.tgz", "resolved": "https://registry.npmjs.org/nativescript-toast/-/nativescript-toast-2.0.0.tgz",
"integrity": "sha512-xqyNfFS894oGfrEVO7CjpioAQLiLNNcd77Euq9XIUTf1U3W0PsIgAJbLP7+kkVGIJxdLtlBkbcQ4wDmf2DCi1w==" "integrity": "sha512-xqyNfFS894oGfrEVO7CjpioAQLiLNNcd77Euq9XIUTf1U3W0PsIgAJbLP7+kkVGIJxdLtlBkbcQ4wDmf2DCi1w=="
}, },
"nativescript-ui-calendar": {
"version": "7.0.2",
"resolved": "https://registry.npmjs.org/nativescript-ui-calendar/-/nativescript-ui-calendar-7.0.2.tgz",
"integrity": "sha512-yzSZPLFsboYj73BnVG0IYsiKHpPtmL/35QcXd7hC7kWdfjoaiE1eZgtqIRiTsNJaGAp9MeSrBdvuOCe7hI9rEA==",
"requires": {
"nativescript-ui-core": "~4.0.0",
"ts-node": "^8.10.2"
}
},
"nativescript-ui-core": { "nativescript-ui-core": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/nativescript-ui-core/-/nativescript-ui-core-4.0.0.tgz", "resolved": "https://registry.npmjs.org/nativescript-ui-core/-/nativescript-ui-core-4.0.0.tgz",

1
package.json
View file

@ -24,6 +24,7 @@
"nativescript-imagecropper": "^4.0.1", "nativescript-imagecropper": "^4.0.1",
"nativescript-plugin-filepicker": "^1.0.0", "nativescript-plugin-filepicker": "^1.0.0",
"nativescript-toast": "^2.0.0", "nativescript-toast": "^2.0.0",
"nativescript-ui-calendar": "^7.0.2",
"nativescript-ui-listview": "^9.0.4", "nativescript-ui-listview": "^9.0.4",
"nativescript-ui-sidedrawer": "^9.0.3", "nativescript-ui-sidedrawer": "^9.0.3",
"nativescript-vue": "^2.6.1", "nativescript-vue": "^2.6.1",