Skip to content

Commit

Permalink
UI improvements #9
Browse files Browse the repository at this point in the history
  • Loading branch information
AnnaSamonenko committed Mar 17, 2019
1 parent f167531 commit a1c2f00
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
public class SwaggerConfig {

@Bean
public Docket api(){
public Docket api() {
return new Docket(DocumentationType.SWAGGER_2)
.select()
.apis(RequestHandlerSelectors.any())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
13 changes: 9 additions & 4 deletions src/main/resources/static/css/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@ body {
}

.content {
height: 90%;
height: 78%;
margin-top: 20px;

}

#projects {
height: 100%;
height: 80%;
float: left;
width: 20%;
background-color: #FFFFFF;
}

#tasks {
margin-right: 30px;
height: 100%;
height: 80%;
float: right;
width: 75%;
background-color: #FFFFFF;
Expand All @@ -46,7 +46,7 @@ nav {
}

img.design_guru {
height: 35%;
height: 250%;
position: absolute;
right: 0px;
bottom: 0px;
Expand All @@ -56,4 +56,9 @@ img.design_guru {
font-style: italic;
font-size: small;
color: darkgrey;
}

footer {
position: relative;
background: #FFE4C4;
}
9 changes: 7 additions & 2 deletions src/main/resources/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,13 @@
</tr>
</table>
</div>

<img src="img/unicorn1.png" class = "design_guru">
</div>

<footer class="page-footer font-small blue">
<div class="footer-copyright text-center py-3">
@asamonenko
</div>
<img src="img/unicorn1.png" class="design_guru">
</footer>
</body>
</html>

0 comments on commit a1c2f00

Please sign in to comment.