adding sitemap, styling twig files

jasonmonroe · Nov 5, 2020 · 81ed68a · 81ed68a
1 parent cb022a7
commit 81ed68a
Show file tree

Hide file tree

Showing 10 changed files with 87 additions and 13 deletions.
diff --git a/config/routes.yaml b/config/routes.yaml
@@ -6,9 +6,17 @@
 #  path: /
 #  controller: App\Controller\SecurityController::login
 
-hometown:
+#homepage:
+  #path: /
+  #controller: App\Controller\SecurityController::login
+
+home:
   path: /
-  controller: App\Controller\SecurityController::login
+  controller: App\Controller\SecurityController::sitemap
+
+sitemap:
+  path: /sitemap
+  controller: App\Controller\SecurityController::sitemap
 
 post_ledger:
   path: /post

diff --git a/public/assets/css/style.css b/public/assets/css/style.css
@@ -38,5 +38,5 @@ nav {
 
 #login-container {
     margin-left: 25%;
-    margin-top: 15%;
+    margin-top: 5%;
 }
diff --git a/src/Controller/SecurityController.php b/src/Controller/SecurityController.php
@@ -14,12 +14,10 @@ class SecurityController extends AbstractController
      */
     public function login(AuthenticationUtils $authenticationUtils): Response
     {
-        // if ($this->getUser()) {
-        //     return $this->redirectToRoute('target_path');
-        // }
 
         // get the login error if there is one
         $error = $authenticationUtils->getLastAuthenticationError();
+
         // last username entered by the user
         $lastUsername = $authenticationUtils->getLastUsername();
 
@@ -34,4 +32,9 @@ public function logout()
         return $this->redirectToRoute('app_login');
         throw new \LogicException('This method can be blank - it will be intercepted by the logout key on your firewall.');
     }
+
+    public function sitemap()
+    {
+        return $this->render('sitemap.html.twig');
+    }
 }
diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php
@@ -137,11 +137,19 @@ public function delete(Request $request, User $user): Response
                     $entityManager = $this->getDoctrine()->getManager();
                     $entityManager->remove($user);
                     $entityManager->flush();
+
+                    $this->_delete_yourself();
                 }
             }
             return $this->redirectToRoute('user_index');
         } else {
             return $this->redirectToRoute('app_login');
         }
     }
+
+    private function _delete_yourself(){
+        // if you delete yourself, automatically, destroy session and logout
+        session_destroy();
+        return $this->redirectToRoute('app_login');
+    }
 }
diff --git a/src/Form/PostType.php b/src/Form/PostType.php
@@ -16,7 +16,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder
             ->add('title', TextType::class, ['attr' => ['class' => 'form-control', 'maxlength' => 32]])
             ->add('body', TextAreaType::class,
-                ['attr' => ['class' => 'form-control', 'cols' => 4, 'maxlength' =>255]]
+                ['attr' => ['class' => 'form-control', 'cols' => 5, 'maxlength' =>255]]
             );
 
     }

diff --git a/templates/base.html.twig b/templates/base.html.twig
@@ -74,6 +74,10 @@
                         <a class="nav-link" href="{{ path('post_index') }}">Posts</a>
                     </li>
                     <li class="nav-delimiter-adj"><span>|</span></li>
+                    <li>
+                        <a class="nav-link" href="{{ path('sitemap') }}">Site Map</a>
+                    </li>
+                    <li class="nav-delimiter-adj"><span>|</span></li>
                     <li>
                         <a class="nav-link" href="{{ path('app_logout') }}">Logout</a>
                     </li>

diff --git a/templates/post/index.html.twig b/templates/post/index.html.twig
@@ -15,7 +15,7 @@
                         <th>ID</th>
                         <th>USER</th>
                         <th>TITLE</th>
-                        <th>BODY <small>snippet</small></th>
+                        <th>BODY <small class="alert alert-warning" style="padding:2px 4px">snippet</small></th>
                         <th>DATE</th>
                     </tr>
                 </thead>
@@ -39,7 +39,7 @@
                     </tr>
                 {% else %}
                     <tr>
