ching/dsite
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: ching:83a3bd193bc71efba4beaebf55015eed917ceaaa
Branches Tags
ching:master
ching:feature/ingredient-summary-2022-02-05
ching:develop
ching:vr20220205
ching:vr2022-02-13a
ching:r2022-02-13
..
compare: ching:1277accf5c1f49b9fb9502fbcda1450b96189659
Branches Tags
ching:feature/ingredient-summary-2022-02-05
ching:develop
ching:master
ching:vr20220205
ching:vr2022-02-13a
ching:r2022-02-13

No commits in common. "83a3bd193bc71efba4beaebf55015eed917ceaaa" and "1277accf5c1f49b9fb9502fbcda1450b96189659" have entirely different histories.
83a3bd193b ... 1277accf5c

6 changed files with 30 additions and 163 deletions
Show Stats Expand all files Collapse all files

45
frontend/src/components/input_recipe.vue
View File

@ -1,5 +1,5 @@
<template>
<el-row justify="left" gutter="10">
<el-row justify="left">
<el-col>
<el-form :rules="rules" ref="form" :model="form" label-position="left">
<el-form-item label="名字" prop="name">
@ -54,7 +54,6 @@
<el-input type="textarea" v-model="form.note"></el-input>
</el-form-item>
<el-form-item>
<el-col :span="12" v-if="recipe_id">
<el-button
type="primary"
plain
@ -62,25 +61,6 @@
@click="onSubmit(recipe_id)"
>提交</el-button
>
</el-col>
<el-col :span="24" v-else>
<el-button
type="primary"
plain
class="summit-recipe"
@click="onSubmit(recipe_id)"
>提交</el-button
>
</el-col>
<el-col :span="12" v-if="recipe_id">
<el-button
type="danger"
plain
class="summit-recipe"
@click="onSubmitDelete(recipe_id)"
>删除</el-button
>
</el-col>
</el-form-item>
</el-form>
</el-col>
@ -89,8 +69,6 @@
<script>
import axios from 'axios';
import config from '@/config/index';
import { ElMessage } from 'element-plus';
export default {
props: ['recipe_'],
watch: {
@ -127,10 +105,6 @@ export default {
axios
.post(config.publicPath + '/recipe/recipe/', data)
.then(function() {
ElMessage({
message: '创建成功.',
type: 'success',
});
location.reload();
})
.catch(function(error) {
@ -140,26 +114,12 @@ export default {
axios
.put(config.publicPath + '/recipe/recipe/' + recipe_id, data)
.then(function() {
ElMessage({
message: '修改成功.',
type: 'success',
});
})
.catch(function (error) {
console.log(error);
});
}
},
onSubmitDelete(recipe_id) {
axios
.delete(config.publicPath + '/recipe/recipe/' + recipe_id)
.then(function () {
ElMessage.error('删除成功.');
location.reload();
})
.catch(function(error) {
console.log(error);
});
}
},
},
};
@ -168,6 +128,5 @@ export default {
<style scoped>
.summit-recipe {
width: 100%;
margin-bottom: 10px;
}
</style>

53
frontend/src/components/recipe-mobile/recipe-edit.vue
View File

@ -43,12 +43,10 @@
/>
</van-cell-group>
<div class="recipe-create">
<van-row gutter="20">
<van-col span="12" v-if="recipe_id">
<van-button
class="submit-button"
round
type="primary"
block
plain
hairline
:disabled="disable_submit"
@ -56,34 +54,6 @@
:loading="loading"
>提交</van-button
>
</van-col>
<van-col span="24" v-else>
<van-button
class="submit-button"
round
type="primary"
plain
hairline
:disabled="disable_submit"
@click="onSubmit(recipe_id)"
:loading="loading"
>提交</van-button
>
</van-col>
<van-col span="12" v-if="recipe_id">
<van-button
class="submit-button"
round
type="danger"
plain
hairline
:disabled="disable_submit"
@click="onSubmitDelete(recipe_id)"
:loading="loading"
>删除</van-button
>
</van-col>
</van-row>
</div>
</van-form>
</template>
@ -98,8 +68,6 @@ import {
Rate,
Button,
Toast,
Col,
Row,
} from 'vant';
import axios from 'axios';
import config from '@/config/index';
@ -122,8 +90,6 @@ export default {
[RadioGroup.name]: RadioGroup,
[Rate.name]: Rate,
[Button.name]: Button,
[Col.name]: Col,
[Row.name]: Row,
},
data() {
return {
@ -171,20 +137,6 @@ export default {
);
}
},
onSubmitDelete(recipe_id) {
if (!this.form.name) {
return;
}
this.loading = true;
axios.delete(config.publicPath + '/recipe/recipe/' + recipe_id).then(
(Toast.success({
message: '删除成功',
forbidClick: true,
duration: 500,
}),
(this.loading = false))
);
},
},
};
</script>
@ -192,7 +144,4 @@ export default {
.recipe-create {
margin: 20px 16px;
}
.submit-button {
width: 100%;
}
</style>

18
recipe/migrations/0003_recipe_status.py
View File

@ -1,18 +0,0 @@
# Generated by Django 3.2.6 on 2022-02-04 16:13
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('recipe', '0002_auto_20211002_1926'),
]
operations = [
migrations.AddField(
model_name='recipe',
name='status',
field=models.CharField(default='active', max_length=32),
),
]

