Merge branch 'master' of code-repo.d4science.org:MaDgIK/irish-monitor

src/app/app-routing.module.ts

@@ -46,13 +46,32 @@ const routes: Routes = [
     loadChildren: () => import('./contact/contact.module').then(m => m.ContactModule),
     data: {title: Irish.METADATA_PREFIX}
   },
+  {
+    path: 'how-it-works',
+    loadChildren: () => import('./resources/how-it-works/how-it-works.module').then(m => m.HowItWorksModule)
+  },
+  {
+    path: 'methodology',
+    loadChildren: () => import('./resources/methodology/methodology.module').then(m => m.MethodologyModule)
+  },
+  {
+    path: 'stats-logs', 
+    loadChildren: () => import('./public-logs/public-logs.module').then(m => m.PublicLogsModule)
+  },
+  {
+    path: 'engagement-training',
+    loadChildren: () => import('./resources/engagement/engagement.module').then(m => m.EngagementModule)
+  },
+  {
+    path: 'support',
+    loadChildren: () => import('./resources/support/support.module').then(m => m.SupportModule)
+  },
   {
     path: 'admin',
     loadChildren: () => import('./admin/admin.module').then(m => m.AdminModule),
     data: {title: Irish.METADATA_PREFIX + ' Admin | ', monitorCurator: true},
     canActivateChild: [AdminLoginGuard, HasConsentGuard]
   },
