From 9405dbd593fced0da3014ed5a201a2ae71a987db Mon Sep 17 00:00:00 2001 From: HerrHase Date: Sun, 7 Aug 2022 16:27:20 +0200 Subject: [PATCH] adding partial for meta --- packages/frontend/views/layout.eta | 15 +++++++++---- packages/frontend/views/partials/meta.eta | 5 +++++ .../frontend/views/templates/page/default.eta | 11 +++++++--- packages/server/handlers/assets.js | 20 ----------------- packages/server/helpers/eta.js | 22 ++++++++++++++++++- packages/server/http/post.js | 10 ++++----- packages/server/http/public.js | 1 + packages/server/http/sitemap.js | 21 +----------------- packages/server/plugins/eta.js | 0 public/mix-manifest.json | 4 ++++ public/spritemap.js | 13 +++++++++++ 11 files changed, 69 insertions(+), 53 deletions(-) create mode 100644 packages/frontend/views/partials/meta.eta create mode 100644 packages/server/plugins/eta.js create mode 100644 public/mix-manifest.json create mode 100644 public/spritemap.js diff --git a/packages/frontend/views/layout.eta b/packages/frontend/views/layout.eta index 7e97865..9d29fd9 100644 --- a/packages/frontend/views/layout.eta +++ b/packages/frontend/views/layout.eta @@ -9,6 +9,9 @@ + + {{! await includeFile('./partials/meta.eta', { meta: it.page.data.meta }) }} +
@@ -17,11 +20,11 @@
{{# if (isHome(it.page)) { }}

- {{ it.page.data.title }} + {{ it.settings.data.project_name }}

{{# } else { }} - {{ it.page.data.title }} + {{ it.settings.data.project_name }} {{# } }}
@@ -34,8 +37,12 @@
-
- +
+
+
+ MIT License +
+
diff --git a/packages/frontend/views/partials/meta.eta b/packages/frontend/views/partials/meta.eta new file mode 100644 index 0000000..4e2800a --- /dev/null +++ b/packages/frontend/views/partials/meta.eta @@ -0,0 +1,5 @@ +{{# if (meta && typeof meta[Symbol.iterator] === 'function') { }} + {{# Object.keys(meta).forEach(function(key) { }} + + {{# }) }} +{{# } }} \ No newline at end of file diff --git a/packages/frontend/views/templates/page/default.eta b/packages/frontend/views/templates/page/default.eta index 9d81c35..b052386 100644 --- a/packages/frontend/views/templates/page/default.eta +++ b/packages/frontend/views/templates/page/default.eta @@ -3,9 +3,14 @@
-
- {{! it.marked.parse(it.page.data.content) }} -
+
+

+ {{ it.page.data.title }} +

+
+ {{! it.marked.parse(it.page.data.content) }} +
+
\ No newline at end of file diff --git a/packages/server/handlers/assets.js b/packages/server/handlers/assets.js index 9b32594..572630d 100644 --- a/packages/server/handlers/assets.js +++ b/packages/server/handlers/assets.js @@ -28,26 +28,6 @@ function asset($path, $prefix = '/public') return $path; } -/** - * getting name of view as slug - * - * @param array $page - * @return string - * - */ -function canonical() -{ - if (isset($_SERVER['HTTPS'])) { - $canoncial = 'https'; - } else { - $canoncial = 'http'; - } - - $canoncial .= '://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']; - - return $canoncial; -} - /** * getting title for head * diff --git a/packages/server/helpers/eta.js b/packages/server/helpers/eta.js index c492e88..b82055a 100644 --- a/packages/server/helpers/eta.js +++ b/packages/server/helpers/eta.js @@ -15,6 +15,26 @@ const basePath = path.join(path.resolve(), '/../../') */ + /** + * getting name of view as slug + * + * @param array $page + * @return string + * + */ + /**function canonical() + { + if (isset($_SERVER['HTTPS'])) { + $canoncial = 'https'; + } else { + $canoncial = 'http'; + } + + $canoncial .= '://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']; + + return $canoncial; + }*/ + /** * asset - checks manifest.json for given path and return * file path with id for cache busting @@ -47,7 +67,7 @@ function asset(publicPath) /** * templateClass - parse template name to css-classname, * use prefix, default is "page" - * + * * * @param {Object} entity * @param {String} [prefix='page'] diff --git a/packages/server/http/post.js b/packages/server/http/post.js index 084e98e..0319655 100644 --- a/packages/server/http/post.js +++ b/packages/server/http/post.js @@ -17,10 +17,10 @@ export default async function(fastify, opts) { /** * prehandler for all routes * - * @param {[type]} request - * @param {[type]} reponse + * @param {Object} request + * @param {Object} reponse * @param {Function} done - * @return {[type]} + * */ fastify.addHook('preHandler', async function(request, response) { @@ -35,8 +35,8 @@ export default async function(fastify, opts) { /** * handle single post * - * @param {object} request - * @param {object} response + * @param {Object} request + * @param {Object} response * */ fastify.get('/:slug([-a-zA-Z0-9]{0,255})', async function(request, response) { diff --git a/packages/server/http/public.js b/packages/server/http/public.js index e1edb8b..7b81a10 100644 --- a/packages/server/http/public.js +++ b/packages/server/http/public.js @@ -2,6 +2,7 @@ import fastifyStatic from '@fastify/static' import path from 'path' /** + * * static files that are send frontend package * * @author Björn Hase diff --git a/packages/server/http/sitemap.js b/packages/server/http/sitemap.js index 899b43a..6698661 100644 --- a/packages/server/http/sitemap.js +++ b/packages/server/http/sitemap.js @@ -15,24 +15,6 @@ import directusResponseHandler from './../handlers/directusResponse.js' export default async function(fastify, opts) { - /** - * prehandler for all routes - * - * @param {[type]} request - * @param {[type]} reponse - * @param {Function} done - * @return {[type]} - */ - fastify.addHook('preHandler', async function(request, response) { - - const pageStore = new PageStore() - - // getting single page - let page = await pageStore.find(request.url) - directusResponseHandler.getOne(page, response) - - }) - /** * handle single page * @@ -50,7 +32,6 @@ export default async function(fastify, opts) { pages.each((page, index) => { }) - - }) + } \ No newline at end of file diff --git a/packages/server/plugins/eta.js b/packages/server/plugins/eta.js new file mode 100644 index 0000000..e69de29 diff --git a/public/mix-manifest.json b/public/mix-manifest.json new file mode 100644 index 0000000..2069c31 --- /dev/null +++ b/public/mix-manifest.json @@ -0,0 +1,4 @@ +{ + "/spritemap.js": "/spritemap.js?id=2dda73ecee3bb668b395026efda6524c", + "/css/styles.css": "/css/styles.css?id=c80a1181f87f3c3ef715844b545559f4" +} diff --git a/public/spritemap.js b/public/spritemap.js new file mode 100644 index 0000000..c3811ca --- /dev/null +++ b/public/spritemap.js @@ -0,0 +1,13 @@ +(self["webpackChunkfrontend"] = self["webpackChunkfrontend"] || []).push([["spritemap"],{ + +/***/ "?c20d": +/*!******************************!*\ + !*** spritemap-dummy-module ***! + \******************************/ +/***/ (() => { + + + +/***/ }) + +}]); \ No newline at end of file