From 7f6448d0ec99c4d66c3581959645468bfd1168d6 Mon Sep 17 00:00:00 2001
From: Ching <loooching@gmail.com>
Date: Sun, 3 Oct 2021 22:35:40 +0800
Subject: [PATCH] =?UTF-8?q?feat(week=20recipe=20page):=20[A]=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90=E6=AF=8F=E5=91=A8?=
 =?UTF-8?q?=E8=8F=9C=E8=B0=B1=E9=80=BB=E8=BE=91=EF=BC=9B=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[A] 增加重新生成每周菜谱逻辑；一些样式调整

Signed-off-by: Ching <loooching@gmail.com>
---
 frontend/src/components/input_recipe.vue |  12 +-
 frontend/src/components/recipe_list.vue  | 103 +++++++++++++++++
 frontend/src/components/week_recipe.vue  |  93 ++++++++++++++++
 frontend/src/router/index.js             |   8 +-
 frontend/src/views/home.vue              | 134 +++++------------------
 frontend/src/views/recipeDetail.vue      |   1 +
 frontend/src/views/weekRecipe.vue        |  34 ++++++
 recipe/models.py                         |   3 +-
 recipe/views.py                          |   6 +-
 9 files changed, 283 insertions(+), 111 deletions(-)
 create mode 100644 frontend/src/components/recipe_list.vue
 create mode 100644 frontend/src/components/week_recipe.vue
 create mode 100644 frontend/src/views/weekRecipe.vue

diff --git a/frontend/src/components/input_recipe.vue b/frontend/src/components/input_recipe.vue
index 37eea5a..0f80b62 100644
--- a/frontend/src/components/input_recipe.vue
+++ b/frontend/src/components/input_recipe.vue
@@ -54,7 +54,11 @@
           <el-input type="textarea" v-model="form.note"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="onSubmit(recipe_id)"
+          <el-button
+            type="primary"
+            plain
+            class="summit-recipe"
+            @click="onSubmit(recipe_id)"
             >提交</el-button
           >
         </el-form-item>
@@ -119,3 +123,9 @@ export default {
   },
 };
 </script>
