Add resources in menu. Add methodology and indicators page.

src/app/app-routing.module.ts

@@ -4,15 +4,23 @@ import {OpenaireErrorPageComponent} from './error/errorPage.component';
 
 const routes: Routes = [
   {path: '', loadChildren: () => import('./home/home.module').then(m => m.HomeModule)},
-  {
-    path: 'browse',
-    loadChildren: () => import('./search-stakeholders/search-stakeholders.module').then(m => m.SearchStakeholdersModule)
-  },
   {path: 'about/learn-how', redirectTo: 'about', pathMatch: 'full'},
   {
     path: 'about',
     loadChildren: () => import('./learn-how/learn-how.module').then(m => m.LearnHowModule)
   },
+  {
+    path: 'methodology',
+    loadChildren: () => import('./openaireLibrary/monitor/methodology/methodology.module').then(m => m.MethodologyModule)
+  },
+  {
+    path: 'indicators/:type',
+    loadChildren: () => import('./openaireLibrary/monitor/indicators/indicators.module').then(m => m.IndicatorsModule)
+  },
+  {
+    path: 'browse',
+    loadChildren: () => import('./search-stakeholders/search-stakeholders.module').then(m => m.SearchStakeholdersModule)
+  },
   {
     path: 'contact-us',
     loadChildren: () => import('./contact/contact.module').then(m => m.ContactModule)

src/app/app.component.ts

@@ -20,6 +20,7 @@ import {StringUtils} from "./openaireLibrary/utils/string-utils.class";
 import {QuickContactComponent} from "./openaireLibrary/sharedComponents/quick-contact/quick-contact.component";
 import {AlertModal} from "./openaireLibrary/utils/modal/alert";
 import {StakeholderEntities} from './openaireLibrary/monitor/entities/stakeholder';
+import {ResourcesService} from "./openaireLibrary/monitor/services/resources.service";
 
 @Component({
   selector: 'app-root',
@@ -99,7 +100,8 @@ export class AppComponent {
               private userManagementService: UserManagementService,
               private quickContactService: QuickContactService,
               private fb: FormBuilder,
-              private emailService: EmailService) {
+              private emailService: EmailService,
+              private resourcesService: ResourcesService) {
     this.subscriptions.push(router.events.forEach((event) => {
       if (event instanceof NavigationEnd) {
         if (event.url === '/contact-us') {
@@ -154,6 +156,9 @@ export class AppComponent {
       rootItem: new MenuItem("about", "About", "", "/about", false, [], null, {}),
       items: []
     });
+    if(this.properties.environment !== 'production') {
+      this.resourcesService.setResourcesDeprecated(this.menuItems);
+    }
     this.menuItems.push({
       rootItem: new MenuItem("stakeholders", "Browse " + this.stakeholderEntities.STAKEHOLDERS, "", "/browse", false, [], null, {}),
       items: []

src/app/openaireLibrary

@@ -1 +1 @@
-Subproject commit 71437f208599735b6eb9ee9fe769111c9f26e3ee
+Subproject commit d55b1819de86b435ad5533949720cba322ae089a

src/assets/common-assets

@@ -1 +1 @@
-Subproject commit f10d1dd1350f2da69eecb3bb43880c0de4705399
+Subproject commit c645362896b10ae00563f38337aa0011c640cb20

src/assets/monitor-custom.less

@@ -18,6 +18,9 @@
 @label-secondary-color: @monitor-color;
 @label-secondary-border: @monitor-color;
 
+/** List */
+@list-primary-color: @monitor-color;
+
 /** Text */
 @text-primary-color: @monitor-color;
 @text-background-color: @monitor-color;

src/assets/openaire-theme

@@ -1 +1 @@
-Subproject commit a05879462df531d670cd521f1834ccdc76e11ae0
+Subproject commit ff0dadc5dd278b9b6fcc86502541c1f9dc39945c