This repository has been archived by the owner on Oct 24, 2023. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #125 from mirelanemes/master
bugfix #121 - Username schimbat in Email
- Loading branch information
Showing
3 changed files
with
37 additions
and
43 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,42 +1,36 @@ | ||
| <section id="wrapper" class="login-register login-sidebar"> | ||
| <!-- <div class="col-md-2 col-sm-1"> </div> --> | ||
| <div class="logo-container col-md-12 col-sm-12 col-xs-12"> | ||
| <img src="./../../../../assets/images/DSU_logo.PNG" /> | ||
| </div> | ||
| <!-- <div class="col-md-2 col-sm-1"> </div> --> | ||
| <div class="login-box col-md-12 col-sm-12 col-xs-12"> | ||
| <div class="card-body"> | ||
| <form autocomplete="off" [formGroup]="loginForm" (ngSubmit)="login()" class="form-horizontal form-material" | ||
| id="loginform" novalidate> | ||
| <div class="form-group mt-4"> | ||
| <div class="col-xs-12"> | ||
| <input formControlName="email" autocomplete="new-password" class="form-control" type="text" | ||
| placeholder="Nume Utilizator" /> | ||
| </div> | ||
| </div> | ||
| <div class="form-group"> | ||
| <div class="col-xs-12"> | ||
| <input autocomplete="new-password" formControlName="password" class="form-control" | ||
| type="password" placeholder="Parola" /> | ||
| </div> | ||
| </div> | ||
| <ngb-alert *ngIf="errorMessage" class="error-message" type="success" (close)="successMessage = null"> | ||
| {{ errorMessage }}</ngb-alert> | ||
| <div class="form-group text-center mt-4"> | ||
| <div class="col-xs-12"> | ||
| <button class="btn button-login btn-lg btn-block text-uppercase waves-effect waves-light" | ||
| type="submit" [disabled]="loginForm.invalid || isLoading"> | ||
| <app-button-loader [isLoading]="isLoading" [label]="'Login'"></app-button-loader> | ||
| </button> | ||
| </div> | ||
| </div> | ||
| </form> | ||
| </div> | ||
| </div> | ||
| <section id="wrapper" class="login-register login-sidebar row"> | ||
| <!-- <div class="col-md-2 col-sm-1"> </div> --> | ||
| <div class="logo-container col-md-12 col-sm-12 col-xs-12"> | ||
| <img src="../../../assets/images/dsu.jpg"/> | ||
| </div> | ||
| <!-- <div class="col-md-2 col-sm-1"> </div> --> | ||
| <div class="login-box col-md-12"> | ||
| <div class="card-body"> | ||
| <form autocomplete="off" [formGroup]="loginForm" (ngSubmit)="login()" class="form-horizontal form-material" id="loginform" novalidate> | ||
| <div class="form-group mt-4"> | ||
| <div class="col-xs-12"> | ||
| <app-form-error-wrapper [control]="loginForm.controls['email']" [controlName]="'email'"> | ||
| <input autocomplete="email" class="form-control" type="email" formControlName="email" placeholder="Email Utilizator"> | ||
| </app-form-error-wrapper> | ||
| </div> | ||
| </div> | ||
| <div class="form-group"> | ||
| <div class="col-xs-12"> | ||
| <app-form-error-wrapper [control]="loginForm.controls['password']" [controlName]="'Password'"> | ||
| <input autocomplete="new-password" class="form-control" type="password" formControlName="password" placeholder="Parola"> | ||
| </app-form-error-wrapper> | ||
| </div> | ||
| </div> | ||
| <div class="form-group text-center mt-4"> | ||
| <div class="col-xs-12"> | ||
| <button class="btn button-login btn-lg btn-block text-uppercase waves-effect waves-light" (click)="login()" [disabled]="loginForm.invalid || isLoading"> | ||
| <app-button-loader [isLoading]="isLoading" [label]="'Login'"></app-button-loader> | ||
| </button> | ||
| </div> | ||
| </div> | ||
|
|
||
| </form> | ||
| </div> | ||
| </div> | ||
| </section> | ||
|
|
||
| <div class="d-flex my-5"> | ||
| <a [routerLink]="['/recover']" class="navigation"> | ||
| Am uitat parola | ||
| </a> | ||
| </div> | ||
| </section> |