From 79b8a937c9c58e967a6e4185d10cc588e5439113 Mon Sep 17 00:00:00 2001
From: Yi-Jacob <jacobyideveloper@gmail.com>
Date: Thu, 9 May 2024 22:12:56 -0400
Subject: [PATCH 1/2] 219 - UI bug Fix and enhancements

---
 .../df-profile/df-profile.component.html      | 12 ++++-----
 .../df-service-details.component.html         |  2 +-
 .../df-service-details.component.scss         | 25 +++++++++++++++++++
 .../df-service-details.component.ts           |  2 +-
 .../adf-user-management.scss                  |  2 +-
 .../df-forgot-password.component.html         | 12 ++++-----
 .../df-password-reset.component.html          | 10 ++++----
 7 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/src/app/adf-profile/df-profile/df-profile.component.html b/src/app/adf-profile/df-profile/df-profile.component.html
index e3592829..227fd8b7 100644
--- a/src/app/adf-profile/df-profile/df-profile.component.html
+++ b/src/app/adf-profile/df-profile/df-profile.component.html
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
diff --git a/src/app/adf-services/df-service-details/df-service-details.component.html b/src/app/adf-services/df-service-details/df-service-details.component.html
index af9ee1b1..603203ff 100644
--- a/src/app/adf-services/df-service-details/df-service-details.component.html
+++ b/src/app/adf-services/df-service-details/df-service-details.component.html
@@ -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>
diff --git a/src/app/adf-services/df-service-details/df-service-details.component.scss b/src/app/adf-services/df-service-details/df-service-details.component.scss
index fe19d8af..7ec876a1 100644
--- a/src/app/adf-services/df-service-details/df-service-details.component.scss
+++ b/src/app/adf-services/df-service-details/df-service-details.component.scss
@@ -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;
+    }
   }
 }
 
@@ -128,3 +132,24 @@ 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;
+    }
+  }
+}
+}
\ No newline at end of file
diff --git a/src/app/adf-services/df-service-details/df-service-details.component.ts b/src/app/adf-services/df-service-details/df-service-details.component.ts
index cd80c6c0..97f53ac2 100644
--- a/src/app/adf-services/df-service-details/df-service-details.component.ts
+++ b/src/app/adf-services/df-service-details/df-service-details.component.ts
@@ -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,
diff --git a/src/app/adf-user-management/adf-user-management.scss b/src/app/adf-user-management/adf-user-management.scss
index 9700ccc1..34159ead 100644
--- a/src/app/adf-user-management/adf-user-management.scss
+++ b/src/app/adf-user-management/adf-user-management.scss
@@ -3,7 +3,7 @@
   flex-direction: column;
   justify-content: center;
   height: 100%;
