From 3bc2a943bda148c93b1d29d48ab4c4132d7308bd Mon Sep 17 00:00:00 2001 From: Pacharapol Withayasakpunt Date: Fri, 28 Feb 2020 04:30:25 +0700 Subject: [PATCH] add query page --- data/config.json | 5 +- data/posts/千字文/千字文1.2.md | 14 +-- data/posts/千字文/千字文1.4.md | 14 +-- data/posts/千字文/千字文1.6.md | 14 +-- data/posts/千字文/千字文1.7.md | 14 +-- data/posts/千字文/千字文1.8.md | 14 +-- data/posts/千字文/千字文1.9.md | 14 +-- data/posts/千字文/千字文2.3.md | 14 +-- data/posts/千字文/千字文2.7.md | 14 +-- data/posts/千字文/千字文2.8.md | 14 +-- data/posts/千字文/千字文3.2.md | 14 +-- data/posts/千字文/千字文3.3.md | 14 +-- web/backend/package.json | 1 + web/backend/scripts/prepare.ts | 21 ++++ web/backend/src/api/data.ts | 21 ++-- web/backend/yarn.lock | 5 + web/frontend/package.json | 1 + web/frontend/public/index.html | 1 + web/frontend/src/App.vue | 8 +- web/frontend/src/assets/.gitkeep | 0 web/frontend/src/assets/logo.png | Bin 6849 -> 0 bytes web/frontend/src/components/HelloWorld.vue | 59 ----------- web/frontend/src/components/PostHeader.vue | 26 +++++ web/frontend/src/components/PostTeaser.vue | 62 ++++++++++++ web/frontend/src/layouts/default.vue | 8 +- web/frontend/src/router/index.ts | 27 ++++- web/frontend/src/utils.ts | 8 ++ web/frontend/src/views/About.vue | 5 - web/frontend/src/views/Home.vue | 18 ---- web/frontend/src/views/QueryView.vue | 109 +++++++++++++++++++++ web/frontend/yarn.lock | 5 + 31 files changed, 380 insertions(+), 164 deletions(-) create mode 100644 web/frontend/src/assets/.gitkeep delete mode 100644 web/frontend/src/assets/logo.png delete mode 100644 web/frontend/src/components/HelloWorld.vue create mode 100644 web/frontend/src/components/PostHeader.vue create mode 100644 web/frontend/src/components/PostTeaser.vue delete mode 100644 web/frontend/src/views/About.vue delete mode 100644 web/frontend/src/views/Home.vue create mode 100644 web/frontend/src/views/QueryView.vue diff --git a/data/config.json b/data/config.json index 19459f8..81aec5c 100644 --- a/data/config.json +++ b/data/config.json @@ -14,5 +14,8 @@ "url": "https://github.com/patarapolw/zhdiary" } ], - "fullUrl": "https://zhdiary.polvcode.dev" + "fullUrl": "https://zhdiary.polvcode.dev", + "author": { + "name": "Pacharapol Withayasakpunt" + } } \ No newline at end of file diff --git a/data/posts/千字文/千字文1.2.md b/data/posts/千字文/千字文1.2.md index 4e6c4c9..202f179 100644 --- a/data/posts/千字文/千字文1.2.md +++ b/data/posts/千字文/千字文1.2.md @@ -37,13 +37,7 @@ tag: figcaption.text-center zhang1 ``` - - ```css parsed -table td:first-child { - width: 10em; -} - figure { width: 100px; } @@ -55,6 +49,14 @@ figure { } ``` + + +```css parsed +table td:first-child { + width: 10em; +} +``` + 盈利 | yínglì | profit / gain 轻盈 | qīngyíng | graceful / lithe / light and graceful / lighthearted / relaxed 盈亏 | yíngkuī | profit and loss / waxing and waning diff --git a/data/posts/千字文/千字文1.4.md b/data/posts/千字文/千字文1.4.md index 1ba3229..b500acc 100644 --- a/data/posts/千字文/千字文1.4.md +++ b/data/posts/千字文/千字文1.4.md @@ -37,13 +37,7 @@ tag: figcaption.text-center yang2 ``` - - ```css parsed -table td:first-child { - width: 10em; -} - figure { width: 100px; } @@ -55,6 +49,14 @@ figure { } ``` + + +```css parsed +table td:first-child { + width: 10em; +} +``` + 闰年 | rùnnián | leap year / (lunar calendar) year with a thirteen intercalary month 闰月 | rùnyuè | intercalary month in the lunar calendar / leap month 敖闰 | Áorùn | Dragon King of the West Sea, Ao Run, also Ao Ji (敖吉) diff --git a/data/posts/千字文/千字文1.6.md b/data/posts/千字文/千字文1.6.md index fdabfdc..03d3c14 100644 --- a/data/posts/千字文/千字文1.6.md +++ b/data/posts/千字文/千字文1.6.md @@ -37,13 +37,7 @@ tag: figcaption.text-center gang1 ``` - - ```css parsed -table td:first-child { - width: 10em; -} - figure { width: 100px; } @@ -55,6 +49,14 @@ figure { } ``` + + +```css parsed +table td:first-child { + width: 10em; +} +``` + 资金 | zījīn | funds / funding / capital 基金 | jījīn | fund 黄金 (黃金) | huángjīn | gold / golden (opportunity) / prime (time) diff --git a/data/posts/千字文/千字文1.7.md b/data/posts/千字文/千字文1.7.md index f68b9fc..11896d0 100644 --- a/data/posts/千字文/千字文1.7.md +++ b/data/posts/千字文/千字文1.7.md @@ -37,13 +37,7 @@ tag: figcaption.text-center guang1 ``` - - ```css parsed -table td:first-child { - width: 10em; -} - figure { width: 100px; } @@ -55,6 +49,14 @@ figure { } ``` + + +```css parsed +table td:first-child { + width: 10em; +} +``` + 刀剑 (刀劍) | dāojiàn | sword 剑桥 (劍橋) | Jiànqiáo | Cambridge 利剑 (利劍) | lìjiàn | sharp sword diff --git a/data/posts/千字文/千字文1.8.md b/data/posts/千字文/千字文1.8.md index ea1ac6c..b86353d 100644 --- a/data/posts/千字文/千字文1.8.md +++ b/data/posts/千字文/千字文1.8.md @@ -37,13 +37,7 @@ tag: figcaption.text-center jiang1 ``` - - ```css parsed -table td:first-child { - width: 10em; -} - figure { width: 100px; } @@ -55,6 +49,14 @@ figure { } ``` + + +```css parsed +table td:first-child { + width: 10em; +} +``` + 如果 | rúguǒ | if / in case / in the event that 结果 (結果) | jiēguǒ | to bear fruit / CL: 個|个 结果 (結果) | jiéguǒ | outcome / result / conclusion / in the end / as a result / to kill / to dispatch diff --git a/data/posts/千字文/千字文1.9.md b/data/posts/千字文/千字文1.9.md index 811b5e0..a06ffc4 100644 --- a/data/posts/千字文/千字文1.9.md +++ b/data/posts/千字文/千字文1.9.md @@ -37,13 +37,7 @@ tag: figcaption.text-center xiang2 ``` - - ```css parsed -table td:first-child { - width: 10em; -} - figure { width: 100px; } @@ -55,6 +49,14 @@ figure { } ``` + + +```css parsed +table td:first-child { + width: 10em; +} +``` + 海报 (海報) | hǎibào | poster / playbill / notice 海外 | hǎiwài | overseas / abroad 海洋 | hǎiyáng | ocean / CL: 個|个 diff --git a/data/posts/千字文/千字文2.3.md b/data/posts/千字文/千字文2.3.md index 02c9118..8daa99d 100644 --- a/data/posts/千字文/千字文2.3.md +++ b/data/posts/千字文/千字文2.3.md @@ -37,13 +37,7 @@ tag: figcaption.text-center tang2 ``` - - ```css parsed -table td:first-child { - width: 10em; -} - figure { width: 100px; } @@ -55,6 +49,14 @@ figure { } ``` + + +```css parsed +table td:first-child { + width: 10em; +} +``` + 推荐 (推薦) | tuījiàn | to recommend / recommendation 推广 (推廣) | tuīguǎng | to extend / to spread / to popularize / generalization / promotion (of a product etc) 推动 (推動) | tuīdòng | to push (for acceptance of a plan) / to push forward / to promote / to actuate / CL: 個|个 diff --git a/data/posts/千字文/千字文2.7.md b/data/posts/千字文/千字文2.7.md index c67d8ed..446a128 100644 --- a/data/posts/千字文/千字文2.7.md +++ b/data/posts/千字文/千字文2.7.md @@ -37,13 +37,7 @@ tag: figcaption.text-center wang2 ``` - - ```css parsed -table td:first-child { - width: 10em; -} - figure { width: 100px; } @@ -55,6 +49,14 @@ figure { } ``` + + +```css parsed +table td:first-child { + width: 10em; +} +``` + 遐想 | xiáxiǎng | reverie / daydream / to be lost in wild and fanciful thoughts 闻名遐迩 (聞名遐邇) | wénmíngxiá'ěr | to be famous far and wide (idiom) 遐 | xiá | distant / long-lasting / to abandon diff --git a/data/posts/千字文/千字文2.8.md b/data/posts/千字文/千字文2.8.md index 04128c6..d88591e 100644 --- a/data/posts/千字文/千字文2.8.md +++ b/data/posts/千字文/千字文2.8.md @@ -37,13 +37,7 @@ tag: figcaption.text-center chang2 ``` - - ```css parsed -table td:first-child { - width: 10em; -} - figure { width: 100px; } @@ -55,6 +49,14 @@ figure { } ``` + + +```css parsed +table td:first-child { + width: 10em; +} +``` + 鸣 (鳴) | míng | to cry (of birds, animals and insects) 共鸣 (共鳴) | gòngmíng | resonance (physics) / sympathetic response to sth 争鸣 (爭鳴) | zhēngmíng | to contend diff --git a/data/posts/千字文/千字文3.2.md b/data/posts/千字文/千字文3.2.md index 99dd361..367c7ce 100644 --- a/data/posts/千字文/千字文3.2.md +++ b/data/posts/千字文/千字文3.2.md @@ -37,13 +37,7 @@ tag: figcaption.text-center shang1 ``` - - ```css parsed -table td:first-child { - width: 10em; -} - figure { width: 100px; } @@ -55,6 +49,14 @@ figure { } ``` + + +```css parsed +table td:first-child { + width: 10em; +} +``` + 恭喜 | gōngxǐ | congratulations / greetings 恭 | gōng | respectful 恭贺 (恭賀) | gōnghè | to congratulate respectfully / to express good wishes diff --git a/data/posts/千字文/千字文3.3.md b/data/posts/千字文/千字文3.3.md index 36cffcb..5f1dfef 100644 --- a/data/posts/千字文/千字文3.3.md +++ b/data/posts/千字文/千字文3.3.md @@ -37,13 +37,7 @@ tag: figcaption.text-center liang2 ``` - - ```css parsed -table td:first-child { - width: 10em; -} - figure { width: 100px; } @@ -55,6 +49,14 @@ figure { } ``` + + +```css parsed +table td:first-child { + width: 10em; +} +``` + 女性 | nǚxìng | woman / the female sex 女子 | nǚzǐ | woman / female 女孩 | nǚhái | girl / lass diff --git a/web/backend/package.json b/web/backend/package.json index 35a2c4d..f765af4 100644 --- a/web/backend/package.json +++ b/web/backend/package.json @@ -10,6 +10,7 @@ "dependencies": { "@patarapolw/qsearch": "^1.1.1", "cors": "^2.8.5", + "dayjs": "^1.8.21", "express": "^4.17.1", "fast-glob": "^3.2.2", "gray-matter": "^4.0.2", diff --git a/web/backend/scripts/prepare.ts b/web/backend/scripts/prepare.ts index 40f79bb..3008344 100644 --- a/web/backend/scripts/prepare.ts +++ b/web/backend/scripts/prepare.ts @@ -4,6 +4,7 @@ import crypto from 'crypto' import matter from 'gray-matter' import glob from 'fast-glob' import DataStore from 'nedb-promises' +import dayjs from 'dayjs' import MakeHtml from '../src/utils/make-html' @@ -44,6 +45,7 @@ const db = new DataStore('assets/data.nedb') await db.insert({ ...data, + date: formatDate(data.date), filename: f, h, excerpt: computedExcerpt, @@ -64,8 +66,13 @@ const db = new DataStore('assets/data.nedb') computedContent = computedContent.substr(computedExcerpt.length) } + if (data.date) { + console.log(formatDate(data.date)) + } + await db.insert({ ...data, + date: formatDate(data.date), filename: f, h, excerpt: computedExcerpt, @@ -77,3 +84,17 @@ const db = new DataStore('assets/data.nedb') } })) })().catch(console.error) + +const tzOffset = new Date().getTimezoneOffset() + +function formatDate (d?: string | Date) { + if (d) { + if (typeof d === 'string') { + return dayjs(d).toDate() + } else { + return dayjs(d).add(tzOffset, 'minute').toDate() + } + } + + return d +} diff --git a/web/backend/src/api/data.ts b/web/backend/src/api/data.ts index 8045499..a221e34 100644 --- a/web/backend/src/api/data.ts +++ b/web/backend/src/api/data.ts @@ -26,26 +26,29 @@ dataRouter.get('/*', (req, res) => { dataRouter.post('/', async (req, res, next) => { try { - const { q, project, offset, limit } = req.body - let cond = q - if (typeof q === 'string') { + const { q, cond = {}, project, offset, limit } = req.body + const $and = [ + { filename: { $regex: /^posts\// } }, + cond + ] as any[] + + if (q) { const parser = new QSearch({ dialect: 'nedb', schema: { + title: {}, filename: {}, excerpt: {}, date: { type: 'date' } } }) - cond = parser.parse(q) + $and.push(parser.parse(q)) } - const count = await db.count(cond) + const count = await db.count({ $and }) + + let c = db.find({ $and }, project).skip(offset || 0) - let c = db.find(cond).skip(offset || 0) - if (project) { - c = c.projection(project) - } if (limit !== null) { c = c.limit(limit || 5) } diff --git a/web/backend/yarn.lock b/web/backend/yarn.lock index 2f1145c..e037543 100644 --- a/web/backend/yarn.lock +++ b/web/backend/yarn.lock @@ -420,6 +420,11 @@ dateformat@~1.0.4-1.2.3: get-stdin "^4.0.1" meow "^3.3.0" +dayjs@^1.8.21: + version "1.8.21" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.21.tgz#98299185b72b9b679f31c7ed987b63923c961552" + integrity sha512-1kbWK0hziklUHkGgiKr7xm59KwAg/K3Tp7H/8X+f58DnNCwY3pKYjOCJpIlVs125FRBukGVZdKZojC073D0IeQ== + debounce@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.0.tgz#44a540abc0ea9943018dc0eaa95cce87f65cd131" diff --git a/web/frontend/package.json b/web/frontend/package.json index eb882bc..1724761 100644 --- a/web/frontend/package.json +++ b/web/frontend/package.json @@ -10,6 +10,7 @@ "axios": "^0.19.2", "buefy": "^0.8.12", "core-js": "^3.6.4", + "dayjs": "^1.8.21", "vue": "^2.6.11", "vue-class-component": "^7.2.2", "vue-extend-layout": "^2.0.6", diff --git a/web/frontend/public/index.html b/web/frontend/public/index.html index 3e91c3f..39bdf80 100644 --- a/web/frontend/public/index.html +++ b/web/frontend/public/index.html @@ -5,6 +5,7 @@ + ZhDiary diff --git a/web/frontend/src/App.vue b/web/frontend/src/App.vue index 9dc07c8..e9b712b 100644 --- a/web/frontend/src/App.vue +++ b/web/frontend/src/App.vue @@ -10,4 +10,10 @@ export default { name: 'App', components: { VueExtendLayouts } } - + + + diff --git a/web/frontend/src/assets/.gitkeep b/web/frontend/src/assets/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/web/frontend/src/assets/logo.png b/web/frontend/src/assets/logo.png deleted file mode 100644 index f3d2503fc2a44b5053b0837ebea6e87a2d339a43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6849 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 -
-

{{ msg }}

-

- For a guide and recipes on how to configure / customize this project,
- check out the - vue-cli documentation. -

-

Installed CLI Plugins

- -

Essential Links

- -

Ecosystem

- -
- - - - - - diff --git a/web/frontend/src/components/PostHeader.vue b/web/frontend/src/components/PostHeader.vue new file mode 100644 index 0000000..39af601 --- /dev/null +++ b/web/frontend/src/components/PostHeader.vue @@ -0,0 +1,26 @@ + + + diff --git a/web/frontend/src/components/PostTeaser.vue b/web/frontend/src/components/PostTeaser.vue new file mode 100644 index 0000000..e06e8c9 --- /dev/null +++ b/web/frontend/src/components/PostTeaser.vue @@ -0,0 +1,62 @@ + + + + + diff --git a/web/frontend/src/layouts/default.vue b/web/frontend/src/layouts/default.vue index 0fabe8f..d9b26ff 100644 --- a/web/frontend/src/layouts/default.vue +++ b/web/frontend/src/layouts/default.vue @@ -6,7 +6,9 @@ section b-navbar-item(tag="router-link" to="/") h1.bold {{config.banner}} template(slot="start") - b-navbar-item(v-for="t in config.tabs" + b-navbar-item( + v-for="t in config.tabs" + :key="t.name" :tag="t.to ? 'router-link' : 'a'" :href="t.to ? '' : t.url" :to="t.to ? t.to : ''" @@ -20,7 +22,7 @@ section fa(icon="search") section(style="margin-top: 3.25rem") .columns - .column.column.is-10-desktop.is-offset-1-desktop + .column.column.is-three-fifths-desktop.is-offset-one-fifth-desktop router-view @@ -44,7 +46,7 @@ import { normalizeArray } from '../utils' { hid: 'og:url', property: 'og:url', - content: this.fullUrl + content: url }, ] } diff --git a/web/frontend/src/router/index.ts b/web/frontend/src/router/index.ts index 51a9887..3cbbe6a 100644 --- a/web/frontend/src/router/index.ts +++ b/web/frontend/src/router/index.ts @@ -6,10 +6,33 @@ Vue.use(VueRouter) const router = new VueRouter({ mode: 'history', routes: [ + { + path: '/', + component: () => import('../views/QueryView.vue'), + meta: { + layout: 'default' + } + }, { path: '/:page', - alias: '/', - component: () => import('../views/Home.vue') + component: () => import('../views/QueryView.vue'), + meta: { + layout: 'default' + } + }, + { + path: '/tag/:tag', + component: () => import('../views/QueryView.vue'), + meta: { + layout: 'default' + } + }, + { + path: '/tag/:tag/:page', + component: () => import('../views/QueryView.vue'), + meta: { + layout: 'default' + } } ] }) diff --git a/web/frontend/src/utils.ts b/web/frontend/src/utils.ts index 7718848..95efd41 100644 --- a/web/frontend/src/utils.ts +++ b/web/frontend/src/utils.ts @@ -1,3 +1,11 @@ +import axios from 'axios' + export function normalizeArray (a: T | T[]): T | undefined { return Array.isArray(a) ? a[0] : a } + +export const isRendered = !!document.getElementById('app')!.getAttribute('data-server-rendered') + +export const api = axios.create({ + baseURL: isRendered ? '/api' : 'http://localhost:48000/api' +}) diff --git a/web/frontend/src/views/About.vue b/web/frontend/src/views/About.vue deleted file mode 100644 index 3fa2807..0000000 --- a/web/frontend/src/views/About.vue +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/web/frontend/src/views/Home.vue b/web/frontend/src/views/Home.vue deleted file mode 100644 index 8bd6c57..0000000 --- a/web/frontend/src/views/Home.vue +++ /dev/null @@ -1,18 +0,0 @@ - - - diff --git a/web/frontend/src/views/QueryView.vue b/web/frontend/src/views/QueryView.vue new file mode 100644 index 0000000..bd31c34 --- /dev/null +++ b/web/frontend/src/views/QueryView.vue @@ -0,0 +1,109 @@ + + + diff --git a/web/frontend/yarn.lock b/web/frontend/yarn.lock index 723f614..79ea1b4 100644 --- a/web/frontend/yarn.lock +++ b/web/frontend/yarn.lock @@ -2794,6 +2794,11 @@ dashdash@^1.12.0: dependencies: assert-plus "^1.0.0" +dayjs@^1.8.21: + version "1.8.21" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.21.tgz#98299185b72b9b679f31c7ed987b63923c961552" + integrity sha512-1kbWK0hziklUHkGgiKr7xm59KwAg/K3Tp7H/8X+f58DnNCwY3pKYjOCJpIlVs125FRBukGVZdKZojC073D0IeQ== + de-indent@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"