+
+<style scoped>
+.summit-recipe {
+  width: 100%;
+}
+</style>
diff --git a/frontend/src/components/recipe_list.vue b/frontend/src/components/recipe_list.vue
new file mode 100644
index 0000000..67ce9d7
--- /dev/null
+++ b/frontend/src/components/recipe_list.vue
@@ -0,0 +1,103 @@
+<template>
+  <el-table :data="recipes" max-height="500" class="recipe-table">
+    <el-table-column prop="name" label="名字"> </el-table-column>
+    <el-table-column
+      prop="recipe_type"
+      label="类型"
+      :formatter="formatRecipeType"
+      :filters="[
+        { text: '青菜', value: 'vegetable' },
+        { text: '肉', value: 'meat' },
+        { text: '汤', value: 'soup' },
+      ]"
+      :filter-method="filterRecipeType"
+    >
+    </el-table-column>
+    <el-table-column
+      prop="difficulty"
+      label="难度"
+      :formatter="formatDifficulty"
+      sortable
+    >
+    </el-table-column>
+    <el-table-column prop="rate" label="评分" :formatter="formatRate" sortable>
+    </el-table-column>
+    <el-table-column label="操作">
+      <template #default="scope">
+        <el-button size="mini" @click="editRecipe(scope.row)">
+          编辑
+        </el-button>
+      </template>
+    </el-table-column>
+  </el-table>
+</template>
+
+<script>
+import axios from 'axios';
+import router from '@/router/index';
+
+const type_map = {
+  vegetable: '青菜',
+  meat: '肉',
+  soup: '汤',
+};
+const rate_map = {
+  1: '🍚',
+  2: '🍚 🍚',
+  3: '🍚 🍚 🍚',
+  4: '🍚 🍚 🍚 🍚',
+  5: '🍚 🍚 🍚 🍚 🍚',
+};
+const difficulty_map = {
+  1: '⭐',
+  2: '⭐ ⭐',
+  3: '⭐ ⭐ ⭐',
+  4: '⭐ ⭐ ⭐ ⭐',
+  5: '⭐ ⭐ ⭐ ⭐ ⭐',
+};
+function formatRecipeType(row) {
+  return type_map[row.recipe_type];
+}
+function formatRate(row) {
+  return rate_map[row.rate];
+}
+function formatDifficulty(row) {
+  return difficulty_map[row.difficulty];
+}
+export default {
+  name: 'RecipeList',
+  // provide() {
+  //   return {
+  //     reload: this.reload,
+  //   };
+  // },
+  methods: {
+    reload() {
+      this.isRouterAlive = false;
+      this.$nextTick(function() {
+        this.isRouterAlive = true;
+      });
+    },
+    filterRecipeType(value, row) {
+      return row.recipe_type === value;
+    },
+    editRecipe(row) {
+      router.push({ name: 'RecipeDetail', params: { id: row.id } });
+    },
+  },
+  data: function() {
+    return {
+      recipes: [],
+      formatRecipeType,
+      formatRate,
+      formatDifficulty,
+      isRouterAlive: true,
+    };
+  },
+  mounted() {
+    axios
+      .get('//localhost:8000/recipe/recipe/')
+      .then((response) => (this.recipes = response.data));
+  },
+};
+</script>
diff --git a/frontend/src/components/week_recipe.vue b/frontend/src/components/week_recipe.vue
new file mode 100644
index 0000000..c560990
--- /dev/null
+++ b/frontend/src/components/week_recipe.vue
@@ -0,0 +1,93 @@
+<template>
+  <el-row justify="center">
+    <el-col>
+      <el-table border stripe :data="daily_recipes" max-height="500">
+        <el-table-column
+          prop="date"
+          label="日期"
+          :formatter="formatDate"
+        ></el-table-column>
+        <el-table-column
+          prop="meat"
+          label="肉"
+          :formatter="formatMeal"
+        ></el-table-column>
+        <el-table-column
+          prop="vegetable"
+          label="菜"
+          :formatter="formatMeal"
+        ></el-table-column>
+        <el-table-column
+          prop="soup"
+          label="汤"
+          :formatter="formatMeal"
+        ></el-table-column>
+      </el-table>
+    </el-col>
+    <el-col>
+      <el-button
+        type="primary"
+        plain
+        class="re-generate"
+        @click="reGenerateRecipe()"
+        >重新生成</el-button
+      >
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import axios from 'axios';
+
+function formatDate(row, column, cellValue) {
+  if (cellValue === undefined) {
+    return;
+  }
+  var date_ = new Date(cellValue * 1000);
+  return date_.toDateString();
+}
+
+function formatMeal(row, column, cellValue) {
+  var data = ['/ '];
+  if (cellValue === undefined) {
+    return;
+  }
+  for (let i = 0; i < cellValue.length; i++) {
+    data.push(cellValue[i].name + ' / ');
+  }
+  return data;
+}
+export default {
+  name: 'WeekRecipe',
+  data: function() {
+    return {
+      daily_recipes: [],
+      formatDate,
+      formatMeal,
+    };
+  },
+  mounted() {
+    axios
+      .get('//localhost:8000/recipe/week-recipe/')
+      .then((response) => (this.daily_recipes = response.data));
+  },
+  methods: {
+    reGenerateRecipe() {
+      axios
+        .post('//localhost:8000/recipe/week-recipe/')
+        .then((response) => {
+          response;
+          return axios.get('//localhost:8000/recipe/week-recipe/');
+        })
+        .then((response) => (this.daily_recipes = response.data));
+    },
+  },
+};
+</script>
+
+<style>
+.re-generate {
+  margin: 20px 0;
+  width: 100%;
+}
+</style>
diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js
index 1a5693c..0368594 100644
--- a/frontend/src/router/index.js
+++ b/frontend/src/router/index.js
@@ -1,6 +1,7 @@
 import { createRouter, createWebHistory } from 'vue-router'
 import Home from '@/views/home.vue'
 import RecipeDetail from '@/views/recipeDetail.vue'
