From 2dc620c7232b79fded82e8b1c1c5d32ba9b10087 Mon Sep 17 00:00:00 2001
From: Zaid Abed Jaser <zaid.abed-jaser@arbetsformedlingen.se>
Date: Fri, 30 Apr 2021 13:12:28 +0200
Subject: [PATCH] more changes according to PR comments

---
 .../src/app/data/models/staff.model.ts         |  2 +-
 .../create-account.component.html              | 18 ++++++++----------
 .../create-account.component.scss              | 16 +++++-----------
 .../staff-list/staff-list.component.html       |  2 +-
 .../staff-list/staff-list.component.scss       |  1 -
 .../src/app/pages/start/start.component.html   | 10 ++--------
 .../src/app/pages/start/start.component.scss   |  9 +++++++--
 7 files changed, 24 insertions(+), 34 deletions(-)

diff --git a/apps/dafa-web/src/app/data/models/staff.model.ts b/apps/dafa-web/src/app/data/models/staff.model.ts
index 90dd257..dd776f9 100644
--- a/apps/dafa-web/src/app/data/models/staff.model.ts
+++ b/apps/dafa-web/src/app/data/models/staff.model.ts
@@ -6,7 +6,7 @@ export interface Staff {
   staffId: string;
   firstName: string;
   lastName: string;
-  Utforandeverksamhet: string;
+  utforandeverksamhet: string;
   active: boolean;
   service: string;
   fullName?: string;
diff --git a/apps/dafa-web/src/app/pages/administration/pages/create-account/create-account.component.html b/apps/dafa-web/src/app/pages/administration/pages/create-account/create-account.component.html
index f4b8ecf..86c83c3 100644
--- a/apps/dafa-web/src/app/pages/administration/pages/create-account/create-account.component.html
+++ b/apps/dafa-web/src/app/pages/administration/pages/create-account/create-account.component.html
@@ -10,16 +10,14 @@
   <form [formGroup]="formGroup" (ngSubmit)="submitForm()">
     <div class="create-account__block">
       <h2>Personuppgifter</h2>
-      <div class="create-account__combined-inputs">
-        <digi-ng-form-input
-          class="create-account__input"
-          formControlName="firstName"
-          afLabel="Förnamn"
-          afInvalidMessage="Förnamn är obligatoriskt"
-          [afDisableValidStyle]="true"
-          [afInvalid]="firstNameControl.invalid && firstNameControl.dirty"
-        ></digi-ng-form-input>
-      </div>
+      <digi-ng-form-input
+        class="create-account__input"
+        formControlName="firstName"
+        afLabel="Förnamn"
+        afInvalidMessage="Förnamn är obligatoriskt"
+        [afDisableValidStyle]="true"
+        [afInvalid]="firstNameControl.invalid && firstNameControl.dirty"
+      ></digi-ng-form-input>
       <digi-ng-form-input
         class="create-account__input"
         formControlName="lastName"
diff --git a/apps/dafa-web/src/app/pages/administration/pages/create-account/create-account.component.scss b/apps/dafa-web/src/app/pages/administration/pages/create-account/create-account.component.scss
index 665c230..abb80dc 100644
--- a/apps/dafa-web/src/app/pages/administration/pages/create-account/create-account.component.scss
+++ b/apps/dafa-web/src/app/pages/administration/pages/create-account/create-account.component.scss
@@ -17,14 +17,14 @@
 
   &__permission-checkbox {
     display: flex;
-    height: 5em;
+    height: 5rem;
     align-items: center;
   }
 
   &__fieldset {
     padding: 0;
     border: 0;
-    margin-top: 2em;
+    margin-top: var(--digi--layout--gutter);
 
     legend {
       width: 100%;
@@ -32,7 +32,7 @@
       align-items: center;
       margin: 0;
       font-weight: var(--digi--typography--font-weight--bold);
-      font-size: 1.5em;
+      font-size: 1.5rem;
       padding-bottom: var(--digi--layout--gutter--s);
     }
   }
@@ -55,22 +55,16 @@
   }
 
   &__footer {
-    margin-top: 2em;
+    margin-top: var(--digi--layout--gutter);
     display: flex;
     gap: var(--digi--layout--gutter);
   }
 }
 
