From 2976f6b801d49845ecf11cd6927f2c6456120cee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20H=C3=BCbner?= Date: Fri, 7 Apr 2017 19:07:15 +0200 Subject: [PATCH] Update Controllers --- .gitignore | 1 + app/Resources/views/base.html.twig | 71 ++++++++++++------- app/Resources/views/macros/elements.html.twig | 10 ++- .../views/{ldraw => }/model/detail.html.twig | 13 ++-- .../views/{ldraw => }/model/index.html.twig | 14 ++-- .../views/rebrickable/part/detail.html.twig | 15 ++-- .../views/rebrickable/set/detail.html.twig | 29 ++------ src/AppBundle/Controller/MediaController.php | 2 +- .../{LDraw => }/ModelController.php | 23 ++++-- .../Controller/Rebrickable/SetController.php | 1 - src/AppBundle/Menu/Builder.php | 2 +- 11 files changed, 98 insertions(+), 83 deletions(-) rename app/Resources/views/{ldraw => }/model/detail.html.twig (91%) rename app/Resources/views/{ldraw => }/model/index.html.twig (66%) rename src/AppBundle/Controller/{LDraw => }/ModelController.php (77%) diff --git a/.gitignore b/.gitignore index 640116f..ad6ac8c 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,5 @@ /node_modules/ /app/Resources/libs/semantic/dist /web/resources/ +/web/media/ .php_cs.cache \ No newline at end of file diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig index f8dff0e..d22379a 100644 --- a/app/Resources/views/base.html.twig +++ b/app/Resources/views/base.html.twig @@ -2,39 +2,56 @@ - - - {% block title %}Welcome!{% endblock %} - {% block stylesheets %} - - {% endblock %} - - - - {% block body %} -
- {{ knp_menu_render('mainMenu') }} + + + {% block title %}PrintABrick{% endblock %} + {% block stylesheets %} + + {% endblock %} + + + +{% block body %} +
+ {{ knp_menu_render('mainMenu') }} +
+
+ +
+
+
+ {% for breadcrumb_item in knp_menu_get_breadcrumbs_array(knp_menu_get_current_item('mainMenu')) %} + {% if not loop.last %} + {{ breadcrumb_item.label }} + + {% else %} + {{ breadcrumb_item.label }} + {% endif %} + {% endfor %} +
+

{% block header %}{% endblock %}

-
- {% for label, flashes in app.session.flashbag.all %} - {% for flash in flashes %} - {{ elements.flash(label,flash) }} - {% endfor %} +
+ + {% for label, flashes in app.session.flashbag.all %} + {% for flash in flashes %} + {{ elements.flash(label,flash) }} {% endfor %} - {% block content %} + {% endfor %} + + {% block content %} - {% endblock %} -
{% endblock %} +
+{% endblock %} - {% block javascripts %} +{% block javascripts %} - + - + - - - {% endblock %} - + +{% endblock %} + diff --git a/app/Resources/views/macros/elements.html.twig b/app/Resources/views/macros/elements.html.twig index 611b7ec..1eaacb4 100644 --- a/app/Resources/views/macros/elements.html.twig +++ b/app/Resources/views/macros/elements.html.twig @@ -1,7 +1,11 @@ {% macro part(model) %} -
- -

{{ model.number }}

+
+
+ + +
{{ model.number }}
+ +
{% endmacro %} diff --git a/app/Resources/views/ldraw/model/detail.html.twig b/app/Resources/views/model/detail.html.twig similarity index 91% rename from app/Resources/views/ldraw/model/detail.html.twig rename to app/Resources/views/model/detail.html.twig index 35cd79b..8411068 100644 --- a/app/Resources/views/ldraw/model/detail.html.twig +++ b/app/Resources/views/model/detail.html.twig @@ -2,8 +2,11 @@ {% import 'macros/elements.html.twig' as elements %} +{% block title %}{{ model.name }}{% endblock %} + +{% block header %}{{ model.name }}{% endblock %} + {% block content %} - {% if model %}
number:
{{ model.number }}
name:
{{ model.name }}
@@ -34,12 +37,10 @@

- - {% endif %}
-
+
@@ -75,10 +76,8 @@ {% endblock %} \ No newline at end of file diff --git a/app/Resources/views/ldraw/model/index.html.twig b/app/Resources/views/model/index.html.twig similarity index 66% rename from app/Resources/views/ldraw/model/index.html.twig rename to app/Resources/views/model/index.html.twig index 0bc5989..11219bf 100644 --- a/app/Resources/views/ldraw/model/index.html.twig +++ b/app/Resources/views/model/index.html.twig @@ -3,7 +3,7 @@ {% import 'macros/elements.html.twig' as elements %} {% block content %} -
+ {{ form_start(form) }} {{ form_row(form.search) }} @@ -19,14 +19,10 @@

{{ models.getTotalItemCount }}

