Project

General

Profile

« Previous | Next » 

Revision 59505

[Monitor Dashboard | Trunk]: Add users admin page. Add verification modal

View differences:

modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/app.component.html
68 68
    </div>
69 69
  </div>
70 70
  <router-outlet></router-outlet>
71
  <role-verification *ngIf="stakeholder && properties.environment === 'development'"
72
                     [id]="stakeholder.alias" [name]="stakeholder.name" [type]="stakeholder.type"></role-verification>
71 73
</div>
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/app.module.ts
19 19
import {SideBarModule} from "./openaireLibrary/dashboard/sharedComponents/sidebar/sideBar.module";
20 20
import {SharedModule} from "./openaireLibrary/shared/shared.module";
21 21
import {Schema2jsonldModule} from "./openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module";
22
import {RoleVerificationModule} from "./openaireLibrary/role-verification/role-verification.module";
22 23

  
23 24
@NgModule({
24

  
25
  
25 26
  imports: [
26 27
    SharedModule,
27 28
    BrowserAnimationsModule,
......
35 36
    SubscribeModule.forRoot(),
36 37
    BrowserModule.withServerTransition({appId: 'my-app'}),
37 38
    AppRoutingModule,
38
    UserMiniModule, SideBarModule, Schema2jsonldModule
39

  
39
    UserMiniModule, SideBarModule, Schema2jsonldModule, RoleVerificationModule
40 40
  ],
41 41
  declarations: [AppComponent, OpenaireErrorPageComponent],
42 42
  exports: [AppComponent],
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/users/users.component.html
1 1
<div id="page_content">
2
  <div *ngIf="loading" class="uk-section">
3
    <loading></loading>
4
  </div>
5
  <div *ngIf="!loading && alias" class="uk-padding">
6
    <dashboard-users [id]="alias" [name]="name" [type]="type" [link]="link"></dashboard-users>
7
  </div>
2 8
</div>
9

  
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/users/users.component.ts
1
import {Component} from "@angular/core";
1
import {Component, OnInit} from "@angular/core";
2
import {StakeholderService} from "../openaireLibrary/monitor/services/stakeholder.service";
3
import {properties} from "../../environments/environment";
2 4

  
3 5
@Component({
4 6
  selector: 'users',
5 7
  templateUrl: 'users.component.html'
6 8
})
7
export class UsersComponent {}
9
export class UsersComponent implements OnInit{
10
  
11
  public alias: string;
12
  public name: string;
13
  public type: string;
14
  public link: string;
15
  public loading: boolean;
16
  
17
  constructor(private stakeholderService: StakeholderService) {
18
  }
19
  
20
  ngOnInit() {
21
    this.loading = true;
22
    this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => {
23
      if(stakeholder) {
24
        this.alias = stakeholder.alias;
25
        this.name = stakeholder.name;
26
        this.type = stakeholder.type;
27
        this.link = this.getURL(this.alias);
28
        this.loading = false;
29
      }
30
    })
31
  }
32
  
33
  private getURL(id: string): string {
34
    return properties.domain + properties.baseLink + "/" + id + "?verify=";
35
  }
36
}
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/users/users.module.ts
3 3
import {CommonModule} from "@angular/common";
4 4
import {UsersRoutingModule} from "./users-routing.module";
5 5
import {AdminDashboardGuard} from "../utils/adminDashboard.guard";
6
import {DashboardUsersModule} from "../openaireLibrary/dashboard/users/dashboard-users.module";
7
import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module";
6 8

  
7 9
@NgModule({
8
  imports: [CommonModule, UsersRoutingModule],
10
  imports: [CommonModule, UsersRoutingModule, DashboardUsersModule, LoadingModule],
9 11
  declarations: [UsersComponent],
10 12
  exports: [UsersComponent],
11 13
  providers: [AdminDashboardGuard]
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/app-routing.module.ts
31 31
    resolve: {envSpecific: EnvironmentSpecificResolver},
32 32
    data: {hasAdminMenu: true}
33 33
  },
34
  /*{
34
  {
35 35
    path: 'admin/:stakeholder/users',
36 36
    loadChildren: './users/users.module#UsersModule',
37 37
    resolve: {envSpecific: EnvironmentSpecificResolver}
38
  },*/
38
  },
39 39
  {
40 40
    path: 'admin/:stakeholder',
41 41
    loadChildren: './stakeholder/stakeholder.module#StakeholderModule',
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/environments/environment.ts
49 49
  vocabulariesAPI: "https://dev-openaire.d4science.org/provision/mvc/vocabularies/",
50 50
  piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
51 51
  piwikSiteId: "80",
52
  /*registryUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/',
52
  registryUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/',
53 53
  loginUrl: "http://mpagasas.di.uoa.gr:8180/dnet-login/openid_connect_login",
54 54
  userInfoUrl: "http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=",
55
  logoutUrl: 'http://mpagasas.di.uoa.gr:8180/dnet-login/openid_logout',*/
56
  loginUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-login/openid_connect_login",
55
  logoutUrl: 'http://mpagasas.di.uoa.gr:8180/dnet-login/openid_logout',
56
  /*loginUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-login/openid_connect_login",
57 57
  userInfoUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=",
58
  logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
58
  logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",*/
59 59
  cookieDomain: ".di.uoa.gr",
60 60
  feedbackmail: "openaire.test@gmail.com",
61 61
  cacheUrl: "http://scoobydoo.di.uoa.gr:3000/get?url=",
......
73 73
  pagingLimit: 20,
74 74
  resultsPerPage: 10,
75 75
  baseLink: "/dashboard",
76
  domain: "https://beta.monitor.openaire.eu",
76
  domain: "http://mpagasas.di.uoa.gr:4600",
77 77
  searchLinkToResult: "/search/result?id=",
78 78
  searchLinkToPublication: "/search/publication?articleId=",
79 79
  searchLinkToProject: "/search/project?projectId=",

Also available in: Unified diff