-.assign-permission-checkbox {
-  display: flex;
-  height: 5em;
-  align-items: center;
-}
-
 .search-address {
   width: 30%;
 }
 
 digi-ng-popover {
-  margin-left: 1em;
+  margin-left: var(--digi--layout--gutter);
 }
diff --git a/apps/dafa-web/src/app/pages/administration/pages/staff/components/staff-list/staff-list.component.html b/apps/dafa-web/src/app/pages/administration/pages/staff/components/staff-list/staff-list.component.html
index 1e89ffd..631702d 100644
--- a/apps/dafa-web/src/app/pages/administration/pages/staff/components/staff-list/staff-list.component.html
+++ b/apps/dafa-web/src/app/pages/administration/pages/staff/components/staff-list/staff-list.component.html
@@ -21,7 +21,7 @@
           </button>
         </th>
         <th scope="col" class="staff-list__column-head">
-          <button class="staff-list__sort-button" (click)="handleSort('Utforandeverksamhet')">
+          <button class="staff-list__sort-button" (click)="handleSort('utforandeverksamhet')">
             Utförandeverksamhet
             <ng-container *ngIf="sortBy?.key === 'Utforandeverksamhet'">
               <digi-icon-caret-up class="staff-list__sort-icon" *ngIf="!sortBy.reverse"></digi-icon-caret-up>
diff --git a/apps/dafa-web/src/app/pages/administration/pages/staff/components/staff-list/staff-list.component.scss b/apps/dafa-web/src/app/pages/administration/pages/staff/components/staff-list/staff-list.component.scss
index 049da3c..305fd90 100644
--- a/apps/dafa-web/src/app/pages/administration/pages/staff/components/staff-list/staff-list.component.scss
+++ b/apps/dafa-web/src/app/pages/administration/pages/staff/components/staff-list/staff-list.component.scss
@@ -20,7 +20,6 @@
     align-items: center;
     gap: var(--digi--layout--gutter);
     cursor: pointer;
-    color: #1616b2;
   }
 
   &__sort-icon {
diff --git a/apps/dafa-web/src/app/pages/start/start.component.html b/apps/dafa-web/src/app/pages/start/start.component.html
index e711b77..fcb81dd 100644
--- a/apps/dafa-web/src/app/pages/start/start.component.html
+++ b/apps/dafa-web/src/app/pages/start/start.component.html
@@ -5,18 +5,12 @@
   </digi-typography>
   <div class="start__wrapper">
     <div class="start__main">
-      <!-- Syntax fel i digi info card? -->
-      <digi-info-card
-        af-heading="Notiser"
-        af-heading-level="h1"
-        af-type="info"
-        af-link-text="Deltagare"
-        af-link-href="/mina-deltagare"
-      >
+      <digi-info-card af-heading="Notiser" af-heading-level="h1" af-type="info" af-link-text="Deltagare">
         <p>
           Det har kommit in nya avrop med deltagare, länken nedan tar dig till fliken Nya deltagare. Du finner den också
           i vänster menyn på sidan
         </p>
+        <a [routerLink]="['/mina-deltagare']">Deltagare</a>
       </digi-info-card>
     </div>
 
diff --git a/apps/dafa-web/src/app/pages/start/start.component.scss b/apps/dafa-web/src/app/pages/start/start.component.scss
index b166548..a496ebf 100644
--- a/apps/dafa-web/src/app/pages/start/start.component.scss
+++ b/apps/dafa-web/src/app/pages/start/start.component.scss
@@ -1,3 +1,4 @@
+@import 'variables/gutters';
 .start {
   &__wrapper {
     display: grid;
@@ -6,16 +7,20 @@
       'header header '
       'main  sidebar'
       'footer footer ';
-    grid-gap: 3em;
+    grid-gap: var(--digi--layout--gutter);
   }
   &__main {
     grid-area: main;
+    a {
+      text-decoration: none;
+      color: var(--digi--typography--color--link);
+    }
   }
   &__sidebar {
     grid-area: sidebar;
   }
   &__sidebar-alert {
-    margin-top: 5%;
+    margin-top: var(--digi--layout--gutter);
   }
   &__footer {
     grid-area: footer;