diff --git a/assets/sass/_layout.scss b/assets/sass/_layout.scss index 13cbcda..e69de29 100644 --- a/assets/sass/_layout.scss +++ b/assets/sass/_layout.scss @@ -1,4 +0,0 @@ -body > main { - display: grid; - grid-template-columns: var(--width-sidebar-max) calc(100% - var(--width-sidebar-max)); -} diff --git a/assets/sass/components/_content.scss b/assets/sass/components/_content.scss index bfd166d..8b51a5e 100644 --- a/assets/sass/components/_content.scss +++ b/assets/sass/components/_content.scss @@ -1,4 +1,4 @@ -body > main > section { +body > main { padding: var(--spacing-elements); header h1 { margin: 0; diff --git a/assets/sass/components/_sidebar.scss b/assets/sass/components/_sidebar.scss deleted file mode 100644 index b77e25e..0000000 --- a/assets/sass/components/_sidebar.scss +++ /dev/null @@ -1,10 +0,0 @@ -body > main > nav { - border: { - right: var(--color-blue-light) solid var(--width-border-default); - } - - a { - display: block; - padding: var(--spacing-small-elements); - } -} diff --git a/assets/sass/index.scss b/assets/sass/index.scss index 0c3b2f1..d5ffe7d 100644 --- a/assets/sass/index.scss +++ b/assets/sass/index.scss @@ -1,7 +1,6 @@ @import 'variables'; @import 'elements'; @import 'components/header'; -@import 'components/sidebar'; @import 'components/content'; @import 'components/footer'; @import 'layout'; diff --git a/config/packages/twig.yaml b/config/packages/twig.yaml index a159146..747b309 100644 --- a/config/packages/twig.yaml +++ b/config/packages/twig.yaml @@ -2,4 +2,3 @@ twig: default_path: '%kernel.project_dir%/templates' globals: app_name: RSS Reader - buckets: '@App\Repository\BucketRepository' diff --git a/config/routes.yaml b/config/routes.yaml index 47c6097..f6d5ae1 100644 --- a/config/routes.yaml +++ b/config/routes.yaml @@ -1,9 +1,10 @@ -# Static pages / templates start: path: / - controller: Symfony\Bundle\FrameworkBundle\Controller\TemplateController - defaults: - template: 'static/start.html.twig' + controller: App\Controller\BucketController::index + +buckets: + path: /buckets/ + controller: App\Controller\BucketController::index bucket: path: /bucket/{slug} diff --git a/public/css/style.css b/public/css/style.css index 943faf1..208e190 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -51,15 +51,9 @@ body > header { body > header h1 { margin: 0; } -body > main > nav { - border-right: var(--color-blue-light) solid var(--width-border-default); } - body > main > nav a { - display: block; - padding: var(--spacing-small-elements); } - -body > main > section { +body > main { padding: var(--spacing-elements); } - body > main > section header h1 { + body > main header h1 { margin: 0; } article { @@ -97,7 +91,3 @@ article { body > footer { padding: var(--spacing-small-elements); border-top: var(--color-blue-light) solid var(--width-border-default); } - -body > main { - display: grid; - grid-template-columns: var(--width-sidebar-max) calc(100% - var(--width-sidebar-max)); } diff --git a/src/Controller/BucketController.php b/src/Controller/BucketController.php index 1041dfb..6bbe471 100644 --- a/src/Controller/BucketController.php +++ b/src/Controller/BucketController.php @@ -3,13 +3,32 @@ namespace App\Controller; use App\Entity\Bucket; +use App\Repository\BucketRepository; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; class BucketController extends AbstractController { - public function show(Bucket $bucket) + /** + * @var BucketRepository + */ + private $repository; + + public function __construct( + BucketRepository $repository + ) { + $this->repository = $repository; + } + + public function index() { return $this->render('bucket/index.html.twig', [ + 'buckets' => $this->repository->findAll(), + ]); + } + + public function show(Bucket $bucket) + { + return $this->render('bucket/show.html.twig', [ 'bucket' => $bucket, ]); } diff --git a/templates/base.html.twig b/templates/base.html.twig index 1bae3c3..650e014 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -13,15 +13,7 @@
- - -
- {% block body %}{% endblock %} -
+ {% block body %}{% endblock %}