From d579d0a40fbc40ae92830ba6e7b4d81534fbf7ba Mon Sep 17 00:00:00 2001 From: HerrHase Date: Thu, 4 Aug 2022 22:32:53 +0200 Subject: [PATCH] adding asset from blade --- packages/frontend/views/404.eta | 19 ++++--- packages/frontend/views/layout.eta | 2 +- packages/frontend/webpack.mix.js | 4 +- packages/server/_bootstrap.js | 4 +- packages/server/handlers/assets.js | 32 ------------ packages/server/helpers/eta.js | 51 ++++++++++++++----- packages/server/http/{static.js => public.js} | 2 +- packages/server/stores/comment.js | 36 +++++++++++-- packages/server/stores/directusAbstract.js | 5 +- packages/server/stores/page.js | 5 +- 10 files changed, 96 insertions(+), 64 deletions(-) rename packages/server/http/{static.js => public.js} (94%) diff --git a/packages/frontend/views/404.eta b/packages/frontend/views/404.eta index 8639fbb..c830a1f 100644 --- a/packages/frontend/views/404.eta +++ b/packages/frontend/views/404.eta @@ -1,12 +1,11 @@ -{% layout 'layout.liquid' %} +{{# layout('layout') }} -{% block siteHeader %} -

- {{ page.data.title }} -

-{% endblock %} -{% block siteMain %} +{{# section('content') { }} +

+ {{ page.data.title }} +

+
@@ -18,4 +17,8 @@
-{% endblock %} \ No newline at end of file +{{# endsection }} + +{{# push('footer') { }} + +{{# } }} \ No newline at end of file diff --git a/packages/frontend/views/layout.eta b/packages/frontend/views/layout.eta index fb40d79..7e97865 100644 --- a/packages/frontend/views/layout.eta +++ b/packages/frontend/views/layout.eta @@ -8,7 +8,7 @@ {{ it.page.data.title }} | {{ it.settings.data.project_name }} - +
diff --git a/packages/frontend/webpack.mix.js b/packages/frontend/webpack.mix.js index 33b14bf..8b847d0 100644 --- a/packages/frontend/webpack.mix.js +++ b/packages/frontend/webpack.mix.js @@ -63,9 +63,9 @@ mix.webpackConfig({ }) mix - .setPublicPath('../../') + .setPublicPath('../../public') //.js('js/app.js', 'public/js') - .sass('scss/styles.scss', 'public/css') + .sass('scss/styles.scss', 'css') .purgeCss({ extend: { content: [ diff --git a/packages/server/_bootstrap.js b/packages/server/_bootstrap.js index 66fa930..6438f32 100644 --- a/packages/server/_bootstrap.js +++ b/packages/server/_bootstrap.js @@ -117,7 +117,7 @@ import postHttp from './http/post.js' // page and static has always the last routes, if no route before match, it try get a page import sitemapHttp from './http/sitemap.js' import pageHttp from './http/page.js' -import staticHttp from './http/static.js' +import publicHttp from './http/public.js' server .register(commentHttp, { @@ -129,6 +129,6 @@ server }) .register(sitemapHttp) .register(pageHttp) - .register(staticHttp) + .register(publicHttp) export default server \ No newline at end of file diff --git a/packages/server/handlers/assets.js b/packages/server/handlers/assets.js index 1c9fa75..9b32594 100644 --- a/packages/server/handlers/assets.js +++ b/packages/server/handlers/assets.js @@ -28,19 +28,6 @@ function asset($path, $prefix = '/public') return $path; } -/** - * getting name of view as slug - * - * @param array $page - * @return string - * - */ -function viewName(array $page) -{ - $slugify = new \Cocur\Slugify\Slugify(); - return $slugify->slugify($page['data']['view']); -} - /** * getting name of view as slug * @@ -86,27 +73,8 @@ function title($page, $site) return join(' | ', $title); } -/** - * getting url for assets of directus api - * - * @param string string - * @param array array - * @return string - * - */ -function assetsUrl(string $id, array $options = NULL) -{ - $query = NULL; - - if ($options) { - $query = '?'.http_build_query($options); - } - - return $_ENV['DIRECTUS_API_URL'].'/assets/'.$id.$query; -} function styles($values) { - $result = ''; if ($values && is_array($values)) { diff --git a/packages/server/helpers/eta.js b/packages/server/helpers/eta.js index f7443a2..b887085 100644 --- a/packages/server/helpers/eta.js +++ b/packages/server/helpers/eta.js @@ -1,6 +1,10 @@ import slugify from 'slugify' import { marked } from 'marked' + import * as fs from 'fs' +import path from 'path' + +const basePath = path.join(path.resolve(), '/../../') /** * etaHelpers @@ -11,30 +15,32 @@ import * as fs from 'fs' */ /** - * asset - + * asset - checks manifest.json for given path and return + * file path with id for cache busting * - * @param {String} path - * @param {String} [prefix='/public'] + * + * @param {String} publicPath * */ -function asset(path, prefix = '/public') +function asset(publicPath) { // getting basePath - const basePath = path + let result = publicPath // path to mix-manifest - file = basePath + 'mix-manifest.json'; + const file = basePath + 'mix-manifest.json' + + if (fs.existsSync(file)) { - if (!fs.existsSync(file)) { - //const manifest = file_get_contents($file); - //const files = json_decode(manifest, true); + const manifest = fs.readFileSync(file) + const files = JSON.parse(manifest) - //if (files[prefix + path]) { - // path = str_replace(prefix, '', files[prefix + path]); - //} + if (files[publicPath]) { + result = files[publicPath] + } } - return path + return result } /** @@ -98,4 +104,23 @@ async function injectStore(name) { return store } +/** + * getting url for assets of directus api + * + * @param string string + * @param array array + * @return string + * + */ +function fileUrl(id, options = NULL) +{ + $query = NULL; + + if (options) { + $query = '?'.http_build_query($options); + } + + return process.ENV.DIRECTUS_API_URL + '/assets/' + id + $query; +} + export { asset, templateClass, isHome, injectStore } \ No newline at end of file diff --git a/packages/server/http/static.js b/packages/server/http/public.js similarity index 94% rename from packages/server/http/static.js rename to packages/server/http/public.js index f7b678f..e1edb8b 100644 --- a/packages/server/http/static.js +++ b/packages/server/http/public.js @@ -18,7 +18,7 @@ export default async function(fastify, opts) { */ fastify.register(fastifyStatic, { root: path.join(path.resolve(), '/../../public'), - prefix: '/static', + prefix: '/public', preCompressed: true }) diff --git a/packages/server/stores/comment.js b/packages/server/stores/comment.js index d2be840..1a11370 100644 --- a/packages/server/stores/comment.js +++ b/packages/server/stores/comment.js @@ -3,6 +3,9 @@ import DirectusAbstractStore from './directusAbstract.js' /** * Comments * + * @author Björn Hase + * @license http://opensource.org/licenses/MIT The MIT License + * @link https://gitea.node001.net/HerrHase/super-fastify-directus.git * */ @@ -11,7 +14,7 @@ class CommentStore extends DirectusAbstractStore { /** * * - * @param {string} endpoint + * @param {String} endpoint * */ constructor() { @@ -21,8 +24,9 @@ class CommentStore extends DirectusAbstractStore { /** * getting page by permalink * - * @param {string} permalink - * @return {object} + * @param {String} permalink + * @return {Object} + * */ find(page, uuid, limit = 20) { return this.items.readByQuery({ @@ -43,6 +47,32 @@ class CommentStore extends DirectusAbstractStore { }) } + /** + * getting page by permalink + * + * @param {String} permalink + * @return {Object} + * + */ + page(page, uuid, limit = 20) { + return this.items.readByQuery({ + fields: [ + 'name', + 'content', + 'approved', + 'belongs_to.comments_id' + ], + filter: { + approved : true, + belongs_to : { + comments_id: uuid + } + }, + limit : limit, + offset : ((page - 1) * limit) + }) + } + } export default CommentStore \ No newline at end of file diff --git a/packages/server/stores/directusAbstract.js b/packages/server/stores/directusAbstract.js index 884d602..24a6958 100644 --- a/packages/server/stores/directusAbstract.js +++ b/packages/server/stores/directusAbstract.js @@ -3,7 +3,10 @@ import { Directus } from '@directus/sdk'; /** * Abstract Class for handling Directus Api * - * + * @author Björn Hase + * @license http://opensource.org/licenses/MIT The MIT License + * @link https://gitea.node001.net/HerrHase/super-fastify-directus.git + * */ class DirectusAbstractStore { diff --git a/packages/server/stores/page.js b/packages/server/stores/page.js index 4fb43fb..6825b6e 100644 --- a/packages/server/stores/page.js +++ b/packages/server/stores/page.js @@ -3,7 +3,10 @@ import DirectusAbstractStore from './directusAbstract.js' /** * Pages from Directus * - * + * @author Björn Hase + * @license http://opensource.org/licenses/MIT The MIT License + * @link https://gitea.node001.net/HerrHase/super-fastify-directus.git + * */ class PageStore extends DirectusAbstractStore {