22
recipe/models.py
View File

@ -9,7 +9,6 @@ import utils
class Recipe(models.Model):
name = models.CharField(max_length=128)
recipe_type = models.CharField(max_length=32, default=const.RECIPE_TYPE_MEAT)
status = models.CharField(max_length=32, default=const.RECIPE_STATUS_ACTIVE)
note = models.TextField(null=True)
rate = models.IntegerField(default=0)
difficulty = models.IntegerField(default=0)
@ -126,12 +125,7 @@ class DailyRecipe(models.Model):
# meat
for x in range(0, 2):
while True:
recipe = (
Recipe.objects.filter(recipe_type=const.RECIPE_TYPE_MEAT)
.exclude(status=const.RECIPE_STATUS_DELETED)
.order_by('?')
.first()
)
recipe = Recipe.objects.filter(recipe_type=const.RECIPE_TYPE_MEAT).order_by('?').first()
if recipe and recipe.id not in recipes and recipe.id not in prev_recipes:
recipes.append(recipe.id)
break
@ -144,12 +138,7 @@ class DailyRecipe(models.Model):
# vegetable
for x in range(0, 1):
while True:
recipe = (
Recipe.objects.filter(recipe_type=const.RECIPE_TYPE_VEGETABLE)
.exclude(status=const.RECIPE_STATUS_DELETED)
.order_by('?')
.first()
)
recipe = Recipe.objects.filter(recipe_type=const.RECIPE_TYPE_VEGETABLE).order_by('?').first()
if recipe and recipe.id not in recipes and recipe.id not in prev_recipes:
recipes.append(recipe.id)
break
@ -161,12 +150,7 @@ class DailyRecipe(models.Model):
# soup
if random.randint(0, 2):
recipe = (
Recipe.objects.filter(recipe_type=const.RECIPE_TYPE_SOUP)
.exclude(status=const.RECIPE_STATUS_DELETED)
.order_by('?')
.first()
)
recipe = Recipe.objects.filter(recipe_type=const.RECIPE_TYPE_SOUP).order_by('?').first()
# if recipe not in recipes and recipe not in prev_recipes:
if recipe:
recipes.append(recipe.id)

8
recipe/views.py
View File

@ -12,7 +12,7 @@ import recipe.serializers
from utils import const
class RecipeAPI(rest_framework.generics.RetrieveUpdateDestroyAPIView):
class RecipeAPI(rest_framework.generics.RetrieveUpdateAPIView):
# authentication_classes = (authentication.TokenAuthentication,
# authentication.SessionAuthentication,
@ -21,10 +21,6 @@ class RecipeAPI(rest_framework.generics.RetrieveUpdateDestroyAPIView):
queryset = recipe.models.Recipe.objects.all()
serializer_class = recipe.serializers.RecipeSerializer
def perform_destroy(self, instance):
instance.status = const.RECIPE_STATUS_DELETED
instance.save(update_fields=['status'])
class RecipeListAPI(rest_framework.generics.ListAPIView, rest_framework.generics.CreateAPIView):
@ -32,7 +28,7 @@ class RecipeListAPI(rest_framework.generics.ListAPIView, rest_framework.generics
# authentication.SessionAuthentication,
# authentication.BasicAuthentication)
# permission_classes = (permissions.IsAuthenticated,)
queryset = recipe.models.Recipe.objects.exclude(status=const.RECIPE_STATUS_DELETED)
queryset = recipe.models.Recipe.objects.all()
serializer_class = recipe.serializers.RecipeSerializer
filterset_fields = {
'recipe_type': const.FILTER_EXACT,

3
utils/const.py
View File

@ -11,9 +11,6 @@ RECIPE_TYPE_MEAT = 'meat'
RECIPE_TYPE_VEGETABLE = 'vegetable'
RECIPE_TYPE_SOUP = 'soup'
RECIPE_STATUS_ACTIVE = 'active'
RECIPE_STATUS_DELETED = 'deleted'
RECIPE_TYPE_CHOICE = [RECIPE_TYPE_MEAT, RECIPE_TYPE_VEGETABLE, RECIPE_TYPE_SOUP]
FILTER_EXACT = ['exact']