Make sidebar work

Author: mikigal

composer.json

@@ -6,6 +6,7 @@
         "ext-ctype": "*",
         "ext-iconv": "*",
         "ext-json": "*",
+        "knplabs/knp-time-bundle": "^1.9",
         "sensio/framework-extra-bundle": "^5.2",
         "symfony/asset": "4.2.*",
         "symfony/console": "4.2.*",

composer.lock

@@ -11,4 +11,5 @@
     Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true],
     Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle::class => ['all' => true],
     Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
+    Knp\Bundle\TimeBundle\KnpTimeBundle::class => ['all' => true],
 ];

config/bundles.php

@@ -4,6 +4,7 @@
 # Put parameters here that don't need to change on each machine where the app is deployed
 # https://symfony.com/doc/current/best_practices/configuration.html#application-related-configuration
 parameters:
+    locale: 'en'
 
 services:
     # default configuration for services in *this* file

config/services.yaml

@@ -2,6 +2,7 @@
 
 namespace App\Controller;
 
+use App\Repository\PasteRepository;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Routing\Annotation\Route;
@@ -15,7 +16,9 @@ class PanelController extends AbstractController {
      * @IsGranted("ROLE_USER")
      * @Route("/", name="app_panel")
      */
-    public function root() {
-        return $this->render("panel/panel.html.twig", []);
+    public function root(PasteRepository $pasteRepository) {
+        return $this->render("panel/panel.html.twig", [
+            'sidebar' => $pasteRepository->getSidebar()
+        ]);
     }
 }

src/Controller/PanelController.php

@@ -4,6 +4,7 @@
 
 use App\Entity\Paste;
 use App\Form\PasteType;
+use App\Repository\PasteRepository;
 use App\Repository\UserRepository;
 use App\Service\RecaptchaService;
 use App\Utils\Utils;
@@ -20,25 +21,27 @@ class RootController extends AbstractController {
     /**
      * @Route("/", name="app_root")
      */
-    public function root(Request $request, RecaptchaService $recaptchaService) {
+    public function root(Request $request, PasteRepository $pasteRepository, EntityManagerInterface $entityManager, RecaptchaService $recaptchaService) {
         $paste = new Paste();
         $form = $this->createForm(PasteType::class, $paste);
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
-            if (!$recaptchaService->checkCaptcha($request->get('g-recaptcha-response'))) {
+            /*if (!$recaptchaService->checkCaptcha($request->get('g-recaptcha-response'))) {
                 $form->addError(new FormError('Are you a robot? Make captcha'));
                 return $this->render('index.html.twig', [
                     'form' => $form->createView(),
-                    'recaptcha' => getenv('RECAPTCHA_SITEKEY')
+                    'recaptcha' => getenv('RECAPTCHA_SITEKEY'),
+                    'sidebar' => $pasteRepository->getSidebar()
                 ]);
-            }
+            }*/
 
             if (strlen(preg_replace('/\s/', '', $paste->getContent())) == 0) {
                 $form->addError(new FormError('Content cant be empty'));
                 return $this->render('index.html.twig', [
                     'form' => $form->createView(),
-                    'recaptcha' => getenv('RECAPTCHA_SITEKEY')
+                    'recaptcha' => getenv('RECAPTCHA_SITEKEY'),
+                    'sidebar' => $pasteRepository->getSidebar()
                 ]);
             }
 
@@ -48,7 +51,6 @@ public function root(Request $request, RecaptchaService $recaptchaService) {
             $paste->setContent(base64_encode(str_replace(array("\r\n", "\r", "\n"), "[new-line]", $paste->getContent())));
             $paste->setName(Utils::getRandomString(10));
 
-            $entityManager = $this->getDoctrine()->getManager();
             $entityManager->persist($paste);
             $entityManager->flush();
 
@@ -59,25 +61,28 @@ public function root(Request $request, RecaptchaService $recaptchaService) {
 
         return $this->render('index.html.twig', [
             'form' => $form->createView(),
-            'recaptcha' => getenv('RECAPTCHA_SITEKEY')
+            'recaptcha' => getenv('RECAPTCHA_SITEKEY'),
+            'sidebar' => $pasteRepository->getSidebar()
         ]);
     }
 
     /**
      * @Route("/view/{name}", name="app_paste")
      */
-    public function paste(string $name, UserRepository $userRepository) {
-        $paste = $this->getDoctrine()->getRepository(Paste::class)->findOneByName($name);
+    public function paste(string $name, PasteRepository $pasteRepository, UserRepository $userRepository, LoggerInterface $logger) {
+        $paste = $pasteRepository->findOneByName($name);
         if ($paste == null) {
             return $this->render('paste.html.twig', [
-                'paste' => null
+                'paste' => null,
+                'sidebar' => $pasteRepository->getSidebar()
             ]);
         }
 
         return $this->render('paste.html.twig', [
             'content' => explode('[new-line]', base64_decode($paste->getContent())),
             'paste' => $paste,
-            'username' => $paste->getOwner() != null ? $userRepository->findOneBy(['id' => $paste->getOwner()])->getUsername() : 'Guest'
+            'username' => $paste->getOwner() != null ? $userRepository->findOneBy(['id' => $paste->getOwner()])->getUsername() : 'Guest',
+            'sidebar' => $pasteRepository->getSidebar()
         ]);
     }
 }