MaDgIK
/
irish-monitor
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

[master | WIP]1. Add irish monitor style. 2. Move upload under user menu and add manage profiles. 3. Adjust upload service html and search page initialization. 4. Add monitor page.

This commit is contained in:
Konstantinos Triantafyllou 2023-11-14 16:13:09 +02:00
parent 05211652fd
commit e05c04ee21
36 changed files with 254 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/admin/admin.component.ts
View File

@ -9,7 +9,8 @@ import {MenuItem} from "../openaireLibrary/sharedComponents/menu";
@Component({
selector: 'admin',
template: `
<div class="sidebar_main_swipe uk-flex uk-background-default"
<loading *ngIf="loading" class="uk-position-center"></loading>
<div *ngIf="!loading" class="sidebar_main_swipe uk-flex uk-background-default"
[class.sidebar_main_active]="open && (hasSidebar || hasInternalSidebar)"
[class.sidebar_mini]="!open && (hasSidebar || hasInternalSidebar)"
[class.sidebar_hover]="hover">
@ -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;
}
}));
}

3
src/app/admin/admin.module.ts
View File

@ -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]
})

25
src/app/app.component.ts
View File

@ -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
<loading [full]="true"></loading>
</div>
<div *ngIf="!loading">
<div>
<div class="uk-background-default">
<div id="modal-container"></div>
<navbar *ngIf="hasHeader" portal="irish_monitor" [menuItems]="menuItems" [showMenu]="true"
[header]="header" [user]="user" [userMenuItems]="[]"></navbar>
[header]="header" [user]="user" [userMenuItems]="userMenuItems"></navbar>
<main>
<router-outlet></router-outlet>
</main>
@ -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);
}
}

40
src/app/national/national.component.ts
View File

@ -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: `
<div style="background: mediumseagreen; height: 200px">
<a class="uk-button uk-button-default" routerLink="/search/find/research-outcomes">Browse results</a>
</div>
<div class="uk-section uk-container">
<router-outlet></router-outlet>
</div>
<ng-container *ngIf="!loading">
<div class="uk-section uk-section-primary">
<a class="uk-button uk-button-default" routerLink="/search/find/research-outcomes">Browse results</a>
</div>
<div class="uk-section uk-container">
<router-outlet></router-outlet>
</div>
</ng-container>
`
})
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?
// }
// });
}
});
}
}

7
src/app/national/national.module.ts
View File

@ -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'}
}
];

2
src/app/openaireLibrary

@ -1 +1 @@
Subproject commit e80f73f9a9ceb65bff5b326e5b187b943415d7ad
Subproject commit a8c91dc04cb65db6d09b21d6159319dc3294f2a8

15
src/app/rfo/rfo.component.ts
View File

@ -17,15 +17,16 @@ import {CustomFilterService} from "../shared/customFilter.service";
<div *ngIf="stakeholder">
<div>{{stakeholder.index_name}}</div>
<a class="uk-button uk-button-default" [routerLink]="'rfo/' + stakeholder.alias + '/search/find/research-outcomes'">Browse results</a></div>
<a class="uk-button uk-button-default" [routerLink]="'/rfo/' + stakeholder.alias + '/search/find/research-outcomes'">Browse results</a></div>
</div>
<div class="uk-section uk-container">
<div *ngIf="!this.alias || this.stakeholder" class="uk-section uk-container">
<router-outlet></router-outlet>
</div>
`
})
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?
}));
}
});

2
src/app/rfo/rfo.module.ts
View File

@ -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)}
]
}

9
src/app/rpo/rpo.component.ts
View File