-  margin: 25% 0;
+
   .user-management-card {
     padding: 16px 16px;
     margin: 0 auto;
diff --git a/src/app/adf-user-management/df-forgot-password/df-forgot-password.component.html b/src/app/adf-user-management/df-forgot-password/df-forgot-password.component.html
index 63ad0d6f..9f5d9aab 100644
--- a/src/app/adf-user-management/df-forgot-password/df-forgot-password.component.html
+++ b/src/app/adf-user-management/df-forgot-password/df-forgot-password.component.html
@@ -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
           >
@@ -39,7 +39,7 @@
           </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>
@@ -58,7 +58,7 @@
         [formGroup]="securityQuestionForm"
         (ngSubmit)="resetPassword()"
         *ngIf="hasSecurityQuestion">
-        <mat-form-field appearance="fill">
+        <mat-form-field appearance="outline">
           <mat-label>
             {{
               'userManagement.controls.securityQuestion.label' | transloco
@@ -70,7 +70,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
@@ -85,7 +85,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>
@@ -104,7 +104,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>
diff --git a/src/app/adf-user-management/df-password-reset/df-password-reset.component.html b/src/app/adf-user-management/df-password-reset/df-password-reset.component.html
index ad49d609..d66cb0bb 100644
--- a/src/app/adf-user-management/df-password-reset/df-password-reset.component.html
+++ b/src/app/adf-user-management/df-password-reset/df-password-reset.component.html
@@ -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
           >
@@ -45,7 +45,7 @@
           </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>
@@ -56,7 +56,7 @@
           </mat-error>
         </mat-form-field>
 
-        <mat-form-field appearance="fill">
+        <mat-form-field appearance="outline">
           <mat-label>
             {{
               'userManagement.controls.confirmationCode.label' | transloco
@@ -71,7 +71,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
@@ -87,7 +87,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

From 2f2b87cfc8f86d3c246496c9a5ad97c065c947a5 Mon Sep 17 00:00:00 2001
From: Yi-Jacob <jacobyideveloper@gmail.com>
Date: Thu, 9 May 2024 22:14:03 -0400
Subject: [PATCH 2/2] additional style updates

---
 .../df-service-details.component.scss         | 26 +++++++++----------
 .../df-forgot-password.component.html         |  4 ++-
 .../df-password-reset.component.html          |  4 ++-
 .../df-dynamic-field.component.html           |  1 -
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/app/adf-services/df-service-details/df-service-details.component.scss b/src/app/adf-services/df-service-details/df-service-details.component.scss
index 7ec876a1..6b1b750b 100644
--- a/src/app/adf-services/df-service-details/df-service-details.component.scss
+++ b/src/app/adf-services/df-service-details/df-service-details.component.scss
@@ -134,22 +134,20 @@ mat-icon {
 }
 
 .dark-theme {
+  label.radio-card {
+    .card-content-wrapper {
+      background: #000;
+      border: 1px solid #fff;
+    }
 
-label.radio-card {
-
-  .card-content-wrapper {
-    background: #000;
-    border: 1px solid #fff;
-  }
-
-  .check-icon {
-    border: solid 2px #2d2d2d;
-  }
+    .check-icon {
+      border: solid 2px #2d2d2d;
+    }
 
-  .card-content {
-    h4 {
-      color: #fff;
+    .card-content {
+      h4 {
+        color: #fff;
+      }
     }
   }
 }
-}
\ No newline at end of file
diff --git a/src/app/adf-user-management/df-forgot-password/df-forgot-password.component.html b/src/app/adf-user-management/df-forgot-password/df-forgot-password.component.html
index 9f5d9aab..8ddbccc2 100644
--- a/src/app/adf-user-management/df-forgot-password/df-forgot-password.component.html
+++ b/src/app/adf-user-management/df-forgot-password/df-forgot-password.component.html
@@ -39,7 +39,9 @@
           </mat-error>
         </mat-form-field>
 
-        <mat-form-field appearance="outline" *ngIf="loginAttribute === 'username'">
+        <mat-form-field
+          appearance="outline"
+          *ngIf="loginAttribute === 'username'">
           <mat-label>{{
             'userManagement.controls.username.altLabel' | transloco
           }}</mat-label>
diff --git a/src/app/adf-user-management/df-password-reset/df-password-reset.component.html b/src/app/adf-user-management/df-password-reset/df-password-reset.component.html
index d66cb0bb..e06e7bf4 100644
--- a/src/app/adf-user-management/df-password-reset/df-password-reset.component.html
+++ b/src/app/adf-user-management/df-password-reset/df-password-reset.component.html
@@ -45,7 +45,9 @@
           </mat-error>
         </mat-form-field>
 
-        <mat-form-field appearance="outline" *ngIf="loginAttribute === 'username'">
+        <mat-form-field
+          appearance="outline"
+          *ngIf="loginAttribute === 'username'">
           <mat-label>{{
             'userManagement.controls.username.altLabel' | transloco
           }}</mat-label>
diff --git a/src/app/shared/components/df-dynamic-field/df-dynamic-field.component.html b/src/app/shared/components/df-dynamic-field/df-dynamic-field.component.html
index ab3104b6..66d3c07c 100644
--- a/src/app/shared/components/df-dynamic-field/df-dynamic-field.component.html
+++ b/src/app/shared/components/df-dynamic-field/df-dynamic-field.component.html
@@ -85,4 +85,3 @@
     </mat-autocomplete>
   </mat-form-field>
 </div>
-