+import WeekRecipe from '@/views/weekRecipe.vue'
 
 const routes = [
   {
@@ -12,7 +13,12 @@ const routes = [
     path: '/recipe/:id',
     name: "RecipeDetail",
     component: RecipeDetail
-  }
+  },
+  {
+    path: '/week-recipe/',
+    name: "WeekRecipe",
+    component: WeekRecipe
+  },
 ];
 
 const router = createRouter({
diff --git a/frontend/src/views/home.vue b/frontend/src/views/home.vue
index fc8c6ae..38422b5 100644
--- a/frontend/src/views/home.vue
+++ b/frontend/src/views/home.vue
@@ -1,118 +1,40 @@
 <template>
-  <el-row justify="center">
-    <el-col :span="18">
-      <el-table :data="recipes" max-height="500" class="recipe-table">
-        <el-table-column prop="name" label="名字"> </el-table-column>
-        <el-table-column
-          prop="recipe_type"
-          label="类型"
-          :formatter="formatRecipeType"
-          :filters="[
-            { text: '青菜', value: 'vegetable' },
-            { text: '肉', value: 'meat' },
-            { text: '汤', value: 'soup' },
-          ]"
-          :filter-method="filterRecipeType"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="difficulty"
-          label="难度"
-          :formatter="formatDifficulty"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column
-          prop="rate"
-          label="评分"
-          :formatter="formatRate"
-          sortable
-        >
-        </el-table-column>
-        <el-table-column label="操作">
-          <template #default="scope">
-            <el-button size="mini" @click="editRecipe(scope.row)">
-              编辑
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-col>
-  </el-row>
-  <el-row justify="center">
-    <el-col :span="18"> <input_recipe :recipe="{}"></input_recipe> </el-col>
-  </el-row>
+  <el-container>
+    <el-header>
+      <el-menu mode="horizontal" default-active="/" router>
+        <el-menu-item index="/">
+          首页
+        </el-menu-item>
+        <el-menu-item index="/week-recipe/">
+          每周菜谱
+        </el-menu-item>
+      </el-menu>
+    </el-header>
+    <el-main>
+      <el-row justify="center">
+        <el-col>
+          <recipe_list></recipe_list>
+        </el-col>
+      </el-row>
+      <el-row justify="center">
+        <el-col>
+          <input_recipe :recipe="{}"></input_recipe>
+        </el-col>
+      </el-row>
+    </el-main>
+  </el-container>
 </template>
 
 <script>
-import axios from 'axios';
 import input_recipe from '@/components/input_recipe.vue';
-import router from '@/router/index';
+import recipe_list from '@/components/recipe_list.vue';
 import 'element-plus/dist/index.css';
-// const api_root = 'localhost:8000'
-const type_map = {
-  vegetable: '青菜',
-  meat: '肉',
-  soup: '汤',
-};
-const rate_map = {
-  1: '🍚',
-  2: '🍚 🍚',
-  3: '🍚 🍚 🍚',
-  4: '🍚 🍚 🍚 🍚',
-  5: '🍚 🍚 🍚 🍚 🍚',
-};
-const difficulty_map = {
-  1: '⭐',
-  2: '⭐ ⭐',
-  3: '⭐ ⭐ ⭐',
-  4: '⭐ ⭐ ⭐ ⭐',
-  5: '⭐ ⭐ ⭐ ⭐ ⭐',
-};
-function formatRecipeType(row) {
-  return type_map[row.recipe_type];
-}
-function formatRate(row) {
-  return rate_map[row.rate];
-}
-function formatDifficulty(row) {
-  return difficulty_map[row.difficulty];
-}
+
 export default {
-  components: { input_recipe },
   name: 'Home',
-  provide() {
-    return {
-      reload: this.reload,
-    };
-  },
-  methods: {
-    reload() {
-      this.isRouterAlive = false;
-      this.$nextTick(function() {
-        this.isRouterAlive = true;
-      });
-    },
-    filterRecipeType(value, row) {
-      return row.recipe_type === value;
-    },
-    editRecipe(row) {
-      router.push({ name: 'RecipeDetail', params: { id: row.id } });
-    },
-  },
+  components: { input_recipe, recipe_list },
   data: function() {
-    return {
-      recipes: '',
-      formatRecipeType,
-      formatRate,
-      formatDifficulty,
-      isRouterAlive: true,
-    };
-  },
-  mounted() {
-    axios
-      .get('//localhost:8000/recipe/recipe/')
-      .then((response) => (this.recipes = response.data));
+    return {};
   },
 };
 </script>
diff --git a/frontend/src/views/recipeDetail.vue b/frontend/src/views/recipeDetail.vue
index 15c5528..6a7f080 100644
--- a/frontend/src/views/recipeDetail.vue
+++ b/frontend/src/views/recipeDetail.vue
@@ -1,5 +1,6 @@
 <template>
   <el-page-header
+    icon="el-icon-arrow-left"
     @back="goHome"
     title="首页"
     v-bind:content="recipe.name"
diff --git a/frontend/src/views/weekRecipe.vue b/frontend/src/views/weekRecipe.vue
new file mode 100644
index 0000000..b6a9cfd
--- /dev/null
+++ b/frontend/src/views/weekRecipe.vue
@@ -0,0 +1,34 @@
+<template>
+  <el-container>
+    <el-header>
+      <el-menu mode="horizontal" default-active="/week-recipe/" router>
+        <el-menu-item index="/">
+          首页
+        </el-menu-item>
+        <el-menu-item index="/week-recipe/">
+          每周菜谱
+        </el-menu-item>
+      </el-menu>
+    </el-header>
+    <el-main>
+      <el-row justify="center">
+        <el-col>
+          <week_recipe></week_recipe>
+        </el-col>
+      </el-row>
+    </el-main>
+  </el-container>
+</template>
+
+<script>
+import week_recipe from '@/components/week_recipe.vue';
+export default {
+  name: 'WeekRecipe',
+  components: { week_recipe },
+  data: function() {
+    return {};
+  },
+};
+</script>
+
+<style></style>
diff --git a/recipe/models.py b/recipe/models.py
index 40d65d9..cbc3021 100644
--- a/recipe/models.py
+++ b/recipe/models.py
@@ -96,6 +96,7 @@ class DailyRecipe(models.Model):
         value_.append(recipe.serialize())
 
     date = now()
-    date.replace(year=self.date.year, month=self.date.month, day=self.date.day,)
+    date = date.replace(year=self.date.year, month=self.date.month,
+                        day=self.date.day, hour=0, minute=0)
     data['date'] = utils.timestamp_of(utils.day_start(date))
     return data
diff --git a/recipe/views.py b/recipe/views.py
index a5ad0ff..8735aaa 100644
--- a/recipe/views.py
+++ b/recipe/views.py
@@ -42,7 +42,7 @@ class WeekRecipeListAPI(rest_framework.generics.ListAPIView,
     recipes = []
     for x in range(0, 7-today.weekday()):
       daily_recipe, __ = recipe.models.DailyRecipe.objects.get_or_create(
-        date=today + datetime.timedelta(days=1)
+        date=today + datetime.timedelta(days=x)
       )
       daily_recipe.generate_recipe()
       recipes.append(daily_recipe.recipes.values_list('id', flat=True))
@@ -56,7 +56,9 @@ class WeekRecipeListAPI(rest_framework.generics.ListAPIView,
       date__gte=week_start,
       date__lte=week_end,
     ).order_by('date')
-    data = []
+    data = [{}] * (7 - len(daily_recipes))
+
     for daily_recipe in daily_recipes:
       data.append(daily_recipe.serialize())
+
     return Response(data)