diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/deltagare-card.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/deltagare-card.component.html index 33ec2b2..630b053 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/deltagare-card.component.html +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/deltagare-card.component.html @@ -1,7 +1,7 @@
- +
Tillbaka till deltagarlistan

{{contactInformation.fullName }}

@@ -79,6 +79,10 @@ + + + + diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/deltagare-card.module.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/deltagare-card.module.ts index c1b1fd1..e083a1d 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/deltagare-card.module.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/deltagare-card.module.ts @@ -2,6 +2,7 @@ import { DigiNgFormSelectModule } from '@af/digi-ng/_form/form-select'; import { DigiNgLayoutExpansionPanelModule } from '@af/digi-ng/_layout/layout-expansion-panel'; import { DigiNgLinkButtonModule } from '@af/digi-ng/_link/link-button'; import { DigiNgPopoverModule } from '@af/digi-ng/_popover/popover'; +import { DigiNgSkeletonBaseModule } from '@af/digi-ng/_skeleton/skeleton-base'; import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; @@ -13,9 +14,9 @@ import { LayoutModule } from '@msfa-shared/components/layout/layout.module'; import { LoaderModule } from '@msfa-shared/components/loader/loader.module'; import { DeltagareTabExperiencesComponent } from './components/deltagare-tab-experiences/deltagare-tab-experiences.component'; import { DeltagareTabPersonalInformationComponent } from './components/deltagare-tab-personal-information/deltagare-tab-personal-information.component'; +import { ReportsListModule } from './components/deltagare-tab-reports/components/reports-list/reports-list.module'; import { DeltagareTabReportsComponent } from './components/deltagare-tab-reports/deltagare-tab-reports.component'; import { DeltagareTabSensitiveInformationComponent } from './components/deltagare-tab-sensitive-information/deltagare-tab-sensitive-information.component'; -import { ReportsListModule } from './components/deltagare-tab-reports/components/reports-list/reports-list.module'; import { DeltagareCardComponent } from './deltagare-card.component'; import { DeltagareCardService } from './deltagare-card.service'; @@ -42,6 +43,7 @@ import { DeltagareCardService } from './deltagare-card.service'; DigiNgPopoverModule, DigiNgLinkButtonModule, DigiNgFormSelectModule, + DigiNgSkeletonBaseModule, ], providers: [DeltagareCardService], exports: [DeltagareCardComponent], diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-list/deltagare-list.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-list/deltagare-list.component.html index d6d3e12..4510503 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-list/deltagare-list.component.html +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-list/deltagare-list.component.html @@ -32,7 +32,7 @@ - + diff --git a/apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.component.html b/apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.component.html index 6222ba0..553417e 100644 --- a/apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.component.html +++ b/apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.component.html @@ -1,14 +1,20 @@ -
- -

Välj organisation

-

Du tillhör flera organisationer. Välj vilken organisation du vill arbeta med idag.

- - - + + + +
+
+

Välj organisation

+

Du tillhör flera organisationer. Välj vilken organisation du vill arbeta med idag.

+
+ +
+ -
+ + + + + diff --git a/apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.component.scss b/apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.component.scss index 9d68434..77a5f90 100644 --- a/apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.component.scss +++ b/apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.component.scss @@ -1,11 +1,8 @@ @import 'variables/gutters'; .organization-picker { - margin: 6rem 6rem; - max-width: 560px; - - &__form { - display: block; - margin-top: $digi--layout--gutter--xl; - } + max-width: var(--digi--typography--text--max-width); + display: flex; + flex-direction: column; + gap: $digi--layout--gutter--xl; } diff --git a/apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.module.ts b/apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.module.ts index 2ceff5c..dc827d2 100644 --- a/apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.module.ts +++ b/apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.module.ts @@ -1,12 +1,14 @@ import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; +import { LayoutModule } from '@msfa-shared/components/layout/layout.module'; +import { LoaderModule } from '@msfa-shared/components/loader/loader.module'; import { OrganizationPickerFormModule } from '@msfa-shared/components/organization-picker-form/organization-picker-form.module'; import { OrganizationPickerRoutingModule } from './organization-picker-routing.module'; import { OrganizationPickerComponent } from './organization-picker.component'; @NgModule({ declarations: [OrganizationPickerComponent], - imports: [CommonModule, OrganizationPickerRoutingModule, OrganizationPickerFormModule], + imports: [CommonModule, LayoutModule, OrganizationPickerRoutingModule, OrganizationPickerFormModule, LoaderModule], schemas: [CUSTOM_ELEMENTS_SCHEMA], }) export class OrganizationPickerModule {} diff --git a/apps/mina-sidor-fa/src/app/pages/start/start.component.html b/apps/mina-sidor-fa/src/app/pages/start/start.component.html index 6faa074..024f2e8 100644 --- a/apps/mina-sidor-fa/src/app/pages/start/start.component.html +++ b/apps/mina-sidor-fa/src/app/pages/start/start.component.html @@ -1,38 +1,40 @@ - - -
-
-
- -

