From dcda3b62d75f4e6a6471969596cdc8a781c1daf9 Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 5 Jun 2017 15:59:56 +0200 Subject: [PATCH] Change pagination limits, --- app/Resources/translations/messages.en.yml | 9 ++--- app/Resources/views/error/error.html.twig | 20 +++++++--- app/Resources/views/model/detail.html.twig | 11 ++++- app/Resources/views/model/index.html.twig | 33 ++++++++++----- app/Resources/views/part/detail.html.twig | 2 +- app/Resources/views/set/detail.html.twig | 8 ++-- app/Resources/views/set/index.html.twig | 40 +++++++++---------- .../views/set/tabs/inventory.html.twig | 2 +- src/AppBundle/Controller/ModelController.php | 12 +++--- src/AppBundle/Controller/SetController.php | 6 +-- 10 files changed, 85 insertions(+), 58 deletions(-) diff --git a/app/Resources/translations/messages.en.yml b/app/Resources/translations/messages.en.yml index 78a347e..079682e 100644 --- a/app/Resources/translations/messages.en.yml +++ b/app/Resources/translations/messages.en.yml @@ -81,6 +81,10 @@ page: set.index: Browse sets search: "Search: \"%query%\"" color: Colors + error: + title: Error + large: Error + text: Sorry, an unexpected error has occured. filter: model: @@ -121,11 +125,6 @@ empty: models: search.title: No results found for your search criteria -page.error: - title: - large: - text: - part: id: Number name: Name diff --git a/app/Resources/views/error/error.html.twig b/app/Resources/views/error/error.html.twig index 737f0ff..b8614bd 100644 --- a/app/Resources/views/error/error.html.twig +++ b/app/Resources/views/error/error.html.twig @@ -2,10 +2,20 @@ {% block title %}{{ 'page.error.title'|trans }}{% endblock %} +{% block header %}{{ 'page.error.title'|trans }}{% endblock %} + + {% block content %} -

- - {{ 'page.error.large'|trans }} -

-

{{ 'page.error.text'|trans }}

+
+
+

+ +
+ {{ 'page.error.large'|trans }} +
{{ 'page.error.text'|trans }}
+
+

+ +
+
{% endblock %} \ No newline at end of file diff --git a/app/Resources/views/model/detail.html.twig b/app/Resources/views/model/detail.html.twig index 49c4160..5042db3 100644 --- a/app/Resources/views/model/detail.html.twig +++ b/app/Resources/views/model/detail.html.twig @@ -6,6 +6,15 @@ {% block header %}{{ model.name }}{% endblock %} +{% block meta %} + {{ blocks.meta( + model.id~' '~model.name, + app.request.uri, + 'meta.description' | trans | striptags('sup'), + asset('-1/'~model.id~'.png') | imagine_filter('part_large') + )}} +{% endblock %} + {% block content %}
@@ -27,7 +36,7 @@ {{ 'model.category' | trans }} - {{ model.category ? model.category.name }} + {{ model.category ? model.category.name }} {{ 'model.author' | trans }}{{ model.author.name }} diff --git a/app/Resources/views/model/index.html.twig b/app/Resources/views/model/index.html.twig index 8be5f3a..b47d304 100644 --- a/app/Resources/views/model/index.html.twig +++ b/app/Resources/views/model/index.html.twig @@ -6,10 +6,21 @@ {% block header %}{{ 'page.model.index' | trans }}{% endblock %} +{% block meta %} + {{ blocks.meta( + name~' - '~'page.model.index' | trans, + app.request.uri, + 'meta.description' | trans | striptags('sup'), + app.request.schemeAndHttpHost~asset('resources/images/meta-logo.png'), + 256, + 256 + )}} +{% endblock %} + {% block content %} -
+
-
+

{{ 'model.filter.title' | trans }}

