From 8ad9c14765b87b1f9d96e1763e23932005695feb Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 22 May 2017 15:36:38 +0200 Subject: [PATCH] Add homepage --- app/Resources/assets/style/homepage.scss | 24 ++++++++++ app/Resources/assets/style/main.scss | 2 +- app/Resources/assets/style/style.scss | 1 + app/Resources/relations/alias_model.yml | 4 +- app/Resources/translations/messages.en.yml | 12 ++++- app/Resources/views/base.html.twig | 2 +- app/Resources/views/default/index.html.twig | 47 ++++++++++++++++--- app/Resources/views/macros/blocks.html.twig | 6 +-- .../Controller/DefaultController.php | 9 ++++ src/AppBundle/Menu/Builder.php | 2 +- .../Repository/LDraw/ModelRepository.php | 7 +++ .../Repository/Rebrickable/SetRepository.php | 7 +++ 12 files changed, 109 insertions(+), 14 deletions(-) create mode 100644 app/Resources/assets/style/homepage.scss diff --git a/app/Resources/assets/style/homepage.scss b/app/Resources/assets/style/homepage.scss new file mode 100644 index 0000000..833d050 --- /dev/null +++ b/app/Resources/assets/style/homepage.scss @@ -0,0 +1,24 @@ +.hidden.menu { + display: none; +} + +.masthead.segment { + min-height: 500px; + padding: 1em 0em; +} +.masthead .logo.item img { + margin-right: 1em; +} +.masthead .ui.menu .ui.button { + margin-left: 0.5em; +} +.masthead h1.ui.header { + margin-top: 1.5em; + margin-bottom: 0em; + font-size: 4em; + font-weight: normal; +} +.masthead h2 { + font-size: 1.7em; + font-weight: normal; +} diff --git a/app/Resources/assets/style/main.scss b/app/Resources/assets/style/main.scss index 5027b8d..3117dc6 100644 --- a/app/Resources/assets/style/main.scss +++ b/app/Resources/assets/style/main.scss @@ -6,7 +6,7 @@ min-height: calc(100% - 67px); } - .ui.masthead { + .ui.head { position: relative; .header { diff --git a/app/Resources/assets/style/style.scss b/app/Resources/assets/style/style.scss index 852049e..211c39b 100644 --- a/app/Resources/assets/style/style.scss +++ b/app/Resources/assets/style/style.scss @@ -2,6 +2,7 @@ @import "mixins"; @import "main"; +@import "homepage"; @import "modelviewer"; @import "part"; diff --git a/app/Resources/relations/alias_model.yml b/app/Resources/relations/alias_model.yml index fa8b818..806c1e0 100644 --- a/app/Resources/relations/alias_model.yml +++ b/app/Resources/relations/alias_model.yml @@ -381,4 +381,6 @@ u9209c01: u9209 2772c02: 2772c01 2772c03: 2772c01 -81294: 3351a \ No newline at end of file +81294: 3351a + +61738: 54086 \ No newline at end of file diff --git a/app/Resources/translations/messages.en.yml b/app/Resources/translations/messages.en.yml index 95d7f68..9a5676f 100644 --- a/app/Resources/translations/messages.en.yml +++ b/app/Resources/translations/messages.en.yml @@ -68,4 +68,14 @@ page: filter: model: search: Search Model - category: Category \ No newline at end of file + category: Category + +homepage: + models: + title: %count% models + text: + browse: Browse models + sets: + title: %count% sets + text: + browse: Browse sets \ No newline at end of file diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig index c3ef64f..61e3d53 100644 --- a/app/Resources/views/base.html.twig +++ b/app/Resources/views/base.html.twig @@ -21,7 +21,7 @@ {% block page %}
-
+

{% block header %}{% endblock %}

diff --git a/app/Resources/views/default/index.html.twig b/app/Resources/views/default/index.html.twig index d11bc74..c9dd5bd 100644 --- a/app/Resources/views/default/index.html.twig +++ b/app/Resources/views/default/index.html.twig @@ -1,16 +1,51 @@ {% extends 'base.html.twig' %} -{% block page %} -
-
+{% block body %} + +
+
+
-
-
- Hello, world! +
+ {{ knp_menu_render('mainMenu') }} + +
+
+
+ + +
+
+
+
+
+
+ +
+

+ PrintABrick +

+

{{ 'page.home.title.text' | trans }}

+
+
+ +
+
+
+
+

{{ 'homepage.models.title' | trans({'%count%' : models})}}

+

{{ 'homepage.models.text' | trans }}

+ {{ 'homepage.models.browse' | trans }} +
+
+

{{ 'homepage.sets.title' | trans({'%count%' : sets}) }}

+

{{ 'homepage.sets.text' | trans }}

+ {{ 'homepage.sets.browse' | trans }}
+
{% endblock %} diff --git a/app/Resources/views/macros/blocks.html.twig b/app/Resources/views/macros/blocks.html.twig index 6f46e27..cfbb1bd 100644 --- a/app/Resources/views/macros/blocks.html.twig +++ b/app/Resources/views/macros/blocks.html.twig @@ -63,13 +63,13 @@ {% import _self as blocks %} {{ blocks.setImage(set.id,'set_min') }}
-

- {{ set.name }} +

+ {{ set.name }}

{{ set.id }}
- {{ set.theme.fullName }} + {{ set.theme.fullName }}
diff --git a/src/AppBundle/Controller/DefaultController.php b/src/AppBundle/Controller/DefaultController.php index 36ea5c0..576b743 100644 --- a/src/AppBundle/Controller/DefaultController.php +++ b/src/AppBundle/Controller/DefaultController.php @@ -2,6 +2,8 @@ namespace AppBundle\Controller; +use AppBundle\Repository\LDraw\ModelRepository; +use AppBundle\Repository\Rebrickable\SetRepository; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\HttpFoundation\Request; @@ -13,7 +15,14 @@ class DefaultController extends Controller */ public function indexAction(Request $request) { + /** @var ModelRepository $modelRepository */ + $modelRepository = $this->get('repository.ldraw.model'); + + /** @var SetRepository $setRepository */ + $setRepository = $this->get('repository.rebrickable.set'); return $this->render('default/index.html.twig', [ + 'models' => $modelRepository->count(), + 'sets' => $setRepository->count(), ]); } } diff --git a/src/AppBundle/Menu/Builder.php b/src/AppBundle/Menu/Builder.php index dc1c5c0..e8ca503 100644 --- a/src/AppBundle/Menu/Builder.php +++ b/src/AppBundle/Menu/Builder.php @@ -32,7 +32,7 @@ class Builder 'route' => 'homepage', ]); - $menu->addChild('homepage', [ + $menu->addChild('Home', [ 'route' => 'homepage', ]); diff --git a/src/AppBundle/Repository/LDraw/ModelRepository.php b/src/AppBundle/Repository/LDraw/ModelRepository.php index 648f499..05c7fce 100644 --- a/src/AppBundle/Repository/LDraw/ModelRepository.php +++ b/src/AppBundle/Repository/LDraw/ModelRepository.php @@ -106,6 +106,13 @@ class ModelRepository extends BaseRepository return $queryBuilder->getQuery()->getResult(); } + public function count() { + $queryBuilder = $this->createQueryBuilder('model'); + $queryBuilder->select('count(model)'); + + return $queryBuilder->getQuery()->getSingleScalarResult(); + } + /** * Create new Model entity with $number or retrieve one. * diff --git a/src/AppBundle/Repository/Rebrickable/SetRepository.php b/src/AppBundle/Repository/Rebrickable/SetRepository.php index 710533a..9674dc7 100644 --- a/src/AppBundle/Repository/Rebrickable/SetRepository.php +++ b/src/AppBundle/Repository/Rebrickable/SetRepository.php @@ -73,6 +73,13 @@ class SetRepository extends BaseRepository return $queryBuilder->getQuery()->getSingleScalarResult(); } + public function count() { + $queryBuilder = $this->createQueryBuilder('s'); + $queryBuilder->select('count(s)'); + + return $queryBuilder->getQuery()->getSingleScalarResult(); + } + public function getMaxYear() { $queryBuilder = $this->createQueryBuilder('s')