From 621a79d6a5bde4b0ad28f707beb2d8d1c8420c0c Mon Sep 17 00:00:00 2001 From: 7underlines Date: Sun, 15 Sep 2024 08:38:52 +0200 Subject: [PATCH] breaking 4.0.0 internal name change --- .github/workflows/ci.yml | 8 +- .github/workflows/ci_pipe.yml | 16 +-- .github/workflows/pr.yml | 8 +- .php_cs.cache | 2 +- .phpstan.neon | 2 +- CHANGELOG_de-DE.md | 3 +- CHANGELOG_en-GB.md | 3 +- README.md | 2 +- composer-ci.json | 2 +- composer.json | 6 +- docker-compose.yml | 2 +- makefile | 4 +- phpunit.autoload.php | 4 +- phpunit.xml | 2 +- .../BlogCategoryMappingDefinition.php | 16 +-- src/Content/Blog/BlogEntitiesIndexer.php | 6 +- src/Content/Blog/BlogEntriesCollection.php | 2 +- src/Content/Blog/BlogEntriesDefinition.php | 16 +-- src/Content/Blog/BlogEntriesEntity.php | 8 +- .../Blog/BlogEntriesIndexingMessage.php | 2 +- .../BlogEntriesTranslationCollection.php | 2 +- .../BlogEntriesTranslationDefinition.php | 6 +- .../BlogEntriesTranslationEntity.php | 24 ++-- .../Blog/BlogListingFilterBuildEvent.php | 8 +- src/Content/Blog/BlogSeoUrlListener.php | 4 +- src/Content/Blog/BlogSeoUrlRoute.php | 4 +- .../DataResolver/BlogCmsElementResolver.php | 16 +-- .../BlogDetailCmsElementResolver.php | 14 +-- .../BlogNewestListingCmsElementResolver.php | 12 +- .../BlogSingleSelectDataResolver.php | 8 +- src/Content/Blog/Events/BlogIndexerEvent.php | 2 +- .../Blog/Events/BlogMainFilterEvent.php | 2 +- .../Events/NewestListingCriteriaEvent.php | 2 +- .../Blog/Subscriber/BlogSubscriber.php | 14 +-- .../BlogAuthor/BlogAuthorCollection.php | 4 +- .../BlogAuthor/BlogAuthorDefinition.php | 10 +- src/Content/BlogAuthor/BlogAuthorEntity.php | 6 +- .../BlogAuthorTranslationCollection.php | 4 +- .../BlogAuthorTranslationDefinition.php | 6 +- .../BlogAuthorTranslationEntity.php | 24 ++-- .../BlogCategory/BlogCategoryCollection.php | 4 +- .../BlogCategory/BlogCategoryDefinition.php | 14 +-- .../BlogCategory/BlogCategoryEntity.php | 6 +- .../BlogCategory/BlogCategoryIndexer.php | 4 +- .../BlogCategoryTranslationCollection.php | 4 +- .../BlogCategoryTranslationDefinition.php | 6 +- .../BlogCategoryTranslationEntity.php | 24 ++-- ...lver.php => WerklCmsSlotsDataResolver.php} | 8 +- src/Content/Extension/LanguageExtension.php | 8 +- src/Content/Extension/MediaExtension.php | 6 +- src/Content/Extension/SalutationExtension.php | 4 +- .../Suggest/ProductSuggestDecorated.php | 4 +- src/Controller/BlogController.php | 6 +- src/Controller/BlogRssController.php | 6 +- src/Controller/BlogSearchController.php | 6 +- src/Controller/CachedBlogController.php | 6 +- src/Controller/CachedBlogRssController.php | 8 +- src/Controller/CachedBlogSearchController.php | 8 +- .../StoreApi/AbstractBlogController.php | 2 +- src/Controller/StoreApi/BlogController.php | 6 +- .../StoreApi/BlogControllerResponse.php | 4 +- .../Sitemap/Provider/BlogUrlProvider.php | 12 +- .../Migration1559416986BlogEntries.php | 20 ++-- ...39765AddTeaserImageColumnToBlogEntries.php | 4 +- ...on1604519670CreateSasBlogCategoryTable.php | 67 ----------- ...1604519670CreateWerklBlogCategoryTable.php | 67 +++++++++++ ...ion1604520733DefaultBlogCategorySeeder.php | 18 +-- ...n1605031477CreateWerklBlogAuthorTable.php} | 40 +++---- ...ion1612160298CreatePubslihedDateColumn.php | 6 +- ...1260479AddVersionIdToBlogCategoryTable.php | 42 +++---- ...6760242AddCustomFieldToBlogTranslation.php | 4 +- ...ation1647338771WerklBlogEntriesUpdate.php} | 10 +- ...n1649322718CreateCmsPageForBlogEntries.php | 8 +- .../Migration1649580844AddParentVersionId.php | 16 +-- ...2998914SetSalutationIdAuthorToNullable.php | 8 +- src/Page/Blog/BlogPage.php | 6 +- src/Page/Blog/BlogPageCriteriaEvent.php | 2 +- src/Page/Blog/BlogPageLoadedEvent.php | 2 +- src/Page/Blog/BlogPageLoader.php | 8 +- src/Page/Search/BlogSearchPage.php | 2 +- src/Page/Search/BlogSearchPageLoader.php | 2 +- .../app/administration/babel.config.json | 0 .../administration/build/webpack.config.js | 0 .../app/administration/package-lock.json | 0 src/Resources/app/administration/package.json | 0 .../blocks/detail/component/index.js | 4 +- .../sas-cms-block-blog-detail.html.twig | 5 - .../werkl-cms-block-blog-detail.html.twig | 5 + ....scss => werkl-cms-block-blog-detail.scss} | 0 .../module/blog-module/blocks/detail/index.js | 8 +- .../blocks/detail/preview/index.js | 6 +- ...> werkl-cms-preview-blog-detail.html.twig} | 8 +- ...css => werkl-cms-preview-blog-detail.scss} | 4 +- .../blocks/listing/component/index.js | 4 +- .../component/sas-cms-block-blog.html.twig | 5 - .../component/werkl-cms-block-blog.html.twig | 5 + ...ck-blog.scss => werkl-cms-block-blog.scss} | 0 .../blog-module/blocks/listing/index.js | 8 +- .../blocks/listing/preview/index.js | 6 +- ... werkl-cms-preview-blog-listing.html.twig} | 8 +- ...ss => werkl-cms-preview-blog-listing.scss} | 4 +- .../blocks/newest-listing/component/index.js | 2 +- .../sas-cms-block-newest-listing.html.twig | 5 - .../werkl-cms-block-newest-listing.html.twig | 5 + .../blocks/newest-listing/index.js | 8 +- .../blocks/newest-listing/preview/index.js | 6 +- .../sas-cms-preview-newest-listing.html.twig | 15 --- ...werkl-cms-preview-newest-listing.html.twig | 15 +++ ... => werkl-cms-preview-newest-listing.scss} | 4 +- .../blocks/single-entry/component/index.js | 4 +- .../sas-cms-block-blog-single-entry.html.twig | 5 - ...erkl-cms-block-blog-single-entry.html.twig | 5 + ...=> werkl-cms-block-blog-single-entry.scss} | 0 .../blog-module/blocks/single-entry/index.js | 8 +- .../blocks/single-entry/preview/index.js | 6 +- ...as-cms-preview-blog-single-entry.html.twig | 12 -- ...kl-cms-preview-blog-single-entry.html.twig | 12 ++ ... werkl-cms-preview-blog-single-entry.scss} | 4 +- .../blog-category-tree-field/index.js | 4 +- .../component/blog-category-tree/index.js | 8 +- ...wig => werkl-blog-category-tree.html.twig} | 2 +- ...log-extension-component-sections.html.twig | 0 .../index.js | 2 +- .../blog-tree-item/blog-tree-item.html.twig | 6 +- .../component/blog-tree-item/index.js | 2 +- .../blog-vertical-tabs.html.twig | 12 +- .../component/blog-vertical-tabs/index.js | 2 +- ....constant.js => open-blogware.constant.js} | 0 .../elements/blog-detail/component/index.js | 6 +- .../sas-blog-element-blog-detail.html.twig | 8 -- .../werkl-blog-element-blog-detail.html.twig | 8 ++ ...ss => werkl-blog-element-blog-detail.scss} | 6 +- .../elements/blog-detail/config/index.js | 0 .../sw-cms-el-config-blog-detail.html.twig | 10 +- .../config/sw-cms-el-config-blog-detail.scss | 0 .../blog-module/elements/blog-detail/index.js | 4 +- .../elements/blog-detail/preview/index.js | 6 +- ...g => werkl-blog-element-preview.html.twig} | 2 +- ...w.scss => werkl-blog-element-preview.scss} | 0 .../blog-newest-listing/component/index.js | 6 +- .../sas-cms-el-newest-listing.html.twig | 8 -- .../werkl-cms-el-newest-listing.html.twig | 8 ++ ....scss => werkl-cms-el-newest-listing.scss} | 2 +- .../blog-newest-listing/config/index.js | 8 +- ...sas-cms-el-config-newest-listing.html.twig | 54 --------- ...rkl-cms-el-config-newest-listing.html.twig | 54 +++++++++ ...> werkl-cms-el-config-newest-listing.scss} | 2 +- .../elements/blog-newest-listing/index.js | 10 +- .../blog-newest-listing/preview/index.js | 6 +- ...as-cms-el-preview-newest-listing.html.twig | 13 -- ...kl-cms-el-preview-newest-listing.html.twig | 13 ++ ... werkl-cms-el-preview-newest-listing.scss} | 6 +- .../blog-single-select/component/index.js | 2 +- .../sw-cms-el-blog-single-select.html.twig | 4 +- .../sw-cms-el-blog-single-select.scss | 2 +- .../blog-single-select/config/index.js | 2 +- ...cms-el-config-blog-single-select.html.twig | 8 +- .../elements/blog-single-select/index.js | 4 +- .../blog-single-select/preview/index.js | 0 ...ms-el-preview-blog-single-select.html.twig | 2 +- .../sw-cms-el-preview-blog-single-select.scss | 0 .../elements/blog/component/index.js | 0 .../blog/component/sw-cms-el-blog.html.twig | 8 +- .../blog/component/sw-cms-el-blog.scss | 6 +- .../blog-module/elements/blog/config/index.js | 2 +- .../config/sw-cms-el-config-blog.html.twig | 34 +++--- .../blog/config/sw-cms-el-config-blog.scss | 0 .../module/blog-module/elements/blog/index.js | 2 +- .../elements/blog/preview/index.js | 0 .../preview/sw-cms-el-preview-blog.html.twig | 0 .../blog/preview/sw-cms-el-preview-blog.scss | 0 .../src/module/blog-module/error-config.json | 2 +- .../component/cms/sas-cms-slot/index.js | 8 -- .../index.js | 14 +-- .../werkl-cms-sidebar.html.twig} | 112 +++++++++--------- .../werkl-cms-sidebar.scss} | 4 +- .../component/cms/werkl-cms-slot/index.js | 8 ++ .../werkl-cms-slot.html.twig} | 0 .../werkl-cms-slot.scss} | 2 +- .../sw-cms/component/sw-cms-sidebar/index.js | 2 +- .../sw-cms-sidebar/sw-cms-sidebar.html.twig | 2 +- .../sw-cms/page/sw-cms-list/index.js | 0 .../extension/sw-cms/snippet/en-GB.json | 0 .../helper/shopware-version.helper.js | 0 .../src/module/blog-module/index.js | 48 ++++---- .../acl/index.js | 18 +-- .../werkl-blog-author-create}/index.js | 2 +- .../werkl-blog-author-detail}/index.js | 14 +-- .../werkl-blog-author-detail.html.twig} | 44 +++---- .../werkl-blog-author-detail.scss} | 0 .../werkl-blog-author-list}/index.js | 16 +-- .../werkl-blog-author-list.html.twig} | 42 +++---- .../werkl-blog-author-list.scss} | 2 +- .../index.js | 4 +- .../werkl-blog-create.html.twig} | 0 .../acl/index.js | 22 ++-- .../index.js | 18 +-- .../werkl-blog-detail.html.twig} | 4 +- .../acl/index.js | 18 +-- .../index.js | 18 +-- .../werkl-blog-list.scss} | 2 +- .../werkl-blog-list.twig} | 42 +++---- .../src/module/blog-module/snippet/de-DE.json | 14 +-- .../src/module/blog-module/snippet/en-GB.json | 16 +-- src/Resources/config/services.xml | 110 ++++++++--------- .../administration/css/sas-blog-module.css | 22 ---- .../administration/js/sas-blog-module.js | 1 - .../snippet/de_DE/storefront.de-DE.json | 2 +- .../snippet/en_GB/storefront.en-GB.json | 2 +- .../block/cms-block-blog-detail.html.twig | 2 +- .../block/cms-block-blog-listing.html.twig | 2 +- .../cms-block-blog-single-entry.html.twig | 2 +- .../blog/_partials/_block_author.html.twig | 6 +- .../blog/_partials/_block_category.html.twig | 6 +- .../component/blog/card/box.html.twig | 26 ++-- .../component/blog/listing.html.twig | 20 ++-- .../component/blog/newest-listing.html.twig | 12 +- .../listing/blog-filter-panel.html.twig | 4 +- .../element/cms-element-blog-detail.html.twig | 36 +++--- .../cms-element-blog-newest-listing.html.twig | 4 +- .../cms-element-blog-single-select.html.twig | 4 +- .../element/cms-element-blog.html.twig | 6 +- .../header/blog-suggest-tab-content.html.twig | 14 +-- .../layout/header/search-suggest.html.twig | 4 +- .../storefront/layout/header/search.html.twig | 4 +- .../views/storefront/layout/meta.html.twig | 10 +- .../page/blog-search/index.html.twig | 2 +- .../Seo/SeoUrlRoute/SeoUrlUpdateListener.php | 6 +- src/Subscriber/BlogCacheInvalidSubscriber.php | 16 +-- src/Util/Lifecycle.php | 4 +- src/Util/Update.php | 8 +- ...asBlogModule.php => WerklOpenBlogware.php} | 34 +++--- .../integration/administration/cms.spec.js | 4 +- .../admin/blog/BlogFormRepository.js | 4 +- .../admin/general/CmsPageRepository.js | 4 +- .../Blog/Events/BlogMainFilterEventTest.php | 4 +- .../SasCmsSlotsDataResolverTest.php | 18 +-- .../Sitemap/Provider/BlogUrlProviderTest.php | 14 +-- tests/PHPUnit/Fakes/FakeEntityRepository.php | 2 +- .../Page/Blog/BlogPageCriteriaEventTest.php | 4 +- .../Page/Blog/BlogPageLoadedEventTest.php | 6 +- .../PHPUnit/Page/Blog/BlogPageLoaderTest.php | 16 +-- .../Page/Search/BlogSearchPageLoaderTest.php | 14 +-- tests/PHPUnit/Traits/ContextTrait.php | 2 +- tests/PHPUnit/Util/LifecycleTest.php | 6 +- tests/PHPUnit/Util/UpdateTest.php | 6 +- 246 files changed, 1135 insertions(+), 1160 deletions(-) rename src/Content/Cms/DataResolver/{SasCmsSlotsDataResolver.php => WerklCmsSlotsDataResolver.php} (90%) delete mode 100644 src/Migration/Migration1604519670CreateSasBlogCategoryTable.php create mode 100644 src/Migration/Migration1604519670CreateWerklBlogCategoryTable.php rename src/Migration/{Migration1605031477CreateSasBlogAuthorTable.php => Migration1605031477CreateWerklBlogAuthorTable.php} (57%) rename src/Migration/{Migration1647338771SasBlogEntriesUpdate.php => Migration1647338771WerklBlogEntriesUpdate.php} (81%) mode change 100644 => 100755 src/Resources/app/administration/babel.config.json mode change 100644 => 100755 src/Resources/app/administration/build/webpack.config.js mode change 100644 => 100755 src/Resources/app/administration/package-lock.json mode change 100644 => 100755 src/Resources/app/administration/package.json mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/blocks/detail/component/index.js delete mode 100644 src/Resources/app/administration/src/module/blog-module/blocks/detail/component/sas-cms-block-blog-detail.html.twig create mode 100755 src/Resources/app/administration/src/module/blog-module/blocks/detail/component/werkl-cms-block-blog-detail.html.twig rename src/Resources/app/administration/src/module/blog-module/blocks/detail/component/{sas-cms-block-blog-detail.scss => werkl-cms-block-blog-detail.scss} (100%) mode change 100644 => 100755 mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/blocks/detail/index.js mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/blocks/detail/preview/index.js rename src/Resources/app/administration/src/module/blog-module/blocks/detail/preview/{sas-cms-preview-blog-detail.html.twig => werkl-cms-preview-blog-detail.html.twig} (63%) mode change 100644 => 100755 rename src/Resources/app/administration/src/module/blog-module/blocks/detail/preview/{sas-cms-preview-blog-detail.scss => werkl-cms-preview-blog-detail.scss} (92%) mode change 100644 => 100755 mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/blocks/listing/component/index.js delete mode 100644 src/Resources/app/administration/src/module/blog-module/blocks/listing/component/sas-cms-block-blog.html.twig create mode 100755 src/Resources/app/administration/src/module/blog-module/blocks/listing/component/werkl-cms-block-blog.html.twig rename src/Resources/app/administration/src/module/blog-module/blocks/listing/component/{sas-cms-block-blog.scss => werkl-cms-block-blog.scss} (100%) mode change 100644 => 100755 mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/blocks/listing/index.js mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/blocks/listing/preview/index.js rename src/Resources/app/administration/src/module/blog-module/blocks/listing/preview/{sas-cms-preview-blog-listing.html.twig => werkl-cms-preview-blog-listing.html.twig} (56%) mode change 100644 => 100755 rename src/Resources/app/administration/src/module/blog-module/blocks/listing/preview/{sas-cms-preview-blog-listing.scss => werkl-cms-preview-blog-listing.scss} (91%) mode change 100644 => 100755 mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/blocks/newest-listing/component/index.js delete mode 100644 src/Resources/app/administration/src/module/blog-module/blocks/newest-listing/component/sas-cms-block-newest-listing.html.twig create mode 100755 src/Resources/app/administration/src/module/blog-module/blocks/newest-listing/component/werkl-cms-block-newest-listing.html.twig mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/blocks/newest-listing/index.js mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/blocks/newest-listing/preview/index.js delete mode 100644 src/Resources/app/administration/src/module/blog-module/blocks/newest-listing/preview/sas-cms-preview-newest-listing.html.twig create mode 100755 src/Resources/app/administration/src/module/blog-module/blocks/newest-listing/preview/werkl-cms-preview-newest-listing.html.twig rename src/Resources/app/administration/src/module/blog-module/blocks/newest-listing/preview/{sas-cms-preview-newest-listing.scss => werkl-cms-preview-newest-listing.scss} (91%) mode change 100644 => 100755 mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/blocks/single-entry/component/index.js delete mode 100644 src/Resources/app/administration/src/module/blog-module/blocks/single-entry/component/sas-cms-block-blog-single-entry.html.twig create mode 100755 src/Resources/app/administration/src/module/blog-module/blocks/single-entry/component/werkl-cms-block-blog-single-entry.html.twig rename src/Resources/app/administration/src/module/blog-module/blocks/single-entry/component/{sas-cms-block-blog-single-entry.scss => werkl-cms-block-blog-single-entry.scss} (100%) mode change 100644 => 100755 mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/blocks/single-entry/index.js mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/blocks/single-entry/preview/index.js delete mode 100644 src/Resources/app/administration/src/module/blog-module/blocks/single-entry/preview/sas-cms-preview-blog-single-entry.html.twig create mode 100755 src/Resources/app/administration/src/module/blog-module/blocks/single-entry/preview/werkl-cms-preview-blog-single-entry.html.twig rename src/Resources/app/administration/src/module/blog-module/blocks/single-entry/preview/{sas-cms-preview-blog-single-entry.scss => werkl-cms-preview-blog-single-entry.scss} (90%) mode change 100644 => 100755 mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/component/blog-category-tree-field/index.js mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/component/blog-category-tree/index.js rename src/Resources/app/administration/src/module/blog-module/component/blog-category-tree/{sas-blog-category-tree.html.twig => werkl-blog-category-tree.html.twig} (98%) mode change 100644 => 100755 mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/component/blog-extension-component-sections/blog-extension-component-sections.html.twig mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/component/blog-extension-component-sections/index.js mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/component/blog-tree-item/blog-tree-item.html.twig mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/component/blog-tree-item/index.js mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/component/blog-vertical-tabs/blog-vertical-tabs.html.twig mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/component/blog-vertical-tabs/index.js rename src/Resources/app/administration/src/module/blog-module/constant/{blog-module.constant.js => open-blogware.constant.js} (100%) mode change 100644 => 100755 mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/elements/blog-detail/component/index.js delete mode 100644 src/Resources/app/administration/src/module/blog-module/elements/blog-detail/component/sas-blog-element-blog-detail.html.twig create mode 100755 src/Resources/app/administration/src/module/blog-module/elements/blog-detail/component/werkl-blog-element-blog-detail.html.twig rename src/Resources/app/administration/src/module/blog-module/elements/blog-detail/component/{sas-blog-element-blog-detail.scss => werkl-blog-element-blog-detail.scss} (79%) mode change 100644 => 100755 mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/elements/blog-detail/config/index.js mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/elements/blog-detail/config/sw-cms-el-config-blog-detail.html.twig mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/elements/blog-detail/config/sw-cms-el-config-blog-detail.scss mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/elements/blog-detail/index.js mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/elements/blog-detail/preview/index.js rename src/Resources/app/administration/src/module/blog-module/elements/blog-detail/preview/{sas-blog-element-preview.html.twig => werkl-blog-element-preview.html.twig} (87%) mode change 100644 => 100755 rename src/Resources/app/administration/src/module/blog-module/elements/blog-detail/preview/{sas-blog-element-preview.scss => werkl-blog-element-preview.scss} (100%) mode change 100644 => 100755 mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/component/index.js delete mode 100644 src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/component/sas-cms-el-newest-listing.html.twig create mode 100755 src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/component/werkl-cms-el-newest-listing.html.twig rename src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/component/{sas-cms-el-newest-listing.scss => werkl-cms-el-newest-listing.scss} (85%) mode change 100644 => 100755 mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/config/index.js delete mode 100644 src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/config/sas-cms-el-config-newest-listing.html.twig create mode 100755 src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/config/werkl-cms-el-config-newest-listing.html.twig rename src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/config/{sas-cms-el-config-newest-listing.scss => werkl-cms-el-config-newest-listing.scss} (55%) mode change 100644 => 100755 mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/index.js mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/preview/index.js delete mode 100644 src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/preview/sas-cms-el-preview-newest-listing.html.twig create mode 100755 src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/preview/werkl-cms-el-preview-newest-listing.html.twig rename src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/preview/{sas-cms-el-preview-newest-listing.scss => werkl-cms-el-preview-newest-listing.scss} (79%) mode change 100644 => 100755 mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/elements/blog-single-select/component/index.js mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/elements/blog-single-select/component/sw-cms-el-blog-single-select.html.twig mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/elements/blog-single-select/component/sw-cms-el-blog-single-select.scss mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/elements/blog-single-select/config/index.js mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/elements/blog-single-select/config/sw-cms-el-config-blog-single-select.html.twig mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/elements/blog-single-select/index.js mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/elements/blog-single-select/preview/index.js mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/elements/blog-single-select/preview/sw-cms-el-preview-blog-single-select.html.twig mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/elements/blog-single-select/preview/sw-cms-el-preview-blog-single-select.scss mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/elements/blog/component/index.js mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/elements/blog/component/sw-cms-el-blog.html.twig mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/elements/blog/component/sw-cms-el-blog.scss mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/elements/blog/config/index.js mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/elements/blog/config/sw-cms-el-config-blog.html.twig mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/elements/blog/config/sw-cms-el-config-blog.scss mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/elements/blog/index.js mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/elements/blog/preview/index.js mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/elements/blog/preview/sw-cms-el-preview-blog.html.twig mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/elements/blog/preview/sw-cms-el-preview-blog.scss delete mode 100644 src/Resources/app/administration/src/module/blog-module/extension/component/cms/sas-cms-slot/index.js rename src/Resources/app/administration/src/module/blog-module/extension/component/cms/{sas-cms-sidebar => werkl-cms-sidebar}/index.js (84%) mode change 100644 => 100755 rename src/Resources/app/administration/src/module/blog-module/extension/component/cms/{sas-cms-sidebar/sas-cms-sidebar.html.twig => werkl-cms-sidebar/werkl-cms-sidebar.html.twig} (65%) mode change 100644 => 100755 rename src/Resources/app/administration/src/module/blog-module/extension/component/cms/{sas-cms-sidebar/sas-cms-sidebar.scss => werkl-cms-sidebar/werkl-cms-sidebar.scss} (95%) mode change 100644 => 100755 create mode 100755 src/Resources/app/administration/src/module/blog-module/extension/component/cms/werkl-cms-slot/index.js rename src/Resources/app/administration/src/module/blog-module/extension/component/cms/{sas-cms-slot/sas-cms-slot.html.twig => werkl-cms-slot/werkl-cms-slot.html.twig} (100%) mode change 100644 => 100755 rename src/Resources/app/administration/src/module/blog-module/extension/component/cms/{sas-cms-slot/sas-cms-slot.scss => werkl-cms-slot/werkl-cms-slot.scss} (77%) mode change 100644 => 100755 mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/extension/sw-cms/component/sw-cms-sidebar/index.js mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/extension/sw-cms/component/sw-cms-sidebar/sw-cms-sidebar.html.twig mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/extension/sw-cms/page/sw-cms-list/index.js mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/extension/sw-cms/snippet/en-GB.json mode change 100644 => 100755 src/Resources/app/administration/src/module/blog-module/helper/shopware-version.helper.js rename src/Resources/app/administration/src/module/blog-module/page/{sas-blog-list => werkl-blog-author}/acl/index.js (55%) mode change 100644 => 100755 rename src/Resources/app/administration/src/module/blog-module/page/{sas-blog-author/sas-blog-author-create => werkl-blog-author/werkl-blog-author-create}/index.js (77%) mode change 100644 => 100755 rename src/Resources/app/administration/src/module/blog-module/page/{sas-blog-author/sas-blog-author-detail => werkl-blog-author/werkl-blog-author-detail}/index.js (90%) mode change 100644 => 100755 rename src/Resources/app/administration/src/module/blog-module/page/{sas-blog-author/sas-blog-author-detail/sas-blog-author-detail.html.twig => werkl-blog-author/werkl-blog-author-detail/werkl-blog-author-detail.html.twig} (64%) mode change 100644 => 100755 rename src/Resources/app/administration/src/module/blog-module/page/{sas-blog-author/sas-blog-author-detail/sas-blog-author-detail.scss => werkl-blog-author/werkl-blog-author-detail/werkl-blog-author-detail.scss} (100%) mode change 100644 => 100755 rename src/Resources/app/administration/src/module/blog-module/page/{sas-blog-author/sas-blog-author-list => werkl-blog-author/werkl-blog-author-list}/index.js (81%) mode change 100644 => 100755 rename src/Resources/app/administration/src/module/blog-module/page/{sas-blog-author/sas-blog-author-list/sas-blog-author-list.html.twig => werkl-blog-author/werkl-blog-author-list/werkl-blog-author-list.html.twig} (64%) mode change 100644 => 100755 rename src/Resources/app/administration/src/module/blog-module/page/{sas-blog-author/sas-blog-author-list/sas-blog-author-list.scss => werkl-blog-author/werkl-blog-author-list/werkl-blog-author-list.scss} (94%) mode change 100644 => 100755 rename src/Resources/app/administration/src/module/blog-module/page/{sas-blog-create => werkl-blog-create}/index.js (90%) mode change 100644 => 100755 rename src/Resources/app/administration/src/module/blog-module/page/{sas-blog-create/sas-blog-create.html.twig => werkl-blog-create/werkl-blog-create.html.twig} (100%) mode change 100644 => 100755 rename src/Resources/app/administration/src/module/blog-module/page/{sas-blog-detail => werkl-blog-detail}/acl/index.js (53%) mode change 100644 => 100755 rename src/Resources/app/administration/src/module/blog-module/page/{sas-blog-detail => werkl-blog-detail}/index.js (95%) mode change 100644 => 100755 rename src/Resources/app/administration/src/module/blog-module/page/{sas-blog-detail/sas-blog-detail.html.twig => werkl-blog-detail/werkl-blog-detail.html.twig} (97%) mode change 100644 => 100755 rename src/Resources/app/administration/src/module/blog-module/page/{sas-blog-author => werkl-blog-list}/acl/index.js (54%) mode change 100644 => 100755 rename src/Resources/app/administration/src/module/blog-module/page/{sas-blog-list => werkl-blog-list}/index.js (82%) mode change 100644 => 100755 rename src/Resources/app/administration/src/module/blog-module/page/{sas-blog-list/sas-blog-list.scss => werkl-blog-list/werkl-blog-list.scss} (98%) mode change 100644 => 100755 rename src/Resources/app/administration/src/module/blog-module/page/{sas-blog-list/sas-blog-list.twig => werkl-blog-list/werkl-blog-list.twig} (70%) mode change 100644 => 100755 delete mode 100755 src/Resources/public/administration/css/sas-blog-module.css delete mode 100755 src/Resources/public/administration/js/sas-blog-module.js rename src/{SasBlogModule.php => WerklOpenBlogware.php} (91%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f9a154b..f3aaeb1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -91,10 +91,10 @@ jobs: docker logs shop - name: Upload into Docker run: | - docker cp $(pwd)/. shop:/var/www/html/custom/plugins/SasBlogModule + docker cp $(pwd)/. shop:/var/www/html/custom/plugins/WerklOpenBlogware docker exec shop bash -c 'sudo chown www-data:www-data /var/www/html/custom/plugins -R' - name: Install and Build Plugin run: | - docker exec shop bash -c 'cd /var/www/html/custom/plugins/SasBlogModule && make clean' - docker exec shop bash -c 'cd /var/www/html/custom/plugins/SasBlogModule && make install' - docker exec shop bash -c 'cd /var/www/html/custom/plugins/SasBlogModule && make build' + docker exec shop bash -c 'cd /var/www/html/custom/plugins/WerklOpenBlogware && make clean' + docker exec shop bash -c 'cd /var/www/html/custom/plugins/WerklOpenBlogware && make install' + docker exec shop bash -c 'cd /var/www/html/custom/plugins/WerklOpenBlogware && make build' diff --git a/.github/workflows/ci_pipe.yml b/.github/workflows/ci_pipe.yml index 17dfc14..2f9a946 100644 --- a/.github/workflows/ci_pipe.yml +++ b/.github/workflows/ci_pipe.yml @@ -132,14 +132,14 @@ jobs: - name: Upload into Docker run: | - docker cp $(pwd)/. shop:/var/www/html/custom/plugins/SasBlogModule + docker cp $(pwd)/. shop:/var/www/html/custom/plugins/WerklOpenBlogware docker exec shop bash -c 'sudo chown www-data:www-data /var/www/html/custom/plugins -R' - name: Install and Build Plugin run: | - docker exec shop bash -c 'cd /var/www/html/custom/plugins/SasBlogModule && make clean' - docker exec shop bash -c 'cd /var/www/html/custom/plugins/SasBlogModule && make install' - docker exec shop bash -c 'cd /var/www/html/custom/plugins/SasBlogModule && make build' + docker exec shop bash -c 'cd /var/www/html/custom/plugins/WerklOpenBlogware && make clean' + docker exec shop bash -c 'cd /var/www/html/custom/plugins/WerklOpenBlogware && make install' + docker exec shop bash -c 'cd /var/www/html/custom/plugins/WerklOpenBlogware && make build' # ------------------------------------------------------------------------------------------------------------------------ @@ -172,18 +172,18 @@ jobs: # - name: Upload into Docker # run: | - # docker cp $(pwd)/. shop:/var/www/html/custom/plugins/SasBlogModule + # docker cp $(pwd)/. shop:/var/www/html/custom/plugins/WerklOpenBlogware # docker exec shop bash -c 'sudo chown www-data:www-data /var/www/html/custom/plugins -R' # - name: Install and Build Artifacts # run: | - # docker exec shop bash -c 'cd /var/www/html/custom/plugins/SasBlogModule && make install -B' - # docker exec shop bash -c 'cd /var/www/html/custom/plugins/SasBlogModule && make build -B' + # docker exec shop bash -c 'cd /var/www/html/custom/plugins/WerklOpenBlogware && make install -B' + # docker exec shop bash -c 'cd /var/www/html/custom/plugins/WerklOpenBlogware && make build -B' # - name: Install/Configure Plugin # run: | # docker exec shop bash -c 'php bin/console plugin:refresh' - # docker exec shop bash -c 'php bin/console plugin:install SasBlogModule --activate' + # docker exec shop bash -c 'php bin/console plugin:install WerklOpenBlogware --activate' # docker exec shop bash -c 'php bin/console cache:clear' # - name: Install Cypress diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index e034804..3b0f6b3 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -86,10 +86,10 @@ jobs: docker logs shop - name: Upload into Docker run: | - docker cp $(pwd)/. shop:/var/www/html/custom/plugins/SasBlogModule + docker cp $(pwd)/. shop:/var/www/html/custom/plugins/WerklOpenBlogware docker exec shop bash -c 'sudo chown www-data:www-data /var/www/html/custom/plugins -R' - name: Install and Build Plugin run: | - docker exec shop bash -c 'cd /var/www/html/custom/plugins/SasBlogModule && make clean' - docker exec shop bash -c 'cd /var/www/html/custom/plugins/SasBlogModule && make install' - docker exec shop bash -c 'cd /var/www/html/custom/plugins/SasBlogModule && make build' + docker exec shop bash -c 'cd /var/www/html/custom/plugins/WerklOpenBlogware && make clean' + docker exec shop bash -c 'cd /var/www/html/custom/plugins/WerklOpenBlogware && make install' + docker exec shop bash -c 'cd /var/www/html/custom/plugins/WerklOpenBlogware && make build' diff --git a/.php_cs.cache b/.php_cs.cache index 848d596..6213234 100644 --- a/.php_cs.cache +++ b/.php_cs.cache @@ -1 +1 @@ -{"php":"7.4.29","version":"2.19.3:v2.19.3#75ac86f33fab4714ea5a39a396784d83ae3b5ed8","indent":" ","lineEnding":"\n","rules":{"blank_line_after_namespace":true,"braces":true,"class_definition":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline"},"no_break_comment":true,"no_closing_tag":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":true,"encoding":true,"full_opening_tag":true,"single_quote":true,"function_typehint_space":true,"hash_to_slash_comment":true,"method_separation":true,"no_blank_lines_after_phpdoc":true,"no_blank_lines_before_namespace":true,"no_unused_imports":true,"no_useless_else":true,"phpdoc_align":true,"phpdoc_order":true,"phpdoc_scalar":true,"pre_increment":true,"short_scalar_cast":true,"space_after_semicolon":true,"ternary_operator_spaces":true,"trailing_comma_in_multiline_array":true,"semicolon_after_instruction":true,"trim_array_spaces":true,"whitespace_after_comma_in_array":true,"phpdoc_add_missing_param_annotation":true,"ordered_imports":true,"binary_operator_spaces":{"align_equals":false,"align_double_arrow":true},"concat_space":{"spacing":"one"},"array_syntax":{"syntax":"short"}},"hashes":{"src\/Page\/Blog\/BlogPageCriteriaEvent.php":314944644,"src\/Page\/Blog\/BlogPage.php":2706236335,"src\/Page\/Blog\/BlogPageLoader.php":3150878484,"src\/Page\/Blog\/BlogPageLoadedEvent.php":2307273889,"src\/Page\/Search\/BlogSearchPageLoader.php":4021084600,"src\/Page\/Search\/BlogSearchPage.php":3536611592,"src\/SasBlogModule.php":1784235949,"src\/Core\/Content\/Sitemap\/Provider\/BlogUrlProvider.php":2008718243,"src\/Util\/Update.php":3658249283,"src\/Util\/Lifecycle.php":3966690185,"src\/Content\/BlogAuthor\/BlogAuthorDefinition.php":265329503,"src\/Content\/BlogAuthor\/BlogAuthorEntity.php":2305064161,"src\/Content\/BlogAuthor\/BlogAuthorTranslation\/BlogAuthorTranslationDefinition.php":3437891261,"src\/Content\/BlogAuthor\/BlogAuthorTranslation\/BlogAuthorTranslationCollection.php":214717944,"src\/Content\/BlogAuthor\/BlogAuthorTranslation\/BlogAuthorTranslationEntity.php":1087744547,"src\/Content\/BlogAuthor\/BlogAuthorCollection.php":384288389,"src\/Content\/BlogCategory\/BlogCategoryDefinition.php":4087296137,"src\/Content\/BlogCategory\/BlogCategoryTranslation\/BlogCategoryTranslationDefinition.php":2417094993,"src\/Content\/BlogCategory\/BlogCategoryTranslation\/BlogCategoryTranslationEntity.php":1453710896,"src\/Content\/BlogCategory\/BlogCategoryTranslation\/BlogCategoryTranslationCollection.php":1654547079,"src\/Content\/BlogCategory\/BlogCategoryEntity.php":4081984804,"src\/Content\/BlogCategory\/BlogCategoryIndexer.php":2342396229,"src\/Content\/BlogCategory\/BlogCategoryCollection.php":2647868457,"src\/Content\/Blog\/DataResolver\/SasCmsSlotsDataResolver.php":4122573966,"src\/Content\/Blog\/DataResolver\/BlogCmsElementResolver.php":2239832067,"src\/Content\/Blog\/DataResolver\/BlogSingleSelectDataResolver.php":3099369916,"src\/Content\/Blog\/DataResolver\/BlogDetailCmsElementResolver.php":3213698661,"src\/Content\/Blog\/Aggregate\/BlogCategoryMappingDefinition.php":4102877476,"src\/Content\/Blog\/BlogEntriesCollection.php":496021737,"src\/Content\/Blog\/BlogListingFilterBuildEvent.php":3440316816,"src\/Content\/Blog\/BlogEntriesEntity.php":3681564287,"src\/Content\/Blog\/Subscriber\/BlogSubscriber.php":2334093380,"src\/Content\/Blog\/Events\/BlogMainFilterEvent.php":4242742479,"src\/Content\/Blog\/BlogSeoUrlListener.php":4001334800,"src\/Content\/Blog\/BlogEntriesDefinition.php":156841383,"src\/Content\/Blog\/BlogSeoUrlRoute.php":1738305917,"src\/Content\/Blog\/BlogTranslation\/BlogTranslationCollection.php":3605503894,"src\/Content\/Blog\/BlogTranslation\/BlogTranslationEntity.php":2707099448,"src\/Content\/Blog\/BlogTranslation\/BlogTranslationDefinition.php":60284177,"src\/Content\/SalesChannel\/Suggest\/ProductSuggestDecorated.php":289113257,"src\/Controller\/BlogController.php":1660253338,"src\/Controller\/StoreApi\/BlogControllerResponse.php":587140342,"src\/Controller\/StoreApi\/BlogController.php":518786207,"src\/Controller\/StoreApi\/AbstractBlogController.php":1300258681,"src\/Migration\/Migration1604520733DefaultBlogCategorySeeder.php":197359240,"src\/Migration\/Migration1612160298CreatePubslihedDateColumn.php":3546170814,"src\/Migration\/Migration1621260479AddVersionIdToBlogCategoryTable.php":49104478,"src\/Migration\/Migration1605031477CreateSasBlogAuthorTable.php":10683443,"src\/Migration\/Migration1604519670CreateSasBlogCategoryTable.php":300225515,"src\/Migration\/Migration1626760242AddCustomFieldToBlogTranslation.php":1239226930,"src\/Migration\/Migration1647338771SasBlogEntriesUpdate.php":69629835,"src\/Migration\/Migration1602739765AddTeaserImageColumnToBlogEntries.php":3088455465,"src\/Migration\/Migration1649322718CreateCmsPageForBlogEntries.php":4215710689,"src\/Migration\/Migration1559416986BlogEntries.php":414753366}} \ No newline at end of file +{"php":"7.4.29","version":"2.19.3:v2.19.3#75ac86f33fab4714ea5a39a396784d83ae3b5ed8","indent":" ","lineEnding":"\n","rules":{"blank_line_after_namespace":true,"braces":true,"class_definition":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline"},"no_break_comment":true,"no_closing_tag":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":true,"encoding":true,"full_opening_tag":true,"single_quote":true,"function_typehint_space":true,"hash_to_slash_comment":true,"method_separation":true,"no_blank_lines_after_phpdoc":true,"no_blank_lines_before_namespace":true,"no_unused_imports":true,"no_useless_else":true,"phpdoc_align":true,"phpdoc_order":true,"phpdoc_scalar":true,"pre_increment":true,"short_scalar_cast":true,"space_after_semicolon":true,"ternary_operator_spaces":true,"trailing_comma_in_multiline_array":true,"semicolon_after_instruction":true,"trim_array_spaces":true,"whitespace_after_comma_in_array":true,"phpdoc_add_missing_param_annotation":true,"ordered_imports":true,"binary_operator_spaces":{"align_equals":false,"align_double_arrow":true},"concat_space":{"spacing":"one"},"array_syntax":{"syntax":"short"}},"hashes":{"src\/Page\/Blog\/BlogPageCriteriaEvent.php":314944644,"src\/Page\/Blog\/BlogPage.php":2706236335,"src\/Page\/Blog\/BlogPageLoader.php":3150878484,"src\/Page\/Blog\/BlogPageLoadedEvent.php":2307273889,"src\/Page\/Search\/BlogSearchPageLoader.php":4021084600,"src\/Page\/Search\/BlogSearchPage.php":3536611592,"src\/WerklOpenBlogware.php":1784235949,"src\/Core\/Content\/Sitemap\/Provider\/BlogUrlProvider.php":2008718243,"src\/Util\/Update.php":3658249283,"src\/Util\/Lifecycle.php":3966690185,"src\/Content\/BlogAuthor\/BlogAuthorDefinition.php":265329503,"src\/Content\/BlogAuthor\/BlogAuthorEntity.php":2305064161,"src\/Content\/BlogAuthor\/BlogAuthorTranslation\/BlogAuthorTranslationDefinition.php":3437891261,"src\/Content\/BlogAuthor\/BlogAuthorTranslation\/BlogAuthorTranslationCollection.php":214717944,"src\/Content\/BlogAuthor\/BlogAuthorTranslation\/BlogAuthorTranslationEntity.php":1087744547,"src\/Content\/BlogAuthor\/BlogAuthorCollection.php":384288389,"src\/Content\/BlogCategory\/BlogCategoryDefinition.php":4087296137,"src\/Content\/BlogCategory\/BlogCategoryTranslation\/BlogCategoryTranslationDefinition.php":2417094993,"src\/Content\/BlogCategory\/BlogCategoryTranslation\/BlogCategoryTranslationEntity.php":1453710896,"src\/Content\/BlogCategory\/BlogCategoryTranslation\/BlogCategoryTranslationCollection.php":1654547079,"src\/Content\/BlogCategory\/BlogCategoryEntity.php":4081984804,"src\/Content\/BlogCategory\/BlogCategoryIndexer.php":2342396229,"src\/Content\/BlogCategory\/BlogCategoryCollection.php":2647868457,"src\/Content\/Blog\/DataResolver\/WerklCmsSlotsDataResolver.php":4122573966,"src\/Content\/Blog\/DataResolver\/BlogCmsElementResolver.php":2239832067,"src\/Content\/Blog\/DataResolver\/BlogSingleSelectDataResolver.php":3099369916,"src\/Content\/Blog\/DataResolver\/BlogDetailCmsElementResolver.php":3213698661,"src\/Content\/Blog\/Aggregate\/BlogCategoryMappingDefinition.php":4102877476,"src\/Content\/Blog\/BlogEntriesCollection.php":496021737,"src\/Content\/Blog\/BlogListingFilterBuildEvent.php":3440316816,"src\/Content\/Blog\/BlogEntriesEntity.php":3681564287,"src\/Content\/Blog\/Subscriber\/BlogSubscriber.php":2334093380,"src\/Content\/Blog\/Events\/BlogMainFilterEvent.php":4242742479,"src\/Content\/Blog\/BlogSeoUrlListener.php":4001334800,"src\/Content\/Blog\/BlogEntriesDefinition.php":156841383,"src\/Content\/Blog\/BlogSeoUrlRoute.php":1738305917,"src\/Content\/Blog\/BlogTranslation\/BlogTranslationCollection.php":3605503894,"src\/Content\/Blog\/BlogTranslation\/BlogTranslationEntity.php":2707099448,"src\/Content\/Blog\/BlogTranslation\/BlogTranslationDefinition.php":60284177,"src\/Content\/SalesChannel\/Suggest\/ProductSuggestDecorated.php":289113257,"src\/Controller\/BlogController.php":1660253338,"src\/Controller\/StoreApi\/BlogControllerResponse.php":587140342,"src\/Controller\/StoreApi\/BlogController.php":518786207,"src\/Controller\/StoreApi\/AbstractBlogController.php":1300258681,"src\/Migration\/Migration1604520733DefaultBlogCategorySeeder.php":197359240,"src\/Migration\/Migration1612160298CreatePubslihedDateColumn.php":3546170814,"src\/Migration\/Migration1621260479AddVersionIdToBlogCategoryTable.php":49104478,"src\/Migration\/Migration1605031477CreateWerklBlogAuthorTable.php":10683443,"src\/Migration\/Migration1604519670CreateWerklBlogCategoryTable.php":300225515,"src\/Migration\/Migration1626760242AddCustomFieldToBlogTranslation.php":1239226930,"src\/Migration\/Migration1647338771WerklBlogEntriesUpdate.php":69629835,"src\/Migration\/Migration1602739765AddTeaserImageColumnToBlogEntries.php":3088455465,"src\/Migration\/Migration1649322718CreateCmsPageForBlogEntries.php":4215710689,"src\/Migration\/Migration1559416986BlogEntries.php":414753366}} \ No newline at end of file diff --git a/.phpstan.neon b/.phpstan.neon index 883de6b..e7b8ba8 100644 --- a/.phpstan.neon +++ b/.phpstan.neon @@ -9,4 +9,4 @@ parameters: excludes_analyse: - ./src/Resources/app/administration/node_modules/* - ./src/Resources/app/storefront/node_modules/* - - ./src/SasBlogModule.php + - ./src/WerklOpenBlogware.php diff --git a/CHANGELOG_de-DE.md b/CHANGELOG_de-DE.md index 0d9fac0..a475e6e 100644 --- a/CHANGELOG_de-DE.md +++ b/CHANGELOG_de-DE.md @@ -1,6 +1,5 @@ # 4.0.0 -- Breaking: Plugin Klasse von SasBlogModule zu WerklOpenBlogware umbenannt -- Breaking: Databasen Tabllen prefix von `sas_blog_` auf `open_blogware_` geändert +- Breaking: Plugin interne Namensänderung von Sas\\BlogModule\\SasBlogModule zu Werkl\\OpenBlogware\\WerklOpenBlogware # 3.0.4 - Überspringe-Artikel-Funktionalität für das neueste Blog-Artikel-Element diff --git a/CHANGELOG_en-GB.md b/CHANGELOG_en-GB.md index 493652c..aa74400 100644 --- a/CHANGELOG_en-GB.md +++ b/CHANGELOG_en-GB.md @@ -1,6 +1,5 @@ # 4.0.0 -- Breaking: Renamed plugin class from SasBlogModule to WerklOpenBlogware -- Breaking: Changed database table prefix from `sas_blog_` to `open_blogware_` +- Breaking: Renamed plugin internals from Sas\\BlogModule\\SasBlogModule to Werkl\\OpenBlogware\\WerklOpenBlogware # 3.0.4 - Added offset count functionality to the newest blog items element diff --git a/README.md b/README.md index 6603bf9..1e10497 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ composer require werkstattl/openblogware 3. To install the plugin, run: ```sh bin/console plugin:refresh -bin/console plugin:install --activate SasBlogModule +bin/console plugin:install --activate WerklOpenBlogware ``` 4. To clear the cache, run: ```sh diff --git a/composer-ci.json b/composer-ci.json index ef2f95a..d5cfc82 100644 --- a/composer-ci.json +++ b/composer-ci.json @@ -1,7 +1,7 @@ { "autoload": { "psr-4": { - "Sas\\BlogModule\\": "src/" + "Werkl\\OpenBlogware\\": "src/" } } } diff --git a/composer.json b/composer.json index 7acb394..db3af75 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,7 @@ "infection/infection": "^0.29.6" }, "extra": { - "shopware-plugin-class": "Sas\\BlogModule\\SasBlogModule", + "shopware-plugin-class": "Werkl\\OpenBlogware\\WerklOpenBlogware", "plugin-icon": "src/Resources/config/plugin.png", "copyright": "(c) by SMK Shape & Shift LTD and Werkstattl", "label": { @@ -54,12 +54,12 @@ }, "autoload": { "psr-4": { - "Sas\\BlogModule\\": "src/" + "Werkl\\OpenBlogware\\": "src/" } }, "autoload-dev": { "psr-4": { - "BlogModule\\Tests\\": "tests/PHPUnit/" + "OpenBlogware\\Tests\\": "tests/PHPUnit/" } }, "config": { diff --git a/docker-compose.yml b/docker-compose.yml index 475c8fc..493342f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,4 +4,4 @@ services: ports: - "80:80" volumes: - - .:/var/www/html/custom/plugins/OpenBlogware + - .:/var/www/html/custom/plugins/WerklOpenBlogware diff --git a/makefile b/makefile index 4c436d2..0039c47 100644 --- a/makefile +++ b/makefile @@ -36,7 +36,7 @@ admin: ## Installs all admin dependencies build: ## Installs the plugin, and builds cd /var/www/html && php bin/console plugin:refresh - cd /var/www/html && php bin/console plugin:install SasBlogModule --activate | true + cd /var/www/html && php bin/console plugin:install WerklOpenBlogware --activate | true cd /var/www/html && php bin/console plugin:refresh cd /var/www/html && php bin/console theme:dump cd /var/www/html && PUPPETEER_SKIP_DOWNLOAD=1 ./bin/build-js.sh @@ -45,7 +45,7 @@ build: ## Installs the plugin, and builds cd /var/www/html && php bin/console theme:refresh phpunit: ## Starts all PHPUnit Tests - @XDEBUG_MODE=coverage php vendor/bin/phpunit --configuration=phpunit.xml --coverage-html ../../../public/.reports/blogmodule/coverage + @XDEBUG_MODE=coverage php vendor/bin/phpunit --configuration=phpunit.xml --coverage-html ../../../public/.reports/OpenBlogware/coverage infection: ## Starts all Infection/Mutation tests diff --git a/phpunit.autoload.php b/phpunit.autoload.php index 0d57043..e594995 100644 --- a/phpunit.autoload.php +++ b/phpunit.autoload.php @@ -4,6 +4,6 @@ include_once __DIR__ . '/vendor/autoload.php'; $classLoader = new Composer\Autoload\ClassLoader(); -$classLoader->addPsr4('Sas\\BlogModule\\', __DIR__ . '/src', true); -$classLoader->addPsr4('BlogModule\\Tests\\', __DIR__ . '/tests/PHPUnit', true); +$classLoader->addPsr4('Werkl\\OpenBlogware\\', __DIR__ . '/src', true); +$classLoader->addPsr4('OpenBlogware\\Tests\\', __DIR__ . '/tests/PHPUnit', true); $classLoader->register(); diff --git a/phpunit.xml b/phpunit.xml index 25fa0af..ab036ee 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -9,7 +9,7 @@ > - + ./tests/PHPUnit/ diff --git a/src/Content/Blog/Aggregate/BlogCategoryMappingDefinition.php b/src/Content/Blog/Aggregate/BlogCategoryMappingDefinition.php index 8560c15..ce463f5 100644 --- a/src/Content/Blog/Aggregate/BlogCategoryMappingDefinition.php +++ b/src/Content/Blog/Aggregate/BlogCategoryMappingDefinition.php @@ -1,10 +1,10 @@ addFlags(new PrimaryKey(), new Required()), - (new FkField('sas_blog_category_id', 'blogCategoryId', BlogCategoryDefinition::class))->addFlags(new PrimaryKey(), new Required()), + (new FkField('werkl_blog_entries_id', 'blogId', BlogEntriesDefinition::class))->addFlags(new PrimaryKey(), new Required()), + (new FkField('werkl_blog_category_id', 'blogCategoryId', BlogCategoryDefinition::class))->addFlags(new PrimaryKey(), new Required()), (new ReferenceVersionField(BlogCategoryDefinition::class))->addFlags(new PrimaryKey(), new Required()), - new ManyToOneAssociationField('blog', 'sas_blog_entries_id', BlogEntriesDefinition::class, 'id', false), - new ManyToOneAssociationField('blogCategory', 'sas_blog_category_id', BlogCategoryDefinition::class, 'id', false), + new ManyToOneAssociationField('blog', 'werkl_blog_entries_id', BlogEntriesDefinition::class, 'id', false), + new ManyToOneAssociationField('blogCategory', 'werkl_blog_category_id', BlogCategoryDefinition::class, 'id', false), ]); } } diff --git a/src/Content/Blog/BlogEntitiesIndexer.php b/src/Content/Blog/BlogEntitiesIndexer.php index 53b707c..be63b30 100644 --- a/src/Content/Blog/BlogEntitiesIndexer.php +++ b/src/Content/Blog/BlogEntitiesIndexer.php @@ -1,9 +1,9 @@ addFlags(new Required(), new ApiAware()), - (new TranslationsAssociationField(BlogEntriesTranslationDefinition::class, 'sas_blog_entries_id'))->addFlags(new Required()), + (new TranslationsAssociationField(BlogEntriesTranslationDefinition::class, 'werkl_blog_entries_id'))->addFlags(new Required()), - (new ManyToManyAssociationField('blogCategories', BlogCategoryDefinition::class, BlogCategoryMappingDefinition::class, 'sas_blog_entries_id', 'sas_blog_category_id'))->addFlags(new CascadeDelete(), new ApiAware(), new SearchRanking(SearchRanking::ASSOCIATION_SEARCH_RANKING)), + (new ManyToManyAssociationField('blogCategories', BlogCategoryDefinition::class, BlogCategoryMappingDefinition::class, 'werkl_blog_entries_id', 'werkl_blog_category_id'))->addFlags(new CascadeDelete(), new ApiAware(), new SearchRanking(SearchRanking::ASSOCIATION_SEARCH_RANKING)), (new ManyToOneAssociationField('blogAuthor', 'author_id', BlogAuthorDefinition::class, 'id', false))->addFlags(new ApiAware(), new SearchRanking(SearchRanking::ASSOCIATION_SEARCH_RANKING)), (new OneToOneAssociationField('cmsPage', 'cms_page_id', 'id', CmsPageDefinition::class, false))->addFlags(new ApiAware()), ]); diff --git a/src/Content/Blog/BlogEntriesEntity.php b/src/Content/Blog/BlogEntriesEntity.php index d5370f2..278c3df 100644 --- a/src/Content/Blog/BlogEntriesEntity.php +++ b/src/Content/Blog/BlogEntriesEntity.php @@ -1,11 +1,11 @@ sasBlogEntriesId; + return $this->werklBlogEntriesId; } - public function setSasBlogEntriesId(string $sasBlogEntriesId): void + public function setWerklBlogEntriesId(string $werklBlogEntriesId): void { - $this->sasBlogEntriesId = $sasBlogEntriesId; + $this->werklBlogEntriesId = $werklBlogEntriesId; } - public function getSasBlogEntries(): BlogEntriesEntity + public function getWerklBlogEntries(): BlogEntriesEntity { - return $this->sasBlogEntries; + return $this->werklBlogEntries; } - public function setSasBlogEntries(BlogEntriesEntity $sasBlogEntries): void + public function setWerklBlogEntries(BlogEntriesEntity $werklBlogEntries): void { - $this->sasBlogEntries = $sasBlogEntries; + $this->werklBlogEntries = $werklBlogEntries; } public function getTitle(): ?string diff --git a/src/Content/Blog/BlogListingFilterBuildEvent.php b/src/Content/Blog/BlogListingFilterBuildEvent.php index d9e6fc8..8954d01 100644 --- a/src/Content/Blog/BlogListingFilterBuildEvent.php +++ b/src/Content/Blog/BlogListingFilterBuildEvent.php @@ -1,9 +1,9 @@ 'onBlogUpdated', + 'werkl_blog_entries.written' => 'onBlogUpdated', ]; } diff --git a/src/Content/Blog/BlogSeoUrlRoute.php b/src/Content/Blog/BlogSeoUrlRoute.php index b74742e..937e26e 100644 --- a/src/Content/Blog/BlogSeoUrlRoute.php +++ b/src/Content/Blog/BlogSeoUrlRoute.php @@ -1,7 +1,7 @@ add( - 'sas_blog', + 'werkl_blog', BlogEntriesDefinition::class, $criteria ); @@ -106,12 +106,12 @@ public function collect(CmsSlotEntity $slot, ResolverContext $resolverContext): public function enrich(CmsSlotEntity $slot, ResolverContext $resolverContext, ElementDataCollection $result): void { - $sasBlog = $result->get('sas_blog'); - if (!$sasBlog instanceof EntitySearchResult) { + $werklBlog = $result->get('werkl_blog'); + if (!$werklBlog instanceof EntitySearchResult) { return; } - $slot->setData($sasBlog); + $slot->setData($werklBlog); } private function handlePagination(int $limit, Request $request, Criteria $criteria): void diff --git a/src/Content/Blog/DataResolver/BlogDetailCmsElementResolver.php b/src/Content/Blog/DataResolver/BlogDetailCmsElementResolver.php index bae07e8..306bf7e 100644 --- a/src/Content/Blog/DataResolver/BlogDetailCmsElementResolver.php +++ b/src/Content/Blog/DataResolver/BlogDetailCmsElementResolver.php @@ -1,9 +1,9 @@ add( - 'sas_blog', + 'werkl_blog', BlogEntriesDefinition::class, $criteria ); @@ -62,11 +62,11 @@ public function collect(CmsSlotEntity $slot, ResolverContext $resolverContext): public function enrich(CmsSlotEntity $slot, ResolverContext $resolverContext, ElementDataCollection $result): void { - /** @var EntitySearchResult $sasBlog */ - $sasBlog = $result->get('sas_blog') ?? null; + /** @var EntitySearchResult $werklBlog */ + $werklBlog = $result->get('werkl_blog') ?? null; - if ($sasBlog !== null && $sasBlog->first() !== null) { - $slot->setData($sasBlog->first()); + if ($werklBlog !== null && $werklBlog->first() !== null) { + $slot->setData($werklBlog->first()); } } } diff --git a/src/Content/Blog/DataResolver/BlogNewestListingCmsElementResolver.php b/src/Content/Blog/DataResolver/BlogNewestListingCmsElementResolver.php index bb34e8d..159dc32 100644 --- a/src/Content/Blog/DataResolver/BlogNewestListingCmsElementResolver.php +++ b/src/Content/Blog/DataResolver/BlogNewestListingCmsElementResolver.php @@ -1,10 +1,10 @@ get(BlogEntriesDefinition::ENTITY_NAME); + $werklBlog = $result->get(BlogEntriesDefinition::ENTITY_NAME); - if (!$sasBlog instanceof EntitySearchResult) { + if (!$werklBlog instanceof EntitySearchResult) { return; } - $slot->setData($sasBlog); + $slot->setData($werklBlog); } /** diff --git a/src/Content/Blog/DataResolver/BlogSingleSelectDataResolver.php b/src/Content/Blog/DataResolver/BlogSingleSelectDataResolver.php index 05e12f9..15c1b4d 100644 --- a/src/Content/Blog/DataResolver/BlogSingleSelectDataResolver.php +++ b/src/Content/Blog/DataResolver/BlogSingleSelectDataResolver.php @@ -1,9 +1,9 @@ add( - 'sas_blog_single_select', + 'werkl_blog_single_select', BlogEntriesDefinition::class, $criteria ); @@ -57,7 +57,7 @@ public function collect(CmsSlotEntity $slot, ResolverContext $resolverContext): public function enrich(CmsSlotEntity $slot, ResolverContext $resolverContext, ElementDataCollection $result): void { - $result = $result->get('sas_blog_single_select') ?? null; + $result = $result->get('werkl_blog_single_select') ?? null; if ($result !== null && $result->first() !== null) { $slot->setData($result->first()); diff --git a/src/Content/Blog/Events/BlogIndexerEvent.php b/src/Content/Blog/Events/BlogIndexerEvent.php index e05f2cb..dcdc6f8 100644 --- a/src/Content/Blog/Events/BlogIndexerEvent.php +++ b/src/Content/Blog/Events/BlogIndexerEvent.php @@ -1,7 +1,7 @@ add( - 'sas_blog', + 'werkl_blog', BlogEntriesDefinition::class, $criteria ); @@ -119,7 +119,7 @@ private function getCategoriesFilter(Request $request): Filter 'categories', !empty($ids), [ - new EntityAggregation('blogCategories', 'blogCategories.id', 'sas_blog_category'), + new EntityAggregation('blogCategories', 'blogCategories.id', 'werkl_blog_category'), ], new EqualsAnyFilter('blogCategories.id', $ids), $ids @@ -134,7 +134,7 @@ private function getAuthorsFilter(Request $request): Filter 'authors', !empty($ids), [ - new EntityAggregation('authors', 'authorId', 'sas_blog_author'), + new EntityAggregation('authors', 'authorId', 'werkl_blog_author'), ], new EqualsAnyFilter('authorId', $ids), $ids diff --git a/src/Content/BlogAuthor/BlogAuthorCollection.php b/src/Content/BlogAuthor/BlogAuthorCollection.php index d8e2b9c..c820525 100644 --- a/src/Content/BlogAuthor/BlogAuthorCollection.php +++ b/src/Content/BlogAuthor/BlogAuthorCollection.php @@ -1,7 +1,7 @@ addFlags(new ApiAware(), new SearchRanking(SearchRanking::MIDDLE_SEARCH_RANKING)), (new TranslatedField('customFields'))->addFlags(new ApiAware()), - new TranslationsAssociationField(BlogAuthorTranslationDefinition::class, 'sas_blog_author_id'), + new TranslationsAssociationField(BlogAuthorTranslationDefinition::class, 'werkl_blog_author_id'), (new OneToOneAssociationField('media', 'media_id', 'id', MediaDefinition::class, true))->addFlags(new ApiAware()), (new OneToManyAssociationField('blogEntries', BlogEntriesDefinition::class, 'author_id', 'id'))->addFlags(new CascadeDelete(), new SearchRanking(SearchRanking::ASSOCIATION_SEARCH_RANKING)), diff --git a/src/Content/BlogAuthor/BlogAuthorEntity.php b/src/Content/BlogAuthor/BlogAuthorEntity.php index f183e19..6af13e2 100644 --- a/src/Content/BlogAuthor/BlogAuthorEntity.php +++ b/src/Content/BlogAuthor/BlogAuthorEntity.php @@ -1,10 +1,10 @@ sasBlogAuthorId; + return $this->werklBlogAuthorId; } - public function setSasBlogAuthorId(string $sasBlogAuthorId): void + public function setWerklBlogAuthorId(string $werklBlogAuthorId): void { - $this->sasBlogAuthorId = $sasBlogAuthorId; + $this->werklBlogAuthorId = $werklBlogAuthorId; } - public function getSasBlogAuthor(): ?BlogAuthorEntity + public function getWerklBlogAuthor(): ?BlogAuthorEntity { - return $this->sasBlogAuthor; + return $this->werklBlogAuthor; } - public function setSasBlogAuthor(BlogAuthorEntity $sasBlogAuthor): void + public function setWerklBlogAuthor(BlogAuthorEntity $werklBlogAuthor): void { - $this->sasBlogAuthor = $sasBlogAuthor; + $this->werklBlogAuthor = $werklBlogAuthor; } public function getDescription(): ?string diff --git a/src/Content/BlogCategory/BlogCategoryCollection.php b/src/Content/BlogCategory/BlogCategoryCollection.php index dcbb95f..cd1e8ee 100644 --- a/src/Content/BlogCategory/BlogCategoryCollection.php +++ b/src/Content/BlogCategory/BlogCategoryCollection.php @@ -1,7 +1,7 @@ addFlags(new Required()), + (new TranslationsAssociationField(BlogCategoryTranslationDefinition::class, 'werkl_blog_category_id'))->addFlags(new Required()), - (new ManyToManyAssociationField('blogEntries', BlogEntriesDefinition::class, BlogCategoryMappingDefinition::class, 'sas_blog_category_id', 'sas_blog_entries_id'))->addFlags(new SearchRanking(SearchRanking::ASSOCIATION_SEARCH_RANKING), new CascadeDelete()), + (new ManyToManyAssociationField('blogEntries', BlogEntriesDefinition::class, BlogCategoryMappingDefinition::class, 'werkl_blog_category_id', 'werkl_blog_entries_id'))->addFlags(new SearchRanking(SearchRanking::ASSOCIATION_SEARCH_RANKING), new CascadeDelete()), new OneToManyAssociationField('navigationSalesChannels', SalesChannelDefinition::class, 'navigation_category_id'), new OneToManyAssociationField('footerSalesChannels', SalesChannelDefinition::class, 'footer_category_id'), new OneToManyAssociationField('serviceSalesChannels', SalesChannelDefinition::class, 'service_category_id'), diff --git a/src/Content/BlogCategory/BlogCategoryEntity.php b/src/Content/BlogCategory/BlogCategoryEntity.php index f4399d1..9c935f8 100644 --- a/src/Content/BlogCategory/BlogCategoryEntity.php +++ b/src/Content/BlogCategory/BlogCategoryEntity.php @@ -1,10 +1,10 @@ customFields = $customFields; } - public function getSasBlogCategoryId(): string + public function getWerklBlogCategoryId(): string { - return $this->sasBlogCategoryId; + return $this->werklBlogCategoryId; } - public function setSasBlogCategoryId(string $sasBlogCategoryId): void + public function setWerklBlogCategoryId(string $werklBlogCategoryId): void { - $this->sasBlogCategoryId = $sasBlogCategoryId; + $this->werklBlogCategoryId = $werklBlogCategoryId; } - public function getSasBlogCategory(): ?BlogCategoryEntity + public function getWerklBlogCategory(): ?BlogCategoryEntity { - return $this->sasBlogCategory; + return $this->werklBlogCategory; } - public function setSasBlogCategory(BlogCategoryEntity $sasBlogCategory): void + public function setWerklBlogCategory(BlogCategoryEntity $werklBlogCategory): void { - $this->sasBlogCategory = $sasBlogCategory; + $this->werklBlogCategory = $werklBlogCategory; } } diff --git a/src/Content/Cms/DataResolver/SasCmsSlotsDataResolver.php b/src/Content/Cms/DataResolver/WerklCmsSlotsDataResolver.php similarity index 90% rename from src/Content/Cms/DataResolver/SasCmsSlotsDataResolver.php rename to src/Content/Cms/DataResolver/WerklCmsSlotsDataResolver.php index d9820f9..f6b15f1 100644 --- a/src/Content/Cms/DataResolver/SasCmsSlotsDataResolver.php +++ b/src/Content/Cms/DataResolver/WerklCmsSlotsDataResolver.php @@ -1,10 +1,10 @@ getDecorated()->load($request, $context, $criteria); - if (!$this->systemConfigService->get('SasBlogModule.config.enableSearchBox')) { + if (!$this->systemConfigService->get('WerklOpenBlogware.config.enableSearchBox')) { return $response; } diff --git a/src/Controller/BlogController.php b/src/Controller/BlogController.php index 4151fee..dc1d2bf 100644 --- a/src/Controller/BlogController.php +++ b/src/Controller/BlogController.php @@ -1,9 +1,9 @@ blogPageLoader = $blogPageLoader; } - #[Route(path: '/sas_blog/{articleId}', name: 'sas.frontend.blog.detail', methods: ['GET'])] + #[Route(path: '/werkl_blog/{articleId}', name: 'werkl.frontend.blog.detail', methods: ['GET'])] public function detailAction(Request $request, SalesChannelContext $context): Response { $page = $this->blogPageLoader->load($request, $context); diff --git a/src/Controller/BlogRssController.php b/src/Controller/BlogRssController.php index dd84486..ac8e2e5 100644 --- a/src/Controller/BlogRssController.php +++ b/src/Controller/BlogRssController.php @@ -1,7 +1,7 @@ blogRepository = $blogRepository; } - #[Route(path: '/blog/rss', name: 'frontend.sas.blog.rss', methods: ['GET'])] + #[Route(path: '/blog/rss', name: 'frontend.werkl_blog.rss', methods: ['GET'])] public function rss(Request $request, SalesChannelContext $context): Response { $dateTime = new \DateTime(); @@ -50,7 +50,7 @@ public function rss(Request $request, SalesChannelContext $context): Response $page = $this->genericPageLoader->load($request, $context); $page = NavigationPage::createFrom($page); - $response = $this->renderStorefront('@SasBlogModule/storefront/page/rss.html.twig', [ + $response = $this->renderStorefront('@WerklOpenBlogware/storefront/page/rss.html.twig', [ 'results' => $results, 'page' => $page, ]); diff --git a/src/Controller/BlogSearchController.php b/src/Controller/BlogSearchController.php index aed94e1..e0b53e4 100644 --- a/src/Controller/BlogSearchController.php +++ b/src/Controller/BlogSearchController.php @@ -1,9 +1,9 @@ blogSearchPageLoader = $blogSearchPageLoader; } - #[Route(path: '/sas_blog_search', name: 'sas.frontend.blog.search', methods: ['GET'])] + #[Route(path: '/werkl_blog_search', name: 'werkl.frontend.blog.search', methods: ['GET'])] public function search(Request $request, SalesChannelContext $context): Response { try { diff --git a/src/Controller/CachedBlogController.php b/src/Controller/CachedBlogController.php index f3b210d..714f45c 100644 --- a/src/Controller/CachedBlogController.php +++ b/src/Controller/CachedBlogController.php @@ -1,7 +1,7 @@ attributes->get('articleId'); diff --git a/src/Controller/CachedBlogRssController.php b/src/Controller/CachedBlogRssController.php index 45d16dd..cc30d36 100644 --- a/src/Controller/CachedBlogRssController.php +++ b/src/Controller/CachedBlogRssController.php @@ -1,7 +1,7 @@ ['storefront']])] class CachedBlogRssController extends StorefrontController { - public const RSS_TAG = 'sas-blog-rss'; + public const RSS_TAG = 'werkl-blog-rss'; private BlogRssController $decorated; @@ -48,10 +48,10 @@ public function __construct( public static function buildName(string $salesChannelId): string { - return 'sas-blog-rss-' . $salesChannelId; + return 'werkl-blog-rss-' . $salesChannelId; } - #[Route(path: '/blog/rss', name: 'frontend.sas.blog.rss', methods: ['GET'])] + #[Route(path: '/blog/rss', name: 'frontend.werkl_blog.rss', methods: ['GET'])] public function rss(Request $request, SalesChannelContext $context): Response { $key = $this->generateKey($request, $context); diff --git a/src/Controller/CachedBlogSearchController.php b/src/Controller/CachedBlogSearchController.php index 8807fd7..756c859 100644 --- a/src/Controller/CachedBlogSearchController.php +++ b/src/Controller/CachedBlogSearchController.php @@ -1,7 +1,7 @@ ['storefront']])] class CachedBlogSearchController extends StorefrontController { - public const SEARCH_TAG = 'sas-blog-search'; + public const SEARCH_TAG = 'werkl-blog-search'; private BlogSearchController $decorated; @@ -49,10 +49,10 @@ public function __construct( public static function buildName(string $salesChannelId): string { - return 'sas-blog-search-' . $salesChannelId; + return 'werkl-blog-search-' . $salesChannelId; } - #[Route(path: '/sas_blog_search', name: 'sas.frontend.blog.search', methods: ['GET'])] + #[Route(path: '/werkl_blog_search', name: 'werkl.frontend.blog.search', methods: ['GET'])] public function search(Request $request, SalesChannelContext $context): Response { $key = $this->generateSearchKey($request, $context); diff --git a/src/Controller/StoreApi/AbstractBlogController.php b/src/Controller/StoreApi/AbstractBlogController.php index 1834a8a..0f9b7cf 100644 --- a/src/Controller/StoreApi/AbstractBlogController.php +++ b/src/Controller/StoreApi/AbstractBlogController.php @@ -1,7 +1,7 @@ 'sas_blog_entries'])] + #[Route(path: '/store-api/blog', name: 'store-api.werkl_blog.load', methods: ['GET', 'POST'], defaults: ['_entity' => 'werkl_blog_entries'])] #[OAT\Get( path: '/store-api/blog', - summary: 'This route can be used to load the sas_blog_entries by specific filters', + summary: 'This route can be used to load the werkl_blog_entries by specific filters', operationId: 'listBlog', tags: ['Store API', 'Blog'], parameters: [ diff --git a/src/Controller/StoreApi/BlogControllerResponse.php b/src/Controller/StoreApi/BlogControllerResponse.php index 70fdfa8..ae33d22 100644 --- a/src/Controller/StoreApi/BlogControllerResponse.php +++ b/src/Controller/StoreApi/BlogControllerResponse.php @@ -1,9 +1,9 @@ eventDispatcher->dispatch(new BlogIndexerEvent($blogEntities->getIds(), $context->getContext())); - $seoUrls = $this->getSeoUrls($blogEntities->getIds(), 'sas.frontend.blog.detail', $context, $this->connection); + $seoUrls = $this->getSeoUrls($blogEntities->getIds(), 'werkl.frontend.blog.detail', $context, $this->connection); $seoUrls = FetchModeHelper::groupUnique($seoUrls); $urls = []; diff --git a/src/Migration/Migration1559416986BlogEntries.php b/src/Migration/Migration1559416986BlogEntries.php index 574dbb4..aff4448 100644 --- a/src/Migration/Migration1559416986BlogEntries.php +++ b/src/Migration/Migration1559416986BlogEntries.php @@ -1,7 +1,7 @@ executeStatement( ' - CREATE TABLE IF NOT EXISTS `sas_blog_entries` ( + CREATE TABLE IF NOT EXISTS `werkl_blog_entries` ( `id` BINARY(16) NOT NULL, `active` TINYINT DEFAULT 0, `detail_teaser_image` TINYINT DEFAULT 1, @@ -32,8 +32,8 @@ public function update(Connection $connection): void $connection->executeStatement( ' - CREATE TABLE IF NOT EXISTS `sas_blog_entries_translation` ( - `sas_blog_entries_id` BINARY(16) NOT NULL, + CREATE TABLE IF NOT EXISTS `werkl_blog_entries_translation` ( + `werkl_blog_entries_id` BINARY(16) NOT NULL, `language_id` BINARY(16) NOT NULL, `title` VARCHAR(255) NOT NULL, `slug` VARCHAR(255) NOT NULL, @@ -43,11 +43,11 @@ public function update(Connection $connection): void `content` MEDIUMTEXT COLLATE utf8mb4_unicode_ci NULL, `created_at` DATETIME(3) NOT NULL, `updated_at` DATETIME(3) NULL, - PRIMARY KEY (`sas_blog_entries_id`, `language_id`), - CONSTRAINT `fk.sas_blog_entries_translation.language_id` FOREIGN KEY (`language_id`) + PRIMARY KEY (`werkl_blog_entries_id`, `language_id`), + CONSTRAINT `fk.werkl_blog_entries_translation.language_id` FOREIGN KEY (`language_id`) REFERENCES `language` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `fk.sas_blog_entries_translation.sas_blog_entries_id` FOREIGN KEY (`sas_blog_entries_id`) - REFERENCES `sas_blog_entries` (`id`) ON DELETE CASCADE ON UPDATE CASCADE + CONSTRAINT `fk.werkl_blog_entries_translation.werkl_blog_entries_id` FOREIGN KEY (`werkl_blog_entries_id`) + REFERENCES `werkl_blog_entries` (`id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; ' ); @@ -57,8 +57,8 @@ public function update(Connection $connection): void VALUES (:id, NULL, :routeName, :entityName, :template, 1, NULL, :createdAt, NULL); ', [ 'id' => Uuid::randomBytes(), - 'routeName' => 'sas.frontend.blog.detail', - 'entityName' => 'sas_blog_entries', + 'routeName' => 'werkl.frontend.blog.detail', + 'entityName' => 'werkl_blog_entries', 'template' => 'blog/{{ entry.translated.title|lower }}', 'createdAt' => (new \DateTime())->format(Defaults::STORAGE_DATE_TIME_FORMAT), ]); diff --git a/src/Migration/Migration1602739765AddTeaserImageColumnToBlogEntries.php b/src/Migration/Migration1602739765AddTeaserImageColumnToBlogEntries.php index e6b4a2b..690311c 100644 --- a/src/Migration/Migration1602739765AddTeaserImageColumnToBlogEntries.php +++ b/src/Migration/Migration1602739765AddTeaserImageColumnToBlogEntries.php @@ -1,7 +1,7 @@ executeStatement(' ALTER TABLE - sas_blog_entries + werkl_blog_entries ADD COLUMN media_id BINARY(16) DEFAULT NULL AFTER diff --git a/src/Migration/Migration1604519670CreateSasBlogCategoryTable.php b/src/Migration/Migration1604519670CreateSasBlogCategoryTable.php deleted file mode 100644 index 66365f8..0000000 --- a/src/Migration/Migration1604519670CreateSasBlogCategoryTable.php +++ /dev/null @@ -1,67 +0,0 @@ -executeStatement(' - CREATE TABLE IF NOT EXISTS `sas_blog_category` ( - `id` BINARY(16) NOT NULL, - `parent_id` BINARY(16) NULL, - `after_category_id` BINARY(16) NULL, - `level` INT(11) NULL, - `path` LONGTEXT NULL, - `child_count` INT(11) NULL, - `created_at` DATETIME(3) NOT NULL, - `updated_at` DATETIME(3) NULL, - PRIMARY KEY (`id`), - CONSTRAINT `fk.sas_blog_category.parent_id` FOREIGN KEY (`parent_id`) REFERENCES `sas_blog_category` (`id`) ON DELETE SET NULL ON UPDATE CASCADE - ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - '); - - $connection->executeStatement(' - CREATE TABLE IF NOT EXISTS `sas_blog_category_translation` ( - `name` VARCHAR(255) NOT NULL, - `custom_fields` JSON NULL, - `created_at` DATETIME(3) NOT NULL, - `updated_at` DATETIME(3) NULL, - `sas_blog_category_id` BINARY(16) NOT NULL, - `language_id` BINARY(16) NOT NULL, - PRIMARY KEY (`sas_blog_category_id`,`language_id`), - CONSTRAINT `json.sas_blog_category_translation.custom_fields` CHECK (JSON_VALID(`custom_fields`)), - KEY `fk.sas_blog_category_translation.sas_blog_category_id` (`sas_blog_category_id`), - KEY `fk.sas_blog_category_translation.language_id` (`language_id`), - CONSTRAINT `fk.sas_blog_category_translation.sas_blog_category_id` FOREIGN KEY (`sas_blog_category_id`) REFERENCES `sas_blog_category` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `fk.sas_blog_category_translation.language_id` FOREIGN KEY (`language_id`) REFERENCES `language` (`id`) ON DELETE CASCADE ON UPDATE CASCADE - ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - '); - - $connection->executeStatement(' - CREATE TABLE IF NOT EXISTS `sas_blog_blog_category` ( - `sas_blog_entries_id` BINARY(16) NOT NULL, - `sas_blog_category_id` BINARY(16) NOT NULL, - PRIMARY KEY (`sas_blog_entries_id`,`sas_blog_category_id`), - KEY `fk.sas_blog_blog_category.sas_blog_entries_id` (`sas_blog_entries_id`), - KEY `fk.sas_blog_blog_category.sas_blog_category_id` (`sas_blog_category_id`), - CONSTRAINT `fk.sas_blog_blog_category.sas_blog_entries_id` FOREIGN KEY (`sas_blog_entries_id`) REFERENCES `sas_blog_entries` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `fk.sas_blog_blog_category.sas_blog_category_id` FOREIGN KEY (`sas_blog_category_id`) REFERENCES `sas_blog_category` (`id`) ON DELETE CASCADE ON UPDATE CASCADE - ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - '); - } - - public function updateDestructive(Connection $connection): void - { - // implement update destructive - } -} diff --git a/src/Migration/Migration1604519670CreateWerklBlogCategoryTable.php b/src/Migration/Migration1604519670CreateWerklBlogCategoryTable.php new file mode 100644 index 0000000..75e88c1 --- /dev/null +++ b/src/Migration/Migration1604519670CreateWerklBlogCategoryTable.php @@ -0,0 +1,67 @@ +executeStatement(' + CREATE TABLE IF NOT EXISTS `werkl_blog_category` ( + `id` BINARY(16) NOT NULL, + `parent_id` BINARY(16) NULL, + `after_category_id` BINARY(16) NULL, + `level` INT(11) NULL, + `path` LONGTEXT NULL, + `child_count` INT(11) NULL, + `created_at` DATETIME(3) NOT NULL, + `updated_at` DATETIME(3) NULL, + PRIMARY KEY (`id`), + CONSTRAINT `fk.werkl_blog_category.parent_id` FOREIGN KEY (`parent_id`) REFERENCES `werkl_blog_category` (`id`) ON DELETE SET NULL ON UPDATE CASCADE + ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + '); + + $connection->executeStatement(' + CREATE TABLE IF NOT EXISTS `werkl_blog_category_translation` ( + `name` VARCHAR(255) NOT NULL, + `custom_fields` JSON NULL, + `created_at` DATETIME(3) NOT NULL, + `updated_at` DATETIME(3) NULL, + `werkl_blog_category_id` BINARY(16) NOT NULL, + `language_id` BINARY(16) NOT NULL, + PRIMARY KEY (`werkl_blog_category_id`,`language_id`), + CONSTRAINT `json.werkl_blog_category_translation.custom_fields` CHECK (JSON_VALID(`custom_fields`)), + KEY `fk.werkl_blog_category_translation.werkl_blog_category_id` (`werkl_blog_category_id`), + KEY `fk.werkl_blog_category_translation.language_id` (`language_id`), + CONSTRAINT `fk.werkl_blog_category_translation.werkl_blog_category_id` FOREIGN KEY (`werkl_blog_category_id`) REFERENCES `werkl_blog_category` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `fk.werkl_blog_category_translation.language_id` FOREIGN KEY (`language_id`) REFERENCES `language` (`id`) ON DELETE CASCADE ON UPDATE CASCADE + ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + '); + + $connection->executeStatement(' + CREATE TABLE IF NOT EXISTS `werkl_blog_blog_category` ( + `werkl_blog_entries_id` BINARY(16) NOT NULL, + `werkl_blog_category_id` BINARY(16) NOT NULL, + PRIMARY KEY (`werkl_blog_entries_id`,`werkl_blog_category_id`), + KEY `fk.werkl_blog_blog_category.werkl_blog_entries_id` (`werkl_blog_entries_id`), + KEY `fk.werkl_blog_blog_category.werkl_blog_category_id` (`werkl_blog_category_id`), + CONSTRAINT `fk.werkl_blog_blog_category.werkl_blog_entries_id` FOREIGN KEY (`werkl_blog_entries_id`) REFERENCES `werkl_blog_entries` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `fk.werkl_blog_blog_category.werkl_blog_category_id` FOREIGN KEY (`werkl_blog_category_id`) REFERENCES `werkl_blog_category` (`id`) ON DELETE CASCADE ON UPDATE CASCADE + ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + '); + } + + public function updateDestructive(Connection $connection): void + { + // implement update destructive + } +} diff --git a/src/Migration/Migration1604520733DefaultBlogCategorySeeder.php b/src/Migration/Migration1604520733DefaultBlogCategorySeeder.php index 2adf2c9..47e8b1b 100644 --- a/src/Migration/Migration1604520733DefaultBlogCategorySeeder.php +++ b/src/Migration/Migration1604520733DefaultBlogCategorySeeder.php @@ -1,13 +1,13 @@ $categoryId, + 'werkl_blog_category_id' => $categoryId, 'name' => 'Allgemeines', ], [ - 'sas_blog_category_id' => $categoryId, + 'werkl_blog_category_id' => $categoryId, 'name' => 'General', ] ); @@ -50,8 +50,8 @@ public function update(Connection $connection): void } foreach ($blogs as $insert) { - $insert['sas_blog_category_id'] = $categoryId; - $insert['sas_blog_entries_id'] = $insert['id']; + $insert['werkl_blog_category_id'] = $categoryId; + $insert['werkl_blog_entries_id'] = $insert['id']; unset($insert['id']); $queue->addInsert(BlogCategoryMappingDefinition::ENTITY_NAME, $insert); diff --git a/src/Migration/Migration1605031477CreateSasBlogAuthorTable.php b/src/Migration/Migration1605031477CreateWerklBlogAuthorTable.php similarity index 57% rename from src/Migration/Migration1605031477CreateSasBlogAuthorTable.php rename to src/Migration/Migration1605031477CreateWerklBlogAuthorTable.php index 796d999..8225c56 100644 --- a/src/Migration/Migration1605031477CreateSasBlogAuthorTable.php +++ b/src/Migration/Migration1605031477CreateWerklBlogAuthorTable.php @@ -1,15 +1,15 @@ executeStatement(' - CREATE TABLE IF NOT EXISTS `sas_blog_author` ( + CREATE TABLE IF NOT EXISTS `werkl_blog_author` ( `id` BINARY(16) NOT NULL, `salutation_id` BINARY(16) NOT NULL, `media_id` BINARY(16) NULL, @@ -30,40 +30,40 @@ public function update(Connection $connection): void `created_at` DATETIME(3) NOT NULL, `updated_at` DATETIME(3) NULL, PRIMARY KEY (`id`), - KEY `fk.sas_blog_author.salutation_id` (`salutation_id`), - KEY `fk.sas_blog_author.media_id` (`media_id`), - CONSTRAINT `fk.sas_blog_author.salutation_id` FOREIGN KEY (`salutation_id`) + KEY `fk.werkl_blog_author.salutation_id` (`salutation_id`), + KEY `fk.werkl_blog_author.media_id` (`media_id`), + CONSTRAINT `fk.werkl_blog_author.salutation_id` FOREIGN KEY (`salutation_id`) REFERENCES `salutation` (`id`) ON DELETE RESTRICT ON UPDATE CASCADE, - CONSTRAINT `fk.sas_blog_author.media_id` FOREIGN KEY (`media_id`) + CONSTRAINT `fk.werkl_blog_author.media_id` FOREIGN KEY (`media_id`) REFERENCES `media` (`id`) ON DELETE SET NULL ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; '); $connection->executeStatement(' - CREATE TABLE IF NOT EXISTS `sas_blog_author_translation` ( + CREATE TABLE IF NOT EXISTS `werkl_blog_author_translation` ( `description` LONGTEXT NULL, `custom_fields` JSON NULL, `created_at` DATETIME(3) NOT NULL, `updated_at` DATETIME(3) NULL, - `sas_blog_author_id` BINARY(16) NOT NULL, + `werkl_blog_author_id` BINARY(16) NOT NULL, `language_id` BINARY(16) NOT NULL, - PRIMARY KEY (`sas_blog_author_id`,`language_id`), - CONSTRAINT `json.sas_blog_author_translation.custom_fields` CHECK (JSON_VALID(`custom_fields`)), - KEY `fk.sas_blog_author_translation.sas_blog_author_id` (`sas_blog_author_id`), - KEY `fk.sas_blog_author_translation.language_id` (`language_id`), - CONSTRAINT `fk.sas_blog_author_translation.sas_blog_author_id` FOREIGN KEY (`sas_blog_author_id`) REFERENCES `sas_blog_author` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `fk.sas_blog_author_translation.language_id` FOREIGN KEY (`language_id`) REFERENCES `language` (`id`) ON DELETE CASCADE ON UPDATE CASCADE + PRIMARY KEY (`werkl_blog_author_id`,`language_id`), + CONSTRAINT `json.werkl_blog_author_translation.custom_fields` CHECK (JSON_VALID(`custom_fields`)), + KEY `fk.werkl_blog_author_translation.werkl_blog_author_id` (`werkl_blog_author_id`), + KEY `fk.werkl_blog_author_translation.language_id` (`language_id`), + CONSTRAINT `fk.werkl_blog_author_translation.werkl_blog_author_id` FOREIGN KEY (`werkl_blog_author_id`) REFERENCES `werkl_blog_author` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `fk.werkl_blog_author_translation.language_id` FOREIGN KEY (`language_id`) REFERENCES `language` (`id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; '); $notSpecified = $connection->fetchOne('SELECT id from salutation LIMIT 1'); - $defaultAuthorId = $connection->fetchOne('SELECT id from sas_blog_author LIMIT 1'); + $defaultAuthorId = $connection->fetchOne('SELECT id from werkl_blog_author LIMIT 1'); if (empty($defaultAuthorId)) { - $defaultAuthorId = Uuid::fromHexToBytes(SasBlogModule::ANONYMOUS_AUTHOR_ID); + $defaultAuthorId = Uuid::fromHexToBytes(WerklOpenBlogware::ANONYMOUS_AUTHOR_ID); - $connection->insert('sas_blog_author', [ + $connection->insert('werkl_blog_author', [ 'id' => $defaultAuthorId, 'first_name' => 'N/A', 'last_name' => 'N/A', @@ -75,7 +75,7 @@ public function update(Connection $connection): void } $connection->executeStatement(' - ALTER TABLE sas_blog_entries ADD COLUMN author_id BINARY(16) NOT NULL DEFAULT \'' . $defaultAuthorId . '\' AFTER active; + ALTER TABLE werkl_blog_entries ADD COLUMN author_id BINARY(16) NOT NULL DEFAULT \'' . $defaultAuthorId . '\' AFTER active; '); } diff --git a/src/Migration/Migration1612160298CreatePubslihedDateColumn.php b/src/Migration/Migration1612160298CreatePubslihedDateColumn.php index 26aeceb..4e784fc 100644 --- a/src/Migration/Migration1612160298CreatePubslihedDateColumn.php +++ b/src/Migration/Migration1612160298CreatePubslihedDateColumn.php @@ -1,7 +1,7 @@ executeStatement(' ALTER TABLE - sas_blog_entries + werkl_blog_entries ADD COLUMN published_at DATETIME(3) NOT NULL AFTER @@ -25,7 +25,7 @@ public function update(Connection $connection): void '); $connection->executeStatement(' - UPDATE sas_blog_entries SET published_at = created_at + UPDATE werkl_blog_entries SET published_at = created_at '); } diff --git a/src/Migration/Migration1621260479AddVersionIdToBlogCategoryTable.php b/src/Migration/Migration1621260479AddVersionIdToBlogCategoryTable.php index d4fa340..e0f296f 100644 --- a/src/Migration/Migration1621260479AddVersionIdToBlogCategoryTable.php +++ b/src/Migration/Migration1621260479AddVersionIdToBlogCategoryTable.php @@ -1,7 +1,7 @@ executeStatement(' - ALTER TABLE `sas_blog_category` add `version_id` BINARY(16) NOT NULL AFTER `id`, + ALTER TABLE `werkl_blog_category` add `version_id` BINARY(16) NOT NULL AFTER `id`, DROP PRIMARY KEY , ADD PRIMARY KEY ( `id`, `version_id` ); '); $connection->executeStatement(' - ALTER TABLE `sas_blog_category_translation` - DROP FOREIGN KEY `fk.sas_blog_category_translation.sas_blog_category_id`, - DROP KEY `fk.sas_blog_category_translation.sas_blog_category_id`; + ALTER TABLE `werkl_blog_category_translation` + DROP FOREIGN KEY `fk.werkl_blog_category_translation.werkl_blog_category_id`, + DROP KEY `fk.werkl_blog_category_translation.werkl_blog_category_id`; '); $connection->executeStatement(' - ALTER TABLE `sas_blog_blog_category` - DROP FOREIGN KEY `fk.sas_blog_blog_category.sas_blog_category_id`, - DROP KEY `fk.sas_blog_blog_category.sas_blog_category_id`; + ALTER TABLE `werkl_blog_blog_category` + DROP FOREIGN KEY `fk.werkl_blog_blog_category.werkl_blog_category_id`, + DROP KEY `fk.werkl_blog_blog_category.werkl_blog_category_id`; '); $connection->executeStatement(' - ALTER TABLE `sas_blog_category_translation` - ADD `sas_blog_category_version_id` BINARY(16) NOT NULL AFTER `name`, - DROP PRIMARY KEY, ADD PRIMARY KEY ( `sas_blog_category_id`, `language_id`, `sas_blog_category_version_id` ), - ADD CONSTRAINT `fk.sas_blog_category_translation.sas_blog_category_id` FOREIGN KEY (`sas_blog_category_id`, `sas_blog_category_version_id`) - REFERENCES `sas_blog_category` (`id`, `version_id`) ON DELETE CASCADE ON UPDATE CASCADE; + ALTER TABLE `werkl_blog_category_translation` + ADD `werkl_blog_category_version_id` BINARY(16) NOT NULL AFTER `name`, + DROP PRIMARY KEY, ADD PRIMARY KEY ( `werkl_blog_category_id`, `language_id`, `werkl_blog_category_version_id` ), + ADD CONSTRAINT `fk.werkl_blog_category_translation.werkl_blog_category_id` FOREIGN KEY (`werkl_blog_category_id`, `werkl_blog_category_version_id`) + REFERENCES `werkl_blog_category` (`id`, `version_id`) ON DELETE CASCADE ON UPDATE CASCADE; '); $connection->executeStatement(' - ALTER TABLE `sas_blog_blog_category` - ADD `sas_blog_category_version_id` BINARY(16) NOT NULL AFTER `sas_blog_category_id`, - DROP PRIMARY KEY, ADD PRIMARY KEY ( `sas_blog_entries_id`, `sas_blog_category_id`, `sas_blog_category_version_id` ), - ADD CONSTRAINT `fk.sas_blog_blog_category.sas_blog_category_id` FOREIGN KEY (`sas_blog_category_id`, `sas_blog_category_version_id`) - REFERENCES `sas_blog_category` (`id`, `version_id`) ON DELETE CASCADE ON UPDATE CASCADE; + ALTER TABLE `werkl_blog_blog_category` + ADD `werkl_blog_category_version_id` BINARY(16) NOT NULL AFTER `werkl_blog_category_id`, + DROP PRIMARY KEY, ADD PRIMARY KEY ( `werkl_blog_entries_id`, `werkl_blog_category_id`, `werkl_blog_category_version_id` ), + ADD CONSTRAINT `fk.werkl_blog_blog_category.werkl_blog_category_id` FOREIGN KEY (`werkl_blog_category_id`, `werkl_blog_category_version_id`) + REFERENCES `werkl_blog_category` (`id`, `version_id`) ON DELETE CASCADE ON UPDATE CASCADE; '); $connection->executeStatement(' - UPDATE `sas_blog_category` SET version_id = unhex(:version) + UPDATE `werkl_blog_category` SET version_id = unhex(:version) ', [ 'version' => $version, ]); $connection->executeStatement(' - UPDATE `sas_blog_category_translation` SET sas_blog_category_version_id = unhex(:version) + UPDATE `werkl_blog_category_translation` SET werkl_blog_category_version_id = unhex(:version) ', [ 'version' => $version, ]); $connection->executeStatement(' - UPDATE `sas_blog_blog_category` SET sas_blog_category_version_id = unhex(:version) + UPDATE `werkl_blog_blog_category` SET werkl_blog_category_version_id = unhex(:version) ', [ 'version' => $version, ]); diff --git a/src/Migration/Migration1626760242AddCustomFieldToBlogTranslation.php b/src/Migration/Migration1626760242AddCustomFieldToBlogTranslation.php index 99daa1a..274a74c 100644 --- a/src/Migration/Migration1626760242AddCustomFieldToBlogTranslation.php +++ b/src/Migration/Migration1626760242AddCustomFieldToBlogTranslation.php @@ -1,7 +1,7 @@ executeStatement(' - ALTER TABLE `sas_blog_entries_translation` + ALTER TABLE `werkl_blog_entries_translation` ADD COLUMN `custom_fields` json DEFAULT NULL AFTER `content`; '); } diff --git a/src/Migration/Migration1647338771SasBlogEntriesUpdate.php b/src/Migration/Migration1647338771WerklBlogEntriesUpdate.php similarity index 81% rename from src/Migration/Migration1647338771SasBlogEntriesUpdate.php rename to src/Migration/Migration1647338771WerklBlogEntriesUpdate.php index a9aa0cf..591e077 100644 --- a/src/Migration/Migration1647338771SasBlogEntriesUpdate.php +++ b/src/Migration/Migration1647338771WerklBlogEntriesUpdate.php @@ -1,12 +1,12 @@ executeStatement(' - ALTER TABLE `sas_blog_entries` + ALTER TABLE `werkl_blog_entries` ADD `cms_page_id` BINARY(16) NULL AFTER `id`, ADD `cms_page_version_id` binary(16) NULL AFTER `cms_page_id`, - ADD CONSTRAINT `fk.sas_blog_entries.cms_page_id` + ADD CONSTRAINT `fk.werkl_blog_entries.cms_page_id` FOREIGN KEY (`cms_page_id`, `cms_page_version_id`) REFERENCES `cms_page` (`id`, `version_id`) ON DELETE RESTRICT ON UPDATE CASCADE; @@ -41,7 +41,7 @@ public function updateSchema(Connection $connection): void private function createDeleteTrigger(Connection $connection): void { $query - = 'CREATE TRIGGER sas_blog_entries_delete AFTER DELETE ON sas_blog_entries + = 'CREATE TRIGGER werkl_blog_entries_delete AFTER DELETE ON werkl_blog_entries FOR EACH ROW BEGIN IF @TRIGGER_DISABLED IS NULL OR @TRIGGER_DISABLED = 0 THEN diff --git a/src/Migration/Migration1649322718CreateCmsPageForBlogEntries.php b/src/Migration/Migration1649322718CreateCmsPageForBlogEntries.php index 31be663..32f842b 100644 --- a/src/Migration/Migration1649322718CreateCmsPageForBlogEntries.php +++ b/src/Migration/Migration1649322718CreateCmsPageForBlogEntries.php @@ -1,7 +1,7 @@ format(Defaults::STORAGE_DATE_TIME_FORMAT); $updateSql = ''; - $blogEntries = $connection->fetchAllAssociative('SELECT id FROM sas_blog_entries WHERE cms_page_id IS NULL'); + $blogEntries = $connection->fetchAllAssociative('SELECT id FROM werkl_blog_entries WHERE cms_page_id IS NULL'); foreach ($blogEntries as $blogEntry) { $blogTranslations = $connection->fetchAllAssociative( - 'SELECT language_id, title, content FROM sas_blog_entries_translation WHERE sas_blog_entries_id = :blogEntryId', + 'SELECT language_id, title, content FROM werkl_blog_entries_translation WHERE werkl_blog_entries_id = :blogEntryId', ['blogEntryId' => $blogEntry['id']] ); diff --git a/src/Migration/Migration1649580844AddParentVersionId.php b/src/Migration/Migration1649580844AddParentVersionId.php index e1b521f..c213f6c 100644 --- a/src/Migration/Migration1649580844AddParentVersionId.php +++ b/src/Migration/Migration1649580844AddParentVersionId.php @@ -1,7 +1,7 @@ executeStatement(' - ALTER TABLE `sas_blog_category` + ALTER TABLE `werkl_blog_category` ADD `parent_version_id` BINARY(16) NULL AFTER `parent_id`, - DROP FOREIGN KEY `fk.sas_blog_category.parent_id`, - DROP INDEX `fk.sas_blog_category.parent_id`; + DROP FOREIGN KEY `fk.werkl_blog_category.parent_id`, + DROP INDEX `fk.werkl_blog_category.parent_id`; '); $connection->executeStatement(' - ALTER TABLE `sas_blog_category` - ADD CONSTRAINT `fk.sas_blog_category.parent_id` + ALTER TABLE `werkl_blog_category` + ADD CONSTRAINT `fk.werkl_blog_category.parent_id` FOREIGN KEY (`parent_id`, `parent_version_id`) - REFERENCES `sas_blog_category` (`id`, `version_id`) + REFERENCES `werkl_blog_category` (`id`, `version_id`) ON DELETE CASCADE ON UPDATE CASCADE; '); $connection->executeStatement( ' - UPDATE `sas_blog_category` SET parent_version_id = unhex(:version) + UPDATE `werkl_blog_category` SET parent_version_id = unhex(:version) ', ['version' => $version] ); diff --git a/src/Migration/Migration1702998914SetSalutationIdAuthorToNullable.php b/src/Migration/Migration1702998914SetSalutationIdAuthorToNullable.php index 13e18d1..592ebfa 100644 --- a/src/Migration/Migration1702998914SetSalutationIdAuthorToNullable.php +++ b/src/Migration/Migration1702998914SetSalutationIdAuthorToNullable.php @@ -1,7 +1,7 @@ executeStatement('ALTER TABLE `sas_blog_author` MODIFY `salutation_id` BINARY(16) NULL;'); - $connection->executeStatement('ALTER TABLE `sas_blog_author` DROP FOREIGN KEY `fk.sas_blog_author.salutation_id`;'); - $connection->executeStatement('ALTER TABLE `sas_blog_author` ADD CONSTRAINT `fk.sas_blog_author.salutation_id` FOREIGN KEY (`salutation_id`) REFERENCES `salutation` (`id`) ON DELETE SET NULL ON UPDATE CASCADE;'); + $connection->executeStatement('ALTER TABLE `werkl_blog_author` MODIFY `salutation_id` BINARY(16) NULL;'); + $connection->executeStatement('ALTER TABLE `werkl_blog_author` DROP FOREIGN KEY `fk.werkl_blog_author.salutation_id`;'); + $connection->executeStatement('ALTER TABLE `werkl_blog_author` ADD CONSTRAINT `fk.werkl_blog_author.salutation_id` FOREIGN KEY (`salutation_id`) REFERENCES `salutation` (`id`) ON DELETE SET NULL ON UPDATE CASCADE;'); } public function updateDestructive(Connection $connection): void diff --git a/src/Page/Blog/BlogPage.php b/src/Page/Blog/BlogPage.php index c36f66f..ca0a78b 100644 --- a/src/Page/Blog/BlogPage.php +++ b/src/Page/Blog/BlogPage.php @@ -1,10 +1,10 @@ systemConfigService->getString('SasBlogModule.config.cmsBlogDetailPage'); + $detailCmsPageId = $this->systemConfigService->getString('WerklOpenBlogware.config.cmsBlogDetailPage'); if (!$detailCmsPageId) { - throw new ConfigurationNotFoundException('SasBlogModule'); + throw new ConfigurationNotFoundException('WerklOpenBlogware'); } $detailCmsPage = $this->cmsPageLoader->load($request, new Criteria([$detailCmsPageId]), $context)->first(); diff --git a/src/Page/Search/BlogSearchPage.php b/src/Page/Search/BlogSearchPage.php index 23949b9..889876b 100644 --- a/src/Page/Search/BlogSearchPage.php +++ b/src/Page/Search/BlogSearchPage.php @@ -1,7 +1,7 @@ - - -{% endblock %} diff --git a/src/Resources/app/administration/src/module/blog-module/blocks/detail/component/werkl-cms-block-blog-detail.html.twig b/src/Resources/app/administration/src/module/blog-module/blocks/detail/component/werkl-cms-block-blog-detail.html.twig new file mode 100755 index 0000000..2949f8c --- /dev/null +++ b/src/Resources/app/administration/src/module/blog-module/blocks/detail/component/werkl-cms-block-blog-detail.html.twig @@ -0,0 +1,5 @@ +{% block werkl_cms_block_detail %} +
+ +
+{% endblock %} diff --git a/src/Resources/app/administration/src/module/blog-module/blocks/detail/component/sas-cms-block-blog-detail.scss b/src/Resources/app/administration/src/module/blog-module/blocks/detail/component/werkl-cms-block-blog-detail.scss old mode 100644 new mode 100755 similarity index 100% rename from src/Resources/app/administration/src/module/blog-module/blocks/detail/component/sas-cms-block-blog-detail.scss rename to src/Resources/app/administration/src/module/blog-module/blocks/detail/component/werkl-cms-block-blog-detail.scss diff --git a/src/Resources/app/administration/src/module/blog-module/blocks/detail/index.js b/src/Resources/app/administration/src/module/blog-module/blocks/detail/index.js old mode 100644 new mode 100755 index 43aac3e..031a982 --- a/src/Resources/app/administration/src/module/blog-module/blocks/detail/index.js +++ b/src/Resources/app/administration/src/module/blog-module/blocks/detail/index.js @@ -3,10 +3,10 @@ import './preview'; Shopware.Service('cmsService').registerCmsBlock({ name: 'blog-detail', - label: 'sas-blog.blocks.blog.detail.label', - category: 'sas-blog', - component: 'sas-cms-block-blog-detail', - previewComponent: 'sas-cms-preview-blog-detail', + label: 'werkl-blog.blocks.blog.detail.label', + category: 'werkl-blog', + component: 'werkl-cms-block-blog-detail', + previewComponent: 'werkl-cms-preview-blog-detail', defaultConfig: { marginBottom: '0px', marginTop: '0px', diff --git a/src/Resources/app/administration/src/module/blog-module/blocks/detail/preview/index.js b/src/Resources/app/administration/src/module/blog-module/blocks/detail/preview/index.js old mode 100644 new mode 100755 index 9387b68..7f9b804 --- a/src/Resources/app/administration/src/module/blog-module/blocks/detail/preview/index.js +++ b/src/Resources/app/administration/src/module/blog-module/blocks/detail/preview/index.js @@ -1,7 +1,7 @@ -import template from './sas-cms-preview-blog-detail.html.twig'; -import './sas-cms-preview-blog-detail.scss'; +import template from './werkl-cms-preview-blog-detail.html.twig'; +import './werkl-cms-preview-blog-detail.scss'; -Shopware.Component.register('sas-cms-preview-blog-detail', { +Shopware.Component.register('werkl-cms-preview-blog-detail', { template, computed: { diff --git a/src/Resources/app/administration/src/module/blog-module/blocks/detail/preview/sas-cms-preview-blog-detail.html.twig b/src/Resources/app/administration/src/module/blog-module/blocks/detail/preview/werkl-cms-preview-blog-detail.html.twig old mode 100644 new mode 100755 similarity index 63% rename from src/Resources/app/administration/src/module/blog-module/blocks/detail/preview/sas-cms-preview-blog-detail.html.twig rename to src/Resources/app/administration/src/module/blog-module/blocks/detail/preview/werkl-cms-preview-blog-detail.html.twig index 77f6c3a..4fa8c9f --- a/src/Resources/app/administration/src/module/blog-module/blocks/detail/preview/sas-cms-preview-blog-detail.html.twig +++ b/src/Resources/app/administration/src/module/blog-module/blocks/detail/preview/werkl-cms-preview-blog-detail.html.twig @@ -1,7 +1,7 @@ -{% block sas_cms_preview_blog_detail %} -
-
-

{{ $tc('sas-blog.blocks.blog.detail.previewTitle') }}

+{% block werkl_cms_preview_blog_detail %} +
+
+

{{ $tc('werkl-blog.blocks.blog.detail.previewTitle') }}

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, diff --git a/src/Resources/app/administration/src/module/blog-module/blocks/detail/preview/sas-cms-preview-blog-detail.scss b/src/Resources/app/administration/src/module/blog-module/blocks/detail/preview/werkl-cms-preview-blog-detail.scss old mode 100644 new mode 100755 similarity index 92% rename from src/Resources/app/administration/src/module/blog-module/blocks/detail/preview/sas-cms-preview-blog-detail.scss rename to src/Resources/app/administration/src/module/blog-module/blocks/detail/preview/werkl-cms-preview-blog-detail.scss index 5b4737f..26f7421 --- a/src/Resources/app/administration/src/module/blog-module/blocks/detail/preview/sas-cms-preview-blog-detail.scss +++ b/src/Resources/app/administration/src/module/blog-module/blocks/detail/preview/werkl-cms-preview-blog-detail.scss @@ -1,6 +1,6 @@ @import "~scss/variables"; -.sas-cms-preview-blog-detail { +.werkl-cms-preview-blog-detail { width: 100%; background: $color-white; font-size: 22px; @@ -16,7 +16,7 @@ margin: 0 0 2px 0; } - .sas-cms-preview-blog-detail-item { + .werkl-cms-preview-blog-detail-item { div > div { margin: 10px 0; diff --git a/src/Resources/app/administration/src/module/blog-module/blocks/listing/component/index.js b/src/Resources/app/administration/src/module/blog-module/blocks/listing/component/index.js old mode 100644 new mode 100755 index 29d4f74..1560f73 --- a/src/Resources/app/administration/src/module/blog-module/blocks/listing/component/index.js +++ b/src/Resources/app/administration/src/module/blog-module/blocks/listing/component/index.js @@ -1,5 +1,5 @@ -import template from './sas-cms-block-blog.html.twig'; -import './sas-cms-block-blog.scss'; +import template from './werkl-cms-block-blog.html.twig'; +import './werkl-cms-block-blog.scss'; Shopware.Component.register('sw-cms-block-blog-listing', { template, diff --git a/src/Resources/app/administration/src/module/blog-module/blocks/listing/component/sas-cms-block-blog.html.twig b/src/Resources/app/administration/src/module/blog-module/blocks/listing/component/sas-cms-block-blog.html.twig deleted file mode 100644 index 0bf158f..0000000 --- a/src/Resources/app/administration/src/module/blog-module/blocks/listing/component/sas-cms-block-blog.html.twig +++ /dev/null @@ -1,5 +0,0 @@ -{% block sas_cms_block_listing %} -

- -
-{% endblock %} diff --git a/src/Resources/app/administration/src/module/blog-module/blocks/listing/component/werkl-cms-block-blog.html.twig b/src/Resources/app/administration/src/module/blog-module/blocks/listing/component/werkl-cms-block-blog.html.twig new file mode 100755 index 0000000..6ed3c30 --- /dev/null +++ b/src/Resources/app/administration/src/module/blog-module/blocks/listing/component/werkl-cms-block-blog.html.twig @@ -0,0 +1,5 @@ +{% block werkl_cms_block_listing %} +
+ +
+{% endblock %} diff --git a/src/Resources/app/administration/src/module/blog-module/blocks/listing/component/sas-cms-block-blog.scss b/src/Resources/app/administration/src/module/blog-module/blocks/listing/component/werkl-cms-block-blog.scss old mode 100644 new mode 100755 similarity index 100% rename from src/Resources/app/administration/src/module/blog-module/blocks/listing/component/sas-cms-block-blog.scss rename to src/Resources/app/administration/src/module/blog-module/blocks/listing/component/werkl-cms-block-blog.scss diff --git a/src/Resources/app/administration/src/module/blog-module/blocks/listing/index.js b/src/Resources/app/administration/src/module/blog-module/blocks/listing/index.js old mode 100644 new mode 100755 index 3e247b2..616eaed --- a/src/Resources/app/administration/src/module/blog-module/blocks/listing/index.js +++ b/src/Resources/app/administration/src/module/blog-module/blocks/listing/index.js @@ -3,10 +3,10 @@ import './preview'; Shopware.Service('cmsService').registerCmsBlock({ name: 'blog-listing', - label: 'sas-blog.blocks.blog.listing.label', - category: 'sas-blog', - component: 'sas-cms-block-blog', - previewComponent: 'sas-cms-preview-blog-listing', + label: 'werkl-blog.blocks.blog.listing.label', + category: 'werkl-blog', + component: 'werkl-cms-block-blog', + previewComponent: 'werkl-cms-preview-blog-listing', defaultConfig: { marginBottom: '0px', marginTop: '0px', diff --git a/src/Resources/app/administration/src/module/blog-module/blocks/listing/preview/index.js b/src/Resources/app/administration/src/module/blog-module/blocks/listing/preview/index.js old mode 100644 new mode 100755 index 3a7ba77..df94f96 --- a/src/Resources/app/administration/src/module/blog-module/blocks/listing/preview/index.js +++ b/src/Resources/app/administration/src/module/blog-module/blocks/listing/preview/index.js @@ -1,7 +1,7 @@ -import template from './sas-cms-preview-blog-listing.html.twig'; -import './sas-cms-preview-blog-listing.scss'; +import template from './werkl-cms-preview-blog-listing.html.twig'; +import './werkl-cms-preview-blog-listing.scss'; -Shopware.Component.register('sas-cms-preview-blog-listing', { +Shopware.Component.register('werkl-cms-preview-blog-listing', { template, computed: { diff --git a/src/Resources/app/administration/src/module/blog-module/blocks/listing/preview/sas-cms-preview-blog-listing.html.twig b/src/Resources/app/administration/src/module/blog-module/blocks/listing/preview/werkl-cms-preview-blog-listing.html.twig old mode 100644 new mode 100755 similarity index 56% rename from src/Resources/app/administration/src/module/blog-module/blocks/listing/preview/sas-cms-preview-blog-listing.html.twig rename to src/Resources/app/administration/src/module/blog-module/blocks/listing/preview/werkl-cms-preview-blog-listing.html.twig index de05a92..6d0bebc --- a/src/Resources/app/administration/src/module/blog-module/blocks/listing/preview/sas-cms-preview-blog-listing.html.twig +++ b/src/Resources/app/administration/src/module/blog-module/blocks/listing/preview/werkl-cms-preview-blog-listing.html.twig @@ -1,7 +1,7 @@ -{% block sas_cms_preview_blog_listing %} -
-
-

{{ $tc('sas-blog.blocks.blog.listing.previewTitle') }}

+{% block werkl_cms_preview_blog_listing %} +
+
+

{{ $tc('werkl-blog.blocks.blog.listing.previewTitle') }}

diff --git a/src/Resources/app/administration/src/module/blog-module/blocks/listing/preview/sas-cms-preview-blog-listing.scss b/src/Resources/app/administration/src/module/blog-module/blocks/listing/preview/werkl-cms-preview-blog-listing.scss old mode 100644 new mode 100755 similarity index 91% rename from src/Resources/app/administration/src/module/blog-module/blocks/listing/preview/sas-cms-preview-blog-listing.scss rename to src/Resources/app/administration/src/module/blog-module/blocks/listing/preview/werkl-cms-preview-blog-listing.scss index 1b515b4..32547c1 --- a/src/Resources/app/administration/src/module/blog-module/blocks/listing/preview/sas-cms-preview-blog-listing.scss +++ b/src/Resources/app/administration/src/module/blog-module/blocks/listing/preview/werkl-cms-preview-blog-listing.scss @@ -1,6 +1,6 @@ @import "~scss/variables"; -.sas-cms-preview-blog-listing { +.werkl-cms-preview-blog-listing { width: 100%; background: $color-white; font-size: 22px; @@ -16,7 +16,7 @@ margin: 0 0 2px 0; } - .sas-cms-preview-blog-listing-item { + .werkl-cms-preview-blog-listing-item { display: grid; grid-template-columns: 1fr 1fr; grid-gap: 20px; diff --git a/src/Resources/app/administration/src/module/blog-module/blocks/newest-listing/component/index.js b/src/Resources/app/administration/src/module/blog-module/blocks/newest-listing/component/index.js old mode 100644 new mode 100755 index 0cdbd7e..b11deba --- a/src/Resources/app/administration/src/module/blog-module/blocks/newest-listing/component/index.js +++ b/src/Resources/app/administration/src/module/blog-module/blocks/newest-listing/component/index.js @@ -1,4 +1,4 @@ -import template from './sas-cms-block-newest-listing.html.twig'; +import template from './werkl-cms-block-newest-listing.html.twig'; const { Component } = Shopware; diff --git a/src/Resources/app/administration/src/module/blog-module/blocks/newest-listing/component/sas-cms-block-newest-listing.html.twig b/src/Resources/app/administration/src/module/blog-module/blocks/newest-listing/component/sas-cms-block-newest-listing.html.twig deleted file mode 100644 index fece0f2..0000000 --- a/src/Resources/app/administration/src/module/blog-module/blocks/newest-listing/component/sas-cms-block-newest-listing.html.twig +++ /dev/null @@ -1,5 +0,0 @@ -{% block sas_cms_block_newest_listing %} -
- -
-{% endblock %} diff --git a/src/Resources/app/administration/src/module/blog-module/blocks/newest-listing/component/werkl-cms-block-newest-listing.html.twig b/src/Resources/app/administration/src/module/blog-module/blocks/newest-listing/component/werkl-cms-block-newest-listing.html.twig new file mode 100755 index 0000000..6830fdc --- /dev/null +++ b/src/Resources/app/administration/src/module/blog-module/blocks/newest-listing/component/werkl-cms-block-newest-listing.html.twig @@ -0,0 +1,5 @@ +{% block werkl_cms_block_newest_listing %} +
+ +
+{% endblock %} diff --git a/src/Resources/app/administration/src/module/blog-module/blocks/newest-listing/index.js b/src/Resources/app/administration/src/module/blog-module/blocks/newest-listing/index.js old mode 100644 new mode 100755 index f74309f..0f6de6d --- a/src/Resources/app/administration/src/module/blog-module/blocks/newest-listing/index.js +++ b/src/Resources/app/administration/src/module/blog-module/blocks/newest-listing/index.js @@ -3,10 +3,10 @@ import './preview'; Shopware.Service('cmsService').registerCmsBlock({ name: 'blog-newest-listing', - label: 'sas-blog.blocks.blog.newestListing.label', - category: 'sas-blog', - component: 'sas-cms-block-newest-listing', - previewComponent: 'sas-cms-preview-newest-listing', + label: 'werkl-blog.blocks.blog.newestListing.label', + category: 'werkl-blog', + component: 'werkl-cms-block-newest-listing', + previewComponent: 'werkl-cms-preview-newest-listing', defaultConfig: { marginBottom: '0px', marginTop: '0px', diff --git a/src/Resources/app/administration/src/module/blog-module/blocks/newest-listing/preview/index.js b/src/Resources/app/administration/src/module/blog-module/blocks/newest-listing/preview/index.js old mode 100644 new mode 100755 index 2326b19..6ec95fa --- a/src/Resources/app/administration/src/module/blog-module/blocks/newest-listing/preview/index.js +++ b/src/Resources/app/administration/src/module/blog-module/blocks/newest-listing/preview/index.js @@ -1,8 +1,8 @@ -import template from './sas-cms-preview-newest-listing.html.twig'; -import './sas-cms-preview-newest-listing.scss'; +import template from './werkl-cms-preview-newest-listing.html.twig'; +import './werkl-cms-preview-newest-listing.scss'; const { Component } = Shopware; -Component.register('sas-cms-preview-newest-listing', { +Component.register('werkl-cms-preview-newest-listing', { template, }); diff --git a/src/Resources/app/administration/src/module/blog-module/blocks/newest-listing/preview/sas-cms-preview-newest-listing.html.twig b/src/Resources/app/administration/src/module/blog-module/blocks/newest-listing/preview/sas-cms-preview-newest-listing.html.twig deleted file mode 100644 index 1f9f260..0000000 --- a/src/Resources/app/administration/src/module/blog-module/blocks/newest-listing/preview/sas-cms-preview-newest-listing.html.twig +++ /dev/null @@ -1,15 +0,0 @@ -{% block sas_cms_preview_newest_listing %} -
-
-

{{ $tc('sas-blog.blocks.blog.newestListing.previewTitle') }}

-
-
-
-
-
-
-
-
-
-
-{% endblock %} diff --git a/src/Resources/app/administration/src/module/blog-module/blocks/newest-listing/preview/werkl-cms-preview-newest-listing.html.twig b/src/Resources/app/administration/src/module/blog-module/blocks/newest-listing/preview/werkl-cms-preview-newest-listing.html.twig new file mode 100755 index 0000000..e03cd95 --- /dev/null +++ b/src/Resources/app/administration/src/module/blog-module/blocks/newest-listing/preview/werkl-cms-preview-newest-listing.html.twig @@ -0,0 +1,15 @@ +{% block werkl_cms_preview_newest_listing %} +
+
+

{{ $tc('werkl-blog.blocks.blog.newestListing.previewTitle') }}

+
+
+
+
+
+
+
+
+
+
+{% endblock %} diff --git a/src/Resources/app/administration/src/module/blog-module/blocks/newest-listing/preview/sas-cms-preview-newest-listing.scss b/src/Resources/app/administration/src/module/blog-module/blocks/newest-listing/preview/werkl-cms-preview-newest-listing.scss old mode 100644 new mode 100755 similarity index 91% rename from src/Resources/app/administration/src/module/blog-module/blocks/newest-listing/preview/sas-cms-preview-newest-listing.scss rename to src/Resources/app/administration/src/module/blog-module/blocks/newest-listing/preview/werkl-cms-preview-newest-listing.scss index 82c70d3..8e456f9 --- a/src/Resources/app/administration/src/module/blog-module/blocks/newest-listing/preview/sas-cms-preview-newest-listing.scss +++ b/src/Resources/app/administration/src/module/blog-module/blocks/newest-listing/preview/werkl-cms-preview-newest-listing.scss @@ -1,6 +1,6 @@ @import "~scss/variables"; -.sas-cms-preview-newest-listing { +.werkl-cms-preview-newest-listing { width: 100%; background: $color-white; font-size: 22px; @@ -16,7 +16,7 @@ margin: 0 0 2px 0; } - .sas-cms-preview-newest-listing-item { + .werkl-cms-preview-newest-listing-item { display: grid; grid-template-columns: 1fr 1fr; grid-gap: 20px; diff --git a/src/Resources/app/administration/src/module/blog-module/blocks/single-entry/component/index.js b/src/Resources/app/administration/src/module/blog-module/blocks/single-entry/component/index.js old mode 100644 new mode 100755 index be0b2c4..25fd2f5 --- a/src/Resources/app/administration/src/module/blog-module/blocks/single-entry/component/index.js +++ b/src/Resources/app/administration/src/module/blog-module/blocks/single-entry/component/index.js @@ -1,5 +1,5 @@ -import template from './sas-cms-block-blog-single-entry.html.twig'; -import './sas-cms-block-blog-single-entry.scss'; +import template from './werkl-cms-block-blog-single-entry.html.twig'; +import './werkl-cms-block-blog-single-entry.scss'; Shopware.Component.register('sw-cms-block-blog-single-entry', { template, diff --git a/src/Resources/app/administration/src/module/blog-module/blocks/single-entry/component/sas-cms-block-blog-single-entry.html.twig b/src/Resources/app/administration/src/module/blog-module/blocks/single-entry/component/sas-cms-block-blog-single-entry.html.twig deleted file mode 100644 index cb45960..0000000 --- a/src/Resources/app/administration/src/module/blog-module/blocks/single-entry/component/sas-cms-block-blog-single-entry.html.twig +++ /dev/null @@ -1,5 +0,0 @@ -{% block sas_cms_block_blog_single_entry %} -
- -
-{% endblock %} diff --git a/src/Resources/app/administration/src/module/blog-module/blocks/single-entry/component/werkl-cms-block-blog-single-entry.html.twig b/src/Resources/app/administration/src/module/blog-module/blocks/single-entry/component/werkl-cms-block-blog-single-entry.html.twig new file mode 100755 index 0000000..23cb6ce --- /dev/null +++ b/src/Resources/app/administration/src/module/blog-module/blocks/single-entry/component/werkl-cms-block-blog-single-entry.html.twig @@ -0,0 +1,5 @@ +{% block werkl_cms_block_blog_single_entry %} +
+ +
+{% endblock %} diff --git a/src/Resources/app/administration/src/module/blog-module/blocks/single-entry/component/sas-cms-block-blog-single-entry.scss b/src/Resources/app/administration/src/module/blog-module/blocks/single-entry/component/werkl-cms-block-blog-single-entry.scss old mode 100644 new mode 100755 similarity index 100% rename from src/Resources/app/administration/src/module/blog-module/blocks/single-entry/component/sas-cms-block-blog-single-entry.scss rename to src/Resources/app/administration/src/module/blog-module/blocks/single-entry/component/werkl-cms-block-blog-single-entry.scss diff --git a/src/Resources/app/administration/src/module/blog-module/blocks/single-entry/index.js b/src/Resources/app/administration/src/module/blog-module/blocks/single-entry/index.js old mode 100644 new mode 100755 index 45ba43c..0cf30b2 --- a/src/Resources/app/administration/src/module/blog-module/blocks/single-entry/index.js +++ b/src/Resources/app/administration/src/module/blog-module/blocks/single-entry/index.js @@ -3,10 +3,10 @@ import './preview'; Shopware.Service('cmsService').registerCmsBlock({ name: 'blog-single-entry', - label: 'sas-blog.blocks.blog.singleEntry.label', - category: 'sas-blog', - component: 'sas-cms-block-blog-single-entry', - previewComponent: 'sas-cms-preview-blog-single-entry', + label: 'werkl-blog.blocks.blog.singleEntry.label', + category: 'werkl-blog', + component: 'werkl-cms-block-blog-single-entry', + previewComponent: 'werkl-cms-preview-blog-single-entry', defaultConfig: { marginBottom: '0px', marginTop: '0px', diff --git a/src/Resources/app/administration/src/module/blog-module/blocks/single-entry/preview/index.js b/src/Resources/app/administration/src/module/blog-module/blocks/single-entry/preview/index.js old mode 100644 new mode 100755 index 88cbfea..2fec7d7 --- a/src/Resources/app/administration/src/module/blog-module/blocks/single-entry/preview/index.js +++ b/src/Resources/app/administration/src/module/blog-module/blocks/single-entry/preview/index.js @@ -1,7 +1,7 @@ -import template from './sas-cms-preview-blog-single-entry.html.twig'; -import './sas-cms-preview-blog-single-entry.scss'; +import template from './werkl-cms-preview-blog-single-entry.html.twig'; +import './werkl-cms-preview-blog-single-entry.scss'; -Shopware.Component.register('sas-cms-preview-blog-single-entry', { +Shopware.Component.register('werkl-cms-preview-blog-single-entry', { template, computed: { diff --git a/src/Resources/app/administration/src/module/blog-module/blocks/single-entry/preview/sas-cms-preview-blog-single-entry.html.twig b/src/Resources/app/administration/src/module/blog-module/blocks/single-entry/preview/sas-cms-preview-blog-single-entry.html.twig deleted file mode 100644 index fae7c5f..0000000 --- a/src/Resources/app/administration/src/module/blog-module/blocks/single-entry/preview/sas-cms-preview-blog-single-entry.html.twig +++ /dev/null @@ -1,12 +0,0 @@ -{% block sas_cms_preview_blog_single_entry %} -
-
-

{{ $tc('sas-blog.blocks.blog.singleEntry.previewTitle') }}

-
- -
-
-
-
-
-{% endblock %} diff --git a/src/Resources/app/administration/src/module/blog-module/blocks/single-entry/preview/werkl-cms-preview-blog-single-entry.html.twig b/src/Resources/app/administration/src/module/blog-module/blocks/single-entry/preview/werkl-cms-preview-blog-single-entry.html.twig new file mode 100755 index 0000000..d5e1a74 --- /dev/null +++ b/src/Resources/app/administration/src/module/blog-module/blocks/single-entry/preview/werkl-cms-preview-blog-single-entry.html.twig @@ -0,0 +1,12 @@ +{% block werkl_cms_preview_blog_single_entry %} +
+
+

{{ $tc('werkl-blog.blocks.blog.singleEntry.previewTitle') }}

+
+ +
+
+
+
+
+{% endblock %} diff --git a/src/Resources/app/administration/src/module/blog-module/blocks/single-entry/preview/sas-cms-preview-blog-single-entry.scss b/src/Resources/app/administration/src/module/blog-module/blocks/single-entry/preview/werkl-cms-preview-blog-single-entry.scss old mode 100644 new mode 100755 similarity index 90% rename from src/Resources/app/administration/src/module/blog-module/blocks/single-entry/preview/sas-cms-preview-blog-single-entry.scss rename to src/Resources/app/administration/src/module/blog-module/blocks/single-entry/preview/werkl-cms-preview-blog-single-entry.scss index 1c1d6b2..d2b94a4 --- a/src/Resources/app/administration/src/module/blog-module/blocks/single-entry/preview/sas-cms-preview-blog-single-entry.scss +++ b/src/Resources/app/administration/src/module/blog-module/blocks/single-entry/preview/werkl-cms-preview-blog-single-entry.scss @@ -1,6 +1,6 @@ @import "~scss/variables"; -.sas-cms-preview-blog-single-entry { +.werkl-cms-preview-blog-single-entry { width: 100%; background: $color-white; font-size: 22px; @@ -16,7 +16,7 @@ margin: 0 0 2px 0; } - .sas-cms-preview-blog-single-entry-item { + .werkl-cms-preview-blog-single-entry-item { width: 100%; div > div { diff --git a/src/Resources/app/administration/src/module/blog-module/component/blog-category-tree-field/index.js b/src/Resources/app/administration/src/module/blog-module/component/blog-category-tree-field/index.js old mode 100644 new mode 100755 index 2051f00..24384f5 --- a/src/Resources/app/administration/src/module/blog-module/component/blog-category-tree-field/index.js +++ b/src/Resources/app/administration/src/module/blog-module/component/blog-category-tree-field/index.js @@ -1,10 +1,10 @@ const { Component } = Shopware; const { Criteria } = Shopware.Data; -Component.extend('sas-blog-category-tree-field', 'sw-category-tree-field', { +Component.extend('werkl-blog-category-tree-field', 'sw-category-tree-field', { computed: { globalCategoryRepository() { - return this.repositoryFactory.create('sas_blog_category'); + return this.repositoryFactory.create('werkl_blog_category'); }, }, methods: { diff --git a/src/Resources/app/administration/src/module/blog-module/component/blog-category-tree/index.js b/src/Resources/app/administration/src/module/blog-module/component/blog-category-tree/index.js old mode 100644 new mode 100755 index 2fc9a01..dcdc6ec --- a/src/Resources/app/administration/src/module/blog-module/component/blog-category-tree/index.js +++ b/src/Resources/app/administration/src/module/blog-module/component/blog-category-tree/index.js @@ -1,14 +1,14 @@ -import template from './sas-blog-category-tree.html.twig'; +import template from './werkl-blog-category-tree.html.twig'; const { Component } = Shopware; -Component.extend('sas-blog-category-tree', 'sw-category-tree', { +Component.extend('werkl-blog-category-tree', 'sw-category-tree', { template, data() { return { blogCategory: null, - translationContext: 'sas-blog-category', + translationContext: 'werkl-blog-category', }; }, @@ -24,7 +24,7 @@ Component.extend('sas-blog-category-tree', 'sw-category-tree', { }, categoryRepository() { - return this.repositoryFactory.create('sas_blog_category'); + return this.repositoryFactory.create('werkl_blog_category'); }, disableContextMenu() { diff --git a/src/Resources/app/administration/src/module/blog-module/component/blog-category-tree/sas-blog-category-tree.html.twig b/src/Resources/app/administration/src/module/blog-module/component/blog-category-tree/werkl-blog-category-tree.html.twig old mode 100644 new mode 100755 similarity index 98% rename from src/Resources/app/administration/src/module/blog-module/component/blog-category-tree/sas-blog-category-tree.html.twig rename to src/Resources/app/administration/src/module/blog-module/component/blog-category-tree/werkl-blog-category-tree.html.twig index be44631..65a74ee --- a/src/Resources/app/administration/src/module/blog-module/component/blog-category-tree/sas-blog-category-tree.html.twig +++ b/src/Resources/app/administration/src/module/blog-module/component/blog-category-tree/werkl-blog-category-tree.html.twig @@ -35,7 +35,7 @@ selectedItemsPathIds, checkedItemIds, }"> - + {% endblock %} {% block sw_tree_items_actions_edit %} - {{ $tc('sas-blog-tree-item.actions.edit') }} + {{ $tc('werkl-blog-tree-item.actions.edit') }} {% endblock %} diff --git a/src/Resources/app/administration/src/module/blog-module/component/blog-tree-item/index.js b/src/Resources/app/administration/src/module/blog-module/component/blog-tree-item/index.js old mode 100644 new mode 100755 index 0ff80d7..3d89d65 --- a/src/Resources/app/administration/src/module/blog-module/component/blog-tree-item/index.js +++ b/src/Resources/app/administration/src/module/blog-module/component/blog-tree-item/index.js @@ -2,7 +2,7 @@ import template from './blog-tree-item.html.twig'; const { Component } = Shopware; -Component.extend('sas-blog-tree-item', 'sw-tree-item', { +Component.extend('werkl-blog-tree-item', 'sw-tree-item', { template, computed: { diff --git a/src/Resources/app/administration/src/module/blog-module/component/blog-vertical-tabs/blog-vertical-tabs.html.twig b/src/Resources/app/administration/src/module/blog-module/component/blog-vertical-tabs/blog-vertical-tabs.html.twig old mode 100644 new mode 100755 index ae41aa3..be6e71c --- a/src/Resources/app/administration/src/module/blog-module/component/blog-vertical-tabs/blog-vertical-tabs.html.twig +++ b/src/Resources/app/administration/src/module/blog-module/component/blog-vertical-tabs/blog-vertical-tabs.html.twig @@ -7,25 +7,25 @@ position-identifier="blog-vertical-tabs" > diff --git a/src/Resources/app/administration/src/module/blog-module/component/blog-vertical-tabs/index.js b/src/Resources/app/administration/src/module/blog-module/component/blog-vertical-tabs/index.js old mode 100644 new mode 100755 index 40ad601..5f4aae3 --- a/src/Resources/app/administration/src/module/blog-module/component/blog-vertical-tabs/index.js +++ b/src/Resources/app/administration/src/module/blog-module/component/blog-vertical-tabs/index.js @@ -2,7 +2,7 @@ import template from './blog-vertical-tabs.html.twig'; const { Component } = Shopware; -Component.register('sas-blog-vertical-tabs', { +Component.register('werkl-blog-vertical-tabs', { template, props: { diff --git a/src/Resources/app/administration/src/module/blog-module/constant/blog-module.constant.js b/src/Resources/app/administration/src/module/blog-module/constant/open-blogware.constant.js old mode 100644 new mode 100755 similarity index 100% rename from src/Resources/app/administration/src/module/blog-module/constant/blog-module.constant.js rename to src/Resources/app/administration/src/module/blog-module/constant/open-blogware.constant.js diff --git a/src/Resources/app/administration/src/module/blog-module/elements/blog-detail/component/index.js b/src/Resources/app/administration/src/module/blog-module/elements/blog-detail/component/index.js old mode 100644 new mode 100755 index 584f448..e98d9c0 --- a/src/Resources/app/administration/src/module/blog-module/elements/blog-detail/component/index.js +++ b/src/Resources/app/administration/src/module/blog-module/elements/blog-detail/component/index.js @@ -1,9 +1,9 @@ -import template from './sas-blog-element-blog-detail.html.twig'; -import './sas-blog-element-blog-detail.scss'; +import template from './werkl-blog-element-blog-detail.html.twig'; +import './werkl-blog-element-blog-detail.scss'; const { Mixin } = Shopware; -Shopware.Component.register('sas-blog-el-blog-detail', { +Shopware.Component.register('werkl-blog-el-blog-detail', { template, mixins: [ diff --git a/src/Resources/app/administration/src/module/blog-module/elements/blog-detail/component/sas-blog-element-blog-detail.html.twig b/src/Resources/app/administration/src/module/blog-module/elements/blog-detail/component/sas-blog-element-blog-detail.html.twig deleted file mode 100644 index 46f7182..0000000 --- a/src/Resources/app/administration/src/module/blog-module/elements/blog-detail/component/sas-blog-element-blog-detail.html.twig +++ /dev/null @@ -1,8 +0,0 @@ -{% block sas_cms_element_blog_detail %} -
-

{{ $tc('sas-blog.elements.detail.component.elementHeadline') }}

- - {{ $tc('sas-blog.elements.detail.component.infoText') }} - -
-{% endblock %} diff --git a/src/Resources/app/administration/src/module/blog-module/elements/blog-detail/component/werkl-blog-element-blog-detail.html.twig b/src/Resources/app/administration/src/module/blog-module/elements/blog-detail/component/werkl-blog-element-blog-detail.html.twig new file mode 100755 index 0000000..95983f7 --- /dev/null +++ b/src/Resources/app/administration/src/module/blog-module/elements/blog-detail/component/werkl-blog-element-blog-detail.html.twig @@ -0,0 +1,8 @@ +{% block werkl_cms_element_blog_detail %} +
+

{{ $tc('werkl-blog.elements.detail.component.elementHeadline') }}

+ + {{ $tc('werkl-blog.elements.detail.component.infoText') }} + +
+{% endblock %} diff --git a/src/Resources/app/administration/src/module/blog-module/elements/blog-detail/component/sas-blog-element-blog-detail.scss b/src/Resources/app/administration/src/module/blog-module/elements/blog-detail/component/werkl-blog-element-blog-detail.scss old mode 100644 new mode 100755 similarity index 79% rename from src/Resources/app/administration/src/module/blog-module/elements/blog-detail/component/sas-blog-element-blog-detail.scss rename to src/Resources/app/administration/src/module/blog-module/elements/blog-detail/component/werkl-blog-element-blog-detail.scss index bdd9cee..efe4fef --- a/src/Resources/app/administration/src/module/blog-module/elements/blog-detail/component/sas-blog-element-blog-detail.scss +++ b/src/Resources/app/administration/src/module/blog-module/elements/blog-detail/component/werkl-blog-element-blog-detail.scss @@ -1,19 +1,19 @@ @import "~scss/variables"; -.sas-cms-el-blog-detail { +.werkl-cms-el-blog-detail { width: 100%; border: 1px solid #dadee5; border-radius: 4px; background: $color-white; padding: 10px; - .sas-cms-el-blog-placeholder div { + .werkl-cms-el-blog-placeholder div { margin: 15px 30px; height: 1.5em; border-radius: 4px; background-color: $color-gray-100; - &.sas-cms-el-sas-cms-el-blog__placeholder { + &.werkl-cms-el-werkl-cms-el-blog__placeholder { margin: 15px 30px 15px 70px; } } diff --git a/src/Resources/app/administration/src/module/blog-module/elements/blog-detail/config/index.js b/src/Resources/app/administration/src/module/blog-module/elements/blog-detail/config/index.js old mode 100644 new mode 100755 diff --git a/src/Resources/app/administration/src/module/blog-module/elements/blog-detail/config/sw-cms-el-config-blog-detail.html.twig b/src/Resources/app/administration/src/module/blog-module/elements/blog-detail/config/sw-cms-el-config-blog-detail.html.twig old mode 100644 new mode 100755 index 04d2bd4..21a0a9f --- a/src/Resources/app/administration/src/module/blog-module/elements/blog-detail/config/sw-cms-el-config-blog-detail.html.twig +++ b/src/Resources/app/administration/src/module/blog-module/elements/blog-detail/config/sw-cms-el-config-blog-detail.html.twig @@ -1,21 +1,21 @@ -{% block sas_cms_element_blog_detail_config %} +{% block werkl_cms_element_blog_detail_config %}
- {% block sas_cms_element_blog_detail_config_show_meta %} + {% block werkl_cms_element_blog_detail_config_show_meta %} diff --git a/src/Resources/app/administration/src/module/blog-module/elements/blog-detail/config/sw-cms-el-config-blog-detail.scss b/src/Resources/app/administration/src/module/blog-module/elements/blog-detail/config/sw-cms-el-config-blog-detail.scss old mode 100644 new mode 100755 diff --git a/src/Resources/app/administration/src/module/blog-module/elements/blog-detail/index.js b/src/Resources/app/administration/src/module/blog-module/elements/blog-detail/index.js old mode 100644 new mode 100755 index 2c2b26b..99b714b --- a/src/Resources/app/administration/src/module/blog-module/elements/blog-detail/index.js +++ b/src/Resources/app/administration/src/module/blog-module/elements/blog-detail/index.js @@ -5,9 +5,9 @@ import './preview'; Shopware.Service('cmsService').registerCmsElement({ name: 'blog-detail', label: 'Blog Detail', - component: 'sas-blog-el-blog-detail', + component: 'werkl-blog-el-blog-detail', configComponent: 'sw-cms-el-config-blog-detail', - previewComponent: 'sas-blog-el-blog-detail-preview', + previewComponent: 'werkl-blog-el-blog-detail-preview', defaultConfig: { showCategory: { source: 'static', diff --git a/src/Resources/app/administration/src/module/blog-module/elements/blog-detail/preview/index.js b/src/Resources/app/administration/src/module/blog-module/elements/blog-detail/preview/index.js old mode 100644 new mode 100755 index c5a2f8d..6f1f93d --- a/src/Resources/app/administration/src/module/blog-module/elements/blog-detail/preview/index.js +++ b/src/Resources/app/administration/src/module/blog-module/elements/blog-detail/preview/index.js @@ -1,6 +1,6 @@ -import template from './sas-blog-element-preview.html.twig'; -import './sas-blog-element-preview.scss'; +import template from './werkl-blog-element-preview.html.twig'; +import './werkl-blog-element-preview.scss'; -Shopware.Component.register('sas-blog-el-blog-detail-preview', { +Shopware.Component.register('werkl-blog-el-blog-detail-preview', { template, }); diff --git a/src/Resources/app/administration/src/module/blog-module/elements/blog-detail/preview/sas-blog-element-preview.html.twig b/src/Resources/app/administration/src/module/blog-module/elements/blog-detail/preview/werkl-blog-element-preview.html.twig old mode 100644 new mode 100755 similarity index 87% rename from src/Resources/app/administration/src/module/blog-module/elements/blog-detail/preview/sas-blog-element-preview.html.twig rename to src/Resources/app/administration/src/module/blog-module/elements/blog-detail/preview/werkl-blog-element-preview.html.twig index e787773..12443dd --- a/src/Resources/app/administration/src/module/blog-module/elements/blog-detail/preview/sas-blog-element-preview.html.twig +++ b/src/Resources/app/administration/src/module/blog-module/elements/blog-detail/preview/werkl-blog-element-preview.html.twig @@ -1,4 +1,4 @@ -{% block sas_blog_element_previews %} +{% block werkl_blog_element_previews %}

Lorem ipsum dolor

diff --git a/src/Resources/app/administration/src/module/blog-module/elements/blog-detail/preview/sas-blog-element-preview.scss b/src/Resources/app/administration/src/module/blog-module/elements/blog-detail/preview/werkl-blog-element-preview.scss old mode 100644 new mode 100755 similarity index 100% rename from src/Resources/app/administration/src/module/blog-module/elements/blog-detail/preview/sas-blog-element-preview.scss rename to src/Resources/app/administration/src/module/blog-module/elements/blog-detail/preview/werkl-blog-element-preview.scss diff --git a/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/component/index.js b/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/component/index.js old mode 100644 new mode 100755 index 8e1aed2..2ca646a --- a/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/component/index.js +++ b/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/component/index.js @@ -1,9 +1,9 @@ -import template from './sas-cms-el-newest-listing.html.twig'; -import './sas-cms-el-newest-listing.scss'; +import template from './werkl-cms-el-newest-listing.html.twig'; +import './werkl-cms-el-newest-listing.scss'; const { Component, Mixin } = Shopware; -Component.register('sas-cms-el-newest-listing', { +Component.register('werkl-cms-el-newest-listing', { template, mixins: [ diff --git a/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/component/sas-cms-el-newest-listing.html.twig b/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/component/sas-cms-el-newest-listing.html.twig deleted file mode 100644 index 2f34a13..0000000 --- a/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/component/sas-cms-el-newest-listing.html.twig +++ /dev/null @@ -1,8 +0,0 @@ -{% block sas_cms_el_newest_listing %} -

-

{{ $tc('sas-blog.elements.newestListing.component.elementHeadline') }}

- - {{ $tc('sas-blog.elements.newestListing.component.infoText') }} - -
-{% endblock %} diff --git a/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/component/werkl-cms-el-newest-listing.html.twig b/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/component/werkl-cms-el-newest-listing.html.twig new file mode 100755 index 0000000..f1f9cbc --- /dev/null +++ b/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/component/werkl-cms-el-newest-listing.html.twig @@ -0,0 +1,8 @@ +{% block werkl_cms_el_newest_listing %} +
+

{{ $tc('werkl-blog.elements.newestListing.component.elementHeadline') }}

+ + {{ $tc('werkl-blog.elements.newestListing.component.infoText') }} + +
+{% endblock %} diff --git a/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/component/sas-cms-el-newest-listing.scss b/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/component/werkl-cms-el-newest-listing.scss old mode 100644 new mode 100755 similarity index 85% rename from src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/component/sas-cms-el-newest-listing.scss rename to src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/component/werkl-cms-el-newest-listing.scss index 2a0baff..55c9010 --- a/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/component/sas-cms-el-newest-listing.scss +++ b/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/component/werkl-cms-el-newest-listing.scss @@ -1,6 +1,6 @@ @import "~scss/variables"; -.sas-cms-el-newest-listing { +.werkl-cms-el-newest-listing { width: 100%; border: 1px solid #dadee5; border-radius: 4px; diff --git a/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/config/index.js b/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/config/index.js old mode 100644 new mode 100755 index 6a676df..680dd81 --- a/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/config/index.js +++ b/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/config/index.js @@ -1,10 +1,10 @@ -import template from './sas-cms-el-config-newest-listing.html.twig'; -import './sas-cms-el-config-newest-listing.scss'; +import template from './werkl-cms-el-config-newest-listing.html.twig'; +import './werkl-cms-el-config-newest-listing.scss'; const { Component, Mixin } = Shopware; const { EntityCollection, Criteria } = Shopware.Data; -Component.register('sas-cms-el-config-newest-listing', { +Component.register('werkl-cms-el-config-newest-listing', { template, inject: ['repositoryFactory'], @@ -22,7 +22,7 @@ Component.register('sas-cms-el-config-newest-listing', { computed: { blogCategoryRepository() { - return this.repositoryFactory.create('sas_blog_category'); + return this.repositoryFactory.create('werkl_blog_category'); }, blogListingSelectContext() { diff --git a/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/config/sas-cms-el-config-newest-listing.html.twig b/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/config/sas-cms-el-config-newest-listing.html.twig deleted file mode 100644 index 5ae639f..0000000 --- a/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/config/sas-cms-el-config-newest-listing.html.twig +++ /dev/null @@ -1,54 +0,0 @@ -{% block sas_cms_element_newest_listing_config %} -
- - {% block sas_cms_element_newest_listing_config_itemCount_field %} - - {% endblock %} - - {% block sas_cms_element_newest_listing_config_offsetCount_field %} - - {% endblock %} - - {% block sas_cms_element_blog_listing_config_show_type %} - - {% block sas_cms_element_download_card_config_layout_select_options %} - - - {% endblock %} - - {% endblock %} - - {% block sas_cms_element_blog_listing_config_select_categories %} - - {% endblock %} - -
-{% endblock %} diff --git a/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/config/werkl-cms-el-config-newest-listing.html.twig b/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/config/werkl-cms-el-config-newest-listing.html.twig new file mode 100755 index 0000000..232e80b --- /dev/null +++ b/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/config/werkl-cms-el-config-newest-listing.html.twig @@ -0,0 +1,54 @@ +{% block werkl_cms_element_newest_listing_config %} +
+ + {% block werkl_cms_element_newest_listing_config_itemCount_field %} + + {% endblock %} + + {% block werkl_cms_element_newest_listing_config_offsetCount_field %} + + {% endblock %} + + {% block werkl_cms_element_blog_listing_config_show_type %} + + {% block werkl_cms_element_download_card_config_layout_select_options %} + + + {% endblock %} + + {% endblock %} + + {% block werkl_cms_element_blog_listing_config_select_categories %} + + {% endblock %} + +
+{% endblock %} diff --git a/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/config/sas-cms-el-config-newest-listing.scss b/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/config/werkl-cms-el-config-newest-listing.scss old mode 100644 new mode 100755 similarity index 55% rename from src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/config/sas-cms-el-config-newest-listing.scss rename to src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/config/werkl-cms-el-config-newest-listing.scss index f822bce..03fe0ca --- a/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/config/sas-cms-el-config-newest-listing.scss +++ b/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/config/werkl-cms-el-config-newest-listing.scss @@ -1,5 +1,5 @@ @import "~scss/variables"; -.sas-cms-el-config-newest-listing { +.werkl-cms-el-config-newest-listing { width: 100%; } diff --git a/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/index.js b/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/index.js old mode 100644 new mode 100755 index 01ffe1d..8f89399 --- a/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/index.js +++ b/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/index.js @@ -4,10 +4,10 @@ import './preview'; Shopware.Service('cmsService').registerCmsElement({ name: 'blog-newest-listing', - label: 'sas-blog.elements.newestListing.preview.label', - component: 'sas-cms-el-newest-listing', - configComponent: 'sas-cms-el-config-newest-listing', - previewComponent: 'sas-cms-el-preview-newest-listing', + label: 'werkl-blog.elements.newestListing.preview.label', + component: 'werkl-cms-el-newest-listing', + configComponent: 'werkl-cms-el-config-newest-listing', + previewComponent: 'werkl-cms-el-preview-newest-listing', defaultConfig: { itemCount: { source: 'static', @@ -25,7 +25,7 @@ Shopware.Service('cmsService').registerCmsElement({ source: 'static', value: null, entity: { - name: 'sas_blog_categories', + name: 'werkl_blog_categories', }, }, }, diff --git a/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/preview/index.js b/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/preview/index.js old mode 100644 new mode 100755 index 7212840..3b2c33d --- a/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/preview/index.js +++ b/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/preview/index.js @@ -1,8 +1,8 @@ -import template from './sas-cms-el-preview-newest-listing.html.twig'; -import './sas-cms-el-preview-newest-listing.scss'; +import template from './werkl-cms-el-preview-newest-listing.html.twig'; +import './werkl-cms-el-preview-newest-listing.scss'; const { Component } = Shopware; -Component.register('sas-cms-el-preview-newest-listing', { +Component.register('werkl-cms-el-preview-newest-listing', { template, }); diff --git a/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/preview/sas-cms-el-preview-newest-listing.html.twig b/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/preview/sas-cms-el-preview-newest-listing.html.twig deleted file mode 100644 index b045dbd..0000000 --- a/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/preview/sas-cms-el-preview-newest-listing.html.twig +++ /dev/null @@ -1,13 +0,0 @@ -{% block sas_cms_element_newest_listing_preview %} -
-

Newest Listing Element

-
-
-
-
-
-
-
-
-
-{% endblock %} diff --git a/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/preview/werkl-cms-el-preview-newest-listing.html.twig b/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/preview/werkl-cms-el-preview-newest-listing.html.twig new file mode 100755 index 0000000..5972b1b --- /dev/null +++ b/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/preview/werkl-cms-el-preview-newest-listing.html.twig @@ -0,0 +1,13 @@ +{% block werkl_cms_element_newest_listing_preview %} +
+

Newest Listing Element

+
+
+
+
+
+
+
+
+
+{% endblock %} diff --git a/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/preview/sas-cms-el-preview-newest-listing.scss b/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/preview/werkl-cms-el-preview-newest-listing.scss old mode 100644 new mode 100755 similarity index 79% rename from src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/preview/sas-cms-el-preview-newest-listing.scss rename to src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/preview/werkl-cms-el-preview-newest-listing.scss index 97a10a2..40214d7 --- a/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/preview/sas-cms-el-preview-newest-listing.scss +++ b/src/Resources/app/administration/src/module/blog-module/elements/blog-newest-listing/preview/werkl-cms-el-preview-newest-listing.scss @@ -1,19 +1,19 @@ @import "~scss/variables"; -.sas-cms-el-preview-newest-listing { +.werkl-cms-el-preview-newest-listing { width: 100%; background: $color-white; font-size: 22px; color: $color-darkgray-200; font-weight: $font-weight-semi-bold; - .sas-cms-el-category-placeholder-listing div { + .werkl-cms-el-category-placeholder-listing div { margin: 10px 0; height: 0.4em; border-radius: 25px; background-color: $color-gray-100; - &.sas-cms-el-category-navigation__placeholder--subcategory { + &.werkl-cms-el-category-navigation__placeholder--subcategory { margin: 7px 20px; &:last-of-type { diff --git a/src/Resources/app/administration/src/module/blog-module/elements/blog-single-select/component/index.js b/src/Resources/app/administration/src/module/blog-module/elements/blog-single-select/component/index.js old mode 100644 new mode 100755 index 5d99f44..87d635c --- a/src/Resources/app/administration/src/module/blog-module/elements/blog-single-select/component/index.js +++ b/src/Resources/app/administration/src/module/blog-module/elements/blog-single-select/component/index.js @@ -33,7 +33,7 @@ Shopware.Component.register('sw-cms-el-blog-single-select', { }, repository() { - return this.repositoryFactory.create('sas_blog_entries'); + return this.repositoryFactory.create('werkl_blog_entries'); }, selectedBlogEntry() { diff --git a/src/Resources/app/administration/src/module/blog-module/elements/blog-single-select/component/sw-cms-el-blog-single-select.html.twig b/src/Resources/app/administration/src/module/blog-module/elements/blog-single-select/component/sw-cms-el-blog-single-select.html.twig old mode 100644 new mode 100755 index 977cfc0..957ee77 --- a/src/Resources/app/administration/src/module/blog-module/elements/blog-single-select/component/sw-cms-el-blog-single-select.html.twig +++ b/src/Resources/app/administration/src/module/blog-module/elements/blog-single-select/component/sw-cms-el-blog-single-select.html.twig @@ -1,5 +1,5 @@ -{% block sas_cms_element_blog_single_select %} -
+{% block werkl_cms_element_blog_single_select %} +
{{ categoryName }}

{{ title }}

diff --git a/src/Resources/app/administration/src/module/blog-module/elements/blog-single-select/component/sw-cms-el-blog-single-select.scss b/src/Resources/app/administration/src/module/blog-module/elements/blog-single-select/component/sw-cms-el-blog-single-select.scss old mode 100644 new mode 100755 index 04bfc81..b18915e --- a/src/Resources/app/administration/src/module/blog-module/elements/blog-single-select/component/sw-cms-el-blog-single-select.scss +++ b/src/Resources/app/administration/src/module/blog-module/elements/blog-single-select/component/sw-cms-el-blog-single-select.scss @@ -1,6 +1,6 @@ @import "~scss/variables"; -.sas-cms-el-blog-single-select { +.werkl-cms-el-blog-single-select { width: 100%; padding: 20px; diff --git a/src/Resources/app/administration/src/module/blog-module/elements/blog-single-select/config/index.js b/src/Resources/app/administration/src/module/blog-module/elements/blog-single-select/config/index.js old mode 100644 new mode 100755 index 27381e2..eb0e1c3 --- a/src/Resources/app/administration/src/module/blog-module/elements/blog-single-select/config/index.js +++ b/src/Resources/app/administration/src/module/blog-module/elements/blog-single-select/config/index.js @@ -19,7 +19,7 @@ Component.register('sw-cms-el-config-blog-single-select', { }, computed: { blogEntryRepository() { - return this.repositoryFactory.create('sas_blog_entries'); + return this.repositoryFactory.create('werkl_blog_entries'); }, }, diff --git a/src/Resources/app/administration/src/module/blog-module/elements/blog-single-select/config/sw-cms-el-config-blog-single-select.html.twig b/src/Resources/app/administration/src/module/blog-module/elements/blog-single-select/config/sw-cms-el-config-blog-single-select.html.twig old mode 100644 new mode 100755 index 0d14088..f332c28 --- a/src/Resources/app/administration/src/module/blog-module/elements/blog-single-select/config/sw-cms-el-config-blog-single-select.html.twig +++ b/src/Resources/app/administration/src/module/blog-module/elements/blog-single-select/config/sw-cms-el-config-blog-single-select.html.twig @@ -1,9 +1,9 @@ -{% block sas_cms_element_blog_single_select_config %} +{% block werkl_cms_element_blog_single_select_config %}