Skip to content

Commit 11b629f

Browse files
DanielFranDanielFran
authored
Merge pull request #465 from SvMak/update-frontend-ui
[Suggestion] Partial update of the UI to the main site theme
2 parents a7a1907 + f18616d commit 11b629f

28 files changed

+2211
-1609
lines changed

‎package.json‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,15 @@
2121
"@angular/platform-browser-dynamic": "14.2.12",
2222
"@angular/router": "14.2.12",
2323
"@fortawesome/angular-fontawesome": "0.11.1",
24-
"@fortawesome/fontawesome-svg-core": "1.2.27",
25-
"@fortawesome/free-brands-svg-icons": "5.12.0",
26-
"@fortawesome/free-solid-svg-icons": "5.12.0",
27-
"@ng-bootstrap/ng-bootstrap": "11.0.1",
24+
"@fortawesome/fontawesome-svg-core": "6.7.2",
25+
"@fortawesome/free-brands-svg-icons": "6.7.2",
26+
"@fortawesome/free-solid-svg-icons": "6.7.2",
27+
"@ng-bootstrap/ng-bootstrap": "13.1.1",
2828
"@ngx-translate/core": "14.0.0",
2929
"@ngx-translate/http-loader": "7.0.0",
30+
"@popperjs/core": "2.10.2",
3031
"@scarf/scarf": "^1.1.1",
31-
"bootstrap": "5.0.0",
32+
"bootstrap": "5.0.2",
3233
"dayjs": "^1.11.7",
3334
"echarts": "^5.4.0",
3435
"jquery": "3.6.1",

‎src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html‎

Lines changed: 81 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,84 +1,99 @@
11
<div>
2-
<div class="row justify-content-center">
3-
<div class="col-md-4">
4-
<h1>Reset password</h1>
2+
<div class="row justify-content-center">
3+
<div class="col-md-4">
4+
<h1 class="section-title">Reset password</h1>
55

6-
<div class="alert alert-danger" *ngIf="initialized && !key">
7-
<strong>The password reset key is missing.</strong>
8-
</div>
9-
10-
<div class="alert alert-warning" *ngIf="key && !success">
11-
<span>Choose a new password</span>
12-
</div>
6+
<div class="alert alert-danger" *ngIf="initialized && !key">
7+
<strong>The password reset key is missing.</strong>
8+
</div>
139

14-
<div class="alert alert-danger" *ngIf="error">
15-
<span>Your password couldn't be reset. Remember a password request is only valid for 24 hours.</span>
16-
</div>
10+
<div class="alert alert-warning" *ngIf="key && !success">
11+
<span>Choose a new password</span>
12+
</div>
1713

18-
<div class="alert alert-success" *ngIf="success">
19-
<span><strong>Your password has been reset.</strong> Please </span>
20-
<a class="alert-link" (click)="login()">sign in</a>.
21-
</div>
14+
<div class="alert alert-danger" *ngIf="error">
15+
<span>Your password couldn't be reset. Remember a password request is only valid for 24 hours.</span>
16+
</div>
2217

23-
<div class="alert alert-danger" *ngIf="doNotMatch">
24-
The password and its confirmation do not match!
25-
</div>
18+
<div class="alert alert-success" *ngIf="success">
19+
<span><strong>Your password has been reset.</strong> Please </span>
20+
<a class="alert-link" (click)="login()">sign in</a>.
21+
</div>
2622

27-
<div *ngIf="key && !success">
28-
<form name="form" role="form" (ngSubmit)="finishReset()" [formGroup]="passwordForm">
29-
<div class="form-group">
30-
<label class="form-control-label" for="newPassword">New password</label>
31-
<input type="password" class="form-control" id="newPassword" name="newPassword"
32-
placeholder="New password"
33-
formControlName="newPassword" #newPassword>
23+
<div class="alert alert-danger" *ngIf="doNotMatch">
24+
The password and its confirmation do not match!
25+
</div>
3426

