Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#153] add footer login page #155

Draft
wants to merge 9 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/resources/templates/account/acc-info.html
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,6 @@ <h5 class="card-title mb-1">Workspaces</h5>
</tbody>
</table>
</main>
<footer th:replace="~{fragments/footer :: foot}"></footer>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Посмотрите, есть ли в шаблонизаторе механизм наследования шаблонов, чтобы не дублировать футер во все страницы подряд.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Можно немного подробнее про этот момент, я вроде и так получается использую шаблоный футер и передаю его с помощью шаблонизатора

</body>
</html>
1 change: 1 addition & 0 deletions src/main/resources/templates/account/pass-update.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,6 @@
</div>
</div>
</main>
<footer th:replace="~{fragments/footer :: foot}"></footer>
</body>
</html>
1 change: 1 addition & 0 deletions src/main/resources/templates/account/prof-update.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,6 @@
</div>
</div>
</main>
<footer th:replace="~{fragments/footer :: foot}"></footer>
</body>
</html>
2 changes: 1 addition & 1 deletion src/main/resources/templates/account/signup.html
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,6 @@
</div>
</div>
</main>

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Футер должен быть не только на странице входа, но вообще любой, где пользователь сидит. К примеру такая логика на Хекслете, код бейзиксе (на хекслете футера нет только в практиках)

Copy link
Author

@amirhraj amirhraj Jun 5, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Я почти везде добавил, чтобы посмотреть как это все выглядет и потыкать мы можем связаться в телеграм или еще где, я его у себя соберу и дам IP что бы смогли зайти посмотреть.

<footer th:replace="~{fragments/footer :: foot}"></footer>
</body>
</html>
1 change: 1 addition & 0 deletions src/main/resources/templates/create-workspace.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,6 @@
</div>
</div>
</main>
<footer th:replace="~{fragments/footer :: foot}"></footer>
</body>
</html>
1 change: 1 addition & 0 deletions src/main/resources/templates/error-general.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
<div class="alert alert-danger">
<span>Во время работы произошла ошибка. Попробуйте позже.</span>
</div>
<footer th:replace="~{fragments/footer :: foot}"></footer>
</body>
</html>
96 changes: 96 additions & 0 deletions src/main/resources/templates/fragments/footer.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
<!DOCTYPE html>
<html lang="en" xmlns:th="http://www.thymeleaf.org">
<body>
<footer th:fragment="foot" class="footer fixed-bottom d-flex p-3 ">
<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">
О проекте
</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">
Исходный код
</a>
</li>
<li class="nav-item">
<a class="nav-link px-0 py-1 text-light" href="https://t.me/hexletcommunity/12"
target="_blank">
Telegram Hexlet канал Волонтеры
</a>
</li>
</ul>
</div>
<div class="col-sm-6 col-md-3 col-lg-auto">
<p class="h5 mb-3">Помощь</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">
Блог
</a>
</li>
<li class="nav-item">
<a class="nav-link px-0 py-1 text-light" href="https://ru.hexlet.io/knowledge">
База знаний
</a>
</li>
<li class="nav-item">
<a class="nav-link px-0 py-1 text-light"
href="https://ru.hexlet.io/pages/recommended-books">
Рекомендуемые книги
</a>
</li>
</ul>
</div>
<div class="col-sm-6 col-md-3 col-lg-auto">
<p class="h5 mb-3">Другие open-source проекты</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">
Хекслет-резюме
</a>
</li>
<li class="nav-item">
<a class="nav-link px-0 py-1 text-light" href="https://github.com/Hexlet/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">
Друзья Хекслета
</a>
</li>
</ul>
</div>
<div class="col-sm-6 col-md-3 col-lg-auto">
<p class="h5 mb-3">Дополнительно</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/">
Code Basics
</a>
</li>
<li class="nav-item">
<a class="nav-link px-0 py-1 text-light" href="https://codebattle.hexlet.io/">
Кодбаттл
</a>
</li>
<li class="nav-item">
<a class="nav-link px-0 py-1 text-light" href="https://guides.hexlet.io/">
Гайды Хекслета
</a>
</li>
</ul>
</div>
</div>
</div>
</footer>
</body>
</html>
181 changes: 91 additions & 90 deletions src/main/resources/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,97 +28,98 @@ <h1 class="display-1">Hexlet Typo Reporter</h1>
</div>
</main>
</div>
<footer class="d-flex p-3 bg-dark border text-light">
<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">
О проекте
</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">
Исходный код
</a>
</li>
<li class="nav-item">
<a class="nav-link px-0 py-1 text-light" href="https://t.me/hexletcommunity/12"
target="_blank">
Telegram Hexlet канал Волонтеры
</a>
</li>
</ul>
</div>
<div class="col-sm-6 col-md-3 col-lg-auto">
<p class="h5 mb-3">Помощь</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">
Блог
</a>
</li>
<li class="nav-item">
<a class="nav-link px-0 py-1 text-light" href="https://ru.hexlet.io/knowledge">
База знаний
</a>
</li>
<li class="nav-item">
<a class="nav-link px-0 py-1 text-light"
href="https://ru.hexlet.io/pages/recommended-books">
Рекомендуемые книги
</a>
</li>
</ul>
</div>
<div class="col-sm-6 col-md-3 col-lg-auto">
<p class="h5 mb-3">Другие open-source проекты</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">
Хекслет-резюме
</a>
</li>
<li class="nav-item">
<a class="nav-link px-0 py-1 text-light" href="https://github.com/Hexlet/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">
Друзья Хекслета
</a>
</li>
</ul>
</div>
<div class="col-sm-6 col-md-3 col-lg-auto">
<p class="h5 mb-3">Дополнительно</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/">
Code Basics
</a>
</li>
<li class="nav-item">
<a class="nav-link px-0 py-1 text-light" href="https://codebattle.hexlet.io/">
Кодбаттл
</a>
</li>
<li class="nav-item">
<a class="nav-link px-0 py-1 text-light" href="https://guides.hexlet.io/">
Гайды Хекслета
</a>
</li>
</ul>
</div>
</div>
<!-- <footer th:replace="~{fragments/footer :: foot}"></footer> -->
<footer th:fragment="foot" class="d-flex p-3 bg-dark border text-light">
<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">
О проекте
</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">
Исходный код
</a>
</li>
<li class="nav-item">
<a class="nav-link px-0 py-1 text-light" href="https://t.me/hexletcommunity/12"
target="_blank">
Telegram Hexlet канал Волонтеры
</a>
</li>
</ul>
</div>
<div class="col-sm-6 col-md-3 col-lg-auto">
<p class="h5 mb-3">Помощь</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">
Блог
</a>
</li>
<li class="nav-item">
<a class="nav-link px-0 py-1 text-light" href="https://ru.hexlet.io/knowledge">
База знаний
</a>
</li>
<li class="nav-item">
<a class="nav-link px-0 py-1 text-light"
href="https://ru.hexlet.io/pages/recommended-books">
Рекомендуемые книги
</a>
</li>
</ul>
</div>
<div class="col-sm-6 col-md-3 col-lg-auto">
<p class="h5 mb-3">Другие open-source проекты</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">
Хекслет-резюме
</a>
</li>
<li class="nav-item">
<a class="nav-link px-0 py-1 text-light" href="https://github.com/Hexlet/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">
Друзья Хекслета
</a>
</li>
</ul>
</div>
<div class="col-sm-6 col-md-3 col-lg-auto">
<p class="h5 mb-3">Дополнительно</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/">
Code Basics
</a>
</li>
<li class="nav-item">
<a class="nav-link px-0 py-1 text-light" href="https://codebattle.hexlet.io/">
Кодбаттл
</a>
</li>
<li class="nav-item">
<a class="nav-link px-0 py-1 text-light" href="https://guides.hexlet.io/">
Гайды Хекслета
</a>
</li>
</ul>
</div>
</div>
</footer>
</div>
</div>
</footer>
</body>
</html>
2 changes: 1 addition & 1 deletion src/main/resources/templates/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@
</div>
</div>
</main>

