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

layout improvements

Browse Source
This commit is contained in:
vabene1111
2020-06-11 10:59:26 +02:00
parent 729d573460
commit dfe8e1fd42
1 changed files with 26 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
cookbook/templates/meal_plan.html
View File

@@ -24,10 +24,6 @@
{% block content %} {% block content %}
<div id="app"> <div id="app">
<h3>
{% trans 'Meal-Plan' %}
</h3>
<div class="row"> <div class="row">
<div class="col-md-4 offset-md-4"> <div class="col-md-4 offset-md-4">
<div class="input-group" style="margin-top: 8px; margin-bottom: 8px"> <div class="input-group" style="margin-top: 8px; margin-bottom: 8px">
@@ -47,7 +43,6 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<table class="table table-sm table-striped table-responsive-sm"> <table class="table table-sm table-striped table-responsive-sm">
@@ -74,10 +69,10 @@
<a href="#" v-if="element.title !== ''" <a href="#" v-if="element.title !== ''"
@click="plan_detail = element" data-toggle="modal" @click="plan_detail = element" data-toggle="modal"
data-target="#exampleModal">[[element.title]]</a> data-target="#exampleModal">[[element.title]]</a>
<a href="#" v-if="element.recipe_name !== ''" @click="plan_detail = element" <a href="#" v-else-if="element.recipe_name !== ''" @click="plan_detail = element"
data-toggle="modal" data-toggle="modal"
data-target="#exampleModal">[[element.recipe_name]]</a> data-target="#exampleModal">[[element.recipe_name]]</a>
<a href="#" v-if="element.name !== ''" <a href="#" v-else-if="element.name !== ''"
@click="plan_detail = element" data-toggle="modal" @click="plan_detail = element" data-toggle="modal"
data-target="#exampleModal">[[element.name]]</a> data-target="#exampleModal">[[element.name]]</a>
</div> </div>
@@ -92,51 +87,48 @@
</div> </div>
<hr/> <hr/>
<div class="row">
<div class="col-md-6">
<div class="card"> <div class="card">
<div class="card-header"> <div class="card-header">
{% trans 'Recipes' %} <i class="fas fa-calendar-plus"></i> {% trans 'New Entry' %}
</div> </div>
<div class="row">
<div class="col-md-6">
<div class="card-body"> <div class="card-body">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<input type="text" class="form-control" v-model="recipe_query" @keyup="getRecipes" <input type="text" class="form-control" v-model="recipe_query" @keyup="getRecipes"
placeholder="{% trans 'Search Recipe' %}"> placeholder="{% trans 'Search Recipe' %}" style="margin-bottom: 8px">
<!-- TODO remove recipes by backdropping them --> <!-- TODO remove recipes by backdropping them -->
</div> </div>
</div> </div>
<draggable class="list-group" :list="recipes" <draggable class="list-group" :list="recipes"
:group="{ name: 'plan', pull: 'clone', put: false }" :clone="cloneRecipe"> :group="{ name: 'plan', pull: 'clone', put: false }" :clone="cloneRecipe">
<div class="list-group-item" v-for="(element, index) in recipes" :key="element.id"> <div class="list-group-item" v-for="(element, index) in recipes" :key="element.id">
<a href="#">[[element.name]]</a> <i class="fas fa-arrows-alt"></i> <a href="#">[[element.name]]</a>
</div> </div>
</draggable> </draggable>
</div> </div>
</div> </div>
</div>
<div class="col-md-6"> <div class="col-md-6">
<div :key="-1"> <div>
<div class="card">
<div class="card-header">
{% trans 'New Note' %}
</div>
<div class="card-body"> <div class="card-body">
<input type="text" class="form-control" v-model="new_note_title" <input type="text" class="form-control" v-model="new_note_title"
placeholder="{% trans 'Title' %}"> placeholder="{% trans 'Title' %}" style="margin-bottom: 8px">
<textarea class="form-control" v-model="new_note_text" <textarea class="form-control" v-model="new_note_text"
placeholder="{% trans 'Note (optional)' %}"></textarea> placeholder="{% trans 'Note (optional)' %}"></textarea>
<br/>
<draggable :list="pseudo_note_list" <draggable :list="pseudo_note_list"
:group="{ name: 'plan', pull: 'clone', put: false }" :clone="cloneNote"> :group="{ name: 'plan', pull: 'clone', put: false }" :clone="cloneNote">
<div class="list-group-item" v-for="(element, index) in pseudo_note_list" <div class="list-group-item" v-for="(element, index) in pseudo_note_list"
:key="element.id"> :key="element.id">
<button class="btn">{% trans 'Drag me' %}</button> <i class="fas fa-arrows-alt"></i> {% trans 'Create only note' %}
</div> </div>
</draggable> </draggable>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@@ -219,7 +211,7 @@
plan_entries: [], plan_entries: [],
meal_types: [], meal_types: [],
meal_plan: {}, meal_plan: {},
plan_detail: {shared:[]}, plan_detail: {shared: []},
recipes: [], recipes: [],
recipe_query: '', recipe_query: '',
pseudo_note_list: [ pseudo_note_list: [
@@ -236,7 +228,7 @@
this.default_shared_users = [{% for u in request.user.userpreference.plan_share.all %} this.default_shared_users = [{% for u in request.user.userpreference.plan_share.all %}
{{ u.pk }}, {{ u.pk }},
{% endfor %}] {% endfor %} {{ request.user.pk }}]
this.user_id_update = Array.from(this.default_shared_users) this.user_id_update = Array.from(this.default_shared_users)
@@ -292,7 +284,7 @@
this.meal_plan[e.meal_type].days[e.date].items.push(e) this.meal_plan[e.meal_type].days[e.date].items.push(e)
for (let u of e.shared) { for (let u of e.shared) {
if (! this.user_id_update.includes(parseInt(u))){ if (!this.user_id_update.includes(parseInt(u))) {
this.user_id_update.push(parseInt(u)) this.user_id_update.push(parseInt(u))
} }
} }
@@ -312,9 +304,9 @@
console.log(err); console.log(err);
}) })
}, },
updateUserNames: function(){ updateUserNames: function () {
console.log("UPDATE USER NAMES EXECUTED") console.log("UPDATE USER NAMES EXECUTED")
return this.$http.get("{% url 'api:username-list' %}?filter_list=["+this.user_id_update+']').then((response) => { return this.$http.get("{% url 'api:username-list' %}?filter_list=[" + this.user_id_update + ']').then((response) => {
for (let u of response.data) { for (let u of response.data) {
let name = u.username let name = u.username
if (`${u.first_name} ${u.last_name}` !== ' ') { if (`${u.first_name} ${u.last_name}` !== ' ') {
@@ -375,6 +367,8 @@
id: Math.round(Math.random() * 1000) + 10000, id: Math.round(Math.random() * 1000) + 10000,
recipe: recipe.id, recipe: recipe.id,
recipe_name: recipe.name, recipe_name: recipe.name,
title: this.new_note_title,
note: this.new_note_text,
is_new: true is_new: true
} }
}, },