35-
<div *ngIf="passwordForm.get('newPassword')!.invalid && (passwordForm.get('newPassword')!.dirty || passwordForm.get('newPassword')!.touched)">
36-
<small class="form-text text-danger"
37-
*ngIf="passwordForm.get('newPassword')?.errors?.required">
38-
Your password is required.
39-
</small>
27+
<div *ngIf="key && !success">
28+
<form name="form" role="form" (ngSubmit)="finishReset()" [formGroup]="passwordForm">
29+
<div class="mb-3">
30+
<label class="form-label" for="newPassword">New password</label>
31+
<input
32+
type="password"
33+
class="form-control"
34+
id="newPassword"
35+
name="newPassword"
36+
placeholder="New password"
37+
formControlName="newPassword"
38+
#newPassword
39+
/>
4040

41-
<small class="form-text text-danger"
42-
*ngIf="passwordForm.get('newPassword')?.errors?.minlength">
43-
Your password is required to be at least 4 characters.
44-
</small>
41+
<div
42+
*ngIf="
43+
passwordForm.get('newPassword')!.invalid &&
44+
(passwordForm.get('newPassword')!.dirty || passwordForm.get('newPassword')!.touched)
45+
"
46+
>
47+
<small class="form-text text-danger" *ngIf="passwordForm.get('newPassword')?.errors?.required">
48+
Your password is required.
49+
</small>
4550

46-
<small class="form-text text-danger"
47-
*ngIf="passwordForm.get('newPassword')?.errors?.maxlength">
48-
Your password cannot be longer than 50 characters.
49-
</small>
50-
</div>
51+
<small class="form-text text-danger" *ngIf="passwordForm.get('newPassword')?.errors?.minlength">
52+
Your password is required to be at least 4 characters.
53+
</small>
5154

52-
<jhi-password-strength-bar [passwordToCheck]="passwordForm.get('newPassword')!.value"></jhi-password-strength-bar>
53-
</div>
55+
<small class="form-text text-danger" *ngIf="passwordForm.get('newPassword')?.errors?.maxlength">
56+
Your password cannot be longer than 50 characters.
57+
</small>
58+
</div>
5459

55-
<div class="form-group">
56-
<label class="form-control-label" for="confirmPassword">New password confirmation</label>
57-
<input type="password" class="form-control" id="confirmPassword" name="confirmPassword"
58-
placeholder="Confirm the new password"
59-
formControlName="confirmPassword">
60+
<jhi-password-strength-bar [passwordToCheck]="passwordForm.get('newPassword')!.value"></jhi-password-strength-bar>
61+
</div>
6062

61-
<div *ngIf="passwordForm.get('confirmPassword')!.invalid && (passwordForm.get('confirmPassword')!.dirty || passwordForm.get('confirmPassword')!.touched)">
62-
<small class="form-text text-danger"
63-
*ngIf="passwordForm.get('confirmPassword')?.errors?.required">
64-
Your password confirmation is required.
65-
</small>
63+
<div class="mb-3">
64+
<label class="form-label" for="confirmPassword">New password confirmation</label>
65+
<input
66+
type="password"
67+
class="form-control"
68+
id="confirmPassword"
69+
name="confirmPassword"
70+
placeholder="Confirm the new password"
71+
formControlName="confirmPassword"
72+
/>
6673

67-
<small class="form-text text-danger"
68-
*ngIf="passwordForm.get('confirmPassword')?.errors?.minlength">
69-
Your password confirmation is required to be at least 4 characters.
70-
</small>
74+
<div
75+
*ngIf="
76+
passwordForm.get('confirmPassword')!.invalid &&
77+
(passwordForm.get('confirmPassword')!.dirty || passwordForm.get('confirmPassword')!.touched)
78+
"
79+
>
80+
<small class="form-text text-danger" *ngIf="passwordForm.get('confirmPassword')?.errors?.required">
81+
Your password confirmation is required.
82+
</small>
7183

72-
<small class="form-text text-danger"
73-
*ngIf="passwordForm.get('confirmPassword')?.errors?.maxlength">
74-
Your password confirmation cannot be longer than 50 characters.
75-
</small>
76-
</div>
77-
</div>
84+
<small class="form-text text-danger" *ngIf="passwordForm.get('confirmPassword')?.errors?.minlength">
85+
Your password confirmation is required to be at least 4 characters.
86+
</small>
7887

