diff --git a/src/app/admin/admin.component.ts b/src/app/admin/admin.component.ts index 35802d4..4aa6e2c 100644 --- a/src/app/admin/admin.component.ts +++ b/src/app/admin/admin.component.ts @@ -9,7 +9,8 @@ import {MenuItem} from "../openaireLibrary/sharedComponents/menu"; @Component({ selector: 'admin', template: ` -
+
@@ -22,6 +23,7 @@ import {MenuItem} from "../openaireLibrary/sharedComponents/menu"; }) export class AdminComponent extends SidebarBaseComponent implements OnInit { stakeholder: Stakeholder; + loading: boolean = true; constructor(protected _route: ActivatedRoute, protected _router: Router, @@ -36,14 +38,19 @@ export class AdminComponent extends SidebarBaseComponent implements OnInit { super.ngOnInit(); this.subscriptions.push(this.params.subscribe(params => { this.sideBarItems = []; + this.loading = true; if(params['alias']) { this.subscriptions.push(this.stakeholderService.getStakeholder(params['alias']).subscribe(stakeholder => { this.stakeholder = stakeholder; this.sideBarItems.push(new MenuItem("general", "General", "", "/admin/" + this.stakeholder.alias, false, [], [], {}, {name: 'badge'})); this.sideBarItems.push(new MenuItem("indicators", "Indicators", "", "/admin/" + this.stakeholder.alias + '/indicators', false, [], [], {}, {name: 'bar_chart'}, null, "uk-visible@m")); + this.backItem = new MenuItem("back", "Manage profiles", "", "/admin", false, [], null, {}, {name: 'west'}); + this.loading = false; })); } else { this.stakeholderService.setStakeholder(null); + this.hasSidebar = false; + this.loading = false; } })); } diff --git a/src/app/admin/admin.module.ts b/src/app/admin/admin.module.ts index 1b5f5fe..cb7be86 100644 --- a/src/app/admin/admin.module.ts +++ b/src/app/admin/admin.module.ts @@ -4,6 +4,7 @@ import {RouterModule} from "@angular/router"; import {AdminComponent} from "./admin.component"; import {HelperFunctions} from "../openaireLibrary/utils/HelperFunctions.class"; import {SideBarModule} from "../openaireLibrary/dashboard/sharedComponents/sidebar/sideBar.module"; +import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module"; @NgModule({ imports: [CommonModule, RouterModule.forChild([ @@ -29,7 +30,7 @@ import {SideBarModule} from "../openaireLibrary/dashboard/sharedComponents/sideb } ] } - ]), SideBarModule], + ]), SideBarModule, LoadingModule], declarations: [AdminComponent], exports: [AdminComponent] }) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 1ca553d..46e189c 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -6,7 +6,7 @@ import {ConfigurationService} from "./openaireLibrary/utils/configuration/config import {Irish} from "./shared/irish"; import {CustomFilterService} from "./shared/customFilter.service"; import {UserManagementService} from "./openaireLibrary/services/user-management.service"; -import {User} from "./openaireLibrary/login/utils/helper.class"; +import {Session, User} from "./openaireLibrary/login/utils/helper.class"; import {SmoothScroll} from "./openaireLibrary/utils/smooth-scroll"; import {StakeholderBaseComponent} from "./openaireLibrary/monitor-admin/utils/stakeholder-base.component"; @@ -17,10 +17,10 @@ import {StakeholderBaseComponent} from "./openaireLibrary/monitor-admin/utils/st
-
+
+ [header]="header" [user]="user" [userMenuItems]="userMenuItems">
@@ -34,12 +34,13 @@ export class AppComponent extends StakeholderBaseComponent implements OnInit { header: Header = { route: "/", title: "Noami", - logoUrl: "", + logoUrl: 'assets/main.svg', logoSmallUrl: null, position: 'left', badge: true, }; menuItems:MenuItem[] = []; + userMenuItems: MenuItem[] = []; irish: Irish = new Irish(); user: User; @@ -68,12 +69,24 @@ export class AppComponent extends StakeholderBaseComponent implements OnInit { initialize() { this.menuItems = [ - new MenuItem("national", this.stakeholderUtils.entities.country + ' ' + this.stakeholderUtils.entities.stakeholders, "", "/", false, [], null, {}, null, null, null, null), + new MenuItem("national", this.stakeholderUtils.entities.country + ' ' + this.stakeholderUtils.entities.stakeholder, "", "/", false, [], null, {}, null, null, null, null), new MenuItem("rpo", this.stakeholderUtils.entities.organization + ' ' + this.stakeholderUtils.entities.stakeholders, "", "/rpo", false, [], null, {}, null, null, null, null), new MenuItem("rfo", this.stakeholderUtils.entities.funder + ' ' + this.stakeholderUtils.entities.stakeholders, "", "/rfo", false, [], null, {}, null, null, null, null), new MenuItem("researcher", "Researcher Monitors", "", "/researcher", false, [], null, {}, null, null, null, null), +/* new MenuItem("repository", "Repository Monitors", "", "/", false, [], null, {}, null, null, null, null), - new MenuItem("upload-dois", "Upload DOIs", "", "/upload-dois", false, [], null, {}, null, null, null, null) +*/ ]; + + if(this.user) { + this.userMenuItems = [new MenuItem("upload-dois", "Upload DOIs", "", "/upload-dois", false, [], null, {}, null, null, null, null)]; + if(this.isAdmin) { + this.userMenuItems.push(new MenuItem("stakeholders", "Manage profiles", "", "/admin", false, [], [], {}, {name: 'settings'})); + } + } + } + + public get isAdmin() { + return Session.isPortalAdministrator(this.user) || Session.isMonitorCurator(this.user); } } diff --git a/src/app/national/national.component.ts b/src/app/national/national.component.ts index 27a06e0..713a304 100644 --- a/src/app/national/national.component.ts +++ b/src/app/national/national.component.ts @@ -1,4 +1,4 @@ -import {Component, OnDestroy, OnInit} from "@angular/core"; +import {Component, OnInit} from "@angular/core"; import {Stakeholder} from "../openaireLibrary/monitor/entities/stakeholder"; import {StakeholderService} from "../openaireLibrary/monitor/services/stakeholder.service"; import {BaseComponent} from "../openaireLibrary/sharedComponents/base/base.component"; @@ -13,16 +13,19 @@ import {CustomFilterService} from "../shared/customFilter.service"; @Component({ selector: 'national', template: ` -
- Browse results -
-
- -
+ +
+ Browse results +
+
+ +
+ ` }) export class NationalComponent extends BaseComponent implements OnInit { stakeholder: Stakeholder; + loading: boolean = true; constructor(private stakeholderService: StakeholderService, protected _router: Router, @@ -34,23 +37,18 @@ export class NationalComponent extends BaseComponent implements OnInit { private _customFilterService:CustomFilterService) { super(); super.initRouterParams(this._route); - } ngOnInit() { - this.title = 'National Monitor'; - this.description = 'National Monitor'; - this.setMetadata(); - /* this.params.subscribe(params => { - console.log("") - if(!params || !params['stakeholder']) {*/ + this.stakeholderService.getStakeholder(this._route.snapshot.data.stakeholder).subscribe(stakeholder => { + this.stakeholder = stakeholder; + if(this.stakeholder) { + this._customFilterService.setCustomFilter([new SearchCustomFilter("National", "country", "IE", "Irish National Monitor")]); + LinksResolver.setProperties(""); + this.loading = false; + } else { - this._customFilterService.setCustomFilter([new SearchCustomFilter("National", "country", "IE", "Irish National Monitor")]); - LinksResolver.setProperties(""); - - // TODO not correct id/ no author // no irish author? - - // } - // }); + } + }); } } diff --git a/src/app/national/national.module.ts b/src/app/national/national.module.ts index bab49c0..b357cdc 100644 --- a/src/app/national/national.module.ts +++ b/src/app/national/national.module.ts @@ -5,12 +5,9 @@ import {NationalComponent} from "./national.component"; const routes: Route[] = [ { path: '', component: NationalComponent, children: [ - /* { - path: '', - loadChildren: () => import('../shared/browse-stakeholders/browse-stakeholder.module').then(m => m.BrowseStakeholderModule) - },*/ + {path: '', loadChildren: () => import('../shared/monitor/monitor.module').then(m => m.MonitorModule)}, {path: 'search', loadChildren: () => import('../search/search.module').then(m => m.SearchModule)} - ] + ], data: {stakeholder: 'tubitak'} } ]; diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index e80f73f..a8c91dc 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit e80f73f9a9ceb65bff5b326e5b187b943415d7ad +Subproject commit a8c91dc04cb65db6d09b21d6159319dc3294f2a8 diff --git a/src/app/rfo/rfo.component.ts b/src/app/rfo/rfo.component.ts index 75808cc..47498f1 100644 --- a/src/app/rfo/rfo.component.ts +++ b/src/app/rfo/rfo.component.ts @@ -17,15 +17,16 @@ import {CustomFilterService} from "../shared/customFilter.service";
{{stakeholder.index_name}}
- Browse results
+ Browse results
-
+
` }) export class RfoComponent extends BaseComponent implements OnInit { stakeholder: Stakeholder; + alias: string; constructor(private stakeholderService: StakeholderService, private _customFilterService:CustomFilterService, @@ -43,9 +44,9 @@ export class RfoComponent extends BaseComponent implements OnInit { ngOnInit() { this.params.subscribe(params => { this._customFilterService.setCustomFilter(null); - let alias = params['stakeholder']; - if(alias) { - this.subscriptions.push(this.stakeholderService.getStakeholder(alias, true).subscribe(data => { + this.alias = params['stakeholder']; + if(this.alias) { + this.subscriptions.push(this.stakeholderService.getStakeholder(this.alias, true).subscribe(data => { this.stakeholder = data; LinksResolver.resetProperties(); LinksResolver.setSearchAndResultLanding("rfo/" + this.stakeholder.alias); @@ -54,10 +55,6 @@ export class RfoComponent extends BaseComponent implements OnInit { [new SearchCustomFilter("National", "country", "IE", "Irish National Monitor", false), new SearchCustomFilter("RF0", "relfunder", value, this.stakeholder.index_name, true) ]); - - // TODO not correct id/ no irish? - - })); } }); diff --git a/src/app/rfo/rfo.module.ts b/src/app/rfo/rfo.module.ts index 4d7cc1a..7e185e3 100644 --- a/src/app/rfo/rfo.module.ts +++ b/src/app/rfo/rfo.module.ts @@ -6,7 +6,7 @@ const routes: Route[] = [ { path: '', component: RfoComponent, children: [ {path: '', loadChildren: () => import('../shared/browse-stakeholders/browse-stakeholder.module').then(m => m.BrowseStakeholderModule)}, - {path: ':stakeholder', redirectTo: ':stakeholder/search'}, + {path: ':stakeholder', loadChildren: () => import('../shared/monitor/monitor.module').then(m => m.MonitorModule)}, {path: ':stakeholder/search', loadChildren: () => import('../search/resultLanding.module').then(m => m.ResultLandingModule)} ] } diff --git a/src/app/rpo/rpo.component.ts b/src/app/rpo/rpo.component.ts index 45aae6d..437a41f 100644 --- a/src/app/rpo/rpo.component.ts +++ b/src/app/rpo/rpo.component.ts @@ -16,13 +16,14 @@ import {SearchCustomFilter} from "../openaireLibrary/searchPages/searchUtils/sea
-
+
` }) export class RpoComponent extends BaseComponent implements OnInit { stakeholder: Stakeholder; + alias: string; constructor(private stakeholderService: StakeholderService, private _customFilterService:CustomFilterService, @@ -40,9 +41,9 @@ export class RpoComponent extends BaseComponent implements OnInit { ngOnInit() { this.params.subscribe(params => { this._customFilterService.setCustomFilter(null); - let alias = params['stakeholder']; - if(alias) { - this.subscriptions.push(this.stakeholderService.getStakeholder(alias, true).subscribe(data => { + this.alias = params['stakeholder']; + if(this.alias) { + this.subscriptions.push(this.stakeholderService.getStakeholder(this.alias, true).subscribe(data => { this.stakeholder = data; LinksResolver.resetProperties(); LinksResolver.setSearchAndResultLanding("rpo/" + this.stakeholder.alias); diff --git a/src/app/rpo/rpo.module.ts b/src/app/rpo/rpo.module.ts index 32fdff3..4fb2772 100644 --- a/src/app/rpo/rpo.module.ts +++ b/src/app/rpo/rpo.module.ts @@ -6,7 +6,7 @@ const routes: Route[] = [ { path: '', component: RpoComponent, children: [ {path: '', loadChildren: () => import('../shared/browse-stakeholders/browse-stakeholder.module').then(m => m.BrowseStakeholderModule)}, - {path: ':stakeholder', redirectTo: ':stakeholder/search'}, + {path: ':stakeholder', loadChildren: () => import('../shared/monitor/monitor.module').then(m => m.MonitorModule)}, {path: ':stakeholder/search', loadChildren: () => import('../search/resultLanding.module').then(m => m.ResultLandingModule)} ] } diff --git a/src/app/search/searchPages/advanced/searchDataproviders.component.ts b/src/app/search/searchPages/advanced/searchDataproviders.component.ts index f83afe9..cc3c5ad 100644 --- a/src/app/search/searchPages/advanced/searchDataproviders.component.ts +++ b/src/app/search/searchPages/advanced/searchDataproviders.component.ts @@ -1,6 +1,5 @@ -import {Component, Input, OnInit} from '@angular/core'; +import {Component, OnInit} from '@angular/core'; import {ActivatedRoute, Router} from "@angular/router"; -import {SearchForm} from "../../../openaireLibrary/searchPages/searchUtils/newSearchPage.component"; import {SearchBaseComponent} from "../searchBaseComponent"; import {CustomFilterService} from "../../../shared/customFilter.service"; @@ -23,7 +22,4 @@ export class MonitorAdvancedSearchDataprovidersComponent extends SearchBaseComp protected customFilterService: CustomFilterService) { super(); } - ngOnInit() { - super.initSearch(); - } } diff --git a/src/app/search/searchPages/advanced/searchOrganizations.component.ts b/src/app/search/searchPages/advanced/searchOrganizations.component.ts index 25a25f9..d83cb87 100644 --- a/src/app/search/searchPages/advanced/searchOrganizations.component.ts +++ b/src/app/search/searchPages/advanced/searchOrganizations.component.ts @@ -1,6 +1,5 @@ -import {Component, Input, OnInit} from '@angular/core'; +import {Component, OnInit} from '@angular/core'; import {ActivatedRoute, Router} from "@angular/router"; -import {SearchForm} from "../../../openaireLibrary/searchPages/searchUtils/newSearchPage.component"; import {SearchBaseComponent} from "../searchBaseComponent"; import {CustomFilterService} from "../../../shared/customFilter.service"; @@ -22,8 +21,5 @@ export class MonitorAdvancedSearchOrganizationsComponent extends SearchBaseCompo protected customFilterService: CustomFilterService) { super(); } - ngOnInit() { - super.initSearch(); - } } diff --git a/src/app/search/searchPages/advanced/searchProjects.component.ts b/src/app/search/searchPages/advanced/searchProjects.component.ts index 692df92..ebc85ec 100644 --- a/src/app/search/searchPages/advanced/searchProjects.component.ts +++ b/src/app/search/searchPages/advanced/searchProjects.component.ts @@ -1,6 +1,5 @@ -import {Component, Input, OnInit} from '@angular/core'; +import {Component, OnInit} from '@angular/core'; import {ActivatedRoute, Router} from "@angular/router"; -import {SearchForm} from "../../../openaireLibrary/searchPages/searchUtils/newSearchPage.component"; import {SearchBaseComponent} from "../searchBaseComponent"; import {CustomFilterService} from "../../../shared/customFilter.service"; @@ -25,7 +24,4 @@ export class MonitorAdvancedSearchProjectsComponent extends SearchBaseComponent protected customFilterService: CustomFilterService) { super(); } - ngOnInit() { - super.initSearch(); - } } diff --git a/src/app/search/searchPages/advanced/searchResearchResults.component.ts b/src/app/search/searchPages/advanced/searchResearchResults.component.ts index f4c4c71..85cc341 100644 --- a/src/app/search/searchPages/advanced/searchResearchResults.component.ts +++ b/src/app/search/searchPages/advanced/searchResearchResults.component.ts @@ -22,7 +22,4 @@ export class MonitorAdvancedSearchResearchResultsComponent extends SearchBaseCom protected customFilterService: CustomFilterService) { super(); } - ngOnInit() { - super.initSearch(); - } } diff --git a/src/app/search/searchPages/searchBaseComponent.ts b/src/app/search/searchPages/searchBaseComponent.ts index 377cfe9..57fef2d 100644 --- a/src/app/search/searchPages/searchBaseComponent.ts +++ b/src/app/search/searchPages/searchBaseComponent.ts @@ -1,4 +1,4 @@ -import {Directive} from "@angular/core"; +import {Directive, OnInit} from "@angular/core"; import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class"; import {properties} from "../../../environments/environment"; import {BaseComponent} from "../../openaireLibrary/sharedComponents/base/base.component"; @@ -6,20 +6,18 @@ import {CustomFilterService} from "../../shared/customFilter.service"; import {ActivatedRoute, Router} from "@angular/router"; @Directive() -export abstract class SearchBaseComponent extends BaseComponent { +export abstract class SearchBaseComponent extends BaseComponent implements OnInit { protected customFilterService: CustomFilterService; protected route: ActivatedRoute; protected router: Router; customFilters: SearchCustomFilter[]; - properties; keyword = ""; parameters = {}; - protected initSearch(){ - this.properties = properties; + ngOnInit() { //for the case of national this.subscriptions.push((this.customFilterService.getCustomFilterAsObservable().subscribe(customFilters => { - if(customFilters && customFilters.length > 0) { + if (customFilters && customFilters.length > 0) { this.customFilters = customFilters; } }))); @@ -27,11 +25,11 @@ export abstract class SearchBaseComponent extends BaseComponent { if (params && params['stakeholder']) { this.subscriptions.push((this.customFilterService.getCustomFilterAsObservable().subscribe(customFilters => { - if(customFilters && customFilters.length > 0) { + if (customFilters && customFilters.length > 0) { this.customFilters = customFilters; } }))); - }else{ + } else { // TODO } })); @@ -42,21 +40,21 @@ export abstract class SearchBaseComponent extends BaseComponent { })); } - search(){ + search() { this.prepareKeywordParam(this.keyword); this.parameters["page"] = 1; this.router.navigate([location.pathname], {queryParams: this.parameters}); } - private prepareKeywordParam(keyword){ + private prepareKeywordParam(keyword) { if (this.parameters["q"]) { delete this.parameters['q']; delete this.parameters['op']; } - if(keyword.length > 0){ + if (keyword.length > 0) { this.parameters["fv0"] = keyword; this.parameters["f0"] = "q"; - }else if(keyword.length ==0 && this.parameters["f0"]=="q"){ + } else if (keyword.length == 0 && this.parameters["f0"] == "q") { delete this.parameters['f0']; delete this.parameters['fv0']; } diff --git a/src/app/search/searchPages/simple/searchDataproviders.component.ts b/src/app/search/searchPages/simple/searchDataproviders.component.ts index 8915926..cada3ed 100644 --- a/src/app/search/searchPages/simple/searchDataproviders.component.ts +++ b/src/app/search/searchPages/simple/searchDataproviders.component.ts @@ -1,12 +1,5 @@ -import {Component, Input} from '@angular/core'; -import {SearchCustomFilter} from "../../../openaireLibrary/searchPages/searchUtils/searchUtils.class"; +import {Component} from '@angular/core'; import {ActivatedRoute, Router} from "@angular/router"; -import {StakeholderService} from "../../../openaireLibrary/monitor/services/stakeholder.service"; -import {Subscriber} from "rxjs"; -import {ConfigurationService} from "../../../openaireLibrary/utils/configuration/configuration.service"; -import {SearchForm} from "../../../openaireLibrary/searchPages/searchUtils/newSearchPage.component"; -import {EnvProperties} from "../../../openaireLibrary/utils/properties/env-properties"; -import {properties} from "../../../../environments/environment"; import {SearchBaseComponent} from "../searchBaseComponent"; import {CustomFilterService} from "../../../shared/customFilter.service"; @@ -33,10 +26,4 @@ export class MonitorSearchDataprovidersComponent extends SearchBaseComponent{ protected customFilterService: CustomFilterService) { super(); } - - ngOnInit() { - super.initSearch(); - } - - } diff --git a/src/app/search/searchPages/simple/searchOrganizations.component.ts b/src/app/search/searchPages/simple/searchOrganizations.component.ts index ac46af3..79b5796 100644 --- a/src/app/search/searchPages/simple/searchOrganizations.component.ts +++ b/src/app/search/searchPages/simple/searchOrganizations.component.ts @@ -25,10 +25,4 @@ export class MonitorSearchOrganizationsComponent extends SearchBaseComponent{ protected customFilterService: CustomFilterService) { super(); } - - ngOnInit() { - super.initSearch(); - } - - } diff --git a/src/app/search/searchPages/simple/searchProjects.component.ts b/src/app/search/searchPages/simple/searchProjects.component.ts index dd94ef6..31b58ce 100644 --- a/src/app/search/searchPages/simple/searchProjects.component.ts +++ b/src/app/search/searchPages/simple/searchProjects.component.ts @@ -28,10 +28,4 @@ export class MonitorSearchProjectsComponent extends SearchBaseComponent{ protected customFilterService: CustomFilterService) { super(); } - - ngOnInit() { - super.initSearch(); - } - - } diff --git a/src/app/search/searchPages/simple/searchResearchResults.component.ts b/src/app/search/searchPages/simple/searchResearchResults.component.ts index 1d2dad4..ff602d7 100644 --- a/src/app/search/searchPages/simple/searchResearchResults.component.ts +++ b/src/app/search/searchPages/simple/searchResearchResults.component.ts @@ -25,10 +25,4 @@ export class MonitorSearchResearchResultsComponent extends SearchBaseComponent{ protected customFilterService: CustomFilterService) { super(); } - - ngOnInit() { - super.initSearch(); - } - - } diff --git a/src/app/shared/monitor/monitor.component.html b/src/app/shared/monitor/monitor.component.html new file mode 100644 index 0000000..26bd5e9 --- /dev/null +++ b/src/app/shared/monitor/monitor.component.html @@ -0,0 +1,18 @@ +
+
+
+ + + + + +
+
+
+ +
+
diff --git a/src/app/shared/monitor/monitor.component.ts b/src/app/shared/monitor/monitor.component.ts new file mode 100644 index 0000000..f90bf45 --- /dev/null +++ b/src/app/shared/monitor/monitor.component.ts @@ -0,0 +1,69 @@ +import {ChangeDetectorRef, Component} from "@angular/core"; +import { + MonitorIndicatorStakeholderBaseComponent +} from "../../openaireLibrary/monitor/monitor-indicator-stakeholder-base.component"; +import {DomSanitizer, Meta, Title} from "@angular/platform-browser"; +import {LayoutService} from "../../openaireLibrary/dashboard/sharedComponents/sidebar/layout.service"; +import {StatisticsService} from "../../openaireLibrary/monitor-admin/utils/services/statistics.service"; +import {StakeholderService} from "../../openaireLibrary/monitor/services/stakeholder.service"; +import {UserManagementService} from "../../openaireLibrary/services/user-management.service"; +import {IndicatorPath, Visibility} from "../../openaireLibrary/monitor/entities/stakeholder"; +import {ActivatedRoute, Router} from "@angular/router"; +import {PiwikService} from "../../openaireLibrary/utils/piwik/piwik.service"; +import {SEOService} from "../../openaireLibrary/sharedComponents/SEO/SEO.service"; + +@Component({ + selector: 'monitor', + templateUrl: 'monitor.component.html' +}) +export class MonitorComponent extends MonitorIndicatorStakeholderBaseComponent { + tabsClass: string = 'uk-tab'; + + constructor(protected _route: ActivatedRoute, + protected _router: Router, + protected _meta: Meta, + protected _title: Title, + protected _piwikService: PiwikService, + protected seoService: SEOService, + protected sanitizer: DomSanitizer, + protected cdr: ChangeDetectorRef, + protected layoutService: LayoutService, + protected statisticsService: StatisticsService, + private userManagementService: UserManagementService, + private stakeholderService: StakeholderService) { + super(); + } + + ngOnInit() { + super.ngOnInit(); + this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => { + this.user = user; + this.subscriptions.push(this._route.params.subscribe(params => { + this.loading = true; + this.activeTopic = null; + this.activeCategory = null; + this.activeSubCategory = null; + this.numberResults = new Map(); + this.chartsActiveType = new Map(); + this.subscriptions.push(this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => { + if (stakeholder) { + this.stakeholder = stakeholder; + this.subscriptions.push(this._route.queryParams.subscribe(queryParams => { + this.handleQueryParams(queryParams, params); + this.title = this.stakeholder.name; + this.description = this.stakeholder.name; + this.setMetadata(); + this.setView(params); + })); + } else { + this.navigateToError(); + } + })); + })); + })); + } + + hasPermission(visibility: Visibility): boolean { + return true; + } +} diff --git a/src/app/shared/monitor/monitor.module.ts b/src/app/shared/monitor/monitor.module.ts new file mode 100644 index 0000000..77a51a1 --- /dev/null +++ b/src/app/shared/monitor/monitor.module.ts @@ -0,0 +1,17 @@ +import {NgModule} from "@angular/core"; +import {CommonModule} from "@angular/common"; +import {RouterModule} from "@angular/router"; +import {MonitorComponent} from "./monitor.component"; +import {PageContentModule} from "../../openaireLibrary/dashboard/sharedComponents/page-content/page-content.module"; +import {SliderTabsModule} from "../../openaireLibrary/sharedComponents/tabs/slider-tabs.module"; + +@NgModule({ + imports: [CommonModule, RouterModule.forChild([ + {path: '', component: MonitorComponent} + ]), PageContentModule, SliderTabsModule], + declarations: [MonitorComponent], + exports: [MonitorComponent] +}) +export class MonitorModule { + +} diff --git a/src/app/upload-dois/upload-dois.component.html b/src/app/upload-dois/upload-dois.component.html index ac570e1..9c6f00a 100644 --- a/src/app/upload-dois/upload-dois.component.html +++ b/src/app/upload-dois/upload-dois.component.html @@ -1,5 +1,5 @@ -
-
+
+
Title
Lorem ipsum.......
@@ -25,14 +25,14 @@
-
-
-
Drag and Drop your file here
+
+ +
Drag and Drop your file here
File supported: CSV
-
or
+
or
- CHOOSE FILE + Choose File
Maximum size: 5 MB
diff --git a/src/app/upload-dois/upload-dois.module.ts b/src/app/upload-dois/upload-dois.module.ts index 0e4349a..a6ddb42 100644 --- a/src/app/upload-dois/upload-dois.module.ts +++ b/src/app/upload-dois/upload-dois.module.ts @@ -5,12 +5,13 @@ import {UploadDoisRoutingModule} from "./upload-dois-routing.module"; import {SearchResearchResultsServiceModule} from "../openaireLibrary/services/searchResearchResultsService.module"; import {PagingModule} from "../openaireLibrary/utils/paging.module"; import {SearchInputModule} from "../openaireLibrary/sharedComponents/search-input/search-input.module"; +import {IconsModule} from "../openaireLibrary/utils/icons/icons.module"; @NgModule({ declarations: [UploadDoisComponent], imports: [ - CommonModule, UploadDoisRoutingModule, SearchResearchResultsServiceModule, PagingModule, SearchInputModule + CommonModule, UploadDoisRoutingModule, SearchResearchResultsServiceModule, PagingModule, SearchInputModule, IconsModule ], }) diff --git a/src/assets/common-assets b/src/assets/common-assets index d1b2d5e..6bb1e61 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit d1b2d5e585722751792d12645d17f820cd6a7860 +Subproject commit 6bb1e61b059bef1bff3bfb0611b0df46f7840426 diff --git a/src/assets/irish-monitor.less b/src/assets/irish-monitor.less index 7096a0c..6128c36 100644 --- a/src/assets/irish-monitor.less +++ b/src/assets/irish-monitor.less @@ -2,7 +2,6 @@ /* Import OpenAIRE theme*/ @import (multiple) "~src/assets/openaire-theme/less/_import"; @import (multiple) "~src/assets/common-assets/less/general"; - @import (multiple) "~src/assets/common-assets/less/user"; @import (multiple) "~src/assets/common-assets/less/dashboard"; @import (multiple) "~src/assets/common-assets/less/landing"; diff --git a/src/assets/irish-theme/_import.less b/src/assets/irish-theme/_import.less new file mode 100644 index 0000000..cc8f41c --- /dev/null +++ b/src/assets/irish-theme/_import.less @@ -0,0 +1,21 @@ +@import "~src/assets/openaire-theme/less/_import"; +@import "~src/assets/common-assets/less/general"; +@import "~src/assets/common-assets/less/user"; +@import "~src/assets/common-assets/less/landing"; +@import "~src/assets/common-assets/less/linking"; +@import "~src/assets/common-assets/less/dashboard"; +@import "~src/assets/common-assets/less/ckeditor"; + +@import "colors"; + +// Base +@import "variables"; + +// Elements +@import "button"; + +// Navs +@import "navbar"; + +// Utilities +@import "background"; diff --git a/src/assets/irish-theme/background.less b/src/assets/irish-theme/background.less new file mode 100644 index 0000000..376c73c --- /dev/null +++ b/src/assets/irish-theme/background.less @@ -0,0 +1,2 @@ +@background-primary-background: @irish-primary-background; +@background-primary-background-gradient: none; diff --git a/src/assets/irish-theme/button.less b/src/assets/irish-theme/button.less new file mode 100644 index 0000000..b354e50 --- /dev/null +++ b/src/assets/irish-theme/button.less @@ -0,0 +1,11 @@ +/* Secondary */ +@button-secondary-background: @global-secondary-background; +@button-secondary-background-gradient: none; +@button-secondary-color: @global-inverse-color; +@button-secondary-box-shadow: @global-medium-box-shadow; +@button-secondary-border: @global-secondary-background; +@button-secondary-hover-background: @global-inverse-color; +@button-secondary-hover-background-gradient: none; +@button-secondary-hover-color: @global-secondary-background; +@button-secondary-hover-box-shadow: @global-small-box-shadow; +@button-secondary-hover-border: @global-secondary-background; diff --git a/src/assets/irish-theme/colors.less b/src/assets/irish-theme/colors.less new file mode 100644 index 0000000..9ac2f54 --- /dev/null +++ b/src/assets/irish-theme/colors.less @@ -0,0 +1,6 @@ +@irish-primary-color: #1B895F; +@irish-light-color: #25AE7A; +@irish-dark-color: #002B1A; +@irish-secondary-color: #FF7901; +@irish-primary-background: #DCE9E3; +@irish-global-background: #F9FBFC; diff --git a/src/assets/irish-theme/navbar.less b/src/assets/irish-theme/navbar.less new file mode 100644 index 0000000..3a2de8a --- /dev/null +++ b/src/assets/irish-theme/navbar.less @@ -0,0 +1 @@ +@navbar-nav-logo-height: @global-header-height - 30px; diff --git a/src/assets/irish-theme/variables.less b/src/assets/irish-theme/variables.less new file mode 100644 index 0000000..d2241eb --- /dev/null +++ b/src/assets/irish-theme/variables.less @@ -0,0 +1,16 @@ +/** Backgrounds */ +@global-primary-background: @irish-primary-color; +@global-secondary-background: @irish-secondary-color; +@global-background: @irish-global-background; +@global-primary-gradient: radial-gradient(closest-side at 50% 50%, @irish-light-color 0%, @irish-dark-color 100%); + +/** Borders */ +@global-border: @gray-300; + +/* Controls */ +@global-control-small-height: 25px; +@global-control-height: 33px; +@global-control-large-height: 45px; + +/* Header */ +@global-header-height: 60px; diff --git a/src/assets/main.svg b/src/assets/main.svg new file mode 100644 index 0000000..9d79ab8 --- /dev/null +++ b/src/assets/main.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 2dadcf8..928dfa1 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 2dadcf85926bc0f11fff22ed94dc197ddd8587c6 +Subproject commit 928dfa11bd4aeadb30c2d72d408c7b7206d6598e diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 257e82c..22664be 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -8,8 +8,7 @@ import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-propert import {common, commonDev} from "../app/openaireLibrary/utils/properties/environments/environment"; let props: EnvProperties = { - monitorServiceAPIURL: "http://duffy.di.uoa.gr:19380/uoa-monitor-service", - // monitorServiceAPIURL: "http://duffy.di.uoa.gr:19680/uoa-irish-monitor-service/", + monitorServiceAPIURL: "http://duffy.di.uoa.gr:19680/uoa-irish-monitor-service/", monitorStatsFrameUrl:"https://stats.madgik.di.uoa.gr/stats-api/", searchOrcidURL: "https://pub.orcid.org/v3.0/", piwikSiteId: "407", @@ -17,7 +16,7 @@ let props: EnvProperties = { piwikBaseUrl: 'https://beta.analytics.openaire.eu/piwik.php?idsite=', disableFrameLoad: true, adminToolsPortalType: 'irish', - adminToolsCommunity: 'irish' + adminToolsCommunity: 'irish', } export let properties: EnvProperties = { diff --git a/src/styles.less b/src/styles.less index cfbd186..269d904 100644 --- a/src/styles.less +++ b/src/styles.less @@ -1,8 +1,4 @@ /* You can add global styles to this file, and also import other style files */ /* Import OpenAIRE theme*/ -@import "~src/assets/openaire-theme/less/_import"; -@import "~src/assets/common-assets/less/general"; -@import "~src/assets/common-assets/less/user"; -@import "~src/assets/common-assets/less/dashboard"; -@import "~src/assets/common-assets/less/ckeditor"; +@import "~src/assets/irish-theme/_import"; @import "~src/assets/irish-monitor";