From 98b8a69a413e39ac567cfc625a230bb5652ac866 Mon Sep 17 00:00:00 2001 From: MrHakimov Date: Sun, 29 Mar 2020 03:02:23 +0300 Subject: [PATCH] Added copy to clipboard feature, dockerized backend and cleaned the code --- .gitignore | 2 - Dockerfile | 7 + frontend/public/css/mainPage.css | 13 +- frontend/src/App.vue | 5 + frontend/src/components/Header.vue | 12 +- frontend/src/components/middle/Index.vue | 17 +- frontend/src/jquery-3.4.1.min.js | 2 + frontend/src/main.js | 6 + frontend/src/notify.js | 625 + launch-backend.sh | 3 + pom.xml | 3 + .../java/hakimov/easify/WpApplication.java | 2 +- .../easify/controller/JwtController.java | 4 +- .../easify/controller/PostController.java | 24 + .../easify/controller/TextController.java | 8 +- .../easify/controller/UserController.java | 6 +- .../RestControllerExceptionHandler.java | 2 +- src/main/java/hakimov/easify/domain/Post.java | 76 + src/main/java/hakimov/easify/domain/User.java | 28 + .../hakimov/easify/exception/wiki-100k.txt | 99928 ++++++++++++++++ .../UserCredentialsEnterValidator.java | 2 +- .../UserCredentialsRegisterValidator.java | 2 +- .../easify/interceptor/JwtInterceptor.java | 2 +- .../easify/repository/EasifyRepository.java | 3 +- .../easify/repository/PostRepository.java | 10 + .../hakimov/easify/service/EasifyService.java | 3 +- .../hakimov/easify/service/PostService.java | 20 + .../hakimov/easify/service/UserService.java | 2 +- src/main/java/ru/itmo/wp/WpApplication.java | 28 + .../ru/itmo/wp/controller/ApiController.java | 13 + .../ru/itmo/wp/controller/JwtController.java | 38 + .../ru/itmo/wp/controller/PostController.java | 24 + .../ru/itmo/wp/controller/TextController.java | 133 + .../ru/itmo/wp/controller/UserController.java | 51 + .../RestControllerExceptionHandler.java | 30 + src/main/java/ru/itmo/wp/domain/Post.java | 76 + src/main/java/ru/itmo/wp/domain/Text.java | 51 + src/main/java/ru/itmo/wp/domain/User.java | 95 + .../wp/exception/NoSuchResourceException.java | 18 + .../wp/exception/ValidationException.java | 7 + .../java/ru/itmo/wp/exception/wiki-100k.txt | 99928 ++++++++++++++++ .../itmo/wp/form/RegisterUserCredentials.java | 48 + .../java/ru/itmo/wp/form/UserCredentials.java | 35 + .../UserCredentialsEnterValidator.java | 29 + .../UserCredentialsRegisterValidator.java | 30 + .../itmo/wp/interceptor/JwtInterceptor.java | 42 + .../itmo/wp/repository/EasifyRepository.java | 7 + .../ru/itmo/wp/repository/PostRepository.java | 10 + .../ru/itmo/wp/repository/UserRepository.java | 20 + .../ru/itmo/wp/service/EasifyService.java | 16 + .../java/ru/itmo/wp/service/JwtService.java | 49 + .../java/ru/itmo/wp/service/PostService.java | 20 + .../java/ru/itmo/wp/service/UserService.java | 37 + .../ru/itmo/wp/util/BindingResultUtils.java | 21 + 54 files changed, 201639 insertions(+), 34 deletions(-) create mode 100644 Dockerfile create mode 100644 frontend/src/jquery-3.4.1.min.js create mode 100644 frontend/src/notify.js create mode 100644 launch-backend.sh create mode 100644 src/main/java/hakimov/easify/controller/PostController.java create mode 100644 src/main/java/hakimov/easify/domain/Post.java create mode 100644 src/main/java/hakimov/easify/exception/wiki-100k.txt create mode 100644 src/main/java/hakimov/easify/repository/PostRepository.java create mode 100644 src/main/java/hakimov/easify/service/PostService.java create mode 100644 src/main/java/ru/itmo/wp/WpApplication.java create mode 100644 src/main/java/ru/itmo/wp/controller/ApiController.java create mode 100644 src/main/java/ru/itmo/wp/controller/JwtController.java create mode 100644 src/main/java/ru/itmo/wp/controller/PostController.java create mode 100644 src/main/java/ru/itmo/wp/controller/TextController.java create mode 100644 src/main/java/ru/itmo/wp/controller/UserController.java create mode 100644 src/main/java/ru/itmo/wp/controller/handler/RestControllerExceptionHandler.java create mode 100644 src/main/java/ru/itmo/wp/domain/Post.java create mode 100644 src/main/java/ru/itmo/wp/domain/Text.java create mode 100644 src/main/java/ru/itmo/wp/domain/User.java create mode 100644 src/main/java/ru/itmo/wp/exception/NoSuchResourceException.java create mode 100644 src/main/java/ru/itmo/wp/exception/ValidationException.java create mode 100644 src/main/java/ru/itmo/wp/exception/wiki-100k.txt create mode 100644 src/main/java/ru/itmo/wp/form/RegisterUserCredentials.java create mode 100644 src/main/java/ru/itmo/wp/form/UserCredentials.java create mode 100644 src/main/java/ru/itmo/wp/form/validator/UserCredentialsEnterValidator.java create mode 100644 src/main/java/ru/itmo/wp/form/validator/UserCredentialsRegisterValidator.java create mode 100644 src/main/java/ru/itmo/wp/interceptor/JwtInterceptor.java create mode 100644 src/main/java/ru/itmo/wp/repository/EasifyRepository.java create mode 100644 src/main/java/ru/itmo/wp/repository/PostRepository.java create mode 100644 src/main/java/ru/itmo/wp/repository/UserRepository.java create mode 100644 src/main/java/ru/itmo/wp/service/EasifyService.java create mode 100644 src/main/java/ru/itmo/wp/service/JwtService.java create mode 100644 src/main/java/ru/itmo/wp/service/PostService.java create mode 100644 src/main/java/ru/itmo/wp/service/UserService.java create mode 100644 src/main/java/ru/itmo/wp/util/BindingResultUtils.java diff --git a/.gitignore b/.gitignore index f91a8581..a8fc792f 100644 --- a/.gitignore +++ b/.gitignore @@ -32,7 +32,5 @@ build/ ### Secrets ### src/main/resources -src/main/java/ru frontend/node_modules TODO.md - diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..3dbb806a --- /dev/null +++ b/Dockerfile @@ -0,0 +1,7 @@ +FROM openjdk:11.0.4 + +ADD target/easify-backend.jar easify-backend.jar + +EXPOSE 8090 + +ENTRYPOINT ["java", "-jar", "easify-backend.jar"] diff --git a/frontend/public/css/mainPage.css b/frontend/public/css/mainPage.css index f2f84040..0b34979a 100644 --- a/frontend/public/css/mainPage.css +++ b/frontend/public/css/mainPage.css @@ -26,7 +26,7 @@ main { main textarea { padding: 5px; width: 38.3rem; - height: 26rem; + height: 25rem; border-radius: 5px; } @@ -42,3 +42,14 @@ main .request textarea { main .response textarea { } + +.copyButton { + padding: 2px; + border: 2px solid #e7e7e7e; + background-color: white; + transition-duration: 0.4s; +} + +.copyButton:hover { + background-color: #e7e7e7; +} diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 7f3a43e3..2fa314b4 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -1,3 +1,8 @@ + + + + +