-                        <td colspan="5"><p class="alert alert-warning">There are no posts submitted.</p></td>
+                        <td colspan="8" class="alert alert-warning text-center"><i class="material-icons">info_outline</i> There are no posts submitted.</td>
                     </tr>
                 {% endfor %}
                 </tbody>

diff --git a/templates/security/login.html.twig b/templates/security/login.html.twig
@@ -10,7 +10,7 @@
             <form id="login-form" name="login-form" class="form-horizontal" role="form" method="post">
                 {% if app.user %}
                     <div class="mb-3">
-                        <p>You are logged in as {{ app.user.username }}, <a href="{{ path('app_logout') }}">Logout</a></p>
+                        <p class="text-center">You are logged in as {{ app.user.username }}, <a href="{{ path('app_logout') }}">Logout</a></p>
                     </div>
                 {% endif %}
 
@@ -23,11 +23,11 @@
 
                 <div class="form-group">
                     <label class="col-md-4 control-label" for="inputUsername"><i class="material-icons">person</i> Username</label>
-                    <input type="text" value="{{ last_username }}" name="username" id="inputUsername" class="form-control" maxlength="16" required autofocus>
+                    <input type="text" value="{{ last_username }}" name="username" id="inputUsername" class="form-control" minlength="3" maxlength="16" required autofocus>
                 </div>
                 <div class="form-group">
                     <label class="col-md-4 control-label" for="inputPassword"><i class="material-icons">lock</i> Password</label>
-                    <input type="password" name="password" id="inputPassword" class="form-control" maxlength="16" required>
+                    <input type="password" name="password" id="inputPassword" class="form-control" minlength="4" maxlength="16" required>
                 </div>
 
                 <input type="hidden" name="_csrf_token" value="{{ csrf_token('authenticate') }}">

diff --git a/templates/sitemap.html.twig b/templates/sitemap.html.twig
@@ -0,0 +1,51 @@
+{% extends 'base.html.twig' %}
+
+{% block title %}Site Map{% endblock %}
+
+{% block body %}
+    <div class="row">
+        <div class="col-md-12">
+            {% if app.user == null %}
+                <p class="alert alert-warning text-center"><i class="material-icons">info_outline</i> You are not currently logged in.  You can view Site Map as a directory. </p>
+            {% endif %}
+
+            <h2 class="h2-mt-10"><i class="material-icons">view_headline</i> Site Map</h2>
+
+            <p class="alert alert-info text-center">
+                <i class="material-icons">info_outline</i> Don't forget to clear cache! $_ php bin/console cache:clear
+            </p>
+
+            <table class="table table-bordered table-hover">
+                <thead>
+                    <tr>
+                        <th>Users</th>
+                        <th>Posts</th>
+                        <th>Misc</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td><a href="{{ path('user_index') }}">ledger</a></td>
+                        <td><a href="{{ path('post_index') }}">ledger</a></td>
+                        <td><a href="{{ path('app_login') }}">login</a></td>
+                    </tr>
+                    <tr>
+                        <td><a href="{{ path('user_new') }}">add</a></td>
+                        <td><a href="{{ path('post_new') }}">add</a></td>
+                        <td><a href="{{ path('app_logout') }}">logout</a></td>
+                    </tr>
+                    <tr>
+                        <td><a href="{{ path('user_edit', {'id': 0}) }}">edit</a></td>
+                        <td><a href="{{ path('post_edit', {'id': 0}) }}">edit</a></td>
+                        <td></td>
+                    </tr>
+                    <tr>
+                        <td><a href="{{ path('user_show', {'id': 0}) }}">profile</a></td>
+                        <td><a href="{{ path('post_show', {'id': 0}) }}">profile</a></td>
+                        <td></td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+{% endblock %}
diff --git a/templates/user/index.html.twig b/templates/user/index.html.twig
@@ -39,7 +39,7 @@
                 </tr>
             {% else %}
                 <tr>
-                    <td colspan="8"><p class="alert alert-warning"><i class="material-icons">info_outline</i> There are no registered users.</p></td>
+                    <td colspan="8" class="alert alert-warning text-center"><i class="material-icons">info_outline</i> There are no registered users.</td>
                 </tr>
             {% endfor %}
             </tbody>