<footer th:replace="~{fragments/footer :: foot}"></footer>
</body>
</html>
1 change: 1 addition & 0 deletions src/main/resources/templates/widget/report-typo-error.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
<div class="alert alert-danger">
<span>Во время отправки произошла ошибка. Попробуйте позже.</span>
</div>
<footer th:replace="~{fragments/footer :: foot}"></footer>
</body>
</html>
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
<div class="alert alert-success">
<span>Сообщение об ошибке успешно отправлено. Спасибо!</span>
</div>
<footer th:replace="~{fragments/footer :: foot}"></footer>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

В данном файле футер не нужен. Это кусочек виджета

</body>
</html>
1 change: 1 addition & 0 deletions src/main/resources/templates/widget/typo-form.html
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,6 @@
}
};
</script>
<footer th:replace="~{fragments/footer :: foot}"></footer>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

В данном файле футер не нужен. Это кусочек виджета

</body>
</html>
1 change: 1 addition & 0 deletions src/main/resources/templates/workspace/wks-info.html
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,6 @@ <h5 class="card-title" th:text="*{name}"></h5>
</div>
</div>
</main>
<footer th:replace="~{fragments/footer :: foot}"></footer>
</body>
</html>
1 change: 1 addition & 0 deletions src/main/resources/templates/workspace/wks-settings.html
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,6 @@
</div>
</div>
</main>
<footer th:replace="~{fragments/footer :: foot}"></footer>
</body>
</html>
1 change: 1 addition & 0 deletions src/main/resources/templates/workspace/wks-typos.html
Original file line number Diff line number Diff line change
Expand Up @@ -168,5 +168,6 @@
</div>
</div>
</main>
<footer th:replace="~{fragments/footer :: foot}"></footer>
</body>
</html>
1 change: 1 addition & 0 deletions src/main/resources/templates/workspace/wks-update.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,6 @@
</div>
</div>
</main>
<footer th:replace="~{fragments/footer :: foot}"></footer>
</body>
</html>
1 change: 1 addition & 0 deletions src/main/resources/templates/workspace/wks-users.html
Original file line number Diff line number Diff line change
Expand Up @@ -135,5 +135,6 @@
</div>
</div>
</main>
<footer th:replace="~{fragments/footer :: foot}"></footer>
</body>
</html>
Loading