-  {path: 'stats-logs', loadChildren: () => import('./public-logs/public-logs.module').then(m => m.PublicLogsModule)},
   {path: 'user-policy', loadChildren: () => import('./user-policy/user-policy.module').then(m => m.UserPolicyModule)},
   {path: 'participate', loadChildren: () => import('./claims/claims.module').then(m => m.ClaimsModule), canActivate: [HasConsentGuard]},
   {

src/app/app.component.ts

@@ -155,8 +155,21 @@ export class AppComponent extends ResearcherBaseComponent implements OnInit {
       new MenuItem("rfo", this.stakeholderUtils.entities.funder + ' ' + this.stakeholderUtils.entities.stakeholders, "", "/rfo", false, [], null, {}, null, null, null, "/rfo"),
       new MenuItem("researcher", "Researcher Monitors", "", "/researcher", false, [], null, {}, null, null, null, "/researcher"),
       new MenuItem("repository", "Repository Monitors", "", "/repository", false, [], null, {}, null, null, null, "/repository"),
-      new MenuItem("resources", "Resources", "", "", false, [], null, {}, null, null, null,
+      new MenuItem("resources", "Resources & Help", "", "", false, [], null, {}, null, null, null, "/resources","_blank", "internal", false, 
-        "/resources","_blank", "internal", false, [new MenuItem("stats-logs", "Web statistics & Activity Logs ", "", "/stats-logs", false, [], null, {}, null, null, null, "/public-logs")]),
+        [
+          new MenuItem("how-it-works", "How it works?", "", "", false, [], null, {}, null, null, null, null, "_self"),
+          new MenuItem("about", "About", "", "/how-it-works/about", false, [], null, {}, null, null, null, "/about"),
+          new MenuItem("the-5-monitors", "The 5 Monitors", "", "/how-it-works/the-5-monitors", false, [], null, {}, null, null, null, "/the-5-monitors"),
+          new MenuItem("user-actions", "User Actions", "", "/how-it-works/user-actions", false, [], null, {}, null, null, null, "/user-actions"),
+          new MenuItem("methodology", "Methodology", "", "", false, [], null, {}, null, null, null, null, "_self"),
+          new MenuItem("methodological-approach", "Methodological Approach", "", "/methodology/methodological-approach", false, [], null, {}, null, null, null, "/methodological-approach"),
+          new MenuItem("terminology-construction", "Terminology & Construction", "", "/methodology/terminology", false, [], null, {}, null, null, null, "/terminology"),
+          new MenuItem("", "", "", "", false, [], null, {}, null, null, null, null, "_self"),
+          new MenuItem("stats-logs", "Web Statistics & Activity Logs", "", "/stats-logs", false, [], null, {}, null, null, null, "/public-logs"),
+          new MenuItem("engagement-training", "Engagement & Training", "", "/engagement-training", false, [], null, {}, null, null, null, "/engagement-training"),
+          new MenuItem("support", "Support", "", "/support", false, [], null, {}, null, null, null, "/support"),
+        ]
+      ),
     ];
     if (this.user) {
       this.userMenuItems = [];

src/app/openaireLibrary

@@ -1 +1 @@
-Subproject commit 0f52dcbdca01a2af986b44b037c454f6452a45cb
+Subproject commit ab0ae376b960c9c0cc9e45c47c0a6bb95499e3c8

src/app/resources/engagement/engagement.component.ts

@@ -0,0 +1,13 @@
+import {Component} from "@angular/core";
+
+@Component({
+  selector: 'engagement',
+  template: `
+    <div>engagement and training page</div>
+  `
+})
+export class EngagementComponent {
+  constructor() {
+    
+  }
+}

src/app/resources/engagement/engagement.module.ts

@@ -0,0 +1,16 @@
+import {NgModule} from "@angular/core";
+import {CommonModule} from "@angular/common";
+import {EngagementComponent} from "./engagement.component";
+import {RouterModule} from "@angular/router";
+
+@NgModule({
+  declarations: [EngagementComponent],
+  imports: [CommonModule, RouterModule.forChild([
+    {
+      path: '', component: EngagementComponent
+    }
+  ])],
+  exports: [EngagementComponent]
+})
+export class EngagementModule {
+}

src/app/resources/how-it-works/about.component.ts

@@ -0,0 +1,13 @@
+import {Component} from "@angular/core";
+
+@Component({
+  selector: 'about',
+  template: `
+    <div>about page</div>
+  `
+})
+export class AboutComponent {
+  constructor() {
+    
+  }
+}

src/app/resources/how-it-works/how-it-works.module.ts

@@ -0,0 +1,36 @@
+import {NgModule} from "@angular/core";
+import {CommonModule} from "@angular/common";
+import {RouterModule} from "@angular/router";
+import {AboutComponent} from "./about.component";
+import {The5MonitorsComponent} from "./the-5-monitors.component";
+import {UserActionsComponent} from "./user-actions.component";
+
+@NgModule({
+  declarations: [AboutComponent, The5MonitorsComponent, UserActionsComponent],
+  imports: [CommonModule, RouterModule.forChild([
+    {
+      path: '',
+      redirectTo: 'about',
+      pathMatch: 'full',
+      canDeactivate: []
+    },
+    {
+      path: 'about',
+      component: AboutComponent,
+      canDeactivate: []
+    },
+    {
+      path: 'the-5-monitors',
+      component: The5MonitorsComponent,
+      canDeactivate: []
+    },
+		{
+      path: 'user-actions',
+      component: UserActionsComponent,
+			canDeactivate: []
+    }
+  ])],
+  exports: []
+})
+export class HowItWorksModule {
+}

src/app/resources/how-it-works/the-5-monitors.component.ts

@@ -0,0 +1,13 @@
+import {Component} from "@angular/core";
+
+@Component({
+  selector: 'the-5-monitors',
+  template: `
+    <div>the 5 monitors page</div>
+  `
+})
+export class The5MonitorsComponent {
+  constructor() {
+    
+  }
+}

src/app/resources/how-it-works/user-actions.component.ts

@@ -0,0 +1,13 @@
+import {Component} from "@angular/core";
+
+@Component({
+  selector: 'user-actions',
+  template: `
+    <div>user actions page</div>
+  `
+})
+export class UserActionsComponent {
+  constructor() {
+    
+  }
+}

src/app/resources/methodology/methodological-approach.component.ts

@@ -0,0 +1,13 @@
+import {Component} from "@angular/core";
+
+@Component({
+  selector: 'methodological-approach',
+  template: `
+    <div>methodological approach page</div>
+  `
+})
+export class MethodologicalApproachComponent {
+  constructor() {
+    
+  }
+}

src/app/resources/methodology/methodology.module.ts

@@ -0,0 +1,30 @@
+import {NgModule} from "@angular/core";
+import {CommonModule} from "@angular/common";
+import {RouterModule} from "@angular/router";
+import {MethodologicalApproachComponent} from "./methodological-approach.component";
+import {TerminologyComponent} from "./terminology.component";
+
+@NgModule({
+  declarations: [MethodologicalApproachComponent, TerminologyComponent],
+  imports: [CommonModule, RouterModule.forChild([
+    {
+      path: '',
+      redirectTo: 'methodological-approach',
+      pathMatch: 'full',
+      canDeactivate: []
+    },
+    {
+      path: 'methodological-approach',
+      component: MethodologicalApproachComponent,
+      canDeactivate: []
+    },
+    {
+      path: 'terminology',
+      component: TerminologyComponent,
+      canDeactivate: []
+    },
+  ])],
+  exports: []
+})
+export class MethodologyModule {
+}

src/app/resources/methodology/terminology.component.ts

@@ -0,0 +1,13 @@
+import {Component} from "@angular/core";
+
+@Component({
+  selector: 'terminology',
+  template: `
+    <div>terminology page</div>
+  `
+})
+export class TerminologyComponent {
+  constructor() {
+    
+  }
+}

src/app/resources/support/support.component.ts

@@ -0,0 +1,13 @@
+import {Component} from "@angular/core";
+
+@Component({
+  selector: 'support',
+  template: `
+    <div>support page</div>
+  `
+})
+export class SupportComponent {
+  constructor() {
+    
+  }
+}

src/app/resources/support/support.module.ts

@@ -0,0 +1,16 @@
+import {NgModule} from "@angular/core";
+import {CommonModule} from "@angular/common";
+import {SupportComponent} from "./support.component";
+import {RouterModule} from "@angular/router";
+
+@NgModule({
+  declarations: [SupportComponent],
+  imports: [CommonModule, RouterModule.forChild([
+    {
+      path: '', component: SupportComponent
+    }
+  ])],
+  exports: [SupportComponent]
+})
+export class SupportModule {
+}