Skip to content

Commit

Permalink
Merge pull request #32 from valantic-CEC-Deutschland-GmbH/no-task/upd…
Browse files Browse the repository at this point in the history
…ate-yves-templates

no-task update yves templates
  • Loading branch information
patrickjaja authored Jul 16, 2024
2 parents ac4572a + d5f9ddc commit ed5b767
Show file tree
Hide file tree
Showing 12 changed files with 111 additions and 20 deletions.
8 changes: 4 additions & 4 deletions src/main/resources/refresh_templates.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#!/bin/bash
rm -rf templates/*
git clone -b feature/templates-lite [email protected]:nexusunited/spryk.git spryk
# rm -rf templates/*
# git clone -b feature/templates-lite [email protected]:nexusunited/spryk.git spryk

mv spryk/config/spryk/templates/* templates
# mv spryk/config/spryk/templates/* templates

rm -rf spryk
# rm -rf spryk

# find themes/templates -type f -exec sed -i 's/{{ /{$/g' {} + && find . -type f -exec sed -i 's/}/}/g' {} +

Expand Down
12 changes: 9 additions & 3 deletions src/main/resources/template-map.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,14 @@
]}
]},
{"type":"directory","name":"Theme","contents":[
{"type":"file","name":"ViewTwig.twig"},
{"type":"file","name":"WidgetViewTwig.twig"}
{"type":"directory","name":"default","contents":[
{"type":"directory","name":"shop-ui","contents":[
{"type":"file","name":"widget-view.twig"}
]},
{"type":"directory","name":"views","contents":[
{"type":"file","name":"Index.twig"}
]}
]}
]},
{"type":"directory","name":"Widget","contents":[
{"type":"file","name":"Widget.php.twig"}
Expand Down Expand Up @@ -156,5 +162,5 @@
]}
]}
,
{"type":"report","directories":36,"files":84}
{"type":"report","directories":39,"files":84}
]
1 change: 1 addition & 0 deletions src/main/resources/templates/Shared/Constants.php.twig
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ namespace {{ organization }}\Shared\{{ module }};
interface {{ module }}Constants
{
public const EXAMPLE_QUEUE_CHUNK_SIZE = 'EXAMPLE_QUEUE_CHUNK_SIZE';
public const EXAMPLE_CONFIG_VALUE = 'EXAMPLE_CONFIG_VALUE';
}
8 changes: 8 additions & 0 deletions src/main/resources/templates/Yves/Config.php.twig
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,15 @@ declare(strict_types = 1);
namespace {{ organization }}\Yves\{{ module }};
use Spryker\Yves\Kernel\AbstractBundleConfig;
use {{ organization }}\Shared\{{ module }}\{{ module }}Constants;
class {{ module }}Config extends AbstractBundleConfig
{
/**
* @return array
*/
public function getTestConfigValue(): array
{
return $this->get({{ module }}Constants::EXAMPLE_QUEUE_CHUNK_SIZE, []);
}
}
31 changes: 31 additions & 0 deletions src/main/resources/templates/Yves/Controller/Controller.php.twig
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,41 @@ declare(strict_types = 1);
namespace {{ organization }}\Yves\{{ module }}\Controller;
use Spryker\Yves\Kernel\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
/**
* @method \{{ organization }}\Yves\{{ module }}\{{ module }}Factory getFactory()
*/
class {{ controller }}Controller extends AbstractController
{
/**
* @param \Symfony\Component\HttpFoundation\Request $request
*
* @return \Spryker\Yves\Kernel\View\View|\Symfony\Component\HttpFoundation\RedirectResponse
*/
public function indexAction(Request $request)
{
return $this->view(
[
'message' => 'yves action',
],
[],
'@{{ module }}/views/index.twig',
);
}
/**
* @param \Symfony\Component\HttpFoundation\Request $request
*
* @return \Symfony\Component\HttpFoundation\Response
*/
public function apiAction(Request $request): Response
{
return $this->jsonResponse(
[
'message' => 'yves action',
],
);
}
}
18 changes: 18 additions & 0 deletions src/main/resources/templates/Yves/DependencyProvider.php.twig
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ use Spryker\Yves\Kernel\Container;
class {{ module }}DependencyProvider extends AbstractBundleDependencyProvider
{
/**
* @var string
*/
public const CLIENT_CUSTOMER = 'CLIENT_CUSTOMER';
/**
* @param \Spryker\Yves\Kernel\Container $container
*
Expand All @@ -17,6 +22,19 @@ class {{ module }}DependencyProvider extends AbstractBundleDependencyProvider
public function provideDependencies(Container $container): Container
{
$container = parent::provideDependencies($container);
$container = $this->addCustomerClient($container);
return $container;
}
/**
* @param \Spryker\Yves\Kernel\Container $container
*
* @return \Spryker\Yves\Kernel\Container
*/
protected function addCustomerClient(Container $container): Container
{
$container->set(static::CLIENT_CUSTOMER, $container->getLocator()->customer()->client());
return $container;
}
Expand Down
7 changes: 7 additions & 0 deletions src/main/resources/templates/Yves/Factory.php.twig
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,11 @@ use Spryker\Yves\Kernel\AbstractFactory;
*/
class {{ module }}Factory extends AbstractFactory
{
/**
* @return \Spryker\Client\Customer\CustomerClientInterface
*/
public function getCustomerClient(): CustomerClientInterface
{
return $this->getProvidedDependency(MerchantWidgetDependencyProvider::CLIENT_CUSTOMER);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,33 @@ use Spryker\Yves\Router\Route\RouteCollection;
class {{ module }}RouteProviderPlugin extends AbstractRouteProviderPlugin
{
/**
* Specification:
* - Adds Routes to the RouteCollection.
*
* @api
*
* @var string
*/
public const ROUTE_NAME = '{{ module }}';
/**
* @param \Spryker\Yves\Router\Route\RouteCollection $routeCollection
*
* @return \Spryker\Yves\Router\Route\RouteCollection
*/
public function addRoutes(RouteCollection $routeCollection): RouteCollection
{
$routeCollection = $this->addIndexRoute($routeCollection);
return $routeCollection;
}
/**
* @param \Spryker\Yves\Router\Route\RouteCollection $routeCollection
*
* @return \Spryker\Yves\Router\Route\RouteCollection
*/
protected function addIndexRoute(RouteCollection $routeCollection): RouteCollection
{
$route = $this->buildRoute('/{{ module | lcfirst }}', '{{ module }}', '{{ controller }}', 'indexAction');
$routeCollection->add(static::ROUTE_NAME, $route);
return $routeCollection;
}
}
7 changes: 0 additions & 7 deletions src/main/resources/templates/Yves/Theme/ViewTwig.twig

This file was deleted.

11 changes: 11 additions & 0 deletions src/main/resources/templates/Yves/Theme/default/views/index.twig
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{% extends template('page-layout-main') %}

{% define data = {
activePage: 'test',
} %}

{% block content %}
<div>
{{ data.message }}
</div>
{% endblock %}
2 changes: 1 addition & 1 deletion src/main/resources/templates/Yves/Widget/Widget.php.twig
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ class {{ module }}Widget extends AbstractWidget
*/
public static function getTemplate(): string
{
return '@{{ module }}/views/{{ module | dasherize }}/WidgetViewTwig.twig';
return '@{{ module }}/views/shop-ui/widget-view.twig';
}
}

0 comments on commit ed5b767

Please sign in to comment.