Project

General

Profile

« Previous | Next » 

Revision 59738

[Monitor | Trunk]: Add badge for visibility on stakeholders(home)

View differences:

modules/uoa-monitor-portal/trunk/monitor/src/app/home/home.component.css
75 75
}
76 76

  
77 77
.stakeholder-section .uk-card {
78
  border-radius: 36px;
78
  border-radius: 20px;
79 79
  color: currentColor;
80 80
  font-family: "Roboto", sans-serif;
81
  padding: 60px 20px;
81
  padding: 70px 20px;
82 82
}
83 83

  
84 84
.stakeholder-section .uk-card img {
modules/uoa-monitor-portal/trunk/monitor/src/app/home/home.module.ts
18 18
import {RefineFieldResultsServiceModule} from "../openaireLibrary/services/refineFieldResultsService.module";
19 19
import {SearchResearchResultsServiceModule} from "../openaireLibrary/services/searchResearchResultsService.module";
20 20
import {AlertModalModule} from "../openaireLibrary/utils/modal/alertModal.module";
21
import {IconsModule} from "../openaireLibrary/utils/icons/icons.module";
22
import {IconsService} from "../openaireLibrary/utils/icons/icons.service";
23
import {group, lock} from "../openaireLibrary/utils/icons/icons";
21 24

  
22 25
@NgModule({
23 26
  imports: [
24 27
    CommonModule, FormsModule, RouterModule, ErrorMessagesModule, OtherPortalsModule,
25 28
    HelperModule, Schema2jsonldModule, SEOServiceModule, HomeRoutingModule, SearchResearchResultsServiceModule,
26
    RefineFieldResultsServiceModule, AlertModalModule
29
    RefineFieldResultsServiceModule, AlertModalModule, IconsModule
27 30
  ],
28 31
  declarations: [
29 32
    HomeComponent
......
37 40
  ]
38 41
})
39 42
export class HomeModule {
43
  constructor(private iconsService: IconsService) {
44
    this.iconsService.registerIcons([group, lock])
45
  }
40 46
}
modules/uoa-monitor-portal/trunk/monitor/src/app/home/home.component.html
188 188
      <!--<li uk-filter-control="[data-type='project']"><a (click)="type = 'project'">Projects</a></li>-->
189 189
      <li uk-filter-control="[data-type='organization']"><a (click)="type = 'organization'">Organizations</a></li>
190 190
    </ul>
191
    <div
192
        class="stakeholders uk-margin-large-top uk-child-width-1-1 uk-child-width-1-2@s uk-child-width-1-3@m uk-grid uk-flex-top uk-flex-wrap-top"
191
    <div class="stakeholders uk-margin-large-top uk-child-width-1-1 uk-child-width-1-2@s uk-child-width-1-3@m uk-grid uk-flex-top uk-flex-wrap-top"
193 192
        uk-grid="masonry: true" uk-height-match="target: .uk-card; row: false;">
194 193
      <div *ngFor="let stakeholder of stakeholders" [attr.data-type]="stakeholder.type">
195 194
        <a *ngIf="directLink" [href]="getStakeholderPageUrl(stakeholder)" target="_blank">
196
          <div class="uk-card uk-card-default uk-text-center">
195
          <div class="uk-card uk-card-default uk-text-center uk-position-relative">
196
            <div *ngIf="stakeholder.visibility && stakeholder.visibility !== 'PUBLIC'"
197
                 class="uk-position-top-right uk-margin-top uk-margin-right uk-flex uk-flex-middle">
198
              <icon [name]="visibilityIcon.get(stakeholder.visibility)" [flex]="true"></icon>
199
              <span class="space uk-text-small uk-text-capitalize">{{stakeholder.visibility.toLowerCase()}}</span>
200
            </div>
197 201
            <img *ngIf="stakeholder.logoUrl" class="uk-margin-auto" [src]="stakeholder.logoUrl">
198 202
            <div class="uk-text-light uk-margin-medium-top">{{stakeholder.name}}</div>
199 203
          </div>
modules/uoa-monitor-portal/trunk/monitor/src/app/home/home.component.ts
15 15
import {animate, state, style, transition, trigger} from "@angular/animations";
16 16
import {StakeholderService} from "../openaireLibrary/monitor/services/stakeholder.service";
17 17
import {LocalStorageService} from "../openaireLibrary/services/localStorage.service";
18
import {Stakeholder} from "../openaireLibrary/monitor/entities/stakeholder";
18
import {Stakeholder, Visibility} from "../openaireLibrary/monitor/entities/stakeholder";
19 19
import {Session, User} from "../openaireLibrary/login/utils/helper.class";
20 20
import {UserManagementService} from "../openaireLibrary/services/user-management.service";
21 21

  
......
80 80
  @ViewChild('AlertModal') modal;
81 81
  public directLink: boolean = true;
82 82
  private user: User;
83
  visibilityIcon: Map<Visibility, string> = new Map<Visibility, string> ([
84
    ["PUBLIC", 'earth'],
85
    ["PRIVATE", 'lock'],
86
    ["RESTRICTED", 'group']
87
  ]);
83 88
  
84 89
  constructor(
85 90
    private route: ActivatedRoute,
modules/uoa-monitor-portal/trunk/monitor/src/environments/environment.ts
44 44
  vocabulariesAPI: "https://beta.services.openaire.eu/provision/mvc/vocabularies/",
45 45
  piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
46 46
  piwikSiteId: "80",
47
  loginUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-login/openid_connect_login",
47
  registryUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/',
48
  loginUrl: "http://mpagasas.di.uoa.gr:8180/dnet-login/openid_connect_login",
49
  userInfoUrl: "http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=",
50
  logoutUrl: 'http://mpagasas.di.uoa.gr:8180/dnet-login/openid_logout',
51
  /*loginUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-login/openid_connect_login",
48 52
  userInfoUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=",
49
  logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
53
  logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",*/
50 54
  cookieDomain: ".di.uoa.gr",
51 55
  feedbackmail: "openaire.test@gmail.com",
52 56
  cacheUrl: "http://scoobydoo.di.uoa.gr:3000/get?url=",
53
  monitorServiceAPIURL: "https://beta.services.openaire.eu/uoa-monitor-service",
57
  monitorServiceAPIURL: "http://duffy.di.uoa.gr:8080/uoa-monitor-service",
54 58
  adminToolsAPIURL: "http://duffy.di.uoa.gr:8080/uoa-admin-tools/",
55 59
  adminToolsCommunity: "monitor",
56 60
  datasourcesAPI: "https://beta.services.openaire.eu/openaire/ds/search/",

Also available in: Unified diff