-
-
- {% for model in models %} -
- {{ elements.part(model) }} -
- {% endfor %} -
+
+ {% for model in models %} + {{ elements.part(model) }} + {% endfor %}
{{ knp_pagination_render(models) }} diff --git a/app/Resources/views/rebrickable/part/detail.html.twig b/app/Resources/views/rebrickable/part/detail.html.twig index 050fdff..9f41151 100644 --- a/app/Resources/views/rebrickable/part/detail.html.twig +++ b/app/Resources/views/rebrickable/part/detail.html.twig @@ -15,9 +15,6 @@
{% endif %} -
- -
{% if part.model %} {{ elements.part(part.model) }} @@ -28,9 +25,19 @@ Sets + +
{% for set in sets %} - {{ set.number }} +
+
+ + +
{{ set.number }}
+ +
+
{% endfor %} +
{{ dump(apiPart) }} diff --git a/app/Resources/views/rebrickable/set/detail.html.twig b/app/Resources/views/rebrickable/set/detail.html.twig index 153eea9..9d6a7a2 100644 --- a/app/Resources/views/rebrickable/set/detail.html.twig +++ b/app/Resources/views/rebrickable/set/detail.html.twig @@ -10,8 +10,9 @@
count of parts:
{{ set.partCount }}
- + + {{ dump(rbset.imgUrl) }}

Parts {{ inventoryParts|length }} @@ -20,36 +21,18 @@
{% for inventoryPart in inventoryParts %}
-
- {{ inventoryPart.quantity }} +
+ {{ inventoryPart.quantity }} - +
{{ inventoryPart.part.number }}
{{ inventoryPart.isSpare ? 'Spare' : 'Regular' }}
+
{% endfor %}
- -

- Models {{ parts|length }} -

- -
- {% for part in parts %} -
-
- - -
{{ part.number }}
- -
-
- {% endfor %} -
- - {% endif %} {{ brset ? dump(brset) }} diff --git a/src/AppBundle/Controller/MediaController.php b/src/AppBundle/Controller/MediaController.php index ea25151..e9e4b23 100644 --- a/src/AppBundle/Controller/MediaController.php +++ b/src/AppBundle/Controller/MediaController.php @@ -12,7 +12,7 @@ use Symfony\Component\HttpFoundation\StreamedResponse; use Symfony\Component\Routing\Annotation\Route; /** - * @Route("/media") + * @Route("/files") */ class MediaController extends Controller { diff --git a/src/AppBundle/Controller/LDraw/ModelController.php b/src/AppBundle/Controller/ModelController.php similarity index 77% rename from src/AppBundle/Controller/LDraw/ModelController.php rename to src/AppBundle/Controller/ModelController.php index e607afc..0348867 100644 --- a/src/AppBundle/Controller/LDraw/ModelController.php +++ b/src/AppBundle/Controller/ModelController.php @@ -1,6 +1,6 @@ paginate( $filterBuilder->getQuery(), $request->query->getInt('page', 1)/*page number*/, - $request->query->getInt('limit', 100)/*limit per page*/ + $request->query->getInt('limit', 40)/*limit per page*/ ); - return $this->render('ldraw/model/index.html.twig', [ + return $this->render('model/index.html.twig', [ 'models' => $models, 'form' => $form->createView(), ]); @@ -57,7 +57,7 @@ class ModelController extends Controller /** * Finds and displays a part entity. * - * @Route("/models/{number}", name="model_detail") + * @Route("/{number}", name="model_detail") * @Method("GET") */ public function detailAction($number) @@ -65,11 +65,20 @@ class ModelController extends Controller $em = $this->getDoctrine()->getManager(); if($model = $this->get('manager.ldraw.model')->findByNumber($number)) { + + +// $bin = $this->get('imagine.data.loader.media')->find('/ldraw/images/'.$model->getNumber().'.png'); +// +// $path = $this->get('imagine.cache.resolver.media')->resolve('/ldraw/images/'.$model->getNumber().'.png','model'); +// +// $this->get('imagine.cache.resolver.media')->store($bin,$path,'model'); + + try { $rbParts = $model != null ? $em->getRepository(Part::class)->findAllByModel($model) : null; $sets = $model != null ? $em->getRepository(Set::class)->findAllByModel($model) : null; - return $this->render('ldraw/model/detail.html.twig', [ + return $this->render('model/detail.html.twig', [ 'model' => $model, 'rbParts' => $rbParts, 'sets' => $sets, diff --git a/src/AppBundle/Controller/Rebrickable/SetController.php b/src/AppBundle/Controller/Rebrickable/SetController.php index 9cca944..a9483a2 100644 --- a/src/AppBundle/Controller/Rebrickable/SetController.php +++ b/src/AppBundle/Controller/Rebrickable/SetController.php @@ -67,7 +67,6 @@ class SetController extends Controller 'set' => $set, 'brset' => $brset, 'rbset' => $rbset, - 'parts' => $em->getRepository(Model::class)->findAllBySetNumber($number), 'inventoryParts' => $em->getRepository(Inventory_Part::class)->findAllBySetNumber($number), ]); } diff --git a/src/AppBundle/Menu/Builder.php b/src/AppBundle/Menu/Builder.php index d94fe81..acd48a9 100644 --- a/src/AppBundle/Menu/Builder.php +++ b/src/AppBundle/Menu/Builder.php @@ -35,7 +35,7 @@ class Builder ]); $menu->addChild('Models', [ - 'route' => 'ldraw_model_index', + 'route' => 'model_index', ]); $menu->addChild('Sets', [