From a1c2f00ccf55578419a261e52500c00c139bd8a0 Mon Sep 17 00:00:00 2001 From: Anna Samonenko Date: Sun, 17 Mar 2019 21:58:22 +0200 Subject: [PATCH] UI improvements #9 --- .../gmail/samonenko/config/PersistenceConfig.java | 1 + .../com/gmail/samonenko/config/SwaggerConfig.java | 2 +- .../controller/rest/TaskRestController.java | 2 +- .../gmail/samonenko/mail/RegistrationListener.java | 2 +- src/main/resources/static/css/index.css | 13 +++++++++---- src/main/resources/templates/index.html | 9 +++++++-- 6 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/gmail/samonenko/config/PersistenceConfig.java b/src/main/java/com/gmail/samonenko/config/PersistenceConfig.java index a14c127..c7825fd 100644 --- a/src/main/java/com/gmail/samonenko/config/PersistenceConfig.java +++ b/src/main/java/com/gmail/samonenko/config/PersistenceConfig.java @@ -12,6 +12,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean; import org.springframework.validation.Validator; + import javax.sql.DataSource; import java.util.Properties; diff --git a/src/main/java/com/gmail/samonenko/config/SwaggerConfig.java b/src/main/java/com/gmail/samonenko/config/SwaggerConfig.java index 2e12b9a..4101d76 100644 --- a/src/main/java/com/gmail/samonenko/config/SwaggerConfig.java +++ b/src/main/java/com/gmail/samonenko/config/SwaggerConfig.java @@ -13,7 +13,7 @@ public class SwaggerConfig { @Bean - public Docket api(){ + public Docket api() { return new Docket(DocumentationType.SWAGGER_2) .select() .apis(RequestHandlerSelectors.any()) diff --git a/src/main/java/com/gmail/samonenko/controller/rest/TaskRestController.java b/src/main/java/com/gmail/samonenko/controller/rest/TaskRestController.java index b85463d..cfd8003 100644 --- a/src/main/java/com/gmail/samonenko/controller/rest/TaskRestController.java +++ b/src/main/java/com/gmail/samonenko/controller/rest/TaskRestController.java @@ -43,7 +43,7 @@ ResponseEntity create(@RequestBody @Valid TaskDTO taskDTO, BindingResult binding if (taskDTO.getProjectName() == null) { // add task to default project - if(!projectService.isDefaultProjectPresent()){ + if (!projectService.isDefaultProjectPresent()) { Project project = projectService.createDefaultProject(); taskDTO.setProjectName(project.getName()); } diff --git a/src/main/java/com/gmail/samonenko/mail/RegistrationListener.java b/src/main/java/com/gmail/samonenko/mail/RegistrationListener.java index 380a7d1..6ad51f0 100644 --- a/src/main/java/com/gmail/samonenko/mail/RegistrationListener.java +++ b/src/main/java/com/gmail/samonenko/mail/RegistrationListener.java @@ -33,7 +33,7 @@ private void confirmRegistration(OnRegistrationCompleteEvent event) { String subject = "Registration Confirmation"; String confirmationUrl = event.getAppUrl() + "/api/user/registration-confirmation?token=" + token; - + SimpleMailMessage email = new SimpleMailMessage(); email.setTo(recipientAddress); email.setSubject(subject); diff --git a/src/main/resources/static/css/index.css b/src/main/resources/static/css/index.css index d990fff..20ee41a 100644 --- a/src/main/resources/static/css/index.css +++ b/src/main/resources/static/css/index.css @@ -12,13 +12,13 @@ body { } .content { - height: 90%; + height: 78%; margin-top: 20px; } #projects { - height: 100%; + height: 80%; float: left; width: 20%; background-color: #FFFFFF; @@ -26,7 +26,7 @@ body { #tasks { margin-right: 30px; - height: 100%; + height: 80%; float: right; width: 75%; background-color: #FFFFFF; @@ -46,7 +46,7 @@ nav { } img.design_guru { - height: 35%; + height: 250%; position: absolute; right: 0px; bottom: 0px; @@ -56,4 +56,9 @@ img.design_guru { font-style: italic; font-size: small; color: darkgrey; +} + +footer { + position: relative; + background: #FFE4C4; } \ No newline at end of file diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 3200a68..6b1cf46 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -46,8 +46,13 @@ - - + + \ No newline at end of file