diff --git a/src/app/home/home.component.css b/src/app/home/home.component.css index 47957cb..0b78c60 100644 --- a/src/app/home/home.component.css +++ b/src/app/home/home.component.css @@ -75,10 +75,10 @@ } .stakeholder-section .uk-card { - border-radius: 36px; + border-radius: 20px; color: currentColor; font-family: "Roboto", sans-serif; - padding: 60px 20px; + padding: 70px 20px; } .stakeholder-section .uk-card img { diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index 856ac13..5f86333 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -188,12 +188,16 @@
  • Organizations
    • -
    -
    +
    +
    + + {{stakeholder.visibility.toLowerCase()}} +
    {{stakeholder.name}}
    diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index d2aa9a1..49da331 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -15,7 +15,7 @@ import {SearchResearchResultsService} from "../openaireLibrary/services/searchRe import {animate, state, style, transition, trigger} from "@angular/animations"; import {StakeholderService} from "../openaireLibrary/monitor/services/stakeholder.service"; import {LocalStorageService} from "../openaireLibrary/services/localStorage.service"; -import {Stakeholder} from "../openaireLibrary/monitor/entities/stakeholder"; +import {Stakeholder, Visibility} from "../openaireLibrary/monitor/entities/stakeholder"; import {Session, User} from "../openaireLibrary/login/utils/helper.class"; import {UserManagementService} from "../openaireLibrary/services/user-management.service"; @@ -80,6 +80,11 @@ export class HomeComponent { @ViewChild('AlertModal') modal; public directLink: boolean = true; private user: User; + visibilityIcon: Map = new Map ([ + ["PUBLIC", 'earth'], + ["PRIVATE", 'lock'], + ["RESTRICTED", 'group'] + ]); constructor( private route: ActivatedRoute, diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts index de3fd51..689eb4a 100644 --- a/src/app/home/home.module.ts +++ b/src/app/home/home.module.ts @@ -18,12 +18,15 @@ import {HomeRoutingModule} from "./home-routing.module"; import {RefineFieldResultsServiceModule} from "../openaireLibrary/services/refineFieldResultsService.module"; import {SearchResearchResultsServiceModule} from "../openaireLibrary/services/searchResearchResultsService.module"; import {AlertModalModule} from "../openaireLibrary/utils/modal/alertModal.module"; +import {IconsModule} from "../openaireLibrary/utils/icons/icons.module"; +import {IconsService} from "../openaireLibrary/utils/icons/icons.service"; +import {group, lock} from "../openaireLibrary/utils/icons/icons"; @NgModule({ imports: [ CommonModule, FormsModule, RouterModule, ErrorMessagesModule, OtherPortalsModule, HelperModule, Schema2jsonldModule, SEOServiceModule, HomeRoutingModule, SearchResearchResultsServiceModule, - RefineFieldResultsServiceModule, AlertModalModule + RefineFieldResultsServiceModule, AlertModalModule, IconsModule ], declarations: [ HomeComponent @@ -37,4 +40,7 @@ import {AlertModalModule} from "../openaireLibrary/utils/modal/alertModal.module ] }) export class HomeModule { + constructor(private iconsService: IconsService) { + this.iconsService.registerIcons([group, lock]) + } } diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 00d2a9f..9dd7346 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -44,13 +44,17 @@ export let properties: EnvProperties = { vocabulariesAPI: "https://beta.services.openaire.eu/provision/mvc/vocabularies/", piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=", piwikSiteId: "80", - loginUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-login/openid_connect_login", + registryUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/', + loginUrl: "http://mpagasas.di.uoa.gr:8180/dnet-login/openid_connect_login", + userInfoUrl: "http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=", + logoutUrl: 'http://mpagasas.di.uoa.gr:8180/dnet-login/openid_logout', + /*loginUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-login/openid_connect_login", userInfoUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=", - logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=", + logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",*/ cookieDomain: ".di.uoa.gr", feedbackmail: "openaire.test@gmail.com", cacheUrl: "http://scoobydoo.di.uoa.gr:3000/get?url=", - monitorServiceAPIURL: "https://beta.services.openaire.eu/uoa-monitor-service", + monitorServiceAPIURL: "http://duffy.di.uoa.gr:8080/uoa-monitor-service", adminToolsAPIURL: "http://duffy.di.uoa.gr:8080/uoa-admin-tools/", adminToolsCommunity: "monitor", datasourcesAPI: "https://beta.services.openaire.eu/openaire/ds/search/",