- Добавил возможность подписаться на пользователя и отписаться от него.

- Добавил вывод списка подписчиков/подписок.

https://www.youtube.com/watch?v=JpF0MwdJzO4&list=PLU2ftbIeotGpAYRP9Iv2KLIwK36-o_qYk&index=19

src/main/resources/templates/parts/login.ftl

@@ -1,3 +1,4 @@
+<#include "security.ftl">
 <#macro login path isRegistrationForm=false>
     <form action="${path}" method="post" xmlns="http://www.w3.org/1999/html">
         <div class="row mb-3">
@@ -74,6 +75,6 @@
 <#macro logout>
     <form action="/logout" method="post">
         <input type="hidden" name="_csrf" value="${_csrf.token}"/>
-        <button type="submit" class="btn btn-primary">Sign Out</button>
+        <button class="btn btn-primary" type="submit"><#if user??>Sign Out<#else>Log in</#if></button>
     </form>
 </#macro>

src/main/resources/templates/parts/messageEditor.ftl

@@ -1,4 +1,6 @@
-<a class="btn btn-primary mb-3" data-toggle="collapse" href="#collapseExample" role="button" aria-expanded="false"
+<#include "security.ftl">
+
+<a class="btn btn-primary mb-2" data-toggle="collapse" href="#collapseExample" role="button" aria-expanded="false"
    aria-controls="collapseExample">
     Message editor
 </a>
@@ -30,7 +32,7 @@
                 </div>
             </div>
             <input type="hidden" name="_csrf" value="${_csrf.token}"/>
-            <input type="hidden" name="message-id" value=<#if message??>${message.id}</#if>/>
+            <input type="hidden" name="id" value="<#if message??>${message.id}</#if>" />
             <div class="form-group">
                 <button type="submit" class="btn btn-primary">Save message</button>
             </div>

src/main/resources/templates/parts/navbar.ftl

@@ -14,10 +14,10 @@
                 <li class="nav-item">
                     <a class="nav-link" aria-current="page" href="/">Home</a>
                 </li>
+                <#if user??>
                 <li class="nav-item">
                     <a class="nav-link" aria-current="page" href="/main">Messages</a>
                 </li>
-                <#if user??>
                     <li class="nav-item">
                         <a class="nav-link" aria-current="page" href="/user-messages/${currentUserId}">My messages</a>
                     </li>
@@ -34,7 +34,7 @@
                 </#if>
             </ul>
         </div>
-        <div class="navbar-text mr-3">${name}</div>
-        <div><#if name != "unknown"> <@l.logout /> </#if></div>
+        <div class="navbar-text mr-3"><#if user??>${name}<#else>Please, login</#if></div>
+        <@l.logout />
     </div>
 </nav>