{{ form_start(form) }} @@ -31,18 +42,18 @@
-
-
-
Sort By
- {{ knp_pagination_sortable(models, 'Number', 'm.id') }} - {{ knp_pagination_sortable(models, 'Name', 'm.name') }} +
+
+
Showing
+ {{ models.paginationData['firstItemNumber']~' - '~models.paginationData['lastItemNumber'] }} of {{ models.getTotalItemCount }} items
-
-
-
Showing
- {{ models.getTotalItemCount }} +
+
+
Sort By
+ {{ knp_pagination_sortable(models, 'Number', 'm.id') }} + {{ knp_pagination_sortable(models, 'Name', 'm.name') }}
diff --git a/app/Resources/views/part/detail.html.twig b/app/Resources/views/part/detail.html.twig index 5e36aa3..689c0be 100644 --- a/app/Resources/views/part/detail.html.twig +++ b/app/Resources/views/part/detail.html.twig @@ -16,7 +16,7 @@ {% endblock %} {% block content %} -
+
diff --git a/app/Resources/views/set/detail.html.twig b/app/Resources/views/set/detail.html.twig index 4695846..23c7a02 100644 --- a/app/Resources/views/set/detail.html.twig +++ b/app/Resources/views/set/detail.html.twig @@ -35,11 +35,11 @@ {{ 'set.name' | trans }}{{ set.name }} - {{ 'set.year' | trans }}{{ set.year }} + {{ 'set.year' | trans }}{{ set.year }} {{ 'set.theme' | trans }} - {{ set.theme ? set.theme.fullName }} + {{ set.theme ? set.theme.fullName }} {{ 'set.parts' | trans }} @@ -111,6 +111,4 @@ {% endif %}
- - -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/Resources/views/set/index.html.twig b/app/Resources/views/set/index.html.twig index 6bce1e8..26b9f37 100644 --- a/app/Resources/views/set/index.html.twig +++ b/app/Resources/views/set/index.html.twig @@ -18,7 +18,7 @@ {% endblock %} {% block content %} -
+
@@ -48,10 +48,17 @@
-
+
-
-
+
+
+
Showing
+ {{ sets.paginationData['firstItemNumber']~' - '~sets.paginationData['lastItemNumber'] }} of {{ sets.getTotalItemCount }} items +
+
+ +
+
Sort By
{{ knp_pagination_sortable(sets, 'Number', ['s.id']) }} @@ -60,25 +67,18 @@ {{ knp_pagination_sortable(sets, 'Parts', ['s.partCount']) }}
- -
-
-
Showing
- {{ sets.getTotalItemCount }} -
-
-
-
- {% for set in sets %} - {{ blocks.set(set) }} - {% else %} - {{ blocks.empty('empty.search.title' | trans ) }} - {% endfor %} +
+
+ {% for set in sets %} + {{ blocks.set(set) }} + {% else %} + {{ blocks.empty('empty.search.title' | trans ) }} + {% endfor %} +
-
-
+
{{ knp_pagination_render(sets) }}
diff --git a/app/Resources/views/set/tabs/inventory.html.twig b/app/Resources/views/set/tabs/inventory.html.twig index 7fb0372..5e9e7d6 100644 --- a/app/Resources/views/set/tabs/inventory.html.twig +++ b/app/Resources/views/set/tabs/inventory.html.twig @@ -10,7 +10,7 @@ {% endfor %} {% if inventorySets %} -

Sets

+

Sets

{% for inventorySet in inventorySets %} {{ blocks.set(inventorySet.set, inventorySet.quantity) }} diff --git a/src/AppBundle/Controller/ModelController.php b/src/AppBundle/Controller/ModelController.php index d422ab0..831a8d5 100644 --- a/src/AppBundle/Controller/ModelController.php +++ b/src/AppBundle/Controller/ModelController.php @@ -5,18 +5,21 @@ namespace AppBundle\Controller; use AppBundle\Entity\LDraw\Model; use AppBundle\Form\Search\ModelSearchType; use AppBundle\Model\ModelSearch; +use AppBundle\Repository\Rebrickable\SetRepository; use Knp\Component\Pager\Paginator; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\HttpFoundation\BinaryFileResponse; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\ResponseHeaderBag; /** * Part controller. * - * @Route("models") + * @Route("bricks") */ class ModelController extends Controller { @@ -29,11 +32,11 @@ class ModelController extends Controller { $modelSearch = new ModelSearch(); - $form = $this->get('form.factory')->createNamedBuilder('m', ModelSearchType::class, $modelSearch)->getForm(); + $form = $this->get('form.factory')->createNamedBuilder('', ModelSearchType::class, $modelSearch)->getForm(); $form->handleRequest($request); $elasticaManager = $this->get('fos_elastica.manager'); - $results = $elasticaManager->getRepository(Model::class)->search($modelSearch, 5000); + $results = $elasticaManager->getRepository(Model::class)->search($modelSearch, 500); /** @var Paginator $paginator */ $paginator = $this->get('knp_paginator'); @@ -61,15 +64,12 @@ class ModelController extends Controller if ($model = $this->get('repository.ldraw.model')->findOneByNumber($id)) { try { $subparts = $this->get('service.model')->getAllSubparts($model); - - $rbParts = $model != null ? $this->get('repository.rebrickable.part')->findAllByModel($model) : null; $sets = $model != null ? $this->get('repository.rebrickable.set')->findAllByModel($model) : null; $related = $this->get('repository.ldraw.model')->findAllRelatedModels($model->getId()); return $this->render('model/detail.html.twig', [ 'model' => $model, - 'rbParts' => $rbParts, 'sets' => $sets, 'related' => $related, 'subparts' => $subparts, diff --git a/src/AppBundle/Controller/SetController.php b/src/AppBundle/Controller/SetController.php index 07e44b4..86574dd 100644 --- a/src/AppBundle/Controller/SetController.php +++ b/src/AppBundle/Controller/SetController.php @@ -29,18 +29,18 @@ class SetController extends Controller { $setSearch = new SetSearch(); - $form = $this->get('form.factory')->createNamedBuilder('s', SetSearchType::class, $setSearch)->getForm(); + $form = $this->get('form.factory')->createNamedBuilder('', SetSearchType::class, $setSearch)->getForm(); $form->handleRequest($request); /** @var SetRepository $setRepository */ $setRepository = $this->get('fos_elastica.manager')->getRepository(Set::class); - $results = $setRepository->search($setSearch, 5000); + $results = $setRepository->search($setSearch, 500); $paginator = $this->get('knp_paginator'); $sets = $paginator->paginate( $results, $request->query->getInt('page', 1)/*page number*/, - $request->query->getInt('limit', 24)/*limit per page*/ + $request->query->getInt('limit', 20)/*limit per page*/ ); return $this->render('set/index.html.twig', [