diff --git a/.gitignore b/.gitignore index 76add87..63dd18b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ node_modules -dist \ No newline at end of file +dist +.netlify \ No newline at end of file diff --git a/packages/web/assets/util.ts b/packages/web/assets/util.ts index 2c4bc71..9b7721b 100644 --- a/packages/web/assets/util.ts +++ b/packages/web/assets/util.ts @@ -1,5 +1,8 @@ import QParser from 'q2filter' +export const TAGS = JSON.parse(process.env.tags!) +export const HASH = JSON.parse(process.env.hash!) + export function escapeRegExp (s: string) { return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') // $& means the whole matched string } diff --git a/packages/web/components/PostFull.vue b/packages/web/components/PostFull.vue index 1ffaf49..f037a25 100644 --- a/packages/web/components/PostFull.vue +++ b/packages/web/components/PostFull.vue @@ -23,7 +23,7 @@ import PostHeader from './PostHeader.vue' import Empty from './Empty.vue' import { Vue, Component, Prop, Watch } from 'nuxt-property-decorator' import { makeHtml } from '../assets/make-html' -import { globalStore } from '../store' +import { HASH } from '../assets/util' @Component({ components: { @@ -44,9 +44,9 @@ export default class PostFull extends Vue { @Watch('header.path') async updatePost () { if (!this.markdown) { - this.markdown = await fetch(`/build/teaser/${this.header.path}?h=${globalStore.hash.posts[this.header.path]}`).then((r) => r.text()) + this.markdown = await fetch(`/build/teaser/${this.header.path}?h=${HASH.posts[this.header.path]}`).then((r) => r.text()) } - this.markdown = await fetch(`/build/full/${this.header.path}?h=${globalStore.hash.posts[this.header.path]}`).then((r) => r.text()) + this.markdown = await fetch(`/build/full/${this.header.path}?h=${HASH.posts[this.header.path]}`).then((r) => r.text()) } get html () { diff --git a/packages/web/components/PostQuery.vue b/packages/web/components/PostQuery.vue index 142e98a..e2540fc 100644 --- a/packages/web/components/PostQuery.vue +++ b/packages/web/components/PostQuery.vue @@ -17,9 +17,8 @@ section import PostTeaser from './PostTeaser.vue' import Empty from './Empty.vue' import QParser from 'q2filter' -import { normalizeArray, searchPosts } from '@/assets/util' +import { normalizeArray, searchPosts, HASH } from '@/assets/util' import { Vue, Component, Prop, Watch } from 'nuxt-property-decorator' -import { globalStore } from '../store' @Component({ components: { @@ -70,10 +69,10 @@ export default class PostQuery extends Vue { tag: this.tag, } : this.q, current: true, - posts: await fetch(`/build/header/posts.json?h=${globalStore.hash.posts._header}`).then((r) => r.json()), + posts: await fetch(`/build/header/posts.json?h=${HASH.posts._header}`).then((r) => r.json()), }).map(async (h) => { if (!h.teaser) { - h.teaser = await fetch(`/build/teaser/${h.path}?h=${globalStore.hash.posts[h.path]}`).then((r) => r.text()) + h.teaser = await fetch(`/build/teaser/${h.path}?h=${HASH.posts[h.path]}`).then((r) => r.text()) } return h })) diff --git a/packages/web/components/PostTeaser.vue b/packages/web/components/PostTeaser.vue index fcc25e3..0b4a4d0 100644 --- a/packages/web/components/PostTeaser.vue +++ b/packages/web/components/PostTeaser.vue @@ -15,7 +15,7 @@ import PostHeader from './PostHeader.vue' import { Vue, Component, Prop } from 'nuxt-property-decorator' import { makeHtml } from '../assets/make-html' -import { globalStore } from '../store' +import { HASH } from '../assets/util' @Component({ components: { @@ -29,7 +29,7 @@ export default class PostTeaser extends Vue { async mounted () { if (!this.teaser) { - this.teaser = await fetch(`/build/teaser/${this.header.path}.html?h=${globalStore.hash.posts[this.header.path]}`) + this.teaser = await fetch(`/build/teaser/${this.header.path}.html?h=${HASH.posts[this.header.path]}`) .then((r) => r.text()) } } diff --git a/packages/web/layouts/default.vue b/packages/web/layouts/default.vue index 8e2079d..c99a235 100644 --- a/packages/web/layouts/default.vue +++ b/packages/web/layouts/default.vue @@ -33,8 +33,7 @@ section