From 1186635546f0c1f96410ab7964c2050d8f493342 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B0=D1=88=D0=B8=D0=BD=20=D0=9C=D0=B0=D0=BA=D1=81?= =?UTF-8?q?=D0=B8=D0=BC?= Date: Mon, 15 May 2023 15:37:31 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9B=D1=8E=D0=B1=D0=BE=D0=B2=D1=8C,=20=D0=BD?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=D0=B2=D0=B8=D1=81=D1=82=D1=8C,=20=D0=B1?= =?UTF-8?q?=D0=BE=D0=BB=D1=8C,=20=D0=BD=D0=B0=D1=81=D0=BB=D0=B0=D0=B6?= =?UTF-8?q?=D0=B4=D0=B5=D0=BD=D0=B8=D0=B5,=20=D0=B6=D0=B8=D0=B7=D0=BD?= =?UTF-8?q?=D1=8C,=20=D1=81=D0=BC=D0=B5=D1=80=D1=82=D1=8C.=20=D0=97=D0=B4?= =?UTF-8?q?=D0=B5=D1=81=D1=8C=20=D0=B5=D1=81=D1=82=D1=8C=20=D0=B2=D1=81?= =?UTF-8?q?=D1=91...=20=D0=92=D0=BE=D1=82=20=D1=87=D1=82=D0=BE=20=D0=B7?= =?UTF-8?q?=D0=BD=D0=B0=D1=87=D0=B8=D1=82=20=E2=80=94=20=D0=B1=D1=8B=D1=82?= =?UTF-8?q?=D1=8C=20=D1=87=D0=B5=D0=BB=D0=BE=D0=B2=D0=B5=D0=BA=D0=BE=D0=BC?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data.mv.db | Bin 57344 -> 53248 bytes frontend/src/App.jsx | 6 +++--- frontend/src/components/common/Modal.jsx | 6 +++--- frontend/src/components/common/Toolbar.jsx | 5 +++++ .../maxim/Configuration/WebConfiguration.java | 6 +----- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/data.mv.db b/data.mv.db index ea7bddfaa6dd3bcd7cfee71aa23a67eb17bb37a3..14bcf96f138c8f80ff0b764624bd1e34879dc9b6 100644 GIT binary patch literal 53248 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 Ps*Y`Q|F+S*q{06K7TLZb literal 57344 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 diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx index 3041ea8..93e435d 100644 --- a/frontend/src/App.jsx +++ b/frontend/src/App.jsx @@ -41,13 +41,13 @@ export default function App() {
}> - } path="catalogs/store"/> - } path="catalogs/buyer"/> - } path="catalogs/car"/> } path="catalogs/find"/> }> } path="catalog/users"/> + } path="catalogs/store"/> + } path="catalogs/buyer"/> + } path="catalogs/car"/> } path="/login"/> } path="catalog/signup"/> diff --git a/frontend/src/components/common/Modal.jsx b/frontend/src/components/common/Modal.jsx index 898ab44..125532c 100644 --- a/frontend/src/components/common/Modal.jsx +++ b/frontend/src/components/common/Modal.jsx @@ -34,12 +34,12 @@ export default function Modal(props) {
- - {localStorage.getItem("role") == "ADMIN" && ( + + - )} +
diff --git a/frontend/src/components/common/Toolbar.jsx b/frontend/src/components/common/Toolbar.jsx index 238e3b4..495a657 100644 --- a/frontend/src/components/common/Toolbar.jsx +++ b/frontend/src/components/common/Toolbar.jsx @@ -16,6 +16,11 @@ export default function Toolbar(props) { return (
{localStorage.getItem("role") == "ADMIN" && ( + + Добавить + + )} + {( Добавить diff --git a/src/main/java/com/example/maxim/Configuration/WebConfiguration.java b/src/main/java/com/example/maxim/Configuration/WebConfiguration.java index 97df4e0..d5e1d4f 100644 --- a/src/main/java/com/example/maxim/Configuration/WebConfiguration.java +++ b/src/main/java/com/example/maxim/Configuration/WebConfiguration.java @@ -24,11 +24,7 @@ public class WebConfiguration implements WebMvcConfigurer { registration.setViewName("forward:/index.html"); registration.setStatusCode(HttpStatus.OK); } -//@Override -//public void addViewControllers(ViewControllerRegistry registry) { -// WebMvcConfigurer.super.addViewControllers(registry); -// registry.addViewController("rest-test"); -//} + @Bean public WebServerFactoryCustomizer containerCustomizer() { return container -> {