Added user settings view

Author: mikigal

.gitignore

@@ -1,5 +1,6 @@
 .idea/
 .DS_Store
+*.icloud
 
 ###> symfony/framework-bundle ###
 /.env.local

README.MD

@@ -1,5 +1,5 @@
 # pastebin
-Simply pastebin coded for education purposes
+Simply pastebin coded for education purposes. It looks like it works.
 
 ## Used technologies
  - PHP 7
@@ -9,6 +9,4 @@ Simply pastebin coded for education purposes
  - MySQL
 
 ## TODO
- - User panel
- - Syntax highlight
- - Bug fixes and refactoring
+ - Avatars

public/css/main.css

@@ -54,7 +54,7 @@ form {
 		align-items: flex-start;
 	}
 
-	input[type=text] {
+	input[type=text], input[type=password] {
 		border-radius: 2px;
 		box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
 		border: 1px solid #AAA;
@@ -206,4 +206,28 @@ table {
 	tr {
 		text-align: center;
 	}
-}
+}
+
+/* Panel view */
+#panel {
+	@extend .flex;
+	flex-direction: row;
+	justify-content: space-between;
+	padding-left: 10%;
+	padding-right: 10%;
+
+	img {
+		width: 128px;
+		height: 128px;
+	}
+
+	h2, h3 {
+		margin: 3px;
+	}
+}
+
+#password-error {
+	 color: #C03;
+	 width: 100%;
+	 text-align: center;
+ }

public/css/main.css.map

@@ -2,12 +2,14 @@
 
 namespace App\Controller;
 
+use App\Entity\User;
 use App\Repository\PasteRepository;
 use Doctrine\ORM\EntityManagerInterface;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface;
 
 /**
  * @Route("/panel")
@@ -18,9 +20,10 @@ class PanelController extends AbstractController {
      * @IsGranted("ROLE_USER")
      * @Route("/", name="app_panel")
      */
-    public function root(PasteRepository $pasteRepository) {
+    public function root(Request $request, PasteRepository $pasteRepository) {
         return $this->render("panel/panel.html.twig", [
-            'sidebar' => $pasteRepository->getSidebar()
+            'sidebar' => $pasteRepository->getSidebar(),
+            'password' => $request->get('password')
         ]);
     }
 
@@ -30,6 +33,9 @@ public function root(PasteRepository $pasteRepository) {
      */
     public function pastes(Request $request, PasteRepository $pasteRepository) {
         $user = $this->get('security.token_storage')->getToken()->getUser();
+        if ($user == 'anon.') {
+            return $this->redirectToRoute('app_root');
+        }
 
         return $this->render('panel/pastes.html.twig', [
             'sidebar' => $pasteRepository->getSidebar(),
@@ -45,6 +51,9 @@ public function pastes(Request $request, PasteRepository $pasteRepository) {
     public function delete(string $name, PasteRepository $pasteRepository, EntityManagerInterface $entityManager) {
         $paste = $pasteRepository->findOneByName($name);
         $user = $this->get('security.token_storage')->getToken()->getUser();
+        if ($user == 'anon.') {
+            return $this->redirectToRoute('app_root');
+        }
 
         if ($paste == null) {
             return  $this->redirectToRoute('app_pastes', [
@@ -64,4 +73,40 @@ public function delete(string $name, PasteRepository $pasteRepository, EntityMan
             'removed' => true
         ]);
     }
+
+    /**
+     * @IsGranted("ROLE_USER")
+     * @Route("/password/{id}", name="app_password")
+     */
+    public function password(Request $request, int $id, EncoderFactoryInterface $encoderFactory, EntityManagerInterface $entityManager) {
+        $user = $this->get('security.token_storage')->getToken()->getUser();
+        if ($user == 'anon.' || $user->getId() != $id) {
+            return $this->redirectToRoute('app_panel');
+        }
+
+        $old = $request->get('old');
+        $new = $request->get('new');
+        $repeat = $request->get('repeat');
+
+        if ($old == null || $new == null || $repeat == null) {
+            return $this->redirectToRoute('app_panel');
+        }
+
+        if ($new != $repeat) {
+            return $this->redirectToRoute('app_panel', ['password' => 2]);
+        }
+
+        if (!$encoderFactory->getEncoder(User::class)->isPasswordValid($user->getPassword(), $old, $user->getSalt())) {
+            return $this->redirectToRoute('app_panel', ['password' => 3]);
+        }
+
+        if ($old != $new) {
+            return $this->redirectToRoute('app_panel', ['password' => 4]);
+        }
+        $user->setPassword($encoderFactory->getEncoder(User::class)->encodePassword($new, $user->getSalt()));
+        $entityManager->persist($user);
+        $entityManager->flush();
+
+        return $this->redirectToRoute('app_panel', ['password' => 1]);
+    }
 }

public/css/main.scss

@@ -23,8 +23,8 @@
         <a href="{{ path('app_panel') }}"><i class="fas fa-cog"></i></a>
 
         {% if app.user %}
-            <a href="{{ path('app_panel') }}" id="username">{{ app.user.username }}</a>
-            <a href="{{ path('app_panel') }}"><img src="{{ asset('images/guest.png') }}" alt=""/></a> <!-- TODO: User avatars -->
+            <a href="{{ path('app_pastes') }}" id="username">{{ app.user.username }}</a>
+            <a href="{{ path('app_pastes') }}"><img src="{{ asset('images/guest.png') }}" alt=""/></a> <!-- TODO: User avatars -->
             <a href="{{ path('app_logout') }}"><i class="fas fa-sign-out-alt"></i></a>
         {% else %}
             <a href="{{ path('app_login') }}" id="username">Guest user</a>

src/Controller/PanelController.php

@@ -1,9 +1,41 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <title>pastebin</title>
-</head>
-<body>
-    Panel
-</body>
-</html>
+{% extends 'base.html.twig' %}
+{% block head %}
+    <link rel="stylesheet" href="{{ asset('css/main.css') }}" />
+    <title>Pastes list</title>
+{% endblock %}
+
+{% block body %}
+    <h1>Settings</h1>
+    {% if password == 1 %}
+        <h3 id="password-error">Password change successfully</h3>
+    {% elseif password == 2 %}
+        <h3 id="password-error">Password does not match</h3>
+    {% elseif password == 3 %}
+        <h3 id="password-error">Invalid old password</h3>
+    {% elseif password == 4 %}
+        <h3 id="password-error">Old password cant be the same as new</h3>
+    {% endif %}
+    <div id="panel">
+        <div>
+            <img src="{{ asset('images/guest.png') }}" alt="" />
+            <h2>{{ app.user.username }}</h2>
+            <h3>Join date: {{ app.user.registerDate.format('d M Y') }}</h3>
+            <h3>Mail: {{ app.user.mail }}</h3>
+        </div>
+        <form method="post" action="{{ path('app_password', {id: app.user.id}) }}" >
+            <div id="inputs" class="test">
+                <div id="labels">
+                    <label for="old">Old password</label>
+                    <label for="new">New password</label>
+                    <label for="repeat">Repeat new password</label>
+                </div>
+                <div id="widgets">
+                    <input id="old"  name="old" type="password" />
+                    <input id="new" name="new" type="password" />
+                    <input id="repeat" name="repeat" type="password" />
+                    <input type="submit" value="Change password" />
+                </div>
+            </div>
+        </form>
+    </div>
+{% endblock %}