79-
<button type="submit" [disabled]="passwordForm.invalid" class="btn btn-primary">Reset Password</button>
80-
</form>
88+
<small class="form-text text-danger" *ngIf="passwordForm.get('confirmPassword')?.errors?.maxlength">
89+
Your password confirmation cannot be longer than 50 characters.
90+
</small>
8191
</div>
82-
</div>
92+
</div>
93+
94+
<button type="submit" [disabled]="passwordForm.invalid" class="btn btn-primary">Reset Password</button>
95+
</form>
96+
</div>
8397
</div>
98+
</div>
8499
</div>

‎src/main/webapp/app/account/password-reset/init/password-reset-init.component.html‎

Lines changed: 43 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,47 @@
11
<div>
2-
<div class="row justify-content-center">
3-
<div class="col-md-8">
4-
<h1>Reset your password</h1>
5-
6-
<jhi-alert-error></jhi-alert-error>
7-
8-
<div class="alert alert-warning" *ngIf="!success">
9-
<span>Enter the email address you used to register.</span>
10-
</div>
11-
12-
<div class="alert alert-success" *ngIf="success">
13-
<span>Check your emails for details on how to reset your password.</span>
14-
</div>
15-
16-
<form *ngIf="!success" name="form" role="form" (ngSubmit)="requestReset()" [formGroup]="resetRequestForm">
17-
<div class="form-group">
18-
<label class="form-control-label" for="email">Email</label>
19-
<input type="email" class="form-control" id="email" name="email" placeholder="Your email"
20-
formControlName="email" #email>
21-
22-
<div *ngIf="resetRequestForm.get('email')!.invalid && (resetRequestForm.get('email')!.dirty || resetRequestForm.get('email')!.touched)">
23-
<small class="form-text text-danger"
24-
*ngIf="resetRequestForm.get('email')?.errors?.required">
25-
Your email is required.
26-
</small>
27-
28-
<small class="form-text text-danger"
29-
*ngIf="resetRequestForm.get('email')?.errors?.email">
30-
Your email is invalid.
31-
</small>
32-
33-
<small class="form-text text-danger"
34-
*ngIf="resetRequestForm.get('email')?.errors?.minlength">
35-
Your email is required to be at least 5 characters.
36-
</small>
37-
38-
<small class="form-text text-danger"
39-
*ngIf="resetRequestForm.get('email')?.errors?.maxlength">
40-
Your email cannot be longer than 100 characters.
41-
</small>
42-
</div>
43-
</div>
44-
<button type="submit" [disabled]="resetRequestForm.invalid" class="btn btn-primary">Reset</button>
45-
</form>
2+
<div class="row justify-content-center">
3+
<div class="col-md-8">
4+
<h1 class="section-title">Reset your password</h1>
5+
6+
<jhi-alert-error></jhi-alert-error>
7+
8+
<div class="alert alert-warning" *ngIf="!success">
9+
<span>Enter the email address you used to register.</span>
10+
</div>
11+
12+
<div class="alert alert-success" *ngIf="success">
13+
<span>Check your emails for details on how to reset your password.</span>
14+
</div>
15+
16+
<form *ngIf="!success" name="form" role="form" (ngSubmit)="requestReset()" [formGroup]="resetRequestForm">
17+
<div class="mb-3">
18+
<label class="form-label" for="email">Email</label>
19+
<input type="email" class="form-control" id="email" name="email" placeholder="Your email" formControlName="email" #email />
20+
21+
<div
22+
*ngIf="
23+
resetRequestForm.get('email')!.invalid && (resetRequestForm.get('email')!.dirty || resetRequestForm.get('email')!.touched)
24+
"
25+
>
26+
<small class="form-text text-danger" *ngIf="resetRequestForm.get('email')?.errors?.required">
27+
Your email is required.
28+
</small>
29+
30+
<small class="form-text text-danger" *ngIf="resetRequestForm.get('email')?.errors?.email">
31+
Your email is invalid.
32+
</small>
33+
34+
<small class="form-text text-danger" *ngIf="resetRequestForm.get('email')?.errors?.minlength">
35+
Your email is required to be at least 5 characters.
36+
</small>
37+
38+
<small class="form-text text-danger" *ngIf="resetRequestForm.get('email')?.errors?.maxlength">
39+
Your email cannot be longer than 100 characters.
40+
</small>
41+
</div>
4642
</div>
43+
<button type="submit" [disabled]="resetRequestForm.invalid" class="btn btn-primary">Reset</button>
44+
</form>
4745
</div>
46+
</div>
4847
</div>

0 commit comments

Comments
 (0)