From 5164279311117bf11d34edcced47093acccc6ccb Mon Sep 17 00:00:00 2001
From: YunYouJun <me@yunyoujun.cn>
Date: Sun, 30 Jul 2023 16:31:37 +0800
Subject: [PATCH] fix: useStorage in ssr & extract random

---
 README.md                       |   4 +-
 components/BaseFooter.vue       |   6 --
 components/BasketButton.vue     |   3 +-
 components/ChooseFood.vue       | 152 +++++++++++++++-----------------
 components/RandomRecipe.vue     |  15 ++--
 components/RecipePanel.vue      |  39 ++++----
 components/RecipePanelTitle.vue |   5 ++
 components/WrapperMd.vue        |  16 ----
 composables/recipe.ts           |  19 ++++
 composables/store/recipe.ts     |  20 +----
 pages/index.vue                 |   4 +-
 pnpm-lock.yaml                  |   2 +-
 utils/random.ts                 |  10 +++
 13 files changed, 147 insertions(+), 148 deletions(-)
 create mode 100644 components/RecipePanelTitle.vue
 delete mode 100644 components/WrapperMd.vue
 create mode 100644 composables/recipe.ts
 create mode 100644 utils/random.ts

diff --git a/README.md b/README.md
index 9a6485c..6aed2a9 100644
--- a/README.md
+++ b/README.md
@@ -31,9 +31,9 @@
   - [居家菜谱投稿](https://docs.qq.com/form/page/DWk9GWW9oTmlXZU9V)
   - [反馈建议分享-兔小巢](https://support.qq.com/products/507827)
 
-<!-- ### Features -->
+### Features
 
-<!-- 本项目支持 PWA，使用浏览器打开时，可将其添加到主屏幕以获得近原生 APP 的体验。 -->
+本项目支持 PWA，使用浏览器打开时，可将其添加到主屏幕以获得近原生 APP 的体验。
 
 ## 开发
 
diff --git a/components/BaseFooter.vue b/components/BaseFooter.vue
index 79cdb29..6520b3e 100644
--- a/components/BaseFooter.vue
+++ b/components/BaseFooter.vue
@@ -52,11 +52,5 @@ const buildDate = (new Date(Number.parseInt(now) * 1000)).toLocaleDateString()
         云乐坊工作室
       </a>
     </div>
-    <!-- 欢迎赞助 -->
-    <!-- <div m="t-2" opacity="80" class="footer-support flex justify-center items-center">
-      <span>本网站由</span><a class="footer-support-logo" href="https://www.upyun.com" target="blank" title="又拍云">
-        <img m="x-1" width="50" src="https://cdn.yunyoujun.cn/img/logo/upyun-logo.png" alt="又拍云">
-      </a><span>提供 CDN 加速</span>
-    </div> -->
   </div>
 </template>
diff --git a/components/BasketButton.vue b/components/BasketButton.vue
index f394aca..bec09be 100644
--- a/components/BasketButton.vue
+++ b/components/BasketButton.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup>
 import { storeToRefs } from 'pinia'
+import recipes from '~/data/recipe.json'
 
 defineProps({
   isVisible: Boolean,
@@ -11,7 +12,7 @@ const { displayedRecipe } = storeToRefs(rStore)
 
 <template>
   <button
-    v-show="displayedRecipe.length !== rStore.recipes.length && isVisible"
+    v-show="displayedRecipe.length !== recipes.length && isVisible"
     class="fixed z-9 inline-flex cursor-pointer items-center justify-center rounded rounded-full shadow hover:shadow-md"
     bg="green-50 dark:green-900" w="10" h="10"
     bottom="18" right="4"
diff --git a/components/ChooseFood.vue b/components/ChooseFood.vue
index 04a5c46..af72e7d 100644
--- a/components/ChooseFood.vue
+++ b/components/ChooseFood.vue
@@ -13,8 +13,8 @@ const recipeBtn = ref<HTMLButtonElement>()
 const { playAnimation } = useEmojiAnimation(recipeBtn)
 
 const gtm = useGtm()
-const recipePanel = ref()
-const { isVisible, show } = useInvisibleElement(recipePanel)
+const recipePanelRef = ref()
+const { isVisible, show } = useInvisibleElement(recipePanelRef)
 
 function toggleStuff(item: StuffItem, category = '', _e?: Event) {
   rStore.toggleStuff(item.name)
@@ -36,86 +36,76 @@ function toggleStuff(item: StuffItem, category = '', _e?: Event) {
 </script>
 
 <template>
-  <h2 m="t-4" text="xl" font="bold" p="1">
-    🥘 先选一下食材
-  </h2>
   <div>
-    <h2 opacity="90" text="base" font="bold" p="1">
-      🥬 菜菜们
+    <h2 m="t-4" text="xl" font="bold" p="1">
+      🥘 先选一下食材
     </h2>
-    <VegetableTag
-      v-for="item, i in vegetable" :key="i"
-      :active="curStuff.includes(item.name)"
-      @click="toggleStuff(item, 'vegetable')"
-    >
-      <span v-if="item.emoji" class="inline-flex">{{ item.emoji }}</span>
-      <span v-else-if="item.image" class="inline-flex">
-        <img class="inline-flex" w="2" h="2" width="10" height="10" :src="item.image" :alt="item.name">
-      </span>
-      <span class="inline-flex" m="l-1">
-        {{
-          item.name
-        }}
-      </span>
-    </VegetableTag>
-  </div>
-  <div m="y-4">
-    <h2 opacity="90" text="base" font="bold" p="1">
-      🥩 肉肉们
-    </h2>
-    <MeatTag
-      v-for="item, i in meat" :key="i"
-      :active="curStuff.includes(item.name)"
-      @click="toggleStuff(item, 'meat')"
-    >
-      <span>{{ item.emoji }}</span>
-      <span m="l-1">
-        {{
-          item.name
-        }}
-      </span>
-    </MeatTag>
-  </div>
-  <div m="y-4">
-    <h2 opacity="90" text="base" font="bold" p="1">
-      🍚 主食也要一起下锅吗？（不选也行）
-    </h2>
-    <StapleTag
-      v-for="item, i in staple" :key="i"
-      :active="curStuff.includes(item.name)"
-      @click="toggleStuff(item, 'staple')"
-    >
-      <span>{{ item.emoji }}</span>
-      <span m="l-1">
-        {{
-          item.name
-        }}
-      </span>
-    </StapleTag>
-  </div>
-  <div m="t-4">
-    <h2 text="xl" font="bold" p="1">
-      🍳 再选一下厨具
-    </h2>
-    <ToolTag
-      v-for="item, i in tools" :key="i"
-      :active="curTool === item.name"
-      @click="rStore.clickTool(item)"
-    >
-      <span v-if="item.emoji" class="inline-flex">{{ item.emoji }}</span>
-      <span v-else-if="item.icon" class="inline-flex">
-        <div :class="item.icon" />
-      </span>
-      <span class="inline-flex" m="l-1">
-        {{
-          item.label || item.name
-        }}
-      </span>
-    </ToolTag>
-  </div>
+    <div>
+      <h2 opacity="90" text="base" font="bold" p="1">
+        🥬 菜菜们
+      </h2>
+      <VegetableTag
+        v-for="item, i in vegetable" :key="i"
+        :active="curStuff.includes(item.name)"
+        @click="toggleStuff(item, 'vegetable')"
+      >
+        <span v-if="item.emoji" class="inline-flex">{{ item.emoji }}</span>
+        <span v-else-if="item.image" class="inline-flex">
+          <img class="inline-flex" w="2" h="2" width="10" height="10" :src="item.image" :alt="item.name">
+        </span>
+        <span class="inline-flex" m="l-1">{{ item.name }}</span>
+      </VegetableTag>
+    </div>
+    <div m="y-4">
+      <h2 opacity="90" text="base" font="bold" p="1">
+        🥩 肉肉们
+      </h2>
+      <MeatTag
+        v-for="item, i in meat" :key="i"
+        :active="curStuff.includes(item.name)"
+        @click="toggleStuff(item, 'meat')"
+      >
+        <span>{{ item.emoji }}</span>
+        <span m="l-1">{{ item.name }}</span>
+      </MeatTag>
+    </div>
+    <div m="y-4">
+      <h2 opacity="90" text="base" font="bold" p="1">
+        🍚 主食也要一起下锅吗？（不选也行）
+      </h2>
+      <StapleTag
+        v-for="item, i in staple" :key="i"
+        :active="curStuff.includes(item.name)"
+        @click="toggleStuff(item, 'staple')"
+      >
+        <span>{{ item.emoji }}</span>
+        <span m="l-1">{{ item.name }}</span>
+      </StapleTag>
+    </div>
+    <div m="t-4">
+      <h2 text="xl" font="bold" p="1">
+        🍳 再选一下厨具
+      </h2>
+      <ToolTag
+        v-for="item, i in tools" :key="i"
+        :active="curTool === item.name"
+        @click="rStore.clickTool(item)"
+      >
+        <span v-if="item.emoji" class="inline-flex">
+          {{ item.emoji }}
+        </span>
+        <span v-else-if="item.icon" class="inline-flex">
+          <div :class="item.icon" />
+        </span>
+        <span class="inline-flex" m="l-1">{{ item.label || item.name }}</span>
+      </ToolTag>
+    </div>
 
-  <Transition>
-    <BasketButton ref="recipeBtn" :is-visible="isVisible" @click="show" />
-  </Transition>
-  <RecipePanel ref="recipePanel" />
+    <Transition>
+      <BasketButton ref="recipeBtn" :is-visible="isVisible" @click="show" />
+    </Transition>
+    <div ref="recipePanelRef">
+      <RecipePanel />
+    </div>
+  </div>
 </template>
diff --git a/components/RandomRecipe.vue b/components/RandomRecipe.vue
index b9a6346..52125a1 100644
--- a/components/RandomRecipe.vue
+++ b/components/RandomRecipe.vue
@@ -1,12 +1,15 @@
 <script lang="ts" setup>
-const rStore = useRecipeStore()
+const { random, randomRecipe } = useRandomRecipe()
 </script>
 
 <template>
-  <div class="inline-flex items-center justify-center">
-    今天吃什么？<div class="transition" hover="text-blue-500" i-ri-refresh-line inline-block cursor-pointer @click="rStore.random" />
-  </div>
-  <div m="t-2">
-    <DishTag :dish="rStore.randomRecipe" />
+  <div v-show="randomRecipe">
+    <div class="inline-flex items-center justify-center">
+      <div>今天吃什么？</div>
+      <div class="transition" hover="text-blue-500" i-ri-refresh-line inline-block cursor-pointer @click="random" />
+    </div>
+    <div m="t-2">
+      <DishTag v-if="randomRecipe" :dish="randomRecipe" />
+    </div>
   </div>
 </template>
diff --git a/components/RecipePanel.vue b/components/RecipePanel.vue
index 7433f31..e41f2dc 100644
--- a/components/RecipePanel.vue
+++ b/components/RecipePanel.vue
@@ -6,13 +6,17 @@ const rStore = useRecipeStore()
 const { displayedRecipe, selectedStuff, curTool } = storeToRefs(rStore)
 
 const showSearchInput = ref(false)
+
+const showTooltip = computed(() => !selectedStuff.value.length && !curTool.value)
 </script>
 
 <template>
-  <div m="x-2 y-4" p="2" class="recipe-panel relative shadow transition hover:shadow-md" bg="gray-400/8">
-    <h2 text="xl" font="bold" p="1">
-      🍲 来看看组合出的菜谱吧！
-    </h2>
+  <div
+    class="recipe-panel relative shadow transition hover:shadow-md"
+    m="x-2 y-4" p="2"
+    bg="gray-400/8"
+  >
+    <RecipePanelTitle />
 
     <ToggleMode />
 
@@ -21,31 +25,34 @@ const showSearchInput = ref(false)
       <div v-else i-ri-search-fill />
     </button>
 
-    <!-- <Switch /> -->
     <div class="cook-recipes" p="2">
       <SearchFoodInput v-if="showSearchInput" />
 
       <Transition mode="out-in">
         <div class="cook-filter-recipes">
-          <span v-if="!selectedStuff.length && !curTool" text="sm" p="2">
+          <span v-if="showTooltip" text="sm" p="2">
             你要先选食材或工具哦～
           </span>
 
-          <span v-else-if="displayedRecipe.length">
+          <div v-else-if="displayedRecipe.length">
             <DishTag v-for="item, i in displayedRecipe" :key="i" :dish="item" />
-          </span>
+          </div>
 
-          <span v-else text="sm">
-            还没有完美匹配的菜谱呢……
+          <div v-else text="sm">
+            <span>还没有完美匹配的菜谱呢……</span>
             <br>
-            大胆尝试一下，或者<a href="#" @click="rStore.reset()">
-              <strong>换个组合</strong></a>？
+            <span>大胆尝试一下，或者</span>
+            <a href="#" @click="rStore.reset()">
+              <strong>换个组合</strong>
+            </a>
+            <span>？</span>
             <br>
-            <span m="t-1">欢迎来
+            <div m="t-1">
+              <span>欢迎来</span>
               <a class="font-bold text-blue-600 dark:text-blue-400" href="https://docs.qq.com/sheet/DQk1vdkhFV0twQVNS?tab=uykkic" target="_blank">这里</a>
-              反馈新的菜谱！
-            </span>
-          </span>
+              <span>反馈新的菜谱！</span>
+            </div>
+          </div>
         </div>
       </Transition>
 
diff --git a/components/RecipePanelTitle.vue b/components/RecipePanelTitle.vue
new file mode 100644
index 0000000..8e42486
--- /dev/null
+++ b/components/RecipePanelTitle.vue
@@ -0,0 +1,5 @@
+<template>
+  <div text="xl" font="bold" p="1">
+    🍲 来看看组合出的菜谱吧！
+  </div>
+</template>
diff --git a/components/WrapperMd.vue b/components/WrapperMd.vue
deleted file mode 100644
index dd537b9..0000000
--- a/components/WrapperMd.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<script lang="ts" setup>
-defineProps<{
-  frontmatter: {
-    title: string
-  }
-}>()
-</script>
-
-<template>
-  <div m="t-4" class="m-auto max-w-900px text-left">
-    <h3 text="center 3xl" font="serif !black">
-      {{ frontmatter?.title }}
-    </h3>
-    <slot class="markdown-body" />
-  </div>
-</template>
diff --git a/composables/recipe.ts b/composables/recipe.ts
new file mode 100644
index 0000000..ddc36cf
--- /dev/null
+++ b/composables/recipe.ts
@@ -0,0 +1,19 @@
+import recipeData from '~/data/recipe.json'
+import type { RecipeItem, Recipes } from '~/types'
+
+export function useRandomRecipe() {
+  const randomRecipe = ref<RecipeItem>()
+  function random() {
+    randomRecipe.value = generateRandomRecipe(recipeData as Recipes)
+  }
+
+  onMounted(() => {
+    random()
+  })
+
+  return {
+    random,
+
+    randomRecipe,
+  }
+}
diff --git a/composables/store/recipe.ts b/composables/store/recipe.ts
index b8b063b..c3188bb 100644
--- a/composables/store/recipe.ts
+++ b/composables/store/recipe.ts
@@ -4,18 +4,11 @@ import { computed, ref } from 'vue'
 import { useGtm } from '@gtm-support/vue-gtm'
 import recipeData from '../../data/recipe.json'
 import type { StuffItem } from '../../data/food'
-import type { RecipeItem, Recipes } from '~/types'
+import type { Recipes } from '~/types'
 
 const namespace = 'cook'
 
-/**
- * 生成随机菜谱
- * @param recipes
- * @returns
- */
-function generateRandomRecipe(recipes: Recipes) {
-  return recipes[Math.floor(Math.random() * recipes.length)]
-}
+const recipes = recipeData as Recipes
 
 /**
  * survival: 生存模式
@@ -25,7 +18,6 @@ function generateRandomRecipe(recipes: Recipes) {
 export type SearchMode = 'survival' | 'loose' | 'strict'
 
 export const useRecipeStore = defineStore('recipe', () => {
-  const recipes = recipeData as Recipes
   const gtm = useGtm()
 
   /**
@@ -37,13 +29,12 @@ export const useRecipeStore = defineStore('recipe', () => {
   const curStuff = useStorage(`${namespace}:stuff`, new Set<string>())
   // const curTools = ref(new Set<string>())
   const curTool = useStorage(`${namespace}:tool`, '')
+  const curMode = useStorage<SearchMode>(`${namespace}:mode`, 'loose')
 
   const selectedStuff = computed(() => Array.from(curStuff.value))
   // const selectedTools = computed(() => Array.from(curTools.value))
   // const selectedTools = ref('')
 
-  const curMode = useStorage<SearchMode>(`${namespace}:mode`, 'loose')
-
   function toggleStuff(name: string) {
     if (!curStuff.value)
       return
@@ -81,8 +72,6 @@ export const useRecipeStore = defineStore('recipe', () => {
     curStuff.value.add(name)
   }
 
-  const randomRecipe = ref<RecipeItem>(generateRandomRecipe(recipes))
-
   // 默认严格模式
   const displayedRecipe = computed(() => {
     if (keyword.value)
@@ -152,9 +141,6 @@ export const useRecipeStore = defineStore('recipe', () => {
     curMode,
     selectedStuff,
 
-    randomRecipe,
-    random: () => { randomRecipe.value = generateRandomRecipe(recipes) },
-
     clearKeyWord: () => { keyword.value = '' },
     toggleStuff,
     toggleTools,
diff --git a/pages/index.vue b/pages/index.vue
index 2fdae66..17681e4 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -3,8 +3,8 @@ const rStore = useRecipeStore()
 </script>
 
 <template>
-  <div pt-4>
-    <div text-4xl>
+  <div>
+    <div pt-4 text-4xl>
       <button
         class="cursor-pointer transition active:text-green-800 hover:(text-green-600)"
         title="重置"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f5ea905..e1af0e6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5535,7 +5535,7 @@ packages:
     dependencies:
       debug: 3.2.7
       is-core-module: 2.12.1
-      resolve: 1.22.3
+      resolve: 1.22.2
     transitivePeerDependencies:
       - supports-color
     dev: true
diff --git a/utils/random.ts b/utils/random.ts
new file mode 100644
index 0000000..11b8d6b
--- /dev/null
+++ b/utils/random.ts
@@ -0,0 +1,10 @@
+import type { Recipes } from '../types'
+
+/**
+ * 生成随机菜谱
+ * @param recipes
+ * @returns
+ */
+export function generateRandomRecipe(recipes: Recipes) {
+  return recipes[Math.floor(Math.random() * recipes.length)]
+}