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 @@ -