From 4c8792b509528997a7e19e42f3a7c444d78e9d39 Mon Sep 17 00:00:00 2001
From: Alex Martzios <alexandros.martzios@gmail.com>
Date: Tue, 12 Dec 2023 09:51:30 +0200
Subject: [PATCH] [master] all pages: add correct margins for all
 router-outlets, register OA icon on modules

---
 src/app/national/national.component.ts     | 2 +-
 src/app/national/national.module.ts        | 6 ++++++
 src/app/repository/repository.component.ts | 2 +-
 src/app/repository/repository.module.ts    | 5 +++++
 src/app/researcher/researcher.component.ts | 2 +-
 src/app/researcher/researcher.module.ts    | 8 +++++++-
 src/app/rfo/rfo.component.ts               | 2 +-
 src/app/rfo/rfo.module.ts                  | 6 ++++++
 src/app/rpo/rpo.component.ts               | 2 +-
 src/app/rpo/rpo.module.ts                  | 6 ++++++
 10 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/src/app/national/national.component.ts b/src/app/national/national.component.ts
index 5200604..2697b04 100644
--- a/src/app/national/national.component.ts
+++ b/src/app/national/national.component.ts
@@ -48,7 +48,7 @@ import {OpenaireEntities} from "../openaireLibrary/utils/properties/searchFields
                     </div>
                 </div>
             </div>
-            <div class="uk-margin-large-top">
+            <div class="uk-margin-medium-top uk-margin-medium-bottom">
                 <router-outlet></router-outlet>
             </div>
         </div>
diff --git a/src/app/national/national.module.ts b/src/app/national/national.module.ts
index c9b6579..822f62f 100644
--- a/src/app/national/national.module.ts
+++ b/src/app/national/national.module.ts
@@ -5,6 +5,9 @@ import {NationalComponent} from "./national.component";
 import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module";
 import {RoleVerificationModule} from "../openaireLibrary/role-verification/role-verification.module";
 import {IconsModule} from "../openaireLibrary/utils/icons/icons.module";
