diff --git a/.gitignore b/.gitignore
index 465919f..cf03d49 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
# auto generate
-public/data/recipe.json
+src/data/recipe.json
.DS_Store
.vite-ssg-dist
diff --git a/package.json b/package.json
index 22ac4a7..09d9a2c 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
"@types/markdown-it-link-attributes": "^3.0.1",
"@types/nprogress": "^0.2.0",
"@vitejs/plugin-vue": "^2.3.1",
+ "consola": "^2.15.3",
"critters": "^0.0.16",
"cross-env": "^7.0.3",
"eslint": "^8.13.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index bee047c..50a5100 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -9,6 +9,7 @@ specifiers:
'@vitejs/plugin-vue': ^2.3.1
'@vueuse/core': ^8.2.5
'@vueuse/head': ^0.7.6
+ consola: ^2.15.3
critters: ^0.0.16
cross-env: ^7.0.3
eslint: ^8.13.0
@@ -55,6 +56,7 @@ devDependencies:
'@types/markdown-it-link-attributes': 3.0.1
'@types/nprogress': 0.2.0
'@vitejs/plugin-vue': 2.3.1_vite@2.9.2+vue@3.2.32
+ consola: 2.15.3
critters: 0.0.16
cross-env: 7.0.3
eslint: 8.13.0
diff --git a/scripts/convert.ts b/scripts/convert.ts
index 328bbfc..bb4475c 100644
--- a/scripts/convert.ts
+++ b/scripts/convert.ts
@@ -1,17 +1,20 @@
// convert csv to json
import fs from 'fs'
import path from 'path'
+import consola from 'consola'
import type { Recipe } from '~/types'
-const recipeCsvFile = path.resolve(__dirname, '../public/data/recipe.csv')
-const recipeJsonFile = path.resolve(__dirname, '../public/data/recipe.json')
+const recipeCsvFile = path.resolve(__dirname, '../src/data/recipe.csv')
+const recipeJsonFile = path.resolve(__dirname, '../src/data/recipe.json')
function run() {
const csvData = fs.readFileSync(recipeCsvFile, 'utf-8')
const lines = csvData.split(/\r?\n/)
- if (lines[0] !== '名称,食材,链接,标签/描述,方法,工具')
- console.log('Headers Changed!')
+ if (lines[0].trim() !== '名称,食材,链接,标签/描述,方法,工具') {
+ consola.warn(`Headers Changed: ${lines[0]}`)
+ return
+ }
const recipeJson: Recipe = []
const sep = '、'
@@ -20,12 +23,12 @@ function run() {
if (line) {
const attrs = line.split(',')
recipeJson.push({
- name: attrs[0],
- stuff: attrs[1].split(sep),
- link: attrs[2],
- tags: attrs[3].split(sep),
- methods: attrs[4].split(sep),
- tools: attrs[5].split(sep),
+ name: attrs[0].trim(),
+ stuff: attrs[1].trim().split(sep),
+ link: attrs[2].trim(),
+ tags: attrs[3].trim().split(sep),
+ methods: attrs[4].trim().split(sep),
+ tools: attrs[5].trim().split(sep),
})
}
})
diff --git a/src/components.d.ts b/src/components.d.ts
index c6b2fb5..b8e6c83 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -5,6 +5,7 @@
declare module '@vue/runtime-core' {
export interface GlobalComponents {
BaseFooter: typeof import('./components/BaseFooter.vue')['default']
+ ChooseFood: typeof import('./components/ChooseFood.vue')['default']
Counter: typeof import('./components/Counter.vue')['default']
Menu: typeof import('./components/Menu.vue')['default']
README: typeof import('./components/README.md')['default']
diff --git a/src/components/ChooseFood.vue b/src/components/ChooseFood.vue
new file mode 100644
index 0000000..505d5df
--- /dev/null
+++ b/src/components/ChooseFood.vue
@@ -0,0 +1,11 @@
+
+
+
+
好的,今天我们来做菜!
+
+