Hexlet · RedGradient · Jul 1, 2023 · Jul 2, 2023 · Jul 3, 2023 · Jul 3, 2023
diff --git a/pom.xml b/pom.xml
@@ -65,6 +65,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-thymeleaf</artifactId>
         </dependency>
+        <dependency>
+            <groupId>nz.net.ultraq.thymeleaf</groupId>
+            <artifactId>thymeleaf-layout-dialect</artifactId>
+            <version>3.2.1</version>
+        </dependency>
         <!-- WebJars -->
         <dependency>
             <groupId>org.webjars</groupId>

diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties
@@ -79,3 +79,20 @@ text.add-user-to-wks=Adding a user to a workspace
 text.hint-choose-a-user=Choose a user from the list
 text.wks-delete-confirm=Are you sure you want to delete this workspace?
 btn.add-to-wks=Add to workspace
+
+# footer
+about=About
+source-code=Source Code
+telegram=Telegram Hexlet (Volunteers)
+help=Help
+blog=Blog
+knowledge-base=Knowledge Base
+recommended-books=Recommended Books
+other-opensource-projects=Other open-source projects
+hexlet.cv=Hexlet CV
+hexlet.editor=Hexlet Editor
+hexlet.friends=Hexlet Friends
+miscellaneous=Miscellaneous
+code-basics=Code Basics
+codebattle=Codebattle
+hexlet.guides=Hexlet Guides
diff --git a/src/main/resources/messages_ru.properties b/src/main/resources/messages_ru.properties
@@ -75,3 +75,20 @@ text.created-info=Создан пользователем {0} {1} в {2}
 text.add-user-to-wks=Добавить пользователя в пространство
 text.hint-choose-a-user=Выберите пользователя из списка
 text.wks-delete-confirm=Удалить пространство?
+
+# footer
+about=О проекте
+source-code=Исходный Код
+telegram=Telegram Hexlet (Волонтеры)
+help=Help
+blog=Блог
+knowledge-base=База Знаний
+recommended-books=Рекомендованные Книги
+other-opensource-projects=Другие open-source проекты
+hexlet.cv=Hexlet-резюме
+hexlet.editor=Хекслет-редактор
+hexlet.friends=Друзья Хекслета
+miscellaneous=Дополнительно
+code-basics=Code Basics
+codebattle=Кодбаттл
+hexlet.guides=Гайды Хекслета
diff --git a/src/main/resources/templates/account/acc-info.html b/src/main/resources/templates/account/acc-info.html
@@ -54,5 +54,6 @@ <h5 class="card-title mb-1" th:text="#{acc-info.card-title.workspaces}"></h5>
         </tbody>
     </table>
 </main>
+<footer th:replace="~{fragments/footer :: mainFooter}"></footer>
 </body>
 </html>
diff --git a/src/main/resources/templates/account/pass-update.html b/src/main/resources/templates/account/pass-update.html
@@ -37,5 +37,6 @@
         </div>
     </div>
 </main>
+<footer th:replace="~{fragments/footer :: mainFooter}"></footer>
 </body>
 </html>
diff --git a/src/main/resources/templates/account/prof-update.html b/src/main/resources/templates/account/prof-update.html
@@ -48,5 +48,6 @@
         </div>
     </div>
 </main>
+<footer th:replace="~{fragments/footer :: mainFooter}"></footer>
 </body>
 </html>
diff --git a/src/main/resources/templates/account/signup.html b/src/main/resources/templates/account/signup.html
@@ -84,6 +84,6 @@
         </div>
     </div>
 </main>
-
+<footer th:replace="~{fragments/footer :: mainFooter}"></footer>
 </body>
 </html>
diff --git a/src/main/resources/templates/application.html b/src/main/resources/templates/application.html
@@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="en"
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
+<head th:replace="~{fragments/header :: head}"></head>
+<body>
+    <nav th:replace="~{fragments/panels :: mainNavbarTop}"></nav>
+
+    <main layout:fragment="content"></main>
+
+    <footer th:replace="~{fragments/footer :: mainFooter}"></footer>
+</body>
+</html>
diff --git a/src/main/resources/templates/create-workspace.html b/src/main/resources/templates/create-workspace.html
@@ -1,39 +1,40 @@
 <!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/header :: head}"></head>
