+ {{ notification }}
+
+ {% endif %}
+
+ {{- block('choice_widget') -}}
+
+{%- endblock base_package_widget -%}
diff --git a/templates/layout.html.twig b/templates/layout.html.twig
index 2c71dc0f..e1aeb490 100644
--- a/templates/layout.html.twig
+++ b/templates/layout.html.twig
@@ -14,6 +14,7 @@
gtag(\'config\', \'G-JTSKLNF4S0\');
') }}
{% endblock %}
+{% block headline %}Try the new Sitepackage Builder now and create a Sitepackage in 2 easy steps.{% endblock %}
{% block footer %}
{% frame with { color: 'primary' } %}
diff --git a/templates/tools/layout.html.twig b/templates/tools/layout.html.twig
new file mode 100644
index 00000000..b1e59e9d
--- /dev/null
+++ b/templates/tools/layout.html.twig
@@ -0,0 +1,10 @@
+{% extends 'layout.html.twig' %}
+
+{% block headline %}{% endblock %}
+
+{% block footer %}
+
+ {% include 'tools/partials/privacy-footer.html.twig' %}
+ {{ parent() }}
+
+{% endblock %}
diff --git a/templates/tools/partials/privacy-footer.html.twig b/templates/tools/partials/privacy-footer.html.twig
new file mode 100644
index 00000000..a47f9274
--- /dev/null
+++ b/templates/tools/partials/privacy-footer.html.twig
@@ -0,0 +1,13 @@
+{% frame with { id: 'api', color: 'dark', center: true, indent: true, title: 'Do you already know the Sitepackage Builder API?' } %}
+
+
+ {{ basePackage.title }} Base Package for TYPO3 {{ typo3Version }}
+ {% if basePackage.official %}
+
+
+
+ Instead of using the website, you can also create your Sitepackage using + the API. +
+{% endframe %} +{% frame with { id: 'privacy', color: 'light', center: true, indent: true, title: 'We respect your Privacy!' } %} ++ We are not storing, sharing or doing any other crazy stuff with the + data you provide to generate your very own Sitepackage. Simple as + that, check the sources. +
+{% endframe %} diff --git a/templates/tools/sitepackage/configure.html.twig b/templates/tools/sitepackage/configure.html.twig new file mode 100644 index 00000000..dc5a8284 --- /dev/null +++ b/templates/tools/sitepackage/configure.html.twig @@ -0,0 +1,18 @@ +{% extends 'tools/layout.html.twig' %} + +{% block title %}Create your own TYPO3 Sitepackage{% endblock %} + +{% block body %} + + {% frame with { color: 'dark', center: true, title: 'Create your own Sitepackage', titleSize: 1, backgroundImage: asset("assets/Images/keyvisual.png") } %} ++ Awesome you made it here! Just a few more details about your + project and your own Sitepackage is ready for download. +
+ {% endframe %} + + {% frame with { id: 'configuration', indent: true, title: 'Configuration' } %} + {{ form(form, {'attr': {'novalidate': 'novalidate'}}) }} + {% endframe %} + +{% endblock %} diff --git a/templates/tools/sitepackage/detail.html.twig b/templates/tools/sitepackage/detail.html.twig new file mode 100644 index 00000000..580a5a1b --- /dev/null +++ b/templates/tools/sitepackage/detail.html.twig @@ -0,0 +1,90 @@ +{% extends 'tools/layout.html.twig' %} + +{% block title %}Create your own TYPO3 Sitepackage{% endblock %} + +{% block body %} + + {% frame with { color: 'dark', center: true, title: 'Create your own Sitepackage', titleSize: 1, backgroundImage: asset("assets/Images/keyvisual.png") } %} ++ Awesome you made it here! Just a few more details about your + project and your own Sitepackage is ready for download. +
+ {% endframe %} + + {% frame %} +
+ {{ basePackage.title }} Base Package for TYPO3 {{ typo3Version }}
+ {% if basePackage.official %}
+ 
+ {% endif %}
+
+
+
+ {% endframe %}
+
+{% endblock %}
diff --git a/templates/tools/sitepackage/error.html.twig b/templates/tools/sitepackage/error.html.twig
new file mode 100644
index 00000000..bb863ae9
--- /dev/null
+++ b/templates/tools/sitepackage/error.html.twig
@@ -0,0 +1,23 @@
+{% extends 'tools/layout.html.twig' %}
+
+{% block title %}Error{% endblock %}
+
+{% block body %}
+
+ {% frame with { color: 'dark', center: true, title: 'Error', titleSize: 1, backgroundImage: asset("assets/Images/keyvisual.png") } %}
+
+
+
+
+
+ {{ basePackageTemplate.description|markdown_to_html }}
+
+
+ {% for imageFile, imageDescription in basePackageTemplate.assetsGallery %}
+
+
+ {{ imageDescription }}
+
+ {% endfor %}
+
+
+ {% if basePackage.thirdParty %}
+
+ {{ icon('actions-arrow-left-alt', 'auto') }}
+ Back to Base Package
+
+ {% else %}
+
+ {{ icon('actions-arrow-left-alt', 'auto') }}
+ Back to Base Packages
+
+ {% endif %}
+
+
+
+
+
+
+
+
+
+
+ | Last Update | +15 September 2020 | +
|---|---|
| Extensions | +Bootstrap Package Extension XY |
+
| Framework | +Bootstrap | +
| Columns | +3 | +
| Layout | +Responsive | +
+ Your sitepackage was not created, please check the error below. +
+ {% endframe %} + + {% frame with { id: 'error', indent: true, title: 'Error information' } %} +{{ error }}
++ + {{ icon('actions-arrow-left-alt', 'auto') }} + Back + +
+ {% endframe %} + +{% endblock %} diff --git a/templates/tools/sitepackage/index.html.twig b/templates/tools/sitepackage/index.html.twig new file mode 100644 index 00000000..ab5b8bdd --- /dev/null +++ b/templates/tools/sitepackage/index.html.twig @@ -0,0 +1,38 @@ +{% extends 'tools/layout.html.twig' %} + +{% block title %}Kickstart your TYPO3 template development{% endblock %} + +{% block body %} + + {% frame with { color: 'dark', center: true, title: 'Sitepackage Builder', titleSize: 1, backgroundImage: asset("assets/Images/keyvisual.png") } %} ++ Sitepackage-Builder is your kickstarter for modern TYPO3 Theme development. Learn more about TYPO3 templating + or start your own template right now. +
++ + {{ icon('actions-rocket', 'auto') }} + Create Sitepackage + +
+ {% endframe %} + + {% frame with { id: 'about', title: 'What is a Sitepackage?' } %} ++ A Sitepackage is a TYPO3 Extension that containers all relevant configuration for a Website. + Having all configuration stored in a package keeps it protected from unauthorized access. + As Extension your Sitepackage will manage your dependencies to other Extensions and/or the TYPO3 Version. + This will ease your deployment and enables you to put the configuration of your Webiste under Version Control. +
++ Learn more about the best practices recommended from the TYPO3 Core Team. +
++ + {{ icon('actions-notebook', 'auto') }} + Learn about Sitepackages + +
+ {% endframe %} + +{% endblock %} diff --git a/templates/tools/sitepackage/new.html.twig b/templates/tools/sitepackage/new.html.twig new file mode 100644 index 00000000..7a87e261 --- /dev/null +++ b/templates/tools/sitepackage/new.html.twig @@ -0,0 +1,88 @@ +{% extends 'tools/layout.html.twig' %} + +{% block title %}Create your own TYPO3 Sitepackage{% endblock %} + +{% block body %} + + {% frame with { color: 'dark', center: true, title: 'Create your own Sitepackage', titleSize: 1, backgroundImage: asset("assets/Images/keyvisual.png") } %} ++ Awesome you made it here! Just a few more details about your + project and your own Sitepackage is ready for download. +
+ {% endframe %} + + {% if basePackages|length > 0 %} + {% if not filtered %} + {% frame with { id: 'base-packages', center: true, title: 'Choose a Base Package to continue with' } %}{% endframe %} + {% endif %} + + {% frame %} +
+ {% for basePackage in basePackages %}
+
+ {% endframe %}
+
+ {% if filtered %}
+ {% frame with { center: true } %}
+
+
+ {% endfor %}
+
+
+ {% if basePackage.official %}
+
+ {% endif %}
+
+
+
+ {{ basePackage.title }}
+
+
+
+ {{ basePackage.description }}
++ + {{ icon('actions-rocket', 'auto') }} + Show all Base Packages + +
+ {% endframe %} + {% endif %} + {% else %} +
+
+ {% endif %}
+
+{% endblock %}
diff --git a/templates/tools/sitepackage/success.html.twig b/templates/tools/sitepackage/success.html.twig
new file mode 100644
index 00000000..50afe07e
--- /dev/null
+++ b/templates/tools/sitepackage/success.html.twig
@@ -0,0 +1,84 @@
+{% extends 'tools/layout.html.twig' %}
+
+{% block title %}Success{% endblock %}
+
+{% block body %}
+
+ {% frame with { color: 'dark', center: true, title: 'Congratulations!', titleSize: 1, backgroundImage: asset("assets/Images/keyvisual.png") } %}
+ No BasePackages found.
++ Your Sitepackage has been successfully prepared. You can now check the + configuration or download the prepared Sitepackage. +
+ {% endframe %} + + {% frame with { id: 'configuration', indent: true, title: 'Your Sitepackage Configuration' } %} +-
+
- Base Package +
- {{ base_package.title }} ({{ base_package.composerPackageName }}) +
- Source +
- {% if base_package.official %}TYPO3 official base package{% elseif base_package.thirdParty %}Unknown third party{% else %}Verified third party{% endif %} +
- TYPO3 Version +
- {{ sitepackage.typo3Version|version(2) }} +
Sitepackage Extension
+-
+
- Titel +
- {{ sitepackage.title }} + {% if sitepackage.description %} +
- Description +
- {{ sitepackage.description }} + {% endif %} +
- Extension Key +
- {{ sitepackage.extensionKey }} + {% if sitepackage.repositoryUrl %} +
- Repository +
- {{ sitepackage.repositoryUrl }} + {% endif %} +
PHP
+-
+
- Composer Name +
- {{ sitepackage.composerName }} +
- PSR-4 Namespace +
- {{ sitepackage.psr4Namespace }} +
Author
+-
+
- Name +
- {{ sitepackage.author.name }} +
- {{ sitepackage.author.email }} +
- Company +
- {{ sitepackage.author.company }} +
- Homepage +
- {{ sitepackage.author.homepage }} +
+ + {{ icon('actions-undo', 'auto') }} + Restart + + + {{ icon('actions-open', 'auto') }} + Edit Configuration + + + {{ icon('actions-download', 'auto') }} + Download + +
+ {% endframe %} + + {% frame with { color: 'dark', size: 'default', center: true } %} ++ Your Sitepackage has been successfully created and is ready for download. +
+ + {% endframe %} + +{% endblock %} diff --git a/tests/Functional/Controller/Web/DefaultControllerTest.php b/tests/Functional/Controller/Web/DefaultControllerTest.php index c75f4e1b..5c6d5679 100644 --- a/tests/Functional/Controller/Web/DefaultControllerTest.php +++ b/tests/Functional/Controller/Web/DefaultControllerTest.php @@ -46,7 +46,7 @@ public function webDefault(): void { $this->client->request('GET', '/'); self::assertResponseIsSuccessful(); - self::assertSelectorTextContains('h1', 'Build Blazingly'); + self::assertSelectorTextContains('div.frame-container:nth-child(2) > div:nth-child(1) > h1:nth-child(1)', 'Build Blazingly'); self::assertSelectorTextContains('#download-community-1 .btn', 'Get version 10'); self::assertSelectorTextContains('#download-community-2 .btn', 'Get version 9'); self::assertSelectorTextContains('#download-elts-1 .btn-primary', 'Buy ELTS'); @@ -70,7 +70,7 @@ public function webVersionSprint(): void { $this->client->request('GET', '/version/10'); self::assertResponseIsSuccessful(); - self::assertSelectorTextContains('h1', 'TYPO3 10'); + self::assertSelectorTextContains('div.frame-container:nth-child(2) > div:nth-child(1) > h1:nth-child(1)', 'TYPO3 10'); } /** @@ -80,7 +80,7 @@ public function webVersionSpecific(): void { $this->client->request('GET', '/version/10.0.0'); self::assertResponseIsSuccessful(); - self::assertSelectorTextContains('h1', '(10.0.0)'); + self::assertSelectorTextContains('div.frame-container:nth-child(2) > div:nth-child(1) > h1:nth-child(1)', '(10.0.0)'); self::assertSelectorNotExists('#notice-elts'); self::assertSelectorExists('#accordion-download'); } @@ -92,7 +92,7 @@ public function webVersionElts(): void { $this->client->request('GET', '/version/6.2'); self::assertResponseIsSuccessful(); - self::assertSelectorTextContains('h1', '(6.2.23 ELTS)'); + self::assertSelectorTextContains('div.frame-container:nth-child(2) > div:nth-child(1) > h1:nth-child(1)', '(6.2.23 ELTS)'); self::assertSelectorExists('#notice-elts'); self::assertSelectorNotExists('#accordion-download'); } @@ -104,7 +104,7 @@ public function webVersionBeforeElts(): void { $this->client->request('GET', '/version/6.2.0'); self::assertResponseIsSuccessful(); - self::assertSelectorTextContains('h1', '(6.2.0)'); + self::assertSelectorTextContains('div.frame-container:nth-child(2) > div:nth-child(1) > h1:nth-child(1)', '(6.2.0)'); self::assertSelectorExists('#notice-elts'); self::assertSelectorExists('#accordion-download'); } @@ -116,7 +116,7 @@ public function webVersionOutdated(): void { $this->client->request('GET', '/version/4.5.0'); self::assertResponseIsSuccessful(); - self::assertSelectorTextContains('h1', '(4.5.0)'); + self::assertSelectorTextContains('div.frame-container:nth-child(2) > div:nth-child(1) > h1:nth-child(1)', '(4.5.0)'); self::assertSelectorExists('#notice-outdated'); self::assertSelectorExists('#accordion-download'); } @@ -128,7 +128,7 @@ public function webVersionOutdatedElts(): void { $this->client->request('GET', '/version/4.5'); self::assertResponseIsSuccessful(); - self::assertSelectorTextContains('h1', '(4.5.23 ELTS)'); + self::assertSelectorTextContains('div.frame-container:nth-child(2) > div:nth-child(1) > h1:nth-child(1)', '(4.5.23 ELTS)'); self::assertSelectorExists('#notice-outdated'); self::assertSelectorNotExists('#accordion-download'); } @@ -150,7 +150,7 @@ public function weReleaseNotesSprint(): void { $this->client->request('GET', '/release-notes/10'); self::assertResponseIsSuccessful(); - self::assertSelectorTextContains('h1', '10.0.5'); + self::assertSelectorTextContains('div.frame-container:nth-child(2) > div:nth-child(1) > h1:nth-child(1)', '10.0.5'); } /** @@ -160,7 +160,7 @@ public function webReleaseNotesSpecific(): void { $this->client->request('GET', '/release-notes/10.0.0'); self::assertResponseIsSuccessful(); - self::assertSelectorTextContains('h1', '10.0.0'); + self::assertSelectorTextContains('div.frame-container:nth-child(2) > div:nth-child(1) > h1:nth-child(1)', '10.0.0'); self::assertSelectorNotExists('#notice-elts'); } @@ -171,7 +171,7 @@ public function webReleaseNotesElts(): void { $this->client->request('GET', '/release-notes/6.2'); self::assertResponseIsSuccessful(); - self::assertSelectorTextContains('h1', '6.2.23 ELTS'); + self::assertSelectorTextContains('div.frame-container:nth-child(2) > div:nth-child(1) > h1:nth-child(1)', '6.2.23 ELTS'); self::assertSelectorExists('#notice-elts'); } @@ -182,7 +182,7 @@ public function webReleaseNotesBeforeElts(): void { $this->client->request('GET', '/release-notes/6.2.0'); self::assertResponseIsSuccessful(); - self::assertSelectorTextContains('h1', '6.2.0'); + self::assertSelectorTextContains('div.frame-container:nth-child(2) > div:nth-child(1) > h1:nth-child(1)', '6.2.0'); self::assertSelectorExists('#notice-elts'); } @@ -193,7 +193,7 @@ public function webReleaseNotesOutdated(): void { $this->client->request('GET', '/release-notes/4.5.0'); self::assertResponseIsSuccessful(); - self::assertSelectorTextContains('h1', '4.5.0'); + self::assertSelectorTextContains('div.frame-container:nth-child(2) > div:nth-child(1) > h1:nth-child(1)', '4.5.0'); self::assertSelectorExists('#notice-outdated'); } @@ -204,7 +204,7 @@ public function webReleaseNotesOutdatedElts(): void { $this->client->request('GET', '/release-notes/4.5'); self::assertResponseIsSuccessful(); - self::assertSelectorTextContains('h1', '4.5.23 ELTS'); + self::assertSelectorTextContains('div.frame-container:nth-child(2) > div:nth-child(1) > h1:nth-child(1)', '4.5.23 ELTS'); self::assertSelectorExists('#notice-outdated'); } } diff --git a/tmp/.gitkeep b/tmp/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/tmp/base-packages/.gitignore b/tmp/base-packages/.gitignore new file mode 100644 index 00000000..a68d087b --- /dev/null +++ b/tmp/base-packages/.gitignore @@ -0,0 +1,2 @@ +/* +!/.gitignore