+import {IconsService} from "../openaireLibrary/utils/icons/icons.service";
+import {open_access} from "../openaireLibrary/utils/icons/icons";
+
 const routes: Route[] = [
   {
     path: '', component: NationalComponent, children: [
@@ -20,4 +23,7 @@ const routes: Route[] = [
   exports: [NationalComponent],
 })
 export class NationalModule {
+  constructor(private iconsService: IconsService) {
+    this.iconsService.registerIcons([open_access]);
+  }
 }
diff --git a/src/app/repository/repository.component.ts b/src/app/repository/repository.component.ts
index 6cb6b52..7ddbc78 100644
--- a/src/app/repository/repository.component.ts
+++ b/src/app/repository/repository.component.ts
@@ -90,7 +90,7 @@ import {SearchDataprovidersService} from "../openaireLibrary/services/searchData
             </div>
           </div>
         </div>
-        <div *ngIf="!this.alias || this.stakeholder" class="uk-margin-large-top uk-margin-large-bottom">
+        <div *ngIf="!this.alias || this.stakeholder" class="uk-margin-medium-top uk-margin-medium-bottom">
           <router-outlet></router-outlet>
         </div>
         <role-verification *ngIf="stakeholder" [id]="stakeholder.alias" [name]="stakeholder.name" [type]="stakeholder.type"></role-verification>
diff --git a/src/app/repository/repository.module.ts b/src/app/repository/repository.module.ts
index b3c3737..44cb863 100644
--- a/src/app/repository/repository.module.ts
+++ b/src/app/repository/repository.module.ts
@@ -7,6 +7,8 @@ import {RoleVerificationModule} from "../openaireLibrary/role-verification/role-
 import {SearchDataprovidersService} from "../openaireLibrary/services/searchDataproviders.service";
 import {IconsModule} from "../openaireLibrary/utils/icons/icons.module";
 import {EntityMetadataModule} from "../openaireLibrary/landingPages/landing-utils/entity-metadata.module";
+import {IconsService} from "../openaireLibrary/utils/icons/icons.service";
+import {open_access} from "../openaireLibrary/utils/icons/icons";
 
 const routes: Route[] = [
   {
@@ -25,4 +27,7 @@ const routes: Route[] = [
   exports: [RepositoryComponent],
 })
 export class RepositoryModule {
+  constructor(private iconsService: IconsService) {
+    this.iconsService.registerIcons([open_access]);
+  }
 }
diff --git a/src/app/researcher/researcher.component.ts b/src/app/researcher/researcher.component.ts
index 69a692b..bb166d7 100644
--- a/src/app/researcher/researcher.component.ts
+++ b/src/app/researcher/researcher.component.ts
@@ -57,7 +57,7 @@ import {properties} from "../../environments/environment";
           </div>
         </div>
       </div>
-      <div class="uk-section uk-container">
+      <div class="uk-margin-medium-top uk-margin-medium-bottom">
         <router-outlet></router-outlet>
       </div>
     </div>
diff --git a/src/app/researcher/researcher.module.ts b/src/app/researcher/researcher.module.ts
index 112df10..da31580 100644
--- a/src/app/researcher/researcher.module.ts
+++ b/src/app/researcher/researcher.module.ts
@@ -6,6 +6,8 @@ import {SearchOrcidServiceModule} from "../openaireLibrary/claims/claim-utils/se
 import {SearchResearchResultsServiceModule} from "../openaireLibrary/services/searchResearchResultsService.module";
 import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module";
 import {IconsModule} from '../openaireLibrary/utils/icons/icons.module';
+import {IconsService} from '../openaireLibrary/utils/icons/icons.service';
+import {open_access} from '../openaireLibrary/utils/icons/icons';
 
 const routes: Route[] = [
   {
@@ -22,6 +24,10 @@ const routes: Route[] = [
   declarations: [ResearcherComponent],
   exports: [ResearcherComponent],
 })
-export class ResearcherModule { }
+export class ResearcherModule {
+  constructor(private iconsService: IconsService) {
+    this.iconsService.registerIcons([open_access]);
+  }
+}
 
 
diff --git a/src/app/rfo/rfo.component.ts b/src/app/rfo/rfo.component.ts
index 15a0f3c..261c482 100644
--- a/src/app/rfo/rfo.component.ts
+++ b/src/app/rfo/rfo.component.ts
@@ -63,7 +63,7 @@ import {OpenaireEntities} from "../openaireLibrary/utils/properties/searchFields
                   </div>
               </div>
           </div>
-          <div *ngIf="!this.alias || this.stakeholder" class="uk-margin-large-top uk-margin-large-bottom">
+          <div *ngIf="!this.alias || this.stakeholder" class="uk-margin-medium-top uk-margin-medium-bottom">
               <router-outlet></router-outlet>
           </div>
       </div>
diff --git a/src/app/rfo/rfo.module.ts b/src/app/rfo/rfo.module.ts
index d35c38f..7c01cea 100644
--- a/src/app/rfo/rfo.module.ts
+++ b/src/app/rfo/rfo.module.ts
@@ -6,6 +6,9 @@ import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module";
 import {RoleVerificationModule} from "../openaireLibrary/role-verification/role-verification.module";
 import {IconsModule} from "../openaireLibrary/utils/icons/icons.module";
 import {LogoUrlPipeModule} from "../openaireLibrary/utils/pipes/logoUrlPipe.module";
+import {IconsService} from "../openaireLibrary/utils/icons/icons.service";
+import {open_access} from "../openaireLibrary/utils/icons/icons";
+
 const routes: Route[] = [
   {
     path: '', component: RfoComponent, children: [
@@ -22,4 +25,7 @@ const routes: Route[] = [
   exports: [RfoComponent],
 })
 export class RfoModule {
+  constructor(private iconsService: IconsService) {
+    this.iconsService.registerIcons([open_access]);
+  }
 }
diff --git a/src/app/rpo/rpo.component.ts b/src/app/rpo/rpo.component.ts
index 0b8af93..f7f9e19 100644
--- a/src/app/rpo/rpo.component.ts
+++ b/src/app/rpo/rpo.component.ts
@@ -63,7 +63,7 @@ import {OpenaireEntities} from "../openaireLibrary/utils/properties/searchFields
                     </div>
                 </div>
             </div>
-            <div *ngIf="!this.alias || this.stakeholder" class="uk-margin-large-top uk-margin-large-bottom">
+            <div *ngIf="!this.alias || this.stakeholder" class="uk-margin-medium-top uk-margin-medium-bottom">
                 <router-outlet></router-outlet>
             </div>
         </div>
diff --git a/src/app/rpo/rpo.module.ts b/src/app/rpo/rpo.module.ts
index 498da49..0cdced4 100644
--- a/src/app/rpo/rpo.module.ts
+++ b/src/app/rpo/rpo.module.ts
@@ -6,6 +6,9 @@ import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module";
 import {RoleVerificationModule} from "../openaireLibrary/role-verification/role-verification.module";
 import {IconsModule} from "../openaireLibrary/utils/icons/icons.module";
 import {LogoUrlPipeModule} from "../openaireLibrary/utils/pipes/logoUrlPipe.module";
+import {IconsService} from "../openaireLibrary/utils/icons/icons.service";
+import {open_access} from "../openaireLibrary/utils/icons/icons";
+
 const routes: Route[] = [
   {
     path: '', component: RpoComponent, children: [
@@ -22,4 +25,7 @@ const routes: Route[] = [
   exports: [RpoComponent],
 })
 export class RpoModule {
+  constructor(private iconsService: IconsService) {
+    this.iconsService.registerIcons([open_access]);
+  }
 }