-<body style="padding-top: 4.5rem">
-<nav th:replace="~{fragments/panels :: mainNavbarTop}"></nav>
-<main class="container">
-    <div class="row">
-        <div class="col">
-            <form method="post" th:action="@{/workspace}" th:object="${createWorkspace}">
-                <div class="form-floating mb-3">
-                    <input class="form-control" id="inputWksUrl" placeholder="p"
-                           th:classappend="${!#fields.hasErrors('url') && formModified ? 'is-valid' : ''}"
-                           th:errorclass="is-invalid" th:field="*{url}"
-                           type="url">
-                    <label for="inputWksUrl" th:text="#{wks.placeholder.url}"></label>
-                    <div class="invalid-feedback" th:each="err : ${#fields.errors('url')}" th:text="${err}"></div>
-                </div>
-                <div class="form-floating mb-3">
-                    <input class="form-control" id="inputWksName" placeholder="p"
-                           th:classappend="${!#fields.hasErrors('name') && formModified ? 'is-valid' : ''}"
-                           th:errorclass="is-invalid" th:field="*{name}"
-                           type="text">
-                    <label for="inputWksName" th:text="#{wks.placeholder.name}"></label>
-                    <div class="invalid-feedback" th:each="err : ${#fields.errors('name')}" th:text="${err}"></div>
-                </div>
-                <div class="form-floating mb-3">
-                    <textarea class="form-control" id="inWksDesc" placeholder="p" style="height: 100px"
-                              th:errorclass="is-invalid" th:field="*{description}"></textarea>
-                    <label for="inWksDesc" th:text="#{wks.placeholder.descr}"></label>
-                    <div class="invalid-feedback" th:each="err : ${#fields.errors('description')}"
-                         th:text="${err}"></div>
-                </div>
-                <button class="btn btn-primary" type="submit" th:text="#{btn.create}"></button>
-            </form>
+<html lang="en"
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+      layout:decorate="application.html">
+
+    <main layout:fragment="content" class="container">
+        <div class="row">
+            <div class="col">
+                <form method="post" th:action="@{/workspace}" th:object="${createWorkspace}">
+                    <div class="form-floating mb-3">
+                        <input class="form-control" id="inputWksUrl" placeholder="p"
+                               th:classappend="${!#fields.hasErrors('url') && formModified ? 'is-valid' : ''}"
+                               th:errorclass="is-invalid" th:field="*{url}"
+                               type="url">
+                        <label for="inputWksUrl" th:text="#{wks.placeholder.url}"></label>
+                        <div class="invalid-feedback" th:each="err : ${#fields.errors('url')}" th:text="${err}"></div>
+                    </div>
+                    <div class="form-floating mb-3">
+                        <input class="form-control" id="inputWksName" placeholder="p"
+                               th:classappend="${!#fields.hasErrors('name') && formModified ? 'is-valid' : ''}"
+                               th:errorclass="is-invalid" th:field="*{name}"
+                               type="text">
+                        <label for="inputWksName" th:text="#{wks.placeholder.name}"></label>
+                        <div class="invalid-feedback" th:each="err : ${#fields.errors('name')}" th:text="${err}"></div>
+                    </div>
+                    <div class="form-floating mb-3">
+                        <textarea class="form-control" id="inWksDesc" placeholder="p" style="height: 100px"
+                                  th:errorclass="is-invalid" th:field="*{description}"></textarea>
+                        <label for="inWksDesc" th:text="#{wks.placeholder.descr}"></label>
+                        <div class="invalid-feedback" th:each="err : ${#fields.errors('description')}"
+                             th:text="${err}"></div>
+                    </div>
+                    <button class="btn btn-primary" type="submit" th:text="#{btn.create}"></button>
+                </form>
+            </div>
         </div>
-    </div>
-</main>
-</body>
+    </main>
+
 </html>
diff --git a/src/main/resources/templates/error-general.html b/src/main/resources/templates/error-general.html
@@ -2,8 +2,10 @@
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
 <head th:replace="~{fragments/header :: head}"></head>
 <body>
-<div class="alert alert-danger">
-    <span th:text="#{alert.general-error}"></span>
-</div>
+    <main>
+        <div class="alert alert-danger">
+            <span th:text="#{alert.general-error}"></span>
+        </div>
+    </main>
 </body>
 </html>
