-
-
-
{% block header %}{% endblock %}
+{% block header %}{% endblock %}
+ +
@@ -53,8 +51,8 @@
{% endblock page %}
{% block footer %}
-
-
+
diff --git a/app/Resources/views/default/index.html.twig b/app/Resources/views/default/index.html.twig
index 4222685..d11bc74 100644
--- a/app/Resources/views/default/index.html.twig
+++ b/app/Resources/views/default/index.html.twig
@@ -1,11 +1,13 @@
{% extends 'base.html.twig' %}
{% block page %}
-
+
{% endblock %}
LEGO®, the LEGO logo, the Minifigure, and the Brick and Knob configurations are trademarks of the LEGO Group of Companies which does not sponsor, authorize, or endorse this site.
-
-
-
- Hello, world!
+
-{% endmacro %}
\ No newline at end of file
+{% endmacro %}
diff --git a/app/Resources/views/search/index.html.twig b/app/Resources/views/search/index.html.twig
index abc72fc..1a023fb 100644
--- a/app/Resources/views/search/index.html.twig
+++ b/app/Resources/views/search/index.html.twig
@@ -10,7 +10,6 @@
{% for set in sets %}
diff --git a/app/config/config_test.yml b/app/config/config_test.yml
index 2f6d925..c18ccd3 100644
--- a/app/config/config_test.yml
+++ b/app/config/config_test.yml
@@ -14,3 +14,11 @@ web_profiler:
swiftmailer:
disable_delivery: true
+
+doctrine:
+ dbal:
+ default_connection: default
+ connections:
+ default:
+ driver: pdo_sqlite
+ path: "%kernel.cache_dir%/test.db"
\ No newline at end of file
diff --git a/app/config/service/util.yml b/app/config/service/util.yml
index ded4cdc..fa58d95 100644
--- a/app/config/service/util.yml
+++ b/app/config/service/util.yml
@@ -11,6 +11,6 @@ services:
app.twig_extension:
class: AppBundle\Twig\AppExtension
public: false
- arguments: ['@api.manager.rebrickable', '@app.transformer.format']
+ arguments: ['@app.transformer.format']
tags:
- { name: twig.extension }
\ No newline at end of file
diff --git a/src/AppBundle/Api/Client/Brickset/Brickset.php b/src/AppBundle/Api/Client/Brickset/Brickset.php
index c620e63..475f10f 100644
--- a/src/AppBundle/Api/Client/Brickset/Brickset.php
+++ b/src/AppBundle/Api/Client/Brickset/Brickset.php
@@ -12,8 +12,6 @@ use AppBundle\Api\Client\Brickset\Entity\Year;
use AppBundle\Api\Exception\ApiException;
use AppBundle\Api\Exception\AuthenticationFailedException;
use AppBundle\Api\Exception\CallFailedException;
-use AppBundle\Api\Exception\EmptyResponseException;
-use Symfony\Component\Debug\Exception\ContextErrorException;
class Brickset extends \SoapClient
{
@@ -83,11 +81,11 @@ class Brickset extends \SoapClient
$result = $this->__soapCall($method, [$parameters]);
- if(property_exists($result, $method.'Result')) {
+ if (property_exists($result, $method.'Result')) {
return $result->{$method.'Result'};
- } else {
- return null;
}
+
+ return null;
} catch (\SoapFault $e) {
throw new CallFailedException(ApiException::BRICKSET);
} catch (\Exception $e) {
@@ -96,8 +94,9 @@ class Brickset extends \SoapClient
}
}
- private function getArrayResult($response, $method) {
- if($response && $result = $response->{$method}) {
+ private function getArrayResult($response, $method)
+ {
+ if ($response && $result = $response->{$method}) {
return is_array($result) ? $result : [$result];
}
diff --git a/src/AppBundle/Controller/Brickset/SetController.php b/src/AppBundle/Controller/Brickset/SetController.php
index 7364a26..fa532f5 100644
--- a/src/AppBundle/Controller/Brickset/SetController.php
+++ b/src/AppBundle/Controller/Brickset/SetController.php
@@ -3,11 +3,9 @@
namespace AppBundle\Controller\Brickset;
use AppBundle\Api\Exception\ApiException;
-use AppBundle\Api\Exception\EmptyResponseException;
-use AppBundle\Entity\Rebrickable\Set;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
diff --git a/src/AppBundle/Controller/SearchController.php b/src/AppBundle/Controller/SearchController.php
index 2d60224..f7899b9 100644
--- a/src/AppBundle/Controller/SearchController.php
+++ b/src/AppBundle/Controller/SearchController.php
@@ -17,7 +17,7 @@ use Symfony\Component\HttpFoundation\Request;
class SearchController extends Controller
{
/**
- * @Route("/", name="search_result")
+ * @Route("/", name="search_results")
*/
public function searchAction(Request $request)
{
diff --git a/src/AppBundle/Form/Filter/Model/CategoryFilterType.php b/src/AppBundle/Form/Filter/Model/CategoryFilterType.php
index 82dd9ee..d0f71fc 100644
--- a/src/AppBundle/Form/Filter/Model/CategoryFilterType.php
+++ b/src/AppBundle/Form/Filter/Model/CategoryFilterType.php
@@ -23,7 +23,10 @@ class CategoryFilterType extends AbstractType
$builder->add('id', Filters\ChoiceFilterType::class, [
'choices' => $this->categoryRepository->findAll(),
'choice_label' => 'name',
- 'label' => 'filter.part.category',
+ 'label' => 'filter.model.category',
+// 'attr' => [
+// 'class' => 'ui dropdown search selection'
+// ]
]);
}
diff --git a/src/AppBundle/Form/Filter/Model/ModelFilterType.php b/src/AppBundle/Form/Filter/Model/ModelFilterType.php
index e4dbe63..e845baa 100644
--- a/src/AppBundle/Form/Filter/Model/ModelFilterType.php
+++ b/src/AppBundle/Form/Filter/Model/ModelFilterType.php
@@ -16,7 +16,7 @@ class ModelFilterType extends AbstractType
{
$builder->add('search', Filters\TextFilterType::class, [
'apply_filter' => [$this, 'modelSearchCallback'],
- 'label' => 'filter.part.search',
+ 'label' => 'filter.model.search',
]);
$builder->add('category', CategoryFilterType::class, [
@@ -30,7 +30,7 @@ class ModelFilterType extends AbstractType
public function getBlockPrefix()
{
- return 'model_filter';
+ return 'filter';
}
public function configureOptions(OptionsResolver $resolver)
@@ -43,14 +43,16 @@ class ModelFilterType extends AbstractType
public function modelSearchCallback(QueryInterface $filterQuery, $field, $values)
{
- if (empty($values['value'])) {
+ if (empty($values['value']) || $values['value'] === '') {
return null;
}
+ $expr = $filterQuery->getExpr();
+
// expression that represent the condition
- $expression = $filterQuery->getExpr()->orX(
- $filterQuery->getExpr()->like('model.number', ':value'),
- $filterQuery->getExpr()->like('model.name', ':value')
+ $expression = $expr->orX(
+ $expr->like('model.number', ':value'),
+ $expr->like('model.name', ':value')
//TODO filter by keywords
);
diff --git a/src/AppBundle/Form/Filter/Set/SetFilterType.php b/src/AppBundle/Form/Filter/Set/SetFilterType.php
index f47e416..8c62216 100644
--- a/src/AppBundle/Form/Filter/Set/SetFilterType.php
+++ b/src/AppBundle/Form/Filter/Set/SetFilterType.php
@@ -29,7 +29,7 @@ class SetFilterType extends AbstractType
$builder->add('theme', ThemeFilterType::class, [
'add_shared' => function (FilterBuilderExecuterInterface $builderExecuter) {
- $builderExecuter->addOnce($builderExecuter->getAlias().'.theme', 'c', function (QueryBuilder $filterBuilder, $alias, $joinAlias, $expr) {
+ $builderExecuter->addOnce($builderExecuter->getAlias().'.theme', 't', function (QueryBuilder $filterBuilder, $alias, $joinAlias, $expr) {
$filterBuilder->leftJoin($alias.'.theme', $joinAlias);
});
},
diff --git a/src/AppBundle/Form/Filter/Set/ThemeFilterType.php b/src/AppBundle/Form/Filter/Set/ThemeFilterType.php
index f215fc4..d1a05f4 100644
--- a/src/AppBundle/Form/Filter/Set/ThemeFilterType.php
+++ b/src/AppBundle/Form/Filter/Set/ThemeFilterType.php
@@ -21,7 +21,7 @@ class ThemeFilterType extends AbstractType
public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder->add('id', Filters\ChoiceFilterType::class, [
- 'choices' => $this->themeRepository->findAll(),
+ 'choices' => $this->themeRepository->findAllMain(),
'choice_label' => function ($theme, $currentChoiceKey) {
if ($parent = $theme->getParent()) {
if ($parentParent = $parent->getParent()) {
@@ -38,6 +38,9 @@ class ThemeFilterType extends AbstractType
return $theme->getName();
},
'label' => 'filter.set.theme',
+// 'attr' => [
+// 'class' => 'ui dropdown search selection'
+// ]
]);
}
diff --git a/src/AppBundle/Menu/Builder.php b/src/AppBundle/Menu/Builder.php
index acd48a9..dc1c5c0 100644
--- a/src/AppBundle/Menu/Builder.php
+++ b/src/AppBundle/Menu/Builder.php
@@ -28,24 +28,26 @@ class Builder
public function mainMenu(array $options)
{
$request = $this->requestStack->getCurrentRequest();
- $menu = $this->factory->createItem('root');
-
- $menu->addChild('Home', [
+ $menu = $this->factory->createItem('root', [
'route' => 'homepage',
]);
- $menu->addChild('Models', [
+ $menu->addChild('homepage', [
+ 'route' => 'homepage',
+ ]);
+
+ $models = $menu->addChild('Models', [
'route' => 'model_index',
]);
+ $models->addChild('Colors', [
+ 'route' => 'color_index',
+ ]);
+
$menu->addChild('Sets', [
'route' => 'set_index',
]);
- $menu->addChild('Colors', [
- 'route' => 'color_index',
- ]);
-
return $menu;
}
}
diff --git a/src/AppBundle/Transformer/FormatTransformer.php b/src/AppBundle/Transformer/FormatTransformer.php
index 0447bd8..fd0e0f8 100644
--- a/src/AppBundle/Transformer/FormatTransformer.php
+++ b/src/AppBundle/Transformer/FormatTransformer.php
@@ -9,6 +9,7 @@ class FormatTransformer
*
* @param $bytes
* @param int $precision
+ *
* @return string
*/
public function bytesToSize($bytes, $precision = 2)
+
diff --git a/app/Resources/views/macros/elements.html.twig b/app/Resources/views/macros/elements.html.twig
index b9d710d..5d9ef85 100644
--- a/app/Resources/views/macros/elements.html.twig
+++ b/app/Resources/views/macros/elements.html.twig
@@ -23,4 +23,4 @@
{{ message|trans }}