diff --git a/data.mv.db b/data.mv.db index 6819e84..cc68819 100644 Binary files a/data.mv.db and b/data.mv.db differ diff --git a/src/main/java/com/example/demo/DemoApplication.java b/src/main/java/com/example/demo/DemoApplication.java index 7379d4f..8c3558e 100644 --- a/src/main/java/com/example/demo/DemoApplication.java +++ b/src/main/java/com/example/demo/DemoApplication.java @@ -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 genres1 = new ArrayList(); - // genres1.add(genre1); - // genres1.add(genre2); + final List genres1 = new ArrayList(); + genres1.add(genre1); + genres1.add(genre2); - // final List genres2 = new ArrayList(); - // genres2.add(genre2); + final List genres2 = new ArrayList(); + 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 games = new ArrayList(); - // 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 games = new ArrayList(); + games.add(game1); + games.add(game2); - // orderService.create(user1.getId(), new OrderEntity(games)); + orderService.create(user1.getId(), new OrderEntity(games)); } } diff --git a/src/main/resources/public/css/style.css b/src/main/resources/public/css/style.css index 7423490..7c99b70 100644 --- a/src/main/resources/public/css/style.css +++ b/src/main/resources/public/css/style.css @@ -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); } diff --git a/src/main/resources/templates/cart.html b/src/main/resources/templates/cart.html index c595b07..1115a5d 100644 --- a/src/main/resources/templates/cart.html +++ b/src/main/resources/templates/cart.html @@ -6,7 +6,7 @@ -
+
Корзина @@ -17,7 +17,7 @@
-
+
Название: [[${cartItem.gameName}]] @@ -50,16 +50,6 @@
-
diff --git a/src/main/resources/templates/catalog.html b/src/main/resources/templates/catalog.html new file mode 100644 index 0000000..e69de29 diff --git a/src/main/resources/templates/default.html b/src/main/resources/templates/default.html index 0e7b41c..cfab8e5 100644 --- a/src/main/resources/templates/default.html +++ b/src/main/resources/templates/default.html @@ -7,7 +7,7 @@ - My shop + Gamepad.ru @@ -18,8 +18,8 @@