добавила дефолтный layout, применила css и бутстраповские свойства для navbar и footer, впихнула свой шрифт

2024-05-11 23:49:35 +04:00 · 2024-05-11 23:49:35 +04:00 · 8bdbd72802
commit 8bdbd72802
parent 223a89a4c0
6 changed files with 100 additions and 0 deletions
--- a/backend/src/main/resources/public/css/style.css
+++ b/backend/src/main/resources/public/css/style.css
@ -0,0 +1,31 @@
+@font-face {
+    font-family: Candara;
+    src: url("backend\src\main\resources\public\fonts\candara-light.ttf");
+}
+
+
+/* NAVBAR */
+.my-navbar {
+    font-family: Candara;
+    background-color: #3C2C72;
+    font-size: 2.5vh;
+    color: white;
+}
+
+.my-navbar .link a:hover {
+    font-family: Candara;
+    text-decoration: underline !important;
+    color: rgb(251, 158, 149);
+}
+
+.my-navbar .logo {
+    height: 30px;
+}
+
+/* FOOTER */
+.my-footer {
+    font-family: Candara;
+    background-color: #3C2C72;
+    color: white;
+    height: 32px;
+}
--- a/backend/src/main/resources/public/favicon.svg
+++ b/backend/src/main/resources/public/favicon.svg
@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-cart2" viewBox="0 0 16 16">
+  <path d="M0 2.5A.5.5 0 0 1 .5 2H2a.5.5 0 0 1 .485.379L2.89 4H14.5a.5.5 0 0 1 .485.621l-1.5 6A.5.5 0 0 1 13 11H4a.5.5 0 0 1-.485-.379L1.61 3H.5a.5.5 0 0 1-.5-.5zM3.14 5l1.25 5h8.22l1.25-5H3.14zM5 13a1 1 0 1 0 0 2 1 1 0 0 0 0-2zm-2 1a2 2 0 1 1 4 0 2 2 0 0 1-4 0zm9-1a1 1 0 1 0 0 2 1 1 0 0 0 0-2zm-2 1a2 2 0 1 1 4 0 2 2 0 0 1-4 0z"/>
+</svg>
--- a/backend/src/main/resources/public/fonts/candara-light.ttf
+++ b/backend/src/main/resources/public/fonts/candara-light.ttf
--- a/backend/src/main/resources/public/images/logo_livecinema.png
+++ b/backend/src/main/resources/public/images/logo_livecinema.png
--- a/backend/src/main/resources/templates/default.html
+++ b/backend/src/main/resources/templates/default.html
@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html lang="ru" data-bs-theme="dark" xmlns:th="http://www.thymeleaf.org"
+    xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+    xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity6">
+
+<head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title layout:title-pattern="$LAYOUT_TITLE - $CONTENT_TITLE">LiveCinema</title>
+    <script type="text/javascript" src="/webjars/bootstrap/5.3.3/dist/js/bootstrap.bundle.min.js"></script>
+    <link rel="stylesheet" href="/webjars/bootstrap/5.3.3/dist/css/bootstrap.min.css" />
+    <link rel="stylesheet" href="/webjars/bootstrap-icons/1.11.3/font/bootstrap-icons.min.css" />
+    <link rel="stylesheet" href="/css/style.css" />
+</head>
+
+<body class="h-100 d-flex flex-column">
+    <nav expand='md' data-bs-theme='dark' class='my-navbar'>>
+        <div class="container-fluid">
+            <a class="navbar-brand" href="/">
+                <!-- <i class="bi bi-cart2 d-inline-block align-top me-1 logo"></i> -->
+                <img src="backend\src\main\resources\public\images\logo_livecinema.png" alt="" className='logo' />
+                LiveCinema
+            </a>
+            <th:block sec:authorize="isAuthenticated()" th:with="userName=${#authentication.name}">
+                <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#main-navbar"
+                    aria-controls="main-navbar" aria-expanded="false" aria-label="Toggle navigation">
+                    <span class="navbar-toggler-icon"></span>
+                </button>
+                <div class="collapse navbar-collapse" id="main-navbar">
+                    <ul class="navbar-nav me-auto link" th:with="activeLink=${#objects.nullSafe(servletPath, '')}">
+                        <th:block sec:authorize="hasRole('ADMIN')">
+                            <a class="nav-link" href="/admin/movies"
+                                th:classappend="${activeLink.startsWith('/admin/movies') ? 'active' : ''}">
+                                Фильмы
+                            </a>
+                            <a class="nav-link" href="/admin/type"
+                                th:classappend="${activeLink.startsWith('/admin/type') ? 'active' : ''}">
+                                Типы заказов
+                            </a>
+                            <a class="nav-link" href="/admin/subscription"
+                                th:classappend="${activeLink.startsWith('/admin/subscription') ? 'active' : ''}">
+                                Списки рассылки
+                            </a>
+                            <a class="nav-link" href="/h2-console/" target="_blank">Консоль H2</a>
+                        </th:block>
+                    </ul>
+                    <ul class="navbar-nav" th:if="${not #strings.isEmpty(userName)}">
+                        <form th:action="@{/logout}" method="post">
+                            <button type="submit" class="navbar-brand nav-link" onclick="return confirm('Вы уверены?')">
+                                Выход ([[${userName}]])
+                            </button>
+                        </form>
+                    </ul>
+                </div>
+            </th:block>
+        </div>
+    </nav>
+    <main class="container-fluid p-2" layout:fragment="content">
+    </main>
+    <footer class="my-footer mt-auto d-flex flex-shrink-0 justify-content-center align-items-center">
+        Бакальская Е.Д. (@)LiveCinema [[${#dates.year(#dates.createNow())}]]. Все права защищены
+    </footer>
+</body>
+
+</html>
--- a/data.mv.db
+++ b/data.mv.db