From e60943d591604852c97faa0702dcede298bf34b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D0=BA=D1=81=D0=B8=D0=BC=20=D0=AF=D0=BA=D0=BE?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=B2?= Date: Mon, 13 May 2024 15:27:47 +0400 Subject: [PATCH] =?UTF-8?q?=D1=87=D1=83=D1=82=D1=8C=20=D0=B2=D0=B8=D0=B7?= =?UTF-8?q?=D1=83=D0=B0=D0=BB=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data.mv.db | Bin 49152 -> 45056 bytes .../com/example/demo/DemoApplication.java | 46 +++++++++--------- src/main/resources/public/css/style.css | 5 +- src/main/resources/templates/cart.html | 14 +----- src/main/resources/templates/catalog.html | 0 src/main/resources/templates/default.html | 6 +-- src/main/resources/templates/game-edit.html | 2 +- src/main/resources/templates/game.html | 4 +- src/main/resources/templates/genre-edit.html | 2 +- src/main/resources/templates/genre.html | 4 +- src/main/resources/templates/login.html | 2 +- src/main/resources/templates/orders.html | 2 +- src/main/resources/templates/profile.html | 3 +- src/main/resources/templates/signup.html | 2 +- src/main/resources/templates/type-edit.html | 2 +- src/main/resources/templates/type.html | 4 +- src/main/resources/templates/user-edit.html | 2 +- src/main/resources/templates/user.html | 4 +- 18 files changed, 48 insertions(+), 56 deletions(-) create mode 100644 src/main/resources/templates/catalog.html diff --git a/data.mv.db b/data.mv.db index 6819e849f31056a0d65973c86ad7564def917182..cc68819da7b03b19c4df66876f96310491aee31b 100644 GIT binary patch literal 45056 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 Uzl&n@SpIM68pr@1iv0io0V>;eM*si- 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 @@