YakovlevMaxim/PIbd-21_Yakovlev_M.G_IP_SPRING
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

чуть визуала

Browse Source
This commit is contained in:
Максим Яковлев 2024-05-13 15:27:47 +04:00
parent 17214648a2
commit e60943d591
18 changed files with 48 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data.mv.db
View File

Binary file not shown.

46
src/main/java/com/example/demo/DemoApplication.java
View File

@ -50,34 +50,34 @@ public class DemoApplication implements CommandLineRunner {
public void run(String... args) throws Exception {
log.info("start");
// log.info("Create default user values");
// final var admin = new UserEntity("admin", "admin@mail.com", "admin");
// admin.setRole(UserRole.ADMIN);
// userService.create(admin);
// final var user1 = userService.create(new UserEntity("user", "user@gmail.com",
// Constants.DEFAULT_PASSWORD));
log.info("Create default user values");
final var admin = new UserEntity("admin", "admin@mail.com", "admin");
admin.setRole(UserRole.ADMIN);
userService.create(admin);
final var user1 = userService.create(new UserEntity("user", "user@gmail.com",
Constants.DEFAULT_PASSWORD));
// final var type1 = typeService.create(new TypeEntity("ААА"));
// final var type2 = typeService.create(new TypeEntity("АА"));
final var type1 = typeService.create(new TypeEntity("ААА"));
final var type2 = typeService.create(new TypeEntity("АА"));
// final var genre1 = genreService.create(new GenreEntity("Приключения"));
// final var genre2 = genreService.create(new GenreEntity("Симулятор"));
final var genre1 = genreService.create(new GenreEntity("Приключения"));
final var genre2 = genreService.create(new GenreEntity("Симулятор"));
// final List<GenreEntity> genres1 = new ArrayList<GenreEntity>();
// genres1.add(genre1);
// genres1.add(genre2);
final List<GenreEntity> genres1 = new ArrayList<GenreEntity>();
genres1.add(genre1);
genres1.add(genre2);
// final List<GenreEntity> genres2 = new ArrayList<GenreEntity>();
// genres2.add(genre2);
final List<GenreEntity> genres2 = new ArrayList<GenreEntity>();
genres2.add(genre2);
// final var game1 = gameService.create(new GameEntity(type1, "Game1", 2100.0,
// "good game", genres1));
// final var game2 = gameService.create(new GameEntity(type2, "Game2", 1200.0,
// "bad game", genres2));
// final List<GameEntity> games = new ArrayList<GameEntity>();
// games.add(game1);
// games.add(game2);
final var game1 = gameService.create(new GameEntity(type1, "Game1", 2100.0,
"good game", genres1));
final var game2 = gameService.create(new GameEntity(type2, "Game2", 1200.0,
"bad game", genres2));
final List<GameEntity> games = new ArrayList<GameEntity>();
games.add(game1);
games.add(game2);
// orderService.create(user1.getId(), new OrderEntity(games));
orderService.create(user1.getId(), new OrderEntity(games));
}
}

5
src/main/resources/public/css/style.css
View File