@ -16,13 +16,14 @@ import {SearchCustomFilter} from "../openaireLibrary/searchPages/searchUtils/sea
<div style="background: mediumseagreen; height: 200px">
</div>
<div class="uk-section uk-container">
<div *ngIf="!this.alias || this.stakeholder" class="uk-section uk-container">
<router-outlet></router-outlet>
</div>
`
})
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);

2
src/app/rpo/rpo.module.ts
View File

@ -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)}
]
}

6
src/app/search/searchPages/advanced/searchDataproviders.component.ts
View File

@ -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();
}
}

6
src/app/search/searchPages/advanced/searchOrganizations.component.ts
View File

@ -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();
}
}

6
src/app/search/searchPages/advanced/searchProjects.component.ts
View File

@ -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();
}
}

3
src/app/search/searchPages/advanced/searchResearchResults.component.ts
View File

@ -22,7 +22,4 @@ export class MonitorAdvancedSearchResearchResultsComponent extends SearchBaseCom
protected customFilterService: CustomFilterService) {
super();
}
ngOnInit() {
super.initSearch();
}
}

22
src/app/search/searchPages/searchBaseComponent.ts
View File

@ -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'];
}

15
src/app/search/searchPages/simple/searchDataproviders.component.ts
View File

@ -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();
}
}

6
src/app/search/searchPages/simple/searchOrganizations.component.ts
View File

@ -25,10 +25,4 @@ export class MonitorSearchOrganizationsComponent extends SearchBaseComponent{
protected customFilterService: CustomFilterService) {
super();
}
ngOnInit() {
super.initSearch();
}
}

6
src/app/search/searchPages/simple/searchProjects.component.ts
View File

@ -28,10 +28,4 @@ export class MonitorSearchProjectsComponent extends SearchBaseComponent{
protected customFilterService: CustomFilterService) {
super();
}
ngOnInit() {
super.initSearch();
}
}

6
src/app/search/searchPages/simple/searchResearchResults.component.ts
View File

@ -25,10 +25,4 @@ export class MonitorSearchResearchResultsComponent extends SearchBaseComponent{
protected customFilterService: CustomFilterService) {
super();
}
ngOnInit() {
super.initSearch();
}
}

18
src/app/shared/monitor/monitor.component.html Normal file
View File

@ -0,0 +1,18 @@
<div page-content>
<div actions>
<div *ngIf="activeCategory && countSubCategoriesToShow(activeCategory) > 0" [class.uk-margin-bottom]="isMobile">
<slider-tabs *ngIf="stakeholder && !loading && activeTopic" [border]="!isMobile"
[tabsClass]="tabsClass" [type]="'dynamic'">
<ng-template ngFor [ngForOf]="activeCategory.subCategories" let-subCategory>
<slider-tab *ngIf="hasPermission(subCategory.visibility)" [tabTitle]="subCategory.name"
[queryParams]="queryParams" [routerLink]="['/', stakeholder.alias, activeTopic.alias, activeCategory.alias, subCategory.alias]"
[relativeTo]="_route"
[active]="subCategory.alias === activeSubCategory.alias"></slider-tab>
</ng-template>
</slider-tabs>
</div>
</div>
<div inner>
</div>
</div>

69
src/app/shared/monitor/monitor.component.ts Normal file
View File

@ -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<string, number>();
this.chartsActiveType = new Map<string, IndicatorPath>();
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;
}
}

17
src/app/shared/monitor/monitor.module.ts Normal file
View File

@ -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 {
}

14
src/app/upload-dois/upload-dois.component.html
View File

@ -1,5 +1,5 @@
<div style="background: #F9FBFC;">
<div style="background: #DCE9E3; height: 200px" class="uk-grid uk-padding-large">
<div>
<div class="uk-background-primary uk-grid uk-padding-large">
<div class="uk-width-expand">
<div>Title</div>
<div>Lorem ipsum.......</div>
@ -25,14 +25,14 @@
</div>
</div>
<div *ngIf="!filesToUpload || loading" class="uk-section uk-container uk-flex uk-flex-center">
<div class="js-upload uk-placeholder uk-text-center uk-width-xlarge" uk-form-custom>
<div><span uk-icon="icon: upload; ratio: 3"></span></div>
<div><span class="uk-text-large">Drag and Drop your file here</span></div>
<div class="uk-placeholder uk-text-center uk-width-xlarge" uk-form-custom>
<icon name="upload_file" [ratio]="2"></icon>
<div><span class="uk-text-large uk-text-bold">Drag and Drop your file here</span></div>
<div class="uk-text-meta uk-text-small">File supported: CSV</div>
<div class="uk-padding">or</div>
<div class="uk-padding-small">or</div>
<div class="uk-button uk-button-secondary">
<input id="exampleInputFile" class="" type="file" (change)="fileChangeEvent($event)"/>
<span class="uk-link">CHOOSE FILE</span>
<span>Choose File</span>
</div>
<div class="uk-text-meta uk-text-small uk-margin-small-top">Maximum size: 5 MB</div>
</div>

3
src/app/upload-dois/upload-dois.module.ts
View File

@ -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
],
})

2
src/assets/common-assets

@ -1 +1 @@
Subproject commit d1b2d5e585722751792d12645d17f820cd6a7860
Subproject commit 6bb1e61b059bef1bff3bfb0611b0df46f7840426

1
src/assets/irish-monitor.less
View File

@ -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";

21
src/assets/irish-theme/_import.less vendored Normal file
View File

@ -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";

2
src/assets/irish-theme/background.less Normal file
View File

@ -0,0 +1,2 @@
@background-primary-background: @irish-primary-background;
@background-primary-background-gradient: none;

11
src/assets/irish-theme/button.less Normal file
View File

@ -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;

6
src/assets/irish-theme/colors.less Normal file
View File

@ -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;

1
src/assets/irish-theme/navbar.less Normal file
View File

@ -0,0 +1 @@
@navbar-nav-logo-height: @global-header-height - 30px;

16
src/assets/irish-theme/variables.less Normal file
View File

@ -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;

1
src/assets/main.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

2
src/assets/openaire-theme

@ -1 +1 @@
Subproject commit 2dadcf85926bc0f11fff22ed94dc197ddd8587c6
Subproject commit 928dfa11bd4aeadb30c2d72d408c7b7206d6598e

5
src/environments/environment.ts
View File

@ -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 = {

6
src/styles.less
View File

@ -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";