Remote login/logout old components
This commit is contained in:
parent
be592a22f5
commit
d239d37e66
|
@ -1,14 +1,13 @@
|
||||||
import {NgModule} from '@angular/core'
|
import {NgModule} from '@angular/core'
|
||||||
import {RouterModule, Routes} from '@angular/router'
|
import {RouterModule, Routes} from '@angular/router'
|
||||||
import {LogoutComponent} from './pages/logout/logout.component'
|
import {Login, Logout} from './accounts'
|
||||||
import {Login} from './accounts'
|
|
||||||
|
|
||||||
const routes: Routes = [{
|
const routes: Routes = [{
|
||||||
path: 'login',
|
path: 'login',
|
||||||
component: Login
|
component: Login
|
||||||
}, {
|
}, {
|
||||||
path: 'logout',
|
path: 'logout',
|
||||||
component: LogoutComponent
|
component: Logout
|
||||||
}, {
|
}, {
|
||||||
path: '',
|
path: '',
|
||||||
redirectTo: 'login'
|
redirectTo: 'login'
|
||||||
|
|
|
@ -1,19 +1,16 @@
|
||||||
import {NgModule} from '@angular/core'
|
import {NgModule} from '@angular/core'
|
||||||
|
|
||||||
import {AccountsRoutingModule} from './accounts-routing.module'
|
import {AccountsRoutingModule} from './accounts-routing.module'
|
||||||
import {LoginComponent} from './pages/login/login.component'
|
|
||||||
import {SharedModule} from '../shared/shared.module'
|
import {SharedModule} from '../shared/shared.module'
|
||||||
import {LogoutComponent} from './pages/logout/logout.component'
|
import {Login, Logout} from './accounts'
|
||||||
import {Login} from './accounts'
|
|
||||||
import {CreInputsModule} from '../shared/components/inputs/inputs.module'
|
import {CreInputsModule} from '../shared/components/inputs/inputs.module'
|
||||||
import {CreButtonsModule} from '../shared/components/buttons/buttons.module'
|
import {CreButtonsModule} from '../shared/components/buttons/buttons.module'
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
declarations: [
|
declarations: [
|
||||||
LoginComponent,
|
Login,
|
||||||
LogoutComponent,
|
Logout
|
||||||
Login
|
|
||||||
],
|
],
|
||||||
imports: [
|
imports: [
|
||||||
SharedModule,
|
SharedModule,
|
||||||
|
|
|
@ -1,12 +1,11 @@
|
||||||
import {Component, HostListener, ViewChild} from '@angular/core'
|
import {Component, HostListener, ViewChild} from '@angular/core'
|
||||||
import {FormControl, Validators} from '@angular/forms'
|
import {FormControl, Validators} from '@angular/forms'
|
||||||
import {ErrorHandlingComponent} from '../shared/components/subscribing.component'
|
import {ErrorHandlingComponent, SubscribingComponent} from '../shared/components/subscribing.component'
|
||||||
import {AccountService} from './services/account.service'
|
import {AccountService} from './services/account.service'
|
||||||
import {AppState} from '../shared/app-state'
|
import {AppState} from '../shared/app-state'
|
||||||
import {ErrorHandler, ErrorService} from '../shared/service/error.service'
|
import {ErrorHandler, ErrorService} from '../shared/service/error.service'
|
||||||
import {ActivatedRoute, Router} from '@angular/router'
|
import {ActivatedRoute, Router} from '@angular/router'
|
||||||
import {CreForm, ICreForm} from "../shared/components/forms/forms";
|
import {CreForm, ICreForm} from "../shared/components/forms/forms";
|
||||||
import {take, takeUntil} from "rxjs/operators";
|
|
||||||
import {AlertService} from "../shared/service/alert.service";
|
import {AlertService} from "../shared/service/alert.service";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
|
@ -61,3 +60,32 @@ export class Login extends ErrorHandlingComponent {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'cre-logout',
|
||||||
|
template: ''
|
||||||
|
})
|
||||||
|
export class Logout extends SubscribingComponent {
|
||||||
|
constructor(
|
||||||
|
private accountService: AccountService,
|
||||||
|
private alertService: AlertService,
|
||||||
|
private appState: AppState,
|
||||||
|
errorService: ErrorService,
|
||||||
|
router: Router,
|
||||||
|
activatedRoute: ActivatedRoute
|
||||||
|
) {
|
||||||
|
super(errorService, activatedRoute, router)
|
||||||
|
this.appState.title = 'Connexion'
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnInit(): void {
|
||||||
|
if (!this.appState.isAuthenticated) {
|
||||||
|
this.urlUtils.navigateTo('/account/login')
|
||||||
|
}
|
||||||
|
|
||||||
|
this.subscribeAndNavigate(
|
||||||
|
this.accountService.logout(),
|
||||||
|
'/account/login'
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -1,36 +0,0 @@
|
||||||
<form [formGroup]="form">
|
|
||||||
<mat-card class="x-centered y-centered">
|
|
||||||
<mat-card-header>
|
|
||||||
<mat-card-title>Connexion au système</mat-card-title>
|
|
||||||
</mat-card-header>
|
|
||||||
<mat-card-content>
|
|
||||||
<mat-form-field>
|
|
||||||
<mat-label>Numéro d'utilisateur</mat-label>
|
|
||||||
<input matInput [formControl]="idFormControl" type="text"/>
|
|
||||||
<mat-icon matSuffix>person</mat-icon>
|
|
||||||
<mat-error *ngIf="idFormControl.invalid">
|
|
||||||
<span *ngIf="idFormControl.errors.required">Un numéro d'utilisateur est requis</span>
|
|
||||||
<span *ngIf="idFormControl.errors.pattern">Le numéro d'utilisateur doit être un nombre</span>
|
|
||||||
</mat-error>
|
|
||||||
</mat-form-field>
|
|
||||||
<mat-form-field>
|
|
||||||
<mat-label>Mot de passe</mat-label>
|
|
||||||
<input matInput [formControl]="passwordFormControl" type="password"/>
|
|
||||||
<mat-icon matSuffix>lock</mat-icon>
|
|
||||||
<mat-error *ngIf="passwordFormControl.invalid">
|
|
||||||
<span *ngIf="passwordFormControl.errors.required">Un mot de passe est requis</span>
|
|
||||||
</mat-error>
|
|
||||||
</mat-form-field>
|
|
||||||
</mat-card-content>
|
|
||||||
<mat-card-actions class="justify-content-end">
|
|
||||||
<button
|
|
||||||
mat-raised-button
|
|
||||||
type="submit"
|
|
||||||
color="accent"
|
|
||||||
[disabled]="form.invalid"
|
|
||||||
(click)="submit()">
|
|
||||||
Connexion
|
|
||||||
</button>
|
|
||||||
</mat-card-actions>
|
|
||||||
</mat-card>
|
|
||||||
</form>
|
|
|
@ -1,8 +0,0 @@
|
||||||
mat-card
|
|
||||||
width: 25rem
|
|
||||||
|
|
||||||
.alert p
|
|
||||||
margin: 0
|
|
||||||
|
|
||||||
mat-form-field
|
|
||||||
width: 100%
|
|
|
@ -1,55 +0,0 @@
|
||||||
import {Component, OnInit} from '@angular/core'
|
|
||||||
import {FormBuilder, FormControl, FormGroup, Validators} from '@angular/forms'
|
|
||||||
import {AccountService} from '../../services/account.service'
|
|
||||||
import {ActivatedRoute, Router} from '@angular/router'
|
|
||||||
import {ErrorService} from '../../../shared/service/error.service'
|
|
||||||
import {ErrorHandlingComponent} from '../../../shared/components/subscribing.component'
|
|
||||||
import {AppState} from '../../../shared/app-state'
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'cre-login',
|
|
||||||
templateUrl: './login.component.html',
|
|
||||||
styleUrls: ['./login.component.sass']
|
|
||||||
})
|
|
||||||
export class LoginComponent extends ErrorHandlingComponent implements OnInit {
|
|
||||||
form: FormGroup
|
|
||||||
idFormControl: FormControl
|
|
||||||
passwordFormControl: FormControl
|
|
||||||
|
|
||||||
constructor(
|
|
||||||
private formBuilder: FormBuilder,
|
|
||||||
private accountService: AccountService,
|
|
||||||
private appState: AppState,
|
|
||||||
errorService: ErrorService,
|
|
||||||
router: Router,
|
|
||||||
activatedRoute: ActivatedRoute
|
|
||||||
) {
|
|
||||||
super(errorService, activatedRoute, router)
|
|
||||||
this.appState.title = 'Connexion'
|
|
||||||
}
|
|
||||||
|
|
||||||
ngOnInit(): void {
|
|
||||||
this.errorService.activeErrorHandler = this
|
|
||||||
|
|
||||||
if (this.appState.isAuthenticated) {
|
|
||||||
this.router.navigate(['/color'])
|
|
||||||
}
|
|
||||||
|
|
||||||
this.idFormControl = this.formBuilder.control(null, Validators.compose([Validators.required, Validators.pattern(new RegExp('^[0-9]+$'))]))
|
|
||||||
this.passwordFormControl = this.formBuilder.control(null, Validators.required)
|
|
||||||
this.form = this.formBuilder.group({
|
|
||||||
id: this.idFormControl,
|
|
||||||
password: this.passwordFormControl
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
submit() {
|
|
||||||
this.subscribe(
|
|
||||||
this.accountService.login(
|
|
||||||
this.idFormControl.value,
|
|
||||||
this.passwordFormControl.value
|
|
||||||
),
|
|
||||||
response => console.log(response)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,35 +0,0 @@
|
||||||
import {Component} from '@angular/core';
|
|
||||||
import {AccountService} from "../../services/account.service";
|
|
||||||
import {ActivatedRoute, Router} from "@angular/router";
|
|
||||||
import {AppState} from "../../../shared/app-state";
|
|
||||||
import {SubscribingComponent} from "../../../shared/components/subscribing.component";
|
|
||||||
import {ErrorService} from "../../../shared/service/error.service";
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'cre-logout',
|
|
||||||
templateUrl: './logout.component.html',
|
|
||||||
styleUrls: ['./logout.component.sass']
|
|
||||||
})
|
|
||||||
export class LogoutComponent extends SubscribingComponent {
|
|
||||||
|
|
||||||
constructor(
|
|
||||||
private accountService: AccountService,
|
|
||||||
private appState: AppState,
|
|
||||||
errorService: ErrorService,
|
|
||||||
router: Router,
|
|
||||||
activatedRoute: ActivatedRoute
|
|
||||||
) {
|
|
||||||
super(errorService, activatedRoute, router)
|
|
||||||
}
|
|
||||||
|
|
||||||
ngOnInit(): void {
|
|
||||||
if (!this.appState.isAuthenticated) {
|
|
||||||
this.urlUtils.navigateTo('/account/login')
|
|
||||||
}
|
|
||||||
|
|
||||||
this.subscribeAndNavigate(
|
|
||||||
this.accountService.logout(),
|
|
||||||
'/account/login'
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in New Issue