Added paste details

Author: mikigal

public/css/main.css

@@ -120,11 +120,45 @@ form {
 }
 
 #paste {
-	h1 {
-		margin-left: 4vw;
-		margin-bottom: 0;
-		font-size: 25px;
-		margin-top: 8px;
+	margin-left: 4vw;
+
+	#header {
+
+		img {
+			width: 40px;
+			height: 40px;
+			margin-right: 10px;
+			display: inline-block;
+		}
+
+		#data {
+			display: inline-block;
+			height: 40px;
+
+			h1 {
+				margin-bottom: 0;
+				font-size: 18px;
+			}
+
+			#row {
+				@extend .flex;
+			}
+
+			p {
+				margin-top: 5px;
+			}
+
+			#username::before {
+				@extend .icon;
+				content: '\f007';
+			}
+
+			#date::before {
+				@extend .icon;
+				content: '\f073';
+				margin-left: 10px;
+			}
+		}
 	}
 
 	ol {
@@ -133,7 +167,6 @@ form {
 		color: #666666;
 		margin-top: 8px;
 		border: 1px solid #AAA;
-		margin-left: 4vw;
 
 		li {
 			border-left: 1px solid #AAA;

public/css/main.css.map

@@ -4,9 +4,11 @@
 
 use App\Entity\Paste;
 use App\Form\PasteType;
+use App\Repository\UserRepository;
 use App\Service\RecaptchaService;
 use App\Utils\Utils;
 use DateTime;
+use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\FormError;
@@ -61,11 +63,10 @@ public function root(Request $request, RecaptchaService $recaptchaService) {
         ]);
     }
 
-
     /**
      * @Route("/view/{name}", name="app_paste")
      */
-    public function paste(string $name) {
+    public function paste(string $name, UserRepository $userRepository) {
         $paste = $this->getDoctrine()->getRepository(Paste::class)->findOneByName($name);
         if ($paste == null) {
             return $this->render('paste.html.twig', [
@@ -75,7 +76,8 @@ public function paste(string $name) {
 
         return $this->render('paste.html.twig', [
             'content' => explode('[new-line]', base64_decode($paste->getContent())),
-            'paste' => $paste
+            'paste' => $paste,
+            'username' => $paste->getOwner() != null ? $userRepository->findOneBy(['id' => $paste->getOwner()])->getUsername() : 'Guest'
         ]);
     }
 }

public/css/main.scss

@@ -8,9 +8,22 @@
         <h1>Paste not found</h1>
     {% else %}
         <div id="paste">
-            {% if paste.title != null %}
-                <h1>{{ paste.title }}</h1>
-            {% endif %}
+            <div id="header">
+                <img src="{{ asset('images/guest.png') }}" alt=""/> <!-- TODO: User avatars -->
+                <div id="data">
+                    <h1>
+                        {% if paste.title != null %}
+                            {{ paste.title }}
+                        {% else %}
+                             Untitled
+                        {% endif %}
+                    </h1>
+                    <div id="row">
+                        <p id="username">{{ username }}</p>
+                        <p id="date">{{ paste.uploadDate.format('d M Y G:i') }}</p>
+                    </div>
+                </div>
+            </div>
             <ol>
                 {% for line in content %}
                     <li>{{ line }}</li>