@ -1,6 +1,7 @@
html,
body {
height: 100%;
background-color: #252A34;
}
h1 {
@ -38,7 +39,7 @@ td form {
}
.my-navbar {
background-color: #3c3c3c !important;
background-color: #08D9D6 !important;
}
.my-navbar .link a:hover {
@ -51,7 +52,7 @@ td form {
}
.my-footer {
background-color: #2c2c2c;
background-color: #FF2E63;
height: 32px;
color: rgba(255, 255, 255, 0.5);
}

14
src/main/resources/templates/cart.html
View File

@ -6,7 +6,7 @@
</head>
<body>
<main layout:fragment="content">
<main layout:fragment="content" class="w-50 mx-auto">
<div class="d-flex flex-column align-items-center">
<div class="mb-2 col-12 col-md-8 col-lg-6 d-flex align-items-center">
<strong class="flex-fill">Корзина</strong>
@ -17,7 +17,7 @@
</button>
</form>
</div>
<div class="card col-12 col-md-8 col-lg-6 w-25 align-items-center" th:each="cartItem : ${cart}">
<div class="card col-12 col-md-8 col-lg-6 w-75 align-items-center" th:each="cartItem : ${cart}">
<div class="card-body col-12 p-2 d-flex flex-row align-items-center justify-content-center">
<div class="col-5">
Название: [[${cartItem.gameName}]]
@ -50,16 +50,6 @@
</select>
<div th:if="${#fields.hasErrors('game')}" th:errors="*{game}" class="invalid-feedback"></div>
</div>
<!-- <div class="mb-2">
<label for="price" class="form-label">Цена</label>
<input type="number" th:field="*{price}" id="price" class="form-control" step="0.50">
<div th:if="${#fields.hasErrors('price')}" th:errors="*{price}" class="invalid-feedback"></div>
</div>
<div class="mb-2">
<label for="count" class="form-label">Количество</label>
<input type="number" th:field="*{count}" id="count" class="form-control" value="0" step="1">
<div th:if="${#fields.hasErrors('count')}" th:errors="*{count}" class="invalid-feedback"></div>
</div> -->
<button type="submit" class="btn btn-primary">Добавить в корзину</button>
</form>
</div>

0
src/main/resources/templates/catalog.html Normal file
View File

6
src/main/resources/templates/default.html
View File

@ -7,7 +7,7 @@
<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">My shop</title>
<title layout:title-pattern="$LAYOUT_TITLE - $CONTENT_TITLE">Gamepad.ru</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" />
@ -18,8 +18,8 @@
<nav class="navbar navbar-expand-md my-navbar" data-bs-theme="dark">
<div class="container-fluid">
<a class="navbar-brand" href="/">
<i class="bi bi-cart2 d-inline-block align-top me-1 logo"></i>
MyShop
<i class="bi-controller d-inline-block align-top me-1 logo"></i>
Gamepad.ru
</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"

2
src/main/resources/templates/game-edit.html
View File

@ -6,7 +6,7 @@
</head>
<body>
<main layout:fragment="content">
<main layout:fragment="content" class="w-50 mx-auto">
<form action="#" th:action="@{/admin/game/edit/{id}(id=${game.id})}" th:object="${game}" method="post">
<div class="mb-3">
<label for="id" class="form-label">ID</label>

4
src/main/resources/templates/game.html
View File

@ -6,11 +6,11 @@
</head>
<body>
<main layout:fragment="content">
<main layout:fragment="content" class="w-50 mx-auto">
<th:block th:switch="${items.size()}">
<h2 th:case="0">Данные отсутствуют</h2>
<th:block th:case="*">
<h2>Игры</h2>
<h2 class="text-center">Игры</h2>
<div>
<a href="/admin/game/edit/" class="btn btn-primary">Добавить игру</a>
</div>

2
src/main/resources/templates/genre-edit.html
View File

@ -6,7 +6,7 @@
</head>
<body>
<main layout:fragment="content">
<main layout:fragment="content" class="w-50 mx-auto">
<form action="#" th:action="@{/admin/genre/edit/{id}(id=${genre.id})}" th:object="${genre}" method="post">
<div class="mb-3">
<label for="id" class="form-label">ID</label>

4
src/main/resources/templates/genre.html
View File

@ -6,11 +6,11 @@
</head>
<body>
<main layout:fragment="content">
<main layout:fragment="content" class="w-50 mx-auto">
<th:block th:switch="${items.size()}">
<h2 th:case="0">Данные отсутствуют</h2>
<th:block th:case="*">
<h2>Жанры игр</h2>
<h2 class="text-center">Жанры игр</h2>
<div>
<a href="/admin/genre/edit/" class="btn btn-primary">Добавить жанр игры</a>
</div>

2
src/main/resources/templates/login.html
View File

@ -7,7 +7,7 @@
<body>
<main layout:fragment="content">
<form action="#" th:action="@{/login}" method="post">
<form action="#" th:action="@{/login}" method="post" class="w-25 mx-auto">
<div th:if="${param.error}" class="alert alert-danger">
Неверный логин или пароль
</div>

2
src/main/resources/templates/orders.html
View File

@ -5,7 +5,7 @@
<th:block th:fragment="orders (items, totalPages, currentPage, games)">
<th:block th:switch="${items.size()}">
<h2 th:case="0">Данные отсутствуют</h2>
<th:block th:case="*">
<th:block th:case="*" class="w-50 mx-auto">
<table class="table mt-2">
<caption></caption>

3
src/main/resources/templates/profile.html
View File

@ -6,7 +6,7 @@
</head>
<body>
<main layout:fragment="content">
<main layout:fragment="content" class="w-50 mx-auto">
<!-- <ul class="nav nav-pills justify-content-center" role="tablist">
<li class="nav-item">
<a class="nav-link active" data-bs-toggle="pill" href="#orders">Заказы</a>
@ -14,6 +14,7 @@
</ul> -->
<div class="tab-content mt-2">
<h2 class="text-center">Заказы</h2>
<div class="tab-pane container active" id="orders">
<th:block
th:replace="~{ orders :: orders (items=${items}, totalPages=${totalPages}, currentPage=${currentPage}, games=${games})}" />

2
src/main/resources/templates/signup.html
View File

@ -6,7 +6,7 @@
</head>
<body>
<main layout:fragment="content">
<main layout:fragment="content" class="w-25 mx-auto">
<form action="#" th:action="@{/signup}" th:object="${user}" method="post">
<div class="mb-3">
<label for="login" class="form-label">Имя пользователя</label>

2
src/main/resources/templates/type-edit.html
View File

@ -6,7 +6,7 @@
</head>
<body>
<main layout:fragment="content">
<main layout:fragment="content" class="w-50 mx-auto">
<form action="#" th:action="@{/admin/type/edit/{id}(id=${type.id})}" th:object="${type}" method="post">
<div class="mb-3">
<label for="id" class="form-label">ID</label>

4
src/main/resources/templates/type.html
View File

@ -6,11 +6,11 @@
</head>
<body>
<main layout:fragment="content">
<main layout:fragment="content" class="w-50 mx-auto">
<th:block th:switch="${items.size()}">
<h2 th:case="0">Данные отсутствуют</h2>
<th:block th:case="*">
<h2>Типы игр</h2>
<h2 class="text-center">Типы игр</h2>
<div>
<a href="/admin/type/edit/" class="btn btn-primary">Добавить тип игры</a>
</div>

2
src/main/resources/templates/user-edit.html
View File

@ -6,7 +6,7 @@
</head>
<body>
<main layout:fragment="content">
<main layout:fragment="content" class="w-50 mx-auto">
<form action="#" th:action="@{/admin/user/edit/{id}(id=${user.id},page=${page})}" th:object="${user}"
method="post">
<div class="mb-3">

4
src/main/resources/templates/user.html
View File

@ -6,11 +6,11 @@
</head>
<body>
<main layout:fragment="content">
<main layout:fragment="content" class="w-50 mx-auto">
<th:block th:switch="${items.size()}">
<h2 th:case="0">Данные отсутствуют</h2>
<th:block th:case="*">
<h2>Пользователи</h2>
<h2 class=" text-center">Пользователи</h2>
<div>
<a th:href="@{/admin/user/edit/(page=${page})}" class="btn btn-primary">Добавить пользователя</a>
</div>