Skip to content

219 - UI bug Fix and enhancements #222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thekevinm merged 2 commits into from
May 10, 2024
Merged

219 - UI bug Fix and enhancements #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79b8a93
219 - UI bug Fix and enhancements
Yi-Jacob May 10, 2024
2f2b87c
additional style updates
Yi-Jacob May 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/app/adf-profile/df-profile/df-profile.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
[formGroup]="profileForm"
(ngSubmit)="updateProfile()">
<df-profile-details formGroupName="profileDetailsGroup" />
<mat-form-field appearance="fill" *ngIf="needPassword">
<mat-form-field appearance="outline" *ngIf="needPassword">
<mat-label>{{
'userManagement.controls.currentPassword.label' | transloco
}}</mat-label>
Expand Down Expand Up @@ -48,13 +48,13 @@
name="security-question-form"
[formGroup]="securityQuestionForm"
(ngSubmit)="updateSecurityQuestion()">
<mat-form-field appearance="fill">
<mat-form-field appearance="outline">
<mat-label>{{
'userManagement.controls.securityQuestion.label' | transloco
}}</mat-label>
<input matInput formControlName="securityQuestion" />
</mat-form-field>
<mat-form-field appearance="fill">
<mat-form-field appearance="outline">
<mat-label>{{
'userManagement.controls.securityAnswer.label' | transloco
}}</mat-label>
Expand Down Expand Up @@ -84,7 +84,7 @@
(alertClosed)="showAlert = false"
>{{ alertMsg }}</df-alert
>
<mat-form-field appearance="fill">
<mat-form-field appearance="outline">
<mat-label>{{
'userManagement.controls.oldPassword.label' | transloco
}}</mat-label>
Expand All @@ -96,7 +96,7 @@
}}
</mat-error>
</mat-form-field>
<mat-form-field appearance="fill">
<mat-form-field appearance="outline">
<mat-label>{{
'userManagement.controls.password.label' | transloco
}}</mat-label>
Expand All @@ -112,7 +112,7 @@
{{ 'userManagement.controls.password.errors.length' | transloco }}
</mat-error>
</mat-form-field>
<mat-form-field appearance="fill">
<mat-form-field appearance="outline">
<mat-label>{{
'userManagement.controls.confirmPassword.label' | transloco
}}</mat-label>
Expand Down
2 changes: 1 addition & 1 deletion src/app/adf-services/df-service-details/df-service-details.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ <h3>
class="card-icon"
[src]="getBackgroundImage(type.name)"
[alt]="type.label" />
<h4 class="text-center" style="color: black !important">
<h4>
{{ type.label }}
</h4>
</div>
Expand Down
23 changes: 23 additions & 0 deletions src/app/adf-services/df-service-details/df-service-details.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,15 @@ label.radio-card {

.card-content {
width: 100%;
text-align: center;
img {
margin-bottom: 10px;
width: 100%;
height: 110px;
}
h4 {
color: #000;
}
}
}