Välkommen {{ userFullName$ | async }}

-
- -

- Detta är Arbetsförmedlingens nya plattform för fristående aktörer. Här kommer du bland annat kunna sköta den - dagliga kontakten med arbetssökande och Arbetsförmedlingen. Vi kommer successivt att implementera nytt - innehåll, förbättringar och uppdateringar. -

-

Målet är helt enkelt att underlätta ditt dagliga arbete!

- - -

- Det verkar som att du inte har fått din behörighet ännu, kontakta din administratör för att få tillgång till - tjänsten. -

- -
-
- + + + +
+
+
+ +

Välkommen {{ userFullName$ | async }}

+
+ +

+ Detta är Arbetsförmedlingens nya plattform för fristående aktörer. Här kommer du bland annat kunna sköta + den dagliga kontakten med arbetssökande och Arbetsförmedlingen. Vi kommer successivt att implementera nytt + innehåll, förbättringar och uppdateringar. +

+

Målet är helt enkelt att underlätta ditt dagliga arbete!

+ + +

+ Det verkar som att du inte har fått din behörighet ännu, kontakta din administratör för att få tillgång + till tjänsten. +

+ +
+
+ + diff --git a/apps/mina-sidor-fa/src/app/shared/components/loader/loader.component.scss b/apps/mina-sidor-fa/src/app/shared/components/loader/loader.component.scss index 850c27d..c819bbf 100644 --- a/apps/mina-sidor-fa/src/app/shared/components/loader/loader.component.scss +++ b/apps/mina-sidor-fa/src/app/shared/components/loader/loader.component.scss @@ -25,6 +25,10 @@ @include msfa__backdrop($msfa__z-index-backdrop); } + &--full-blank-screen { + @include msfa__backdrop($msfa__z-index-backdrop, true, true); + } + &__spinner { display: inline-flex; animation: spinning 1s linear infinite; diff --git a/apps/mina-sidor-fa/src/app/shared/enums/loader-type.enum.ts b/apps/mina-sidor-fa/src/app/shared/enums/loader-type.enum.ts index 23fb4a9..d671828 100644 --- a/apps/mina-sidor-fa/src/app/shared/enums/loader-type.enum.ts +++ b/apps/mina-sidor-fa/src/app/shared/enums/loader-type.enum.ts @@ -1,5 +1,6 @@ export enum LoaderType { FULL_SCREEN = 'fullscreen', + FULL_BLANK_SCREEN = 'full-blank-screen', ABSOLUTE = 'absolute', PADDED = 'padded', } diff --git a/apps/mina-sidor-fa/src/styles/mixins/_backdrop.scss b/apps/mina-sidor-fa/src/styles/mixins/_backdrop.scss index c96f9c0..660e654 100644 --- a/apps/mina-sidor-fa/src/styles/mixins/_backdrop.scss +++ b/apps/mina-sidor-fa/src/styles/mixins/_backdrop.scss @@ -1,12 +1,17 @@ @import 'variables/z-index'; -@mixin msfa__backdrop($zIndex: $msfa__z-index-default, $fullScreen: true) { +@mixin msfa__backdrop($zIndex: $msfa__z-index-default, $fullScreen: true, $opaqueBackground: false) { top: 0; right: 0; bottom: 0; left: 0; z-index: $zIndex; - background-color: rgba(255, 255, 255, 0.4); + + @if $opaqueBackground { + background-color: var(--digi--ui--color--background); + } @else { + background-color: rgba(255, 255, 255, 0.4); + } @if $fullScreen { position: fixed;