diff --git a/src/main/resources/templates/fragments/footer.html b/src/main/resources/templates/fragments/footer.html
@@ -0,0 +1,92 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<body>
+    <footer class="d-flex p-3 bg-dark text-light" th:fragment="mainFooter">
+        <div class="container-xl">
+            <div class="row justify-content-lg-around">
+                <div class="col-sm-6 col-md-3 col-lg-auto">
+                    <a class="text-dark px-0 py-0 text-decoration-none " href="https://ru.hexlet.io">
+                        <p class="h3 mb-2 text-light">© Hexlet</p>
+                    </a>
+                    <ul class="nav flex-column">
+                        <li class="nav-item">
+                            <a class="nav-link px-0 py-1 text-light"
+                               href="https://sicp.hexlet.io/ru/pages/about" th:text="#{about}"></a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link px-0 py-1 text-light" href="https://github.com/Hexlet/hexlet-correction"
+                               target="_blank"
+                               th:text="#{source-code}"></a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link px-0 py-1 text-light" href="https://t.me/hexletcommunity/12"
+                               target="_blank"
+                               th:text="#{telegram}"></a>
+                        </li>
+                    </ul>
+                </div>
+                <div class="col-sm-6 col-md-3 col-lg-auto">
+                    <p class="h5 mb-3" th:text="#{help}"></p>
+                    <ul class="nav flex-column">
+                        <li class="nav-item">
+                            <a class="nav-link px-0 py-1 text-light"
+                               href="https://ru.hexlet.io/blog"
+                               th:text="#{blog}"></a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link px-0 py-1 text-light"
+                               href="https://ru.hexlet.io/knowledge"
+                               th:text="#{knowledge-base}"></a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link px-0 py-1 text-light"
+                               href="https://ru.hexlet.io/pages/recommended-books"
+                               th:text="#{recommended-books}"></a>
+                        </li>
+                    </ul>
+                </div>
+                <div class="col-sm-6 col-md-3 col-lg-auto">
+                    <p class="h5 mb-3" th:text="#{other-opensource-projects}"></p>
+                    <ul class="nav flex-column">
+                        <li class="nav-item">
+                            <a class="nav-link px-0 py-1 text-light"
+                               href="https://github.com/Hexlet/hexlet-cv"
+                            th:text="#{hexlet.cv}"></a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link px-0 py-1 text-light"
+                               href="https://github.com/Hexlet/hexlet-editor"
+                               th:text="#{hexlet.editor}"></a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link px-0 py-1 text-light"
+                               href="https://github.com/Hexlet/hexlet-friends"
+                               th:text="#{hexlet.friends}"></a>
+                        </li>
+                    </ul>
+                </div>
+                <div class="col-sm-6 col-md-3 col-lg-auto">
+                    <p class="h5 mb-3" th:text="#{miscellaneous}"></p>
+                    <ul class="nav flex-column">
+                        <li class="nav-item">
+                            <a class="nav-link px-0 py-1 text-light"
+                               href="https://ru.code-basics.com/"
+                               th:text="#{code-basics}"></a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link px-0 py-1 text-light"
+                               href="https://codebattle.hexlet.io/"
+                               th:text="#{codebattle}"></a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link px-0 py-1 text-light"
+                               href="https://guides.hexlet.io/"
+                               th:text="#{hexlet.editor}"></a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+    </footer>
+</body>
+</html>
diff --git a/src/main/resources/templates/fragments/header.html b/src/main/resources/templates/fragments/header.html
@@ -13,6 +13,18 @@
     <script th:src="@{/webjars/bootstrap/js/bootstrap.bundle.min.js}" type="text/javascript"></script>
     <!-- Language switcher-->
     <script th:src="@{/fragments/lang-switcher.js}" type="text/javascript"></script>
+    <style>
+        body {
+          padding-top: 4.5rem;
+          min-height: 100vh;
+          display: flex;
+          flex-direction: column;
+        }
+
+        main {
+          flex: 1;
+        }
+    </style>
 </head>
 <body>
 </body>
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,5 +37,6 @@ @@
             </div>
         </div>
     </main>
+    <footer th:replace="~{fragments/footer :: mainFooter}"></footer>
     </body>
     </html>