diff --git a/src/frontend/app/app.component.ts b/src/frontend/app/app.component.ts
index a0fd2eee4cdd66f0ee15d0970d183f8686c4800f..e73025714244b6d98c188c85be78220ae6ba73a9 100755
--- a/src/frontend/app/app.component.ts
+++ b/src/frontend/app/app.component.ts
@@ -57,6 +57,8 @@ export class AppComponent {
}
allowedRoute() {
- return ['/', '/login', '/forgot-password', '/update-password', '/password-modification'].indexOf(this.router.url) === -1;
+ const route = this.router.url.split('?')[0];
+
+ return ['/', '/login', '/forgot-password', '/update-password', '/password-modification'].indexOf(route) === -1;
}
}
diff --git a/src/frontend/app/login/login.component.html b/src/frontend/app/login/login.component.html
index 92b20cd974933c099474479a2d2cc8a4ac259d3a..8bc0bb46376367781936d0ffc080e37ff6990c1f 100644
--- a/src/frontend/app/login/login.component.html
+++ b/src/frontend/app/login/login.component.html
@@ -9,17 +9,21 @@
</ion-item>
<ion-item>
<ion-label position="floating">{{'lang.password' | translate}}</ion-label>
- <ion-input name="password" matInput type="password" formControlName="password" (keyup.enter)="onSubmit()"></ion-input>
+ <ion-input name="password" matInput type="password" formControlName="password"
+ (keyup.enter)="onSubmit()"></ion-input>
</ion-item>
- <a routerLink="/forgot-password" *ngIf="authService.authMode === 'default'"
- class="forgot-password">{{'lang.forgotPassword' | translate}}</a>
- <a href="" *ngIf="authService.authMode === 'ldap'"
- class="forgot-password">{{'lang.ldapEnabled' | translate}}</a>
- <a href="" *ngIf="authService.authMode === 'kerberos'"
- class="forgot-password">{{'lang.kerberosEnabled' | translate}}</a>
- <a href="" *ngIf="authService.authMode === 'x509'"
- class="forgot-password">{{'lang.x509Enabled' | translate}}</a>
- <ion-button type="submit" expand="block" [disabled]="loginForm.invalid || loading">{{'lang.connect' | translate}}
+ <div class="connection-type">
+ <a routerLink="/forgot-password" *ngIf="authService.authMode === 'default'"
+ class="forgot-password">{{'lang.forgotPassword' | translate}}</a>
+ <a href="" *ngIf="authService.authMode === 'ldap'"
+ class="forgot-password">{{'lang.ldapEnabled' | translate}}</a>
+ <a href="" *ngIf="authService.authMode === 'kerberos'"
+ class="forgot-password">{{'lang.kerberosEnabled' | translate}}</a>
+ <a href="" *ngIf="authService.authMode === 'x509'"
+ class="forgot-password">{{'lang.x509Enabled' | translate}}</a>
+ </div>
+ <ion-button type="submit" expand="block" [disabled]="loginForm.invalid || loading">
+ {{'lang.connect' | translate}}
</ion-button>
</form>
</ion-card-content>
diff --git a/src/frontend/app/login/login.component.scss b/src/frontend/app/login/login.component.scss
index 4c4f13bb916468ca5884ec0b31fd1f7c48db02c1..b4300bbb601c262d9d0b2666f67949e2bee782a5 100644
--- a/src/frontend/app/login/login.component.scss
+++ b/src/frontend/app/login/login.component.scss
@@ -21,4 +21,9 @@
.forgot-password {
display: block;
text-align: right;
+}
+
+.connection-type {
+ display: flex;
+ justify-content: end;
}
\ No newline at end of file
diff --git a/src/frontend/app/login/updatePassword/updatePassword.component.html b/src/frontend/app/login/updatePassword/updatePassword.component.html
index b30885a99bd2b9ca4c2135babc5dd63aafe2a1cb..3ee28be3f5eb511930c007b9654ea8040bb600a7 100644
--- a/src/frontend/app/login/updatePassword/updatePassword.component.html
+++ b/src/frontend/app/login/updatePassword/updatePassword.component.html
@@ -56,7 +56,7 @@
<ion-label style="font-size: 13px;">{{labelButton | translate}}</ion-label>
</ion-button>
<ion-button type="button" shape="round" size="large" fill="outline" color="medium"
- [disabled]="allowValidate() || loading" routerLink="/login">
+ routerLink="/login">
<ion-label style="font-size: 13px;">{{'lang.cancel' | translate}}</ion-label>
</ion-button>
</div>
diff --git a/src/frontend/app/login/updatePassword/updatePassword.component.scss b/src/frontend/app/login/updatePassword/updatePassword.component.scss
index b5c32e1ad9fca5ec63cdcd3a50559137d7f7d645..7f981cd7bb926e6233650972d4e21c1a67c44eae 100644
--- a/src/frontend/app/login/updatePassword/updatePassword.component.scss
+++ b/src/frontend/app/login/updatePassword/updatePassword.component.scss
@@ -1,15 +1,3 @@
-@import '../../../css/vars.scss';
-
-.login-content {
- background-color: $primary;
- height: 100vh;
- width: 100vw;
- display: flex;
- flex-direction: column;
- justify-content: center;
- align-items: center;
-}
-
.login-form {
max-width: 600px;
text-align: center;
@@ -37,3 +25,8 @@ footer {
font-size: 10px;
opacity: 0.5;
}
+
+.showpassButton {
+ --background: none;
+ --box-shadow: none;
+}
\ No newline at end of file
diff --git a/src/frontend/app/login/updatePassword/updatePassword.component.ts b/src/frontend/app/login/updatePassword/updatePassword.component.ts
index 51bcf37384baecd5fe118f937309fd53cc29d1bc..5ab5a664edcc59937fbcefa9e3a3afd0eb29519a 100644
--- a/src/frontend/app/login/updatePassword/updatePassword.component.ts
+++ b/src/frontend/app/login/updatePassword/updatePassword.component.ts
@@ -6,6 +6,7 @@ import { Router, ActivatedRoute } from '@angular/router';
import { NotificationService } from '../../service/notification.service';
import { TranslateService } from '@ngx-translate/core';
import { finalize } from 'rxjs/operators';
+import { MenuController } from '@ionic/angular';
@Component({
templateUrl: 'updatePassword.component.html',
@@ -46,7 +47,16 @@ export class UpdatePasswordComponent implements OnInit {
otherRuleText = '';
- constructor(private translate: TranslateService, private router: Router, private route: ActivatedRoute, public http: HttpClient, iconReg: MatIconRegistry, sanitizer: DomSanitizer, public notificationService: NotificationService) {
+ constructor(
+ private translate: TranslateService,
+ private router: Router,
+ private route: ActivatedRoute,
+ public http: HttpClient,
+ iconReg: MatIconRegistry,
+ sanitizer: DomSanitizer,
+ public notificationService: NotificationService,
+ private menu: MenuController,
+ ) {
iconReg.addSvgIcon('maarchLogo', sanitizer.bypassSecurityTrustResourceUrl('../src/frontend/assets/logo_white.svg'));
this.route.queryParams
.subscribe(params => {
@@ -56,6 +66,11 @@ export class UpdatePasswordComponent implements OnInit {
ngOnInit(): void { }
+ ionViewWillEnter() {
+ this.menu.enable(false, 'left-menu');
+ this.menu.enable(false, 'right-menu');
+ }
+
updatePassword() {
this.labelButton = 'lang.sending';
this.loading = true;