Expand Down Expand Up @@ -128,3 +132,22 @@ mat-icon {
::ng-deep .mat-mdc-select-arrow {
color: unset !important;
}

.dark-theme {
label.radio-card {
.card-content-wrapper {
background: #000;
border: 1px solid #fff;
}

.check-icon {
border: solid 2px #2d2d2d;
}

.card-content {
h4 {
color: #fff;
}
}
}
}
2 changes: 1 addition & 1 deletion src/app/adf-services/df-service-details/df-service-details.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import { Service } from 'src/app/shared/types/files';
import { AceEditorMode } from 'src/app/shared/types/scripts';
import { DfScriptEditorComponent } from 'src/app/shared/components/df-script-editor/df-script-editor.component';
import { DfSystemConfigDataService } from 'src/app/shared/services/df-system-config-data.service';
import { forkJoin, map, switchMap } from 'rxjs';
import { map, switchMap } from 'rxjs';
import {
GOLD_SERVICES,
SILVER_SERVICES,
Expand Down
2 changes: 1 addition & 1 deletion src/app/adf-user-management/adf-user-management.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
flex-direction: column;
justify-content: center;
height: 100%;
margin: 25% 0;

.user-management-card {
padding: 16px 16px;
margin: 0 auto;
Expand Down
14 changes: 8 additions & 6 deletions src/app/adf-user-management/df-forgot-password/df-forgot-password.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
[formGroup]="forgetPasswordForm"
(ngSubmit)="requestReset()"
*ngIf="!hasSecurityQuestion">
<mat-form-field appearance="fill" *ngIf="loginAttribute === 'email'">
<mat-form-field appearance="outline" *ngIf="loginAttribute === 'email'">
<mat-label>
{{ 'userManagement.controls.email.label' | transloco }}</mat-label
>
Expand All @@ -39,7 +39,9 @@
</mat-error>
</mat-form-field>

<mat-form-field appearance="fill" *ngIf="loginAttribute === 'username'">
<mat-form-field
appearance="outline"
*ngIf="loginAttribute === 'username'">
<mat-label>{{
'userManagement.controls.username.altLabel' | transloco
}}</mat-label>
Expand All @@ -58,7 +60,7 @@
[formGroup]="securityQuestionForm"
(ngSubmit)="resetPassword()"
*ngIf="hasSecurityQuestion">
<mat-form-field appearance="fill">
<mat-form-field appearance="outline">
<mat-label>
{{
'userManagement.controls.securityQuestion.label' | transloco
Expand All @@ -70,7 +72,7 @@
formControlName="securityQuestion"
[readonly]="true" />
</mat-form-field>
<mat-form-field appearance="fill">
<mat-form-field appearance="outline">
<mat-label>
{{
'userManagement.controls.securityAnswer.label' | transloco
Expand All @@ -85,7 +87,7 @@
}}
</mat-error>
</mat-form-field>
<mat-form-field appearance="fill">
<mat-form-field appearance="outline">
<mat-label>{{
'userManagement.controls.password.label' | transloco
}}</mat-label>
Expand All @@ -104,7 +106,7 @@
</mat-error>
</mat-form-field>

<mat-form-field appearance="fill">
<mat-form-field appearance="outline">
<mat-label>{{
'userManagement.controls.confirmPassword.label' | transloco
}}</mat-label>
Expand Down
12 changes: 7 additions & 5 deletions src/app/adf-user-management/df-password-reset/df-password-reset.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
name="reset-password-form"
[formGroup]="passwordResetForm"
(ngSubmit)="resetPassword()">
<mat-form-field appearance="fill" *ngIf="loginAttribute === 'email'">
<mat-form-field appearance="outline" *ngIf="loginAttribute === 'email'">
<mat-label>
{{ 'userManagement.controls.email.label' | transloco }}</mat-label
>
Expand All @@ -45,7 +45,9 @@
</mat-error>
</mat-form-field>

<mat-form-field appearance="fill" *ngIf="loginAttribute === 'username'">
<mat-form-field
appearance="outline"
*ngIf="loginAttribute === 'username'">
<mat-label>{{
'userManagement.controls.username.altLabel' | transloco
}}</mat-label>
Expand All @@ -56,7 +58,7 @@
</mat-error>
</mat-form-field>

<mat-form-field appearance="fill">
<mat-form-field appearance="outline">
<mat-label>
{{
'userManagement.controls.confirmationCode.label' | transloco
Expand All @@ -71,7 +73,7 @@
}}
</mat-error>
</mat-form-field>
<mat-form-field appearance="fill">
<mat-form-field appearance="outline">
<mat-label>{{
'userManagement.controls.password.' +
(type === 'reset' ? 'label' : 'altLabel') | transloco
Expand All @@ -87,7 +89,7 @@
</mat-error>
</mat-form-field>

<mat-form-field appearance="fill">
<mat-form-field appearance="outline">
<mat-label>{{
'userManagement.controls.confirmPassword.' +
(type === 'reset' ? 'label' : 'altLabel') | transloco
Expand Down
1 change: 0 additions & 1 deletion src/app/shared/components/df-dynamic-field/df-dynamic-field.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,3 @@
</mat-autocomplete>
</mat-form-field>
</div>