From 0d221aedba7cbb244e8228be670a1bbc8add1da0 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 16 Jan 2020 18:08:56 +0100 Subject: [PATCH 1/2] PUNKT-63 dodane dateFrom i dateTo do endpointa /tests/solve --- .../studycaverestservice/controller/TestController.java | 3 +++ .../studycaverestservice/model/test/dto/TestOwnerDTO.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/BackEnd/src/main/java/studycave/studycaverestservice/controller/TestController.java b/BackEnd/src/main/java/studycave/studycaverestservice/controller/TestController.java index 4226a74..1eced18 100644 --- a/BackEnd/src/main/java/studycave/studycaverestservice/controller/TestController.java +++ b/BackEnd/src/main/java/studycave/studycaverestservice/controller/TestController.java @@ -157,6 +157,8 @@ public class TestController { TestOwnerDTO testDTO = modelMapper.map(test.get(), TestOwnerDTO.class); testDTO.setOwner(user.getUsername()); if (test.get().getPermission().equals("GROUP")) { + testDTO.setDateFrom(test.get().getAvailableFrom()); + testDTO.setDateTo(test.get().getAvailableTo()); List groupUsers = test.get().getGroup().getMembers(); for (StudyGroupMember studyGroupMember : groupUsers) { if (studyGroupMember.getIsGroupLeader()) { @@ -183,6 +185,7 @@ public class TestController { if (testDTO.getAttempted() == null){ testDTO.setAttempted(false); } + return testDTO; } diff --git a/BackEnd/src/main/java/studycave/studycaverestservice/model/test/dto/TestOwnerDTO.java b/BackEnd/src/main/java/studycave/studycaverestservice/model/test/dto/TestOwnerDTO.java index 9955729..2ec5b76 100644 --- a/BackEnd/src/main/java/studycave/studycaverestservice/model/test/dto/TestOwnerDTO.java +++ b/BackEnd/src/main/java/studycave/studycaverestservice/model/test/dto/TestOwnerDTO.java @@ -32,6 +32,9 @@ public class TestOwnerDTO { private String permission; private int grade; + private Long dateFrom; + private Long dateTo; + private Boolean attempted = null; @JsonProperty("body") From 9c3691e6bd0c8ea27ac558af487a1a0007494a51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Szczepa=C5=84ski?= Date: Thu, 16 Jan 2020 19:11:22 +0100 Subject: [PATCH 2/2] Responsywny header --- FrontEnd/src/app/login/login.component.ts | 5 +-- .../main-navigation.component.css | 21 ++++++++++++ .../main-navigation.component.html | 12 +++++-- .../main-navigation.component.ts | 34 ++++++++++++++++++- 4 files changed, 67 insertions(+), 5 deletions(-) diff --git a/FrontEnd/src/app/login/login.component.ts b/FrontEnd/src/app/login/login.component.ts index a13d8ee..65bbc80 100644 --- a/FrontEnd/src/app/login/login.component.ts +++ b/FrontEnd/src/app/login/login.component.ts @@ -4,6 +4,7 @@ import { AuthenticationService } from '../authentication.service'; import { HttpClientModule } from '@angular/common/http'; import { HttpModule } from '@angular/http'; import { MatSnackBar } from '@angular/material/snack-bar'; +import { environment } from '../../environments/environment'; @Component({ moduleId: module.id, templateUrl: 'login.component.html', @@ -34,7 +35,7 @@ export class LoginComponent implements OnInit { if (result === true) { // login successful this.isLogin = true; - this.router.navigate(['home']); + this.router.navigate(['/my-groups']); this.snackBar.open('Zalogowano pomyślnie.', null, { duration: 3000, verticalPosition: 'top', panelClass: ['snackbar-success'] }); } else { @@ -64,7 +65,7 @@ export class LoginComponent implements OnInit { this.outh_token_secret = this.outh_token_secret.replace('oauth_token_secret=', ''); localStorage.setItem('outh_token', array[0].replace('oauth_token=', '')); localStorage.setItem('outh_token_secret', array[1].replace('oauth_token_secret=', '')); - window.location.href = el.url; + window.location.href = environment.frontend + 'my-groups'; }); } } diff --git a/FrontEnd/src/app/main-navigation/main-navigation.component.css b/FrontEnd/src/app/main-navigation/main-navigation.component.css index 3633b7e..e30356b 100644 --- a/FrontEnd/src/app/main-navigation/main-navigation.component.css +++ b/FrontEnd/src/app/main-navigation/main-navigation.component.css @@ -77,6 +77,14 @@ a:hover{ width: 4rem; } +.mobile-logo-wrapper, .mobile-off-on-btn { + display: none; +} + +.wrapper .logo-and-name { + display: flex; +} + @media screen and (max-width: 1200px) { .study-cave{ font-size: 32px; @@ -108,6 +116,19 @@ a:hover{ { font-size: large; } + + .mobile-off-on-btn { + display: block; + } + + .mobile-logo-wrapper { + display: flex; + width: 100%; + background-color: black; + height: 55px; + padding-bottom: 5px; + justify-content: space-between; + } } diff --git a/FrontEnd/src/app/main-navigation/main-navigation.component.html b/FrontEnd/src/app/main-navigation/main-navigation.component.html index bfd5660..e5d8ccb 100644 --- a/FrontEnd/src/app/main-navigation/main-navigation.component.html +++ b/FrontEnd/src/app/main-navigation/main-navigation.component.html @@ -1,5 +1,13 @@ -