From de00d6f674ce9ab30fa2a14d8749dd3d0fa32593 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Mon, 11 Jul 2022 18:06:40 +0300 Subject: [PATCH] Site 2.0.0 --- CHANGELOG.md | 2 +- README.md | 2 +- lang/ru_RU.yaml | 2 +- settings.yaml | 2 +- src/core/Console/Commands/Site/SiteGenerateCommand.php | 8 ++++++-- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 38edb39..4da8216 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ -# [2.0.0](https://github.com/flextype-plugins/site/compare/v1.11.0...v2.0.0) (2021-07-XX) +# [2.0.0](https://github.com/flextype-plugins/site/compare/v1.11.0...v2.0.0) (2021-07-11) ### Features diff --git a/README.md b/README.md index 0aafb77..fd8bd9a 100755 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ The following dependencies need to be downloaded and installed for Site Plugin. | [flextype](https://github.com/flextype/flextype) | ^1.0.0-alpha.1 | [download](https://github.com/flextype/flextype/releases) | | [twig](https://github.com/flextype-plugins/twig) | ^3.0.0 | [download](https://github.com/flextype-plugins/twig/releases) | -* twig is optional dependency. +* twig plugin is optional dependency. ## Installation diff --git a/lang/ru_RU.yaml b/lang/ru_RU.yaml index 4d7b91d..91db80b 100755 --- a/lang/ru_RU.yaml +++ b/lang/ru_RU.yaml @@ -1,3 +1,3 @@ site_title: Site site_description: Site plugin to display entries content on the website frontend. -site_powered_by_flextype: Создавайте быстрые и легкие в управлении веб-сайты c Flextype. +site_powered_by_flextype: Создавайте быстрые и легкие в управлении веб-сайты c Flextype. diff --git a/settings.yaml b/settings.yaml index a2827bc..f606e56 100644 --- a/settings.yaml +++ b/settings.yaml @@ -66,7 +66,7 @@ minify: html: # enable HTML Compressor and Minifier - enabled: true + enabled: false # optimize html via "HtmlDomParser()" optimize_via_dom_parser: false diff --git a/src/core/Console/Commands/Site/SiteGenerateCommand.php b/src/core/Console/Commands/Site/SiteGenerateCommand.php index 1277c09..b39e302 100644 --- a/src/core/Console/Commands/Site/SiteGenerateCommand.php +++ b/src/core/Console/Commands/Site/SiteGenerateCommand.php @@ -99,7 +99,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int } // Set entry to the SitemapController class property $sitemap - registry()->set('plugins.site.static.entries', $items); + registry()->set('plugins.site.settings.static.entries', $items); // Run event onSitemapAfterInitialized emitter()->emit('onStaticSiteAfterInitialized'); @@ -152,7 +152,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int ); // Iterate through the pages. - foreach(registry()->get('plugins.site.static.entries') as $page) { + foreach(registry()->get('plugins.site.settings.static.entries') as $page) { // Create page folder. filesystem()->directory($staticSitePath . '/' . $page['id'])->ensureExists(0755, true); @@ -223,6 +223,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int } foreach ($directories as $directory) { + if (in_array($directory, registry()->get('plugins.site.settings.static.ignore.assets'))) { + continue; + } + filesystem()->directory(FLEXTYPE_PATH_PROJECT . '/assets/' . $directory)->copy($staticSitePath . '/' . FLEXTYPE_PROJECT_NAME . '/assets/' . $directory); }