From de321b64bbfaf99f09f4ce0d3907b0cc228b893b Mon Sep 17 00:00:00 2001 From: pbelmann Date: Thu, 22 Feb 2018 15:42:34 +0100 Subject: [PATCH 001/148] fix(settings): use correct url --- src/environments/environment.prod.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index c4a50f5680..4830c26688 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -4,5 +4,5 @@ export const environment = { apiBaseUrl: 'https://cloud.denbi.de/portal/api/v0/', voRegistrationLink: 'https://perun.elixir-czech.cz/registrar/?vo=denbi', - connectorBaseUrl : 'https://cloud.denbi.de./portal/connector/', + connectorBaseUrl : 'https://cloud.denbi.de/portal/connector/', }; From 156198095d332de9b0a459edd8adaa6dffadbabe Mon Sep 17 00:00:00 2001 From: David Weinholz Date: Thu, 22 Feb 2018 18:26:00 +0100 Subject: [PATCH 002/148] feat(add_member):first version of filter --- .../members-manager.service.ts | 25 +++++++-- .../projectmanagement/overview.component.html | 51 ++++++++----------- .../projectmanagement/overview.component.ts | 7 ++- 3 files changed, 47 insertions(+), 36 deletions(-) diff --git a/src/app/perun-connector/members-manager.service.ts b/src/app/perun-connector/members-manager.service.ts index 4d20f4dc08..cab1524d08 100644 --- a/src/app/perun-connector/members-manager.service.ts +++ b/src/app/perun-connector/members-manager.service.ts @@ -5,6 +5,7 @@ import {Observable} from 'rxjs/Rx'; import 'rxjs/add/operator/map'; import 'rxjs/add/operator/catch'; import {ApiSettings} from '../api-connector/api-settings.service'; +import {URLSearchParams} from "@angular/http"; @Injectable() export class MembersManager { @@ -14,7 +15,7 @@ export class MembersManager { getMemberByUser(user_id: number) { var vo = this.settings.getPerunVO(); return this.http.get(this.settings.getPerunBaseURL() + `membersManager/getMemberByUser`, { - headers: new Headers({ 'Authorization': 'Bearer ' + this.apiSettings.getAccessToken()}), + headers: new Headers({'Authorization': 'Bearer ' + this.apiSettings.getAccessToken()}), params: {user: user_id, vo: vo} }); } @@ -24,11 +25,25 @@ export class MembersManager { idp = this.settings.getUserExtSource(); return this.http.get(this.settings.getPerunBaseURL() + `membersManager/getMemberByExtSourceNameAndExtLogin`, { - headers: new Headers({ 'Authorization': 'Bearer ' + this.apiSettings.getAccessToken()}), - params: {extSourceName: idp, - extLogin: ext_login, - vo: vo} + headers: new Headers({'Authorization': 'Bearer ' + this.apiSettings.getAccessToken()}), + params: { + extSourceName: idp, + extLogin: ext_login, + vo: vo + } }); } + getMembersOfdeNBIVo(firstname: string, lastName: string) { + + return this.http.get(this.apiSettings.getApiBaseURL() + 'filter_deNBIMembers/', { + withCredentials: true, + params: { + firstName: firstname, + lastName: lastName, + } + }).map((res: Response) => res.json()).catch((error: any) => Observable.throw(error.json().error || 'Server error')) + + + } } diff --git a/src/app/projectmanagement/overview.component.html b/src/app/projectmanagement/overview.component.html index fbe941a346..503aa6e7db 100755 --- a/src/app/projectmanagement/overview.component.html +++ b/src/app/projectmanagement/overview.component.html @@ -98,41 +98,32 @@

Members of the Project {{ usersModalProjectID }} diff --git a/src/app/applications/applications.component.ts b/src/app/applications/applications.component.ts index 4cce77d7c9..7a344b736f 100644 --- a/src/app/applications/applications.component.ts +++ b/src/app/applications/applications.component.ts @@ -167,9 +167,22 @@ export class ApplicationsComponent { } this.resourceManager.getGroupAssignedResources(group.json()['id']).subscribe(resource => { try { - this.resourceManager.getFacilityByResource(resource.json()[0]['id']).subscribe(facility => { + let resource_id=resource.json()[0]['id']; + this.resourceManager.getFacilityByResource(resource_id).subscribe(facility => { a.ComputeCenter = facility.json()['name']; - this.all_applications.push(a) + this.groupservice.getComputeCentersDetails(resource_id).subscribe(details =>{ + if(details){ + let details_array=[]; + for(let detail in details){ + let detail_as_string=detail + ': ' + details[detail]; + details_array.push(detail_as_string); + } + + a.ComputecenterDetails=details_array; + } + this.all_applications.push(a) + }) + }) diff --git a/src/app/projectmanagement/overview.component.html b/src/app/projectmanagement/overview.component.html index 88a9bbccd7..eeef23b798 100755 --- a/src/app/projectmanagement/overview.component.html +++ b/src/app/projectmanagement/overview.component.html @@ -1,262 +1,271 @@
-
- -

Projects Overview

-
-
-
- Projects -
-
- - - - - - - - - - - - - - - - - - - - - - - -
Project IDProject NameDescriptionFacilityDate createdDays runningActions
{{ project.Id }}{{ project.Name }}{{ project.Description }}{{project.ComputeCenter}}{{ project.DateCreated }}{{ project.DaysRunning }} - - -
+
+ +

Projects Overview

+
+
+
+ Projects +
+
+ + + + + + + + + + + + + + + + + + + + + + + +
Project IDProject NameDescriptionFacilityDate createdDays runningActions
{{ project.Id }}{{ project.Name }}{{ project.Description }}{{project.ComputeCenter}} + + +
    +
  • {{details}}
    • +
+ 		{{ project.DateCreated }}{{ project.DaysRunning }} + + +
+
+
-
+
- -
diff --git a/src/app/projectmanagement/overview.component.ts b/src/app/projectmanagement/overview.component.ts index 89a09f29d2..0b2d3aeb5d 100644 --- a/src/app/projectmanagement/overview.component.ts +++ b/src/app/projectmanagement/overview.component.ts @@ -13,279 +13,297 @@ import 'rxjs/add/operator/toPromise'; import {isNumber} from "util"; import {environment} from '../../environments/environment' import {ApiSettings} from "../api-connector/api-settings.service"; +import {GroupService} from "../api-connector/group.service"; @Component({ - templateUrl: 'overview.component.html', - providers: [ResourcesManager, AuthzResolver, GroupsManager, MembersManager, UsersManager, PerunSettings, ApiSettings] + templateUrl: 'overview.component.html', + providers: [GroupService, ResourcesManager, AuthzResolver, GroupsManager, MembersManager, UsersManager, PerunSettings, ApiSettings] }) export class OverviewComponent { - debug_module = false; - - @Input() voRegistrationLink: string = environment.voRegistrationLink; - - userprojects: {}; - userid: number; - member_id: number; - user_data: {}; - admingroups: {}; - adminvos: {}; - filteredMembers = null; - projects: Project[] = new Array(); - - // modal variables for User list - public usersModal; - public usersModalProjectMembers: ProjectMember[] = new Array; - public usersModalProjectID: number; - public usersModalProjectName: string; - - //modal variables for Add User Modal - public addUserModal; - public addUserModalProjectID: number; - public addUserModalProjectName: string; - public addUserModalFacility: string; - - - //notification Modal variables - public notificationModal; - public notificationModalTitle: string = "Notification"; - public notificationModalMessage: string = "Please wait..."; - public notificationModalType: string = "info"; - public notificationModalIsClosable: boolean = false; - - constructor(private authzresolver: AuthzResolver, - private perunsettings: PerunSettings, - private useresmanager: UsersManager, - private groupsmanager: GroupsManager, - private membersmanager: MembersManager, - private resourceManager: ResourcesManager) { - this.getUserProjects(groupsmanager, membersmanager, useresmanager); - } - - public updateUserProjects() { - this.projects = []; - this.getUserProjects(this.groupsmanager, this.membersmanager, this.useresmanager); - } - - getUserProjects(groupsmanager: GroupsManager, - membersmanager: MembersManager, - usersmanager: UsersManager) { - let user_id: number; - let member_id: number; - let user_projects: {}; - let user_data: {}; - let admin_groups: {}; - let admin_vos: {}; - - this.authzresolver - .getLoggedUser().toPromise() - .then(function (userdata) { - //TODO catch errors - let userid = userdata.json()["id"]; - user_id = userid; - user_data = userdata.json(); - return membersmanager.getMemberByUser(userid).toPromise(); - }) - .then(function (memberdata) { - let memberid = memberdata.json()["id"]; - member_id = memberid; - return groupsmanager.getMemberGroups(memberid).toPromise(); - }).then(function (groupsdata) { - user_projects = groupsdata.json(); - }).then(function () { - return usersmanager.getGroupsWhereUserIsAdmin(user_id).toPromise(); - }).then(function (admingroups) { - admin_groups = admingroups.json(); - }).then(function () { - return usersmanager.getVosWhereUserIsAdmin(user_id).toPromise(); - }).then(function (adminvos) { - admin_vos = adminvos.json(); - }).then(result => { - - //hold data in the class just in case - this.userprojects = user_projects; - this.userid = user_id; - this.user_data = user_data; - this.member_id = member_id; - this.admingroups = admin_groups; - this.adminvos = admin_vos; - - let is_admin = false; - //check if user is a Vo admin so we can serv according buttons - for (let vkey in this.adminvos) { - if (this.adminvos[vkey]["id"] == this.perunsettings.getPerunVO().toString()) { - is_admin = true; - break; - } - } + debug_module = false; + + @Input() voRegistrationLink: string = environment.voRegistrationLink; + + userprojects: {}; + userid: number; + member_id: number; + user_data: {}; + admingroups: {}; + adminvos: {}; + filteredMembers = null; + projects: Project[] = new Array(); + + // modal variables for User list + public usersModal; + public usersModalProjectMembers: ProjectMember[] = new Array; + public usersModalProjectID: number; + public usersModalProjectName: string; + + //modal variables for Add User Modal + public addUserModal; + public addUserModalProjectID: number; + public addUserModalProjectName: string; + public addUserModalFacility: string; + + + //notification Modal variables + public notificationModal; + public notificationModalTitle: string = "Notification"; + public notificationModalMessage: string = "Please wait..."; + public notificationModalType: string = "info"; + public notificationModalIsClosable: boolean = false; + + constructor(private authzresolver: AuthzResolver, + private perunsettings: PerunSettings, + private useresmanager: UsersManager, + private groupsmanager: GroupsManager, + private membersmanager: MembersManager, + private resourceManager: ResourcesManager, + private groupservice: GroupService) { + this.getUserProjects(groupsmanager, membersmanager, useresmanager); + } + public updateUserProjects() { + this.projects = []; + this.getUserProjects(this.groupsmanager, this.membersmanager, this.useresmanager); + } - for (let key in this.userprojects) { - let group = this.userprojects[key]; - let dateCreated = new Date(group["createdAt"]); - let dateDayDifference = Math.ceil((Math.abs(Date.now() - dateCreated.getTime())) / (1000 * 3600 * 24)); - let is_pi = false; - //check if user is a PI (group manager) - if (!is_admin) { - for (let gkey in this.admingroups) { - if (group["id"] == this.admingroups[gkey]["id"]) { - is_pi = true; - break; + getUserProjects(groupsmanager: GroupsManager, + membersmanager: MembersManager, + usersmanager: UsersManager) { + let user_id: number; + let member_id: number; + let user_projects: {}; + let user_data: {}; + let admin_groups: {}; + let admin_vos: {}; + + this.authzresolver + .getLoggedUser().toPromise() + .then(function (userdata) { + //TODO catch errors + let userid = userdata.json()["id"]; + user_id = userid; + user_data = userdata.json(); + return membersmanager.getMemberByUser(userid).toPromise(); + }) + .then(function (memberdata) { + let memberid = memberdata.json()["id"]; + member_id = memberid; + return groupsmanager.getMemberGroups(memberid).toPromise(); + }).then(function (groupsdata) { + user_projects = groupsdata.json(); + }).then(function () { + return usersmanager.getGroupsWhereUserIsAdmin(user_id).toPromise(); + }).then(function (admingroups) { + admin_groups = admingroups.json(); + }).then(function () { + return usersmanager.getVosWhereUserIsAdmin(user_id).toPromise(); + }).then(function (adminvos) { + admin_vos = adminvos.json(); + }).then(result => { + + //hold data in the class just in case + this.userprojects = user_projects; + this.userid = user_id; + this.user_data = user_data; + this.member_id = member_id; + this.admingroups = admin_groups; + this.adminvos = admin_vos; + + let is_admin = false; + //check if user is a Vo admin so we can serv according buttons + for (let vkey in this.adminvos) { + if (this.adminvos[vkey]["id"] == this.perunsettings.getPerunVO().toString()) { + is_admin = true; + break; + } } - } - } else { - is_pi = true; - } - this.resourceManager.getGroupAssignedResources(group['id']).subscribe(resource => { - try { - this.resourceManager.getFacilityByResource(resource.json()[0]['id']).subscribe(facility => { - this.projects.push(new Project( - group["id"], - group["name"], - group["description"], - dateCreated.getDate() + "." + (dateCreated.getMonth() + 1) + "." + dateCreated.getFullYear(), - dateDayDifference, - is_pi, - is_admin, - facility.json()['name']) - ); + for (let key in this.userprojects) { + let group = this.userprojects[key]; + let dateCreated = new Date(group["createdAt"]); + let dateDayDifference = Math.ceil((Math.abs(Date.now() - dateCreated.getTime())) / (1000 * 3600 * 24)); + let is_pi = false; + + //check if user is a PI (group manager) + if (!is_admin) { + for (let gkey in this.admingroups) { + if (group["id"] == this.admingroups[gkey]["id"]) { + is_pi = true; + break; + } + } + } else { + is_pi = true; + } + this.resourceManager.getGroupAssignedResources(group['id']).subscribe(resource => { + try { + let resource_id = resource.json()[0]['id']; + this.resourceManager.getFacilityByResource(resource_id).subscribe(facility => { + let newProject = new Project( + group["id"], + group["name"], + group["description"], + dateCreated.getDate() + "." + (dateCreated.getMonth() + 1) + "." + dateCreated.getFullYear(), + dateDayDifference, + is_pi, + is_admin, + facility.json()['name']) + try { + this.groupservice.getComputeCentersDetails(resource_id).subscribe(details => { + if (details) { + let details_array = []; + for (let detail in details) { + let detail_as_string = detail + ': ' + details[detail]; + details_array.push(detail_as_string); + } + newProject.ComputecenterDetails = details_array; + } + this.projects.push(newProject); + + }) + } + catch(e){ + this.projects.push(newProject); + } + + + }) + } + catch (e) { + + this.projects.push(new Project( + group["id"], + group["name"], + group["description"], + dateCreated.getDate() + "." + (dateCreated.getMonth() + 1) + "." + dateCreated.getFullYear(), + dateDayDifference, + is_pi, + is_admin, + 'None') + ); + + + } + }) - }) - } - catch (e) { - - this.projects.push(new Project( - group["id"], - group["name"], - group["description"], - dateCreated.getDate() + "." + (dateCreated.getMonth() + 1) + "." + dateCreated.getFullYear(), - dateDayDifference, - is_pi, - is_admin, - 'None') - ); - - - } + } + + }); + // .then( function(){ groupsmanager.getGroupsWhereUserIsAdmin(this.userid); }); + } + + public resetAddUserModal() { + this.addUserModalProjectID = null; + this.addUserModalProjectName = null; + this.addUserModalFacility = null; + } + + filterMembers(firstName: string, lastName: string, groupid: number) { + this.membersmanager.getMembersOfdeNBIVo(firstName, lastName, groupid.toString()).subscribe(result => { + this.filteredMembers = result; }) + } - } - - }); - // .then( function(){ groupsmanager.getGroupsWhereUserIsAdmin(this.userid); }); - } - - public resetAddUserModal() { - this.addUserModalProjectID = null; - this.addUserModalProjectName = null; - this.addUserModalFacility = null; - } - - filterMembers(firstName: string, lastName: string, groupid: number) { - this.membersmanager.getMembersOfdeNBIVo(firstName, lastName, groupid.toString()).subscribe(result => { - this.filteredMembers = result; - }) - } - - - getMembesOfTheProject(projectid: number, projectname: string) { - this.groupsmanager.getGroupRichMembers(projectid).toPromise() - .then(function (members_raw) { - return members_raw.json(); - }).then(members => { - this.usersModalProjectID = projectid; - this.usersModalProjectName = projectname; - this.usersModalProjectMembers = new Array(); - for (let member of members) { - let member_id = member["id"]; - let user_id = member["userId"]; - let fullName = member["user"]["firstName"] + " " + member["user"]["lastName"]; - this.usersModalProjectMembers.push(new ProjectMember(user_id, fullName, member_id)); - } - - }); - } - - public showMembersOfTheProject(projectid: number, projectname: string) { - this.getMembesOfTheProject(projectid, projectname); - } - - - public resetNotificaitonModal() { - this.notificationModalTitle = "Notification"; - this.notificationModalMessage = "Please wait..."; - this.notificationModalIsClosable = false; - this.notificationModalType = "info"; - } - - public updateNotificaitonModal(title: string, message: string, closable: true, type: string) { - this.notificationModalTitle = title; - this.notificationModalMessage = message; - this.notificationModalIsClosable = closable; - this.notificationModalType = type; - } - - public makeNotificationModalClosable(closable: boolean) { - this.notificationModalIsClosable = closable; - } - - public changeNotificationModalTitle(title: string) { - this.notificationModalTitle = title; - } - - public changeNotificationModalMessage(message: string) { - this.notificationModalMessage = message; - } - - public changeNotificationModalType(type: string) { - this.notificationModalType = type; - } - - public showAddUserToProjectModal(projectid: number, projectname: string, facility: string) { - this.addUserModalProjectID = projectid; - this.addUserModalProjectName = projectname; - if (facility === 'None') { - this.addUserModalFacility = null; + getMembesOfTheProject(projectid: number, projectname: string) { + this.groupsmanager.getGroupRichMembers(projectid).toPromise() + .then(function (members_raw) { + return members_raw.json(); + }).then(members => { + this.usersModalProjectID = projectid; + this.usersModalProjectName = projectname; + this.usersModalProjectMembers = new Array(); + for (let member of members) { + let member_id = member["id"]; + let user_id = member["userId"]; + let fullName = member["user"]["firstName"] + " " + member["user"]["lastName"]; + this.usersModalProjectMembers.push(new ProjectMember(user_id, fullName, member_id)); + } + + }); } - else { - this.addUserModalFacility = facility; + + public showMembersOfTheProject(projectid: number, projectname: string) { + this.getMembesOfTheProject(projectid, projectname); } - } - public addMember(groupid: number, memberid: number, firstName: string, lastName: string) { - this.groupsmanager.addMember(groupid, memberid).toPromise() - .then(result => { - if (result.status == 200) { - this.updateNotificaitonModal("Success", "Member " + firstName + " " + lastName + " added.", true, "success"); - } else { - this.updateNotificaitonModal("Failed", "Member could not be added!", true, "danger"); + public resetNotificaitonModal() { + this.notificationModalTitle = "Notification"; + this.notificationModalMessage = "Please wait..."; + this.notificationModalIsClosable = false; + this.notificationModalType = "info"; + } + + public updateNotificaitonModal(title: string, message: string, closable: true, type: string) { + this.notificationModalTitle = title; + this.notificationModalMessage = message; + this.notificationModalIsClosable = closable; + this.notificationModalType = type; + } + + public makeNotificationModalClosable(closable: boolean) { + this.notificationModalIsClosable = closable; + } + + public changeNotificationModalTitle(title: string) { + this.notificationModalTitle = title; + } + + public changeNotificationModalMessage(message: string) { + this.notificationModalMessage = message; + } + + public changeNotificationModalType(type: string) { + this.notificationModalType = type; + } + + public showAddUserToProjectModal(projectid: number, projectname: string, facility: string) { + this.addUserModalProjectID = projectid; + this.addUserModalProjectName = projectname; + if (facility === 'None') { + this.addUserModalFacility = null; } - }).catch(error => { - this.updateNotificaitonModal("Failed", "Member could not be added!", true, "danger"); - }); - } - - public removeMember(groupid: number, memberid: number) { - this.groupsmanager.removeMember(groupid, memberid).toPromise() - .then(result => { - if (result.status == 200) { - this.updateNotificaitonModal("Success", "Member " + memberid + " deleted from the group", true, "success"); - - } else { - this.updateNotificaitonModal("Failed", "Member could not be deleted!", true, "danger"); + else { + this.addUserModalFacility = facility; } - }).catch(error => { - this.updateNotificaitonModal("Failed", "Member could not be deleted!", true, "danger"); - }); - } - - public comingSoon() { - alert("This function will be implemented soon.") - } + } + + public addMember(groupid: number, memberid: number, firstName: string, lastName: string) { + this.groupsmanager.addMember(groupid, memberid).toPromise() + .then(result => { + if (result.status == 200) { + this.updateNotificaitonModal("Success", "Member " + firstName + " " + lastName + " added.", true, "success"); + + } else { + this.updateNotificaitonModal("Failed", "Member could not be added!", true, "danger"); + } + }).catch(error => { + this.updateNotificaitonModal("Failed", "Member could not be added!", true, "danger"); + }); + } + + public removeMember(groupid: number, memberid: number) { + this.groupsmanager.removeMember(groupid, memberid).toPromise() + .then(result => { + if (result.status == 200) { + this.updateNotificaitonModal("Success", "Member " + memberid + " deleted from the group", true, "success"); + + } else { + this.updateNotificaitonModal("Failed", "Member could not be deleted!", true, "danger"); + } + }).catch(error => { + this.updateNotificaitonModal("Failed", "Member could not be deleted!", true, "danger"); + }); + } + + public comingSoon() { + alert("This function will be implemented soon.") + } } diff --git a/src/app/projectmanagement/project.model.ts b/src/app/projectmanagement/project.model.ts index 95668b5881..20ac2f5eba 100644 --- a/src/app/projectmanagement/project.model.ts +++ b/src/app/projectmanagement/project.model.ts @@ -15,6 +15,7 @@ export class Project { private _UserIsAdmin: boolean; private _UserIsPi: boolean; private _ComputeCenter:string; + private _ComputeCenterDetails:{}; constructor(Id: number, Name: string, Description: string, DateCreated: string, DaysRunning: number, UserIsAdmin: boolean, UserIsPi: boolean,ComputeCenter: string) { @@ -31,6 +32,12 @@ export class Project { //todo exdend with additional information + get ComputeCenterDetails(){ + return this._ComputeCenterDetails; + } + set ComputecenterDetails(value:{}){ + this._ComputeCenterDetails=value; + } get ComputeCenter(): string { return this._ComputeCenter } From ad2e940c6e39736e7ae16dd34d9d9f07712541fa Mon Sep 17 00:00:00 2001 From: DavidWein94 Date: Sun, 4 Mar 2018 14:38:47 +0100 Subject: [PATCH 027/148] feat(members): now possible to remove members if facility is set (#38) * feat(members): now possible to remove members if facility is set * feat(overview): changed deleted to removed and added the member name to the notifactation modal --- .../projectmanagement/overview.component.html | 51 ++-- .../projectmanagement/overview.component.ts | 239 ++++++++++-------- 2 files changed, 161 insertions(+), 129 deletions(-) diff --git a/src/app/projectmanagement/overview.component.html b/src/app/projectmanagement/overview.component.html index eeef23b798..cb0c5f6fbc 100755 --- a/src/app/projectmanagement/overview.component.html +++ b/src/app/projectmanagement/overview.component.html @@ -25,6 +25,7 @@

Projects Overview

{{ project.Id }} {{ project.Name }} {{ project.Description }} + {{project.ComputeCenter}} @@ -32,11 +33,13 @@

Projects Overview

  • {{details}}
    • + {{ project.DateCreated }} {{ project.DaysRunning }} @@ -85,9 +88,16 @@

    Members of the Project {{ usersModalProjectID }} {{ member.MemberId }} {{ member.Username }} - + @@ -113,7 +123,8 @@

    Add member to the project {{ addUserModalProjectID }} ({{ addUserModalProjectName }})

    -

    In order to add a new user to the project please do the +

    In order to add a new user to the project please do the + following

      @@ -159,7 +170,8 @@

      Add member to the project {{ addUserModalProjectID }}

    -
    +
    +

    Search and add a user to your project by providing his exact name:

    @@ -189,6 +201,7 @@

    Add member to the project {{ addUserModalProjectID }} + @@ -231,18 +244,21 @@

    Add member to the project {{ addUserModalProjectID }}

    - In order to remove a user of your project please send the following information to cloud@denbi.de: -
      -
    • Projekt name
      • -
    • Projekt description
      • -
    • You user id
      • -
    • The user id of the project member you would like to remove
      • -
    -
    -
    - +
    + In order to remove a user of your project please send the following information to cloud@denbi.de: +
      +
    • Projekt name
      • +
    • Projekt description
      • +
    • Your user id
      • +
    • The user id of the project member you would like to remove
      • +
    +
    +
    + +
    +
    @@ -269,3 +285,4 @@

    {{ notificationModalTitle }}

    + diff --git a/src/app/projectmanagement/overview.component.ts b/src/app/projectmanagement/overview.component.ts index 0b2d3aeb5d..cb02376a66 100644 --- a/src/app/projectmanagement/overview.component.ts +++ b/src/app/projectmanagement/overview.component.ts @@ -21,53 +21,54 @@ import {GroupService} from "../api-connector/group.service"; }) export class OverviewComponent { - debug_module = false; - - @Input() voRegistrationLink: string = environment.voRegistrationLink; - - userprojects: {}; - userid: number; - member_id: number; - user_data: {}; - admingroups: {}; - adminvos: {}; - filteredMembers = null; - projects: Project[] = new Array(); - - // modal variables for User list - public usersModal; - public usersModalProjectMembers: ProjectMember[] = new Array; - public usersModalProjectID: number; - public usersModalProjectName: string; - - //modal variables for Add User Modal - public addUserModal; - public addUserModalProjectID: number; - public addUserModalProjectName: string; - public addUserModalFacility: string; - - - //notification Modal variables - public notificationModal; - public notificationModalTitle: string = "Notification"; - public notificationModalMessage: string = "Please wait..."; - public notificationModalType: string = "info"; - public notificationModalIsClosable: boolean = false; - - constructor(private authzresolver: AuthzResolver, - private perunsettings: PerunSettings, - private useresmanager: UsersManager, - private groupsmanager: GroupsManager, - private membersmanager: MembersManager, - private resourceManager: ResourcesManager, - private groupservice: GroupService) { - this.getUserProjects(groupsmanager, membersmanager, useresmanager); - } + debug_module = false; + + @Input() voRegistrationLink: string = environment.voRegistrationLink; + + userprojects: {}; + userid: number; + member_id: number; + user_data: {}; + admingroups: {}; + adminvos: {}; + filteredMembers = null; + projects: Project[] = new Array(); + + // modal variables for User list + public usersModal; + public usersModalProjectMembers: ProjectMember[] = new Array; + public usersModalProjectID: number; + public usersModalProjectName: string; + + //modal variables for Add User Modal + public addUserModal; + public addUserModalProjectID: number; + public addUserModalProjectName: string; + public UserModalFacility: string; + + + //notification Modal variables + public notificationModal; + public notificationModalTitle: string = "Notification"; + public notificationModalMessage: string = "Please wait..."; + public notificationModalType: string = "info"; + public notificationModalIsClosable: boolean = false; + + constructor(private authzresolver: AuthzResolver, + private perunsettings: PerunSettings, + private useresmanager: UsersManager, + private groupsmanager: GroupsManager, + private membersmanager: MembersManager, + private resourceManager: ResourcesManager, + private groupservice: GroupService) { + this.getUserProjects(groupsmanager, membersmanager, useresmanager); + } + + public updateUserProjects() { + this.projects = []; + this.getUserProjects(this.groupsmanager, this.membersmanager, this.useresmanager); + } - public updateUserProjects() { - this.projects = []; - this.getUserProjects(this.groupsmanager, this.membersmanager, this.useresmanager); - } getUserProjects(groupsmanager: GroupsManager, @@ -198,82 +199,96 @@ export class OverviewComponent { // .then( function(){ groupsmanager.getGroupsWhereUserIsAdmin(this.userid); }); } - public resetAddUserModal() { - this.addUserModalProjectID = null; - this.addUserModalProjectName = null; - this.addUserModalFacility = null; - } - filterMembers(firstName: string, lastName: string, groupid: number) { - this.membersmanager.getMembersOfdeNBIVo(firstName, lastName, groupid.toString()).subscribe(result => { - this.filteredMembers = result; - }) - } - getMembesOfTheProject(projectid: number, projectname: string) { - this.groupsmanager.getGroupRichMembers(projectid).toPromise() - .then(function (members_raw) { - return members_raw.json(); - }).then(members => { - this.usersModalProjectID = projectid; - this.usersModalProjectName = projectname; - this.usersModalProjectMembers = new Array(); - for (let member of members) { - let member_id = member["id"]; - let user_id = member["userId"]; - let fullName = member["user"]["firstName"] + " " + member["user"]["lastName"]; - this.usersModalProjectMembers.push(new ProjectMember(user_id, fullName, member_id)); - } + public resetAddUserModal() { + this.addUserModalProjectID = null; + this.addUserModalProjectName = null; + this.UserModalFacility = null; + } - }); - } + filterMembers(firstName: string, lastName: string, groupid: number) { + this.membersmanager.getMembersOfdeNBIVo(firstName, lastName, groupid.toString()).subscribe(result => { + this.filteredMembers = result; + }) + } - public showMembersOfTheProject(projectid: number, projectname: string) { - this.getMembesOfTheProject(projectid, projectname); - } + getMembesOfTheProject(projectid: number, projectname: string) { + this.groupsmanager.getGroupRichMembers(projectid).toPromise() + .then(function (members_raw) { + return members_raw.json(); + }).then(members => { + this.usersModalProjectID = projectid; + this.usersModalProjectName = projectname; + this.usersModalProjectMembers = new Array(); + for (let member of members) { + let member_id = member["id"]; + let user_id = member["userId"]; + let fullName = member["user"]["firstName"] + " " + member["user"]["lastName"]; + this.usersModalProjectMembers.push(new ProjectMember(user_id, fullName, member_id)); + } - public resetNotificaitonModal() { - this.notificationModalTitle = "Notification"; - this.notificationModalMessage = "Please wait..."; - this.notificationModalIsClosable = false; - this.notificationModalType = "info"; - } + }); + } - public updateNotificaitonModal(title: string, message: string, closable: true, type: string) { - this.notificationModalTitle = title; - this.notificationModalMessage = message; - this.notificationModalIsClosable = closable; - this.notificationModalType = type; + public showMembersOfTheProject(projectid: number, projectname: string,facility:string) { + this.getMembesOfTheProject(projectid, projectname); + if (facility === 'None') { + this.UserModalFacility = null; } - - public makeNotificationModalClosable(closable: boolean) { - this.notificationModalIsClosable = closable; + else { + this.UserModalFacility = facility; } + } + + + public resetNotificaitonModal() { + this.notificationModalTitle = "Notification"; + this.notificationModalMessage = "Please wait..."; + this.notificationModalIsClosable = false; + this.notificationModalType = "info"; + } + + public updateNotificaitonModal(title: string, message: string, closable: true, type: string) { + this.notificationModalTitle = title; + this.notificationModalMessage = message; + this.notificationModalIsClosable = closable; + this.notificationModalType = type; + } + + public makeNotificationModalClosable(closable: boolean) { + this.notificationModalIsClosable = closable; + } + + public changeNotificationModalTitle(title: string) { + this.notificationModalTitle = title; + } + + public changeNotificationModalMessage(message: string) { + this.notificationModalMessage = message; + } + + public changeNotificationModalType(type: string) { + this.notificationModalType = type; + } + + public showAddUserToProjectModal(projectid: number, projectname: string, facility: string) { + this.addUserModalProjectID = projectid; + this.addUserModalProjectName = projectname; + if (facility === 'None') { + this.UserModalFacility = null; + } + else { + this.UserModalFacility = facility; + + } + } - public changeNotificationModalTitle(title: string) { - this.notificationModalTitle = title; - } - public changeNotificationModalMessage(message: string) { - this.notificationModalMessage = message; - } - public changeNotificationModalType(type: string) { - this.notificationModalType = type; - } - public showAddUserToProjectModal(projectid: number, projectname: string, facility: string) { - this.addUserModalProjectID = projectid; - this.addUserModalProjectName = projectname; - if (facility === 'None') { - this.addUserModalFacility = null; - } - else { - this.addUserModalFacility = facility; - } - } public addMember(groupid: number, memberid: number, firstName: string, lastName: string) { this.groupsmanager.addMember(groupid, memberid).toPromise() @@ -289,17 +304,17 @@ export class OverviewComponent { }); } - public removeMember(groupid: number, memberid: number) { + public removeMember(groupid: number, memberid: number,name:string) { this.groupsmanager.removeMember(groupid, memberid).toPromise() .then(result => { if (result.status == 200) { - this.updateNotificaitonModal("Success", "Member " + memberid + " deleted from the group", true, "success"); + this.updateNotificaitonModal("Success", "Member " + name + " removed from the group", true, "success"); } else { - this.updateNotificaitonModal("Failed", "Member could not be deleted!", true, "danger"); + this.updateNotificaitonModal("Failed", "Member" + name + " could not be removed !", true, "danger"); } }).catch(error => { - this.updateNotificaitonModal("Failed", "Member could not be deleted!", true, "danger"); + this.updateNotificaitonModal("Failed", "Member" + name + " could not be removed !", true, "danger"); }); } From a64ff8d900e9a23be9fcc6d1ac72e6a66d62703f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Giller?= Date: Mon, 5 Mar 2018 19:23:50 +0100 Subject: [PATCH 028/148] feat(facility): show facility details --- src/app/api-connector/application-status.service.ts | 5 +++-- src/app/applications/applications.component.ts | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/app/api-connector/application-status.service.ts b/src/app/api-connector/application-status.service.ts index e9bb8b084f..5e6bb5a975 100644 --- a/src/app/api-connector/application-status.service.ts +++ b/src/app/api-connector/application-status.service.ts @@ -18,9 +18,10 @@ export class ApplicationStatusService { }); } - setApplicationStatus(application_id: number, status_id: number) { + setApplicationStatus(application_id: number, status_id: number,compute_center:string) { let parameter = JSON.stringify({ - "project_application_status": status_id + "project_application_status": status_id, + 'compute_center': compute_center }); let header = new Headers({ 'X-CSRFToken': this.settings.getCSRFToken(), diff --git a/src/app/applications/applications.component.ts b/src/app/applications/applications.component.ts index 7a344b736f..e527e5a7eb 100644 --- a/src/app/applications/applications.component.ts +++ b/src/app/applications/applications.component.ts @@ -276,7 +276,7 @@ export class ApplicationsComponent { }).then(null_result => { return this.groupsmanager.addAdmin(new_group_id, manager_member_user_id).toPromise(); }).then(null_result => { - return this.applicationstatusservice.setApplicationStatus(application_id, this.getIdByStatus("approved")).toPromise(); + return this.applicationstatusservice.setApplicationStatus(application_id, this.getIdByStatus("approved"),compute_center).toPromise(); }).then(null_result => { //setting approved status for Perun Group this.groupsmanager.setPerunGroupStatus(new_group_id, 2).toPromise(); @@ -295,7 +295,7 @@ export class ApplicationsComponent { } public declineApplication(application_id) { - this.applicationstatusservice.setApplicationStatus(application_id, this.getIdByStatus("declined")).toPromise() + this.applicationstatusservice.setApplicationStatus(application_id, this.getIdByStatus("declined"),'').toPromise() .then(result => { this.all_applications = []; this.user_applications = []; From d44169970b0ec5ba46ee4a83e59504697de230a8 Mon Sep 17 00:00:00 2001 From: pbelmann Date: Tue, 6 Mar 2018 07:48:31 +0100 Subject: [PATCH 029/148] feat(issue): created template for feature issues --- ISSUE_TEMPLATE/feature.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 ISSUE_TEMPLATE/feature.md diff --git a/ISSUE_TEMPLATE/feature.md b/ISSUE_TEMPLATE/feature.md new file mode 100644 index 0000000000..cf248adec1 --- /dev/null +++ b/ISSUE_TEMPLATE/feature.md @@ -0,0 +1,10 @@ +Try to consider the following points that must be fulfilled +before this feature issue is closed: + +- [ ] It is reviewed by one of the team members. (Definition of Done) + +- [ ] It is documented either in the technical or the user documentation. (Definition of Done) + +- [ ] The final result is available on the staging instance. (Definition of Done) + +- [ ] The final result is also checked without elevated privileges (VO Manager). From affe02bfb04439ab688c5a2c9d24017654afe96d Mon Sep 17 00:00:00 2001 From: DavidWein94 Date: Mon, 19 Mar 2018 17:10:07 +0100 Subject: [PATCH 030/148] feat(application): added info (#56) * feat(application): added info * feat(application): modified pi notificiation text --- src/app/applications/addapplication.component.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/app/applications/addapplication.component.html b/src/app/applications/addapplication.component.html index a69b8c9424..d881ba8642 100755 --- a/src/app/applications/addapplication.component.html +++ b/src/app/applications/addapplication.component.html @@ -8,6 +8,9 @@ – Formular
    +
    + Please be aware: Only applications submitted by a principal investigator of a german university or research facility will be accepted! +
    General Information
    From 90b5b26594ad5fa4887f906b5fe41bacd9cbd770 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 19 Mar 2018 11:42:38 +0100 Subject: [PATCH 031/148] fix(application): changed formular to form --- src/app/applications/addapplication.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/applications/addapplication.component.html b/src/app/applications/addapplication.component.html index d881ba8642..8c2798ac75 100755 --- a/src/app/applications/addapplication.component.html +++ b/src/app/applications/addapplication.component.html @@ -5,7 +5,7 @@
    New Application - – Formular + – Form
    From fcbe43cf4fb62026070b47dbe0e6aa424e6cb7f8 Mon Sep 17 00:00:00 2001 From: DavidWein94 Date: Mon, 19 Mar 2018 17:12:57 +0100 Subject: [PATCH 032/148] Feat/facility login link (#54) * feat(facility): changed methods to server * feat(facility): now in the details for a facility the login link is a clickable --- src/app/api-connector/group.service.ts | 11 + src/app/applications/application.model.ts | 4 +- .../applications/applications.component.html | 15 +- .../applications/applications.component.ts | 539 +++++++++--------- .../projectmanagement/overview.component.html | 9 +- .../projectmanagement/overview.component.ts | 305 +++++----- src/app/projectmanagement/project.model.ts | 4 +- 7 files changed, 425 insertions(+), 462 deletions(-) diff --git a/src/app/api-connector/group.service.ts b/src/app/api-connector/group.service.ts index 41826a84f6..8e6b1913c1 100644 --- a/src/app/api-connector/group.service.ts +++ b/src/app/api-connector/group.service.ts @@ -31,6 +31,17 @@ export class GroupService { } + getFacilityByGroup(groupname:string): Observable { + + return this.http.get(this.settings.getApiBaseURL() + 'getFacilityByGroup/', { + withCredentials: true, + params:{groupname:groupname} + }).map((res: Response) => res.json()).catch((error: any) => Observable.throw(error.json().error || 'Server error')) + + } + + + assignGroupToResource(groupid: string, computecenter: string): Observable { let urlSearchParams = new URLSearchParams(); let header = new Headers({ diff --git a/src/app/applications/application.model.ts b/src/app/applications/application.model.ts index 3fadd610a9..9e178c3272 100644 --- a/src/app/applications/application.model.ts +++ b/src/app/applications/application.model.ts @@ -17,7 +17,7 @@ export class Application { private _UserEmail: number; private _Status: number; private _ComputeCenter: string; - private _ComputeCenterDetails:{}; + private _ComputeCenterDetails:[string,string][]; constructor() { @@ -26,7 +26,7 @@ export class Application { get ComputeCenterDetails(){ return this._ComputeCenterDetails; } - set ComputecenterDetails(value:{}){ + set ComputecenterDetails(value:[string,string][]){ this._ComputeCenterDetails=value; } get ComputeCenter(): string { diff --git a/src/app/applications/applications.component.html b/src/app/applications/applications.component.html index 850d584363..a43ad27871 100755 --- a/src/app/applications/applications.component.html +++ b/src/app/applications/applications.component.html @@ -319,12 +319,15 @@

    Applications Overview

     diff --git a/src/app/applications/applications.component.ts b/src/app/applications/applications.component.ts index 7a344b736f..eb8363d0ad 100644 --- a/src/app/applications/applications.component.ts +++ b/src/app/applications/applications.component.ts @@ -17,309 +17,288 @@ import {ResourcesManager} from "../perun-connector/resources_manager"; import {GroupService} from "../api-connector/group.service"; @Component({ - templateUrl: 'applications.component.html', - providers: [GroupService, ResourcesManager, AuthzResolver, UsersManager, MembersManager, GroupsManager, PerunSettings, ApplicationsService, ApplicationStatusService, SpecialHardwareService, ApiSettings] + templateUrl: 'applications.component.html', + providers: [GroupService, ResourcesManager, AuthzResolver, UsersManager, MembersManager, GroupsManager, PerunSettings, ApplicationsService, ApplicationStatusService, SpecialHardwareService, ApiSettings] }) export class ApplicationsComponent { - user_applications: Application[] = []; - is_vo_admin = false; - all_applications: Application[] = []; - application_status: ApplicationStatus[] = []; - special_hardware: SpecialHardware[] = []; - computeCenters: string[]; - - //notification Modal variables - public notificationModal; - public notificationModalTitle: string = "Notification"; - public notificationModalMessage: string = "Please wait..."; - public notificationModalType: string = "info"; - public notificationModalIsClosable: boolean = false; - - - collapse_status: { [id: string]: boolean } = {}; - - constructor(private applicataionsservice: ApplicationsService, - private applicationstatusservice: ApplicationStatusService, - private specialhardwareservice: SpecialHardwareService, - private authzresolver: AuthzResolver, - private perunsettings: PerunSettings, - private groupsmanager: GroupsManager, - private usersmanager: UsersManager, - private membersmanager: MembersManager, - private resourceManager: ResourcesManager, - private groupservice: GroupService) { - this.getUserApplications(); - this.getAllApplications(usersmanager); - this.getApplicationStatus(); - this.getSpecialHardware(); - this.getComputeCenters(); - - } - - getComputeCenters() { - this.groupservice.getComputeCenters().subscribe(result => { - this.computeCenters = result; - }) - } - - getUserApplications() { - this.applicataionsservice - .getUserApplications().toPromise() - .then(result => { - let res = result.json(); - for (let key in res) { - let aj = res[key]; - let a = new Application(); - a.Id = aj["project_application_id"]; - a.Name = aj["project_application_name"]; - a.Lifetime = aj["project_application_lifetime"]; - a.DateSubmitted = aj["project_application_date_submitted"]; - a.Status = aj["project_application_status"]["application_status_name"]; - a.Description = aj["project_application_description"]; - a.VMsRequested = aj["project_application_vms_requested"]; - a.RamPerVM = aj["project_application_ram_per_vm"]; - a.CoresPerVM = aj["project_application_cores_per_vm"]; - a.DiskSpace = aj["project_application_disk_space"]; - a.ObjectStorage = aj["project_application_object_storage"]; - a.SpecialHardware = aj["project_application_special_hardware"]; - - this.user_applications.push(a) - } - }); - } - - getApplicationStatus() { - this.applicationstatusservice.getAllApplicationStatus().toPromise() - .then(result => { - let res = result.json(); - for (let key in res) { - let asj = res[key]; - let aj = new ApplicationStatus(asj["application_status_id"], asj["application_status_name"]); - this.application_status.push(aj) - } - }); - } - - getSpecialHardware() { - this.specialhardwareservice.getAllSpecialHardware().toPromise() - .then(result => { - let res = result.json(); - for (let key in res) { - let shj = res[key]; - let sh = new SpecialHardware(shj["special_hardware_id"], shj["special_hardware_key"], shj["special_hardware_name"]); - this.special_hardware.push(sh) - } - }); - } - - getAllApplications(usersmanager: UsersManager) { - //todo check if user is VO Admin - let user_id: number; - let admin_vos: {}; - - this.authzresolver - .getLoggedUser().toPromise() - .then(function (userdata) { - //TODO catch errors - user_id = userdata.json()["id"]; - return usersmanager.getVosWhereUserIsAdmin(user_id).toPromise(); - }).then(function (adminvos) { - admin_vos = adminvos.json(); - }).then(result => { - //check if user is a Vo admin so we can serv according buttons - for (let vkey in admin_vos) { - if (admin_vos[vkey]["id"] == this.perunsettings.getPerunVO().toString()) { - this.is_vo_admin = true; - this.applicataionsservice - .getAllApplications().toPromise() - .then(result => { - let res = result.json(); - for (let key in res) { - let aj = res[key]; - let a = new Application(); - a.Id = aj["project_application_id"]; - - a.Name = aj["project_application_name"]; - a.Description = aj["project_application_description"]; - a.Lifetime = aj["project_application_lifetime"]; - - a.VMsRequested = aj["project_application_vms_requested"]; - a.RamPerVM = aj["project_application_ram_per_vm"]; - a.CoresPerVM = aj["project_application_cores_per_vm"]; - a.DiskSpace = aj["project_application_disk_space"]; - a.ObjectStorage = aj["project_application_object_storage"]; - a.SpecialHardware = aj["project_application_special_hardware"]; - - a.Institute = aj["project_application_institute"]; - a.Workgroup = aj["project_application_workgroup"]; - - a.DateSubmitted = aj["project_application_date_submitted"]; - a.DateStatusChanged = aj["project_application_date_status_changed"]; - a.User = aj["project_application_user"]["username"]; - a.UserEmail = aj["project_application_user"]["email"]; - a.Status = aj["project_application_status"]; - if (a.Status !==1) { - this.groupsmanager.getGroupByVoandName(a.Name).subscribe(group => { - if (group.status !== 200){ - a.ComputeCenter = 'None' - this.all_applications.push(a) - } - this.resourceManager.getGroupAssignedResources(group.json()['id']).subscribe(resource => { - try { - let resource_id=resource.json()[0]['id']; - this.resourceManager.getFacilityByResource(resource_id).subscribe(facility => { - a.ComputeCenter = facility.json()['name']; - this.groupservice.getComputeCentersDetails(resource_id).subscribe(details =>{ - if(details){ - let details_array=[]; - for(let detail in details){ - let detail_as_string=detail + ': ' + details[detail]; - details_array.push(detail_as_string); - } + user_applications: Application[] = []; + is_vo_admin = false; + all_applications: Application[] = []; + application_status: ApplicationStatus[] = []; + special_hardware: SpecialHardware[] = []; + computeCenters: string[]; + + //notification Modal variables + public notificationModal; + public notificationModalTitle: string = "Notification"; + public notificationModalMessage: string = "Please wait..."; + public notificationModalType: string = "info"; + public notificationModalIsClosable: boolean = false; + + + collapse_status: { [id: string]: boolean } = {}; + + constructor(private applicataionsservice: ApplicationsService, + private applicationstatusservice: ApplicationStatusService, + private specialhardwareservice: SpecialHardwareService, + private authzresolver: AuthzResolver, + private perunsettings: PerunSettings, + private groupsmanager: GroupsManager, + private usersmanager: UsersManager, + private membersmanager: MembersManager, + private resourceManager: ResourcesManager, + private groupservice: GroupService) { + this.getUserApplications(); + this.getAllApplications(usersmanager); + this.getApplicationStatus(); + this.getSpecialHardware(); + this.getComputeCenters(); - a.ComputecenterDetails=details_array; - } - this.all_applications.push(a) - }) + } + getComputeCenters() { + this.groupservice.getComputeCenters().subscribe(result => { + this.computeCenters = result; + }) + } + getUserApplications() { + this.applicataionsservice + .getUserApplications().toPromise() + .then(result => { + let res = result.json(); + for (let key in res) { + let aj = res[key]; + let a = new Application(); + a.Id = aj["project_application_id"]; + a.Name = aj["project_application_name"]; + a.Lifetime = aj["project_application_lifetime"]; + a.DateSubmitted = aj["project_application_date_submitted"]; + a.Status = aj["project_application_status"]["application_status_name"]; + a.Description = aj["project_application_description"]; + a.VMsRequested = aj["project_application_vms_requested"]; + a.RamPerVM = aj["project_application_ram_per_vm"]; + a.CoresPerVM = aj["project_application_cores_per_vm"]; + a.DiskSpace = aj["project_application_disk_space"]; + a.ObjectStorage = aj["project_application_object_storage"]; + a.SpecialHardware = aj["project_application_special_hardware"]; + + this.user_applications.push(a) + } + }); + } - }) - } - catch (e) { + getApplicationStatus() { + this.applicationstatusservice.getAllApplicationStatus().toPromise() + .then(result => { + let res = result.json(); + for (let key in res) { + let asj = res[key]; + let aj = new ApplicationStatus(asj["application_status_id"], asj["application_status_name"]); + this.application_status.push(aj) + } + }); + } - a.ComputeCenter = 'None' + getSpecialHardware() { + this.specialhardwareservice.getAllSpecialHardware().toPromise() + .then(result => { + let res = result.json(); + for (let key in res) { + let shj = res[key]; + let sh = new SpecialHardware(shj["special_hardware_id"], shj["special_hardware_key"], shj["special_hardware_name"]); + this.special_hardware.push(sh) + } + }); + } - this.all_applications.push(a) + getAllApplications(usersmanager: UsersManager) { + //todo check if user is VO Admin + let user_id: number; + let admin_vos: {}; + + this.authzresolver + .getLoggedUser().toPromise() + .then(function (userdata) { + //TODO catch errors + user_id = userdata.json()["id"]; + return usersmanager.getVosWhereUserIsAdmin(user_id).toPromise(); + }).then(function (adminvos) { + admin_vos = adminvos.json(); + }).then(result => { + //check if user is a Vo admin so we can serv according buttons + for (let vkey in admin_vos) { + if (admin_vos[vkey]["id"] == this.perunsettings.getPerunVO().toString()) { + this.is_vo_admin = true; + this.applicataionsservice + .getAllApplications().toPromise() + .then(result => { + let res = result.json(); + for (let key in res) { + let aj = res[key]; + let a = new Application(); + a.Id = aj["project_application_id"]; + + a.Name = aj["project_application_name"]; + a.Description = aj["project_application_description"]; + a.Lifetime = aj["project_application_lifetime"]; + + a.VMsRequested = aj["project_application_vms_requested"]; + a.RamPerVM = aj["project_application_ram_per_vm"]; + a.CoresPerVM = aj["project_application_cores_per_vm"]; + a.DiskSpace = aj["project_application_disk_space"]; + a.ObjectStorage = aj["project_application_object_storage"]; + a.SpecialHardware = aj["project_application_special_hardware"]; + + a.Institute = aj["project_application_institute"]; + a.Workgroup = aj["project_application_workgroup"]; + + a.DateSubmitted = aj["project_application_date_submitted"]; + a.DateStatusChanged = aj["project_application_date_status_changed"]; + a.User = aj["project_application_user"]["username"]; + a.UserEmail = aj["project_application_user"]["email"]; + a.Status = aj["project_application_status"]; + if (a.Status !== 1) { + this.groupservice.getFacilityByGroup(a.Name).subscribe(result => { + + let details = result['Details']; + let details_array = []; + for (let detail in details) { + let detail_tuple = [detail, details[detail]]; + details_array.push(detail_tuple); + } + + a.ComputecenterDetails = details_array; + a.ComputeCenter = result['Facility']; + + this.all_applications.push(a) + + }) + } + else { + a.ComputeCenter = 'None' + + this.all_applications.push(a) + + } + } + }); + break; + } + } + }); + } + public getCollapseStatus(id: string) { + if (id in this.collapse_status) { + return this.collapse_status[id]; + } else { + this.collapse_status[id] = true; + return true; + } + } - } - }) - });} - else { - a.ComputeCenter = 'None' + public switchCollapseStatus(id: string) { + this.collapse_status[id] = !this.getCollapseStatus(id); + } - this.all_applications.push(a) - } - } - }); - break; + public getStatusById(id: number): string { + let s = "Unknown"; + for (let status of this.application_status) { + if (status.Id == id) { + return status.Name; + } } - } - }); - } - - public getCollapseStatus(id: string) { - if (id in this.collapse_status) { - return this.collapse_status[id]; - } else { - this.collapse_status[id] = true; - return true; + return s; } - } - public switchCollapseStatus(id: string) { - this.collapse_status[id] = !this.getCollapseStatus(id); - } + public getIdByStatus(name: string): number { + let s = -1; + for (let status of this.application_status) { + if (status.Name == name) { + return status.Id; + } + } + return s; + } + public updateNotificaitonModal(title: string, message: string, closable: true, type: string) { + this.notificationModalTitle = title; + this.notificationModalMessage = message; + this.notificationModalIsClosable = closable; + this.notificationModalType = type; + } + + public createGroup(name, description, manager_elixir_id, application_id, compute_center) { + //get memeber id in order to add the user later as the new member and manager of the group + let manager_member_id: number; + let manager_member_user_id: number; + let new_group_id: number; + + this.membersmanager.getMemberByExtSourceNameAndExtLogin(manager_elixir_id).toPromise() + .then(member_raw => { + let member = member_raw.json(); + manager_member_id = member["id"]; + manager_member_user_id = member["userId"]; + // create new group + return this.groupsmanager.createGroup(name, description).toPromise(); + } + ).then(group_raw => { + let group = group_raw.json(); + new_group_id = group["id"]; + + //add the application user to the group + return this.groupsmanager.addMember(new_group_id, manager_member_id).toPromise(); + + }).then(null_result => { + return this.groupsmanager.addAdmin(new_group_id, manager_member_user_id).toPromise(); + }).then(null_result => { + return this.applicationstatusservice.setApplicationStatus(application_id, this.getIdByStatus("approved")).toPromise(); + }).then(null_result => { + //setting approved status for Perun Group + this.groupsmanager.setPerunGroupStatus(new_group_id, 2).toPromise(); + this.groupservice.assignGroupToResource(new_group_id.toString(), compute_center).subscribe(); + //update modal + this.updateNotificaitonModal("Success", "The new project was created", true, "success"); + //update applications + this.all_applications = []; + this.user_applications = []; + this.getUserApplications(); + this.getAllApplications(this.usersmanager); + }).catch(error => { + this.updateNotificaitonModal("Failed", "Project could not be created!", true, "danger"); + }); - public getStatusById(id: number): string { - let s = "Unknown"; - for (let status of this.application_status) { - if (status.Id == id) { - return status.Name; - } } - return s; - } - - public getIdByStatus(name: string): number { - let s = -1; - for (let status of this.application_status) { - if (status.Name == name) { - return status.Id; - } + + public declineApplication(application_id) { + this.applicationstatusservice.setApplicationStatus(application_id, this.getIdByStatus("declined")).toPromise() + .then(result => { + this.all_applications = []; + this.user_applications = []; + this.getUserApplications(); + this.getAllApplications(this.usersmanager); + this.updateNotificaitonModal("Success", "The Application was declined", true, "success"); + }) + .catch(error => { + this.updateNotificaitonModal("Failed", "Application could be decilned!", true, "danger"); + }); } - return s; - } - - public updateNotificaitonModal(title: string, message: string, closable: true, type: string) { - this.notificationModalTitle = title; - this.notificationModalMessage = message; - this.notificationModalIsClosable = closable; - this.notificationModalType = type; - } - - public createGroup(name, description, manager_elixir_id, application_id, compute_center) { - //get memeber id in order to add the user later as the new member and manager of the group - let manager_member_id: number; - let manager_member_user_id: number; - let new_group_id: number; - - this.membersmanager.getMemberByExtSourceNameAndExtLogin(manager_elixir_id).toPromise() - .then(member_raw => { - let member = member_raw.json(); - manager_member_id = member["id"]; - manager_member_user_id = member["userId"]; - // create new group - return this.groupsmanager.createGroup(name, description).toPromise(); + + public activeApplicationsAvailable(): boolean { + for (let application of this.all_applications) { + if (application.Status == 1) { + return true; + } } - ).then(group_raw => { - let group = group_raw.json(); - new_group_id = group["id"]; - - //add the application user to the group - return this.groupsmanager.addMember(new_group_id, manager_member_id).toPromise(); - - }).then(null_result => { - return this.groupsmanager.addAdmin(new_group_id, manager_member_user_id).toPromise(); - }).then(null_result => { - return this.applicationstatusservice.setApplicationStatus(application_id, this.getIdByStatus("approved")).toPromise(); - }).then(null_result => { - //setting approved status for Perun Group - this.groupsmanager.setPerunGroupStatus(new_group_id, 2).toPromise(); - this.groupservice.assignGroupToResource(new_group_id.toString(), compute_center).subscribe(); - //update modal - this.updateNotificaitonModal("Success", "The new project was created", true, "success"); - //update applications - this.all_applications = []; - this.user_applications = []; - this.getUserApplications(); - this.getAllApplications(this.usersmanager); - }).catch(error => { - this.updateNotificaitonModal("Failed", "Project could not be created!", true, "danger"); - }); - - } - - public declineApplication(application_id) { - this.applicationstatusservice.setApplicationStatus(application_id, this.getIdByStatus("declined")).toPromise() - .then(result => { - this.all_applications = []; - this.user_applications = []; - this.getUserApplications(); - this.getAllApplications(this.usersmanager); - this.updateNotificaitonModal("Success", "The Application was declined", true, "success"); - }) - .catch(error => { - this.updateNotificaitonModal("Failed", "Application could be decilned!", true, "danger"); - }); - } - - public activeApplicationsAvailable(): boolean { - for (let application of this.all_applications) { - if (application.Status == 1) { - return true; - } + return false; } - return false; - } - public comingSoon() { - alert("This functinality will be implemented soon!") - } + public comingSoon() { + alert("This functinality will be implemented soon!") + } } diff --git a/src/app/projectmanagement/overview.component.html b/src/app/projectmanagement/overview.component.html index cb0c5f6fbc..82dd0b53a4 100755 --- a/src/app/projectmanagement/overview.component.html +++ b/src/app/projectmanagement/overview.component.html @@ -29,9 +29,12 @@

    Projects Overview

    diff --git a/src/app/projectmanagement/overview.component.ts b/src/app/projectmanagement/overview.component.ts index cb02376a66..d04d9ebee4 100644 --- a/src/app/projectmanagement/overview.component.ts +++ b/src/app/projectmanagement/overview.component.ts @@ -21,54 +21,54 @@ import {GroupService} from "../api-connector/group.service"; }) export class OverviewComponent { - debug_module = false; - - @Input() voRegistrationLink: string = environment.voRegistrationLink; - - userprojects: {}; - userid: number; - member_id: number; - user_data: {}; - admingroups: {}; - adminvos: {}; - filteredMembers = null; - projects: Project[] = new Array(); - - // modal variables for User list - public usersModal; - public usersModalProjectMembers: ProjectMember[] = new Array; - public usersModalProjectID: number; - public usersModalProjectName: string; - - //modal variables for Add User Modal - public addUserModal; - public addUserModalProjectID: number; - public addUserModalProjectName: string; - public UserModalFacility: string; - - - //notification Modal variables - public notificationModal; - public notificationModalTitle: string = "Notification"; - public notificationModalMessage: string = "Please wait..."; - public notificationModalType: string = "info"; - public notificationModalIsClosable: boolean = false; - - constructor(private authzresolver: AuthzResolver, - private perunsettings: PerunSettings, - private useresmanager: UsersManager, - private groupsmanager: GroupsManager, - private membersmanager: MembersManager, - private resourceManager: ResourcesManager, - private groupservice: GroupService) { - this.getUserProjects(groupsmanager, membersmanager, useresmanager); - } - - public updateUserProjects() { - this.projects = []; - this.getUserProjects(this.groupsmanager, this.membersmanager, this.useresmanager); - } + debug_module = false; + + @Input() voRegistrationLink: string = environment.voRegistrationLink; + + userprojects: {}; + userid: number; + member_id: number; + user_data: {}; + admingroups: {}; + adminvos: {}; + filteredMembers = null; + projects: Project[] = new Array(); + + + // modal variables for User list + public usersModal; + public usersModalProjectMembers: ProjectMember[] = new Array; + public usersModalProjectID: number; + public usersModalProjectName: string; + + //modal variables for Add User Modal + public addUserModal; + public addUserModalProjectID: number; + public addUserModalProjectName: string; + public UserModalFacility: string; + + + //notification Modal variables + public notificationModal; + public notificationModalTitle: string = "Notification"; + public notificationModalMessage: string = "Please wait..."; + public notificationModalType: string = "info"; + public notificationModalIsClosable: boolean = false; + + constructor(private authzresolver: AuthzResolver, + private perunsettings: PerunSettings, + private useresmanager: UsersManager, + private groupsmanager: GroupsManager, + private membersmanager: MembersManager, + private resourceManager: ResourcesManager, + private groupservice: GroupService) { + this.getUserProjects(groupsmanager, membersmanager, useresmanager); + } + public updateUserProjects() { + this.projects = []; + this.getUserProjects(this.groupsmanager, this.membersmanager, this.useresmanager); + } getUserProjects(groupsmanager: GroupsManager, @@ -141,55 +141,27 @@ export class OverviewComponent { } else { is_pi = true; } - this.resourceManager.getGroupAssignedResources(group['id']).subscribe(resource => { - try { - let resource_id = resource.json()[0]['id']; - this.resourceManager.getFacilityByResource(resource_id).subscribe(facility => { - let newProject = new Project( - group["id"], - group["name"], - group["description"], - dateCreated.getDate() + "." + (dateCreated.getMonth() + 1) + "." + dateCreated.getFullYear(), - dateDayDifference, - is_pi, - is_admin, - facility.json()['name']) - try { - this.groupservice.getComputeCentersDetails(resource_id).subscribe(details => { - if (details) { - let details_array = []; - for (let detail in details) { - let detail_as_string = detail + ': ' + details[detail]; - details_array.push(detail_as_string); - } - newProject.ComputecenterDetails = details_array; - } - this.projects.push(newProject); - - }) - } - catch(e){ - this.projects.push(newProject); - } - - - }) + this.groupservice.getFacilityByGroup(group["name"]).subscribe(result => { + + let newProject = new Project( + group["id"], + group["name"], + group["description"], + dateCreated.getDate() + "." + (dateCreated.getMonth() + 1) + "." + dateCreated.getFullYear(), + dateDayDifference, + is_pi, + is_admin, + result['Facility']) + let details = result['Details']; + let details_array = []; + for (let detail in details) { + let detail_tuple = [detail,details[detail]]; + details_array.push(detail_tuple); } - catch (e) { - - this.projects.push(new Project( - group["id"], - group["name"], - group["description"], - dateCreated.getDate() + "." + (dateCreated.getMonth() + 1) + "." + dateCreated.getFullYear(), - dateDayDifference, - is_pi, - is_admin, - 'None') - ); + newProject.ComputecenterDetails = details_array; + this.projects.push(newProject); - } }) @@ -200,94 +172,89 @@ export class OverviewComponent { } + public resetAddUserModal() { + this.addUserModalProjectID = null; + this.addUserModalProjectName = null; + this.UserModalFacility = null; + } + filterMembers(firstName: string, lastName: string, groupid: number) { + this.membersmanager.getMembersOfdeNBIVo(firstName, lastName, groupid.toString()).subscribe(result => { + this.filteredMembers = result; + }) + } - public resetAddUserModal() { - this.addUserModalProjectID = null; - this.addUserModalProjectName = null; - this.UserModalFacility = null; - } - - filterMembers(firstName: string, lastName: string, groupid: number) { - this.membersmanager.getMembersOfdeNBIVo(firstName, lastName, groupid.toString()).subscribe(result => { - this.filteredMembers = result; - }) - } - - - getMembesOfTheProject(projectid: number, projectname: string) { - this.groupsmanager.getGroupRichMembers(projectid).toPromise() - .then(function (members_raw) { - return members_raw.json(); - }).then(members => { - this.usersModalProjectID = projectid; - this.usersModalProjectName = projectname; - this.usersModalProjectMembers = new Array(); - for (let member of members) { - let member_id = member["id"]; - let user_id = member["userId"]; - let fullName = member["user"]["firstName"] + " " + member["user"]["lastName"]; - this.usersModalProjectMembers.push(new ProjectMember(user_id, fullName, member_id)); - } - }); - } + getMembesOfTheProject(projectid: number, projectname: string) { + this.groupsmanager.getGroupRichMembers(projectid).toPromise() + .then(function (members_raw) { + return members_raw.json(); + }).then(members => { + this.usersModalProjectID = projectid; + this.usersModalProjectName = projectname; + this.usersModalProjectMembers = new Array(); + for (let member of members) { + let member_id = member["id"]; + let user_id = member["userId"]; + let fullName = member["user"]["firstName"] + " " + member["user"]["lastName"]; + this.usersModalProjectMembers.push(new ProjectMember(user_id, fullName, member_id)); + } - public showMembersOfTheProject(projectid: number, projectname: string,facility:string) { - this.getMembesOfTheProject(projectid, projectname); - if (facility === 'None') { - this.UserModalFacility = null; - } - else { - this.UserModalFacility = facility; + }); } - } - - - public resetNotificaitonModal() { - this.notificationModalTitle = "Notification"; - this.notificationModalMessage = "Please wait..."; - this.notificationModalIsClosable = false; - this.notificationModalType = "info"; - } - public updateNotificaitonModal(title: string, message: string, closable: true, type: string) { - this.notificationModalTitle = title; - this.notificationModalMessage = message; - this.notificationModalIsClosable = closable; - this.notificationModalType = type; - } + public showMembersOfTheProject(projectid: number, projectname: string, facility: string) { + this.getMembesOfTheProject(projectid, projectname); + if (facility === 'None') { + this.UserModalFacility = null; + } + else { + this.UserModalFacility = facility; + } + } - public makeNotificationModalClosable(closable: boolean) { - this.notificationModalIsClosable = closable; - } - public changeNotificationModalTitle(title: string) { - this.notificationModalTitle = title; - } + public resetNotificaitonModal() { + this.notificationModalTitle = "Notification"; + this.notificationModalMessage = "Please wait..."; + this.notificationModalIsClosable = false; + this.notificationModalType = "info"; + } - public changeNotificationModalMessage(message: string) { - this.notificationModalMessage = message; - } + public updateNotificaitonModal(title: string, message: string, closable: true, type: string) { + this.notificationModalTitle = title; + this.notificationModalMessage = message; + this.notificationModalIsClosable = closable; + this.notificationModalType = type; + } - public changeNotificationModalType(type: string) { - this.notificationModalType = type; - } + public makeNotificationModalClosable(closable: boolean) { + this.notificationModalIsClosable = closable; + } - public showAddUserToProjectModal(projectid: number, projectname: string, facility: string) { - this.addUserModalProjectID = projectid; - this.addUserModalProjectName = projectname; - if (facility === 'None') { - this.UserModalFacility = null; - } - else { - this.UserModalFacility = facility; + public changeNotificationModalTitle(title: string) { + this.notificationModalTitle = title; + } - } - } + public changeNotificationModalMessage(message: string) { + this.notificationModalMessage = message; + } + public changeNotificationModalType(type: string) { + this.notificationModalType = type; + } + public showAddUserToProjectModal(projectid: number, projectname: string, facility: string) { + this.addUserModalProjectID = projectid; + this.addUserModalProjectName = projectname; + if (facility === 'None') { + this.UserModalFacility = null; + } + else { + this.UserModalFacility = facility; + } + } public addMember(groupid: number, memberid: number, firstName: string, lastName: string) { @@ -304,17 +271,17 @@ export class OverviewComponent { }); } - public removeMember(groupid: number, memberid: number,name:string) { + public removeMember(groupid: number, memberid: number, name: string) { this.groupsmanager.removeMember(groupid, memberid).toPromise() .then(result => { if (result.status == 200) { this.updateNotificaitonModal("Success", "Member " + name + " removed from the group", true, "success"); } else { - this.updateNotificaitonModal("Failed", "Member" + name + " could not be removed !", true, "danger"); + this.updateNotificaitonModal("Failed", "Member" + name + " could not be removed !", true, "danger"); } }).catch(error => { - this.updateNotificaitonModal("Failed", "Member" + name + " could not be removed !", true, "danger"); + this.updateNotificaitonModal("Failed", "Member" + name + " could not be removed !", true, "danger"); }); } diff --git a/src/app/projectmanagement/project.model.ts b/src/app/projectmanagement/project.model.ts index 20ac2f5eba..ba19b9fb52 100644 --- a/src/app/projectmanagement/project.model.ts +++ b/src/app/projectmanagement/project.model.ts @@ -15,7 +15,7 @@ export class Project { private _UserIsAdmin: boolean; private _UserIsPi: boolean; private _ComputeCenter:string; - private _ComputeCenterDetails:{}; + private _ComputeCenterDetails:[string,string][]; constructor(Id: number, Name: string, Description: string, DateCreated: string, DaysRunning: number, UserIsAdmin: boolean, UserIsPi: boolean,ComputeCenter: string) { @@ -35,7 +35,7 @@ export class Project { get ComputeCenterDetails(){ return this._ComputeCenterDetails; } - set ComputecenterDetails(value:{}){ + set ComputecenterDetails(value:[string,string][]){ this._ComputeCenterDetails=value; } get ComputeCenter(): string { From 76c518fed36b5450beec796114b2ee60156c583c Mon Sep 17 00:00:00 2001 From: DavidWein94 Date: Tue, 20 Mar 2018 16:42:06 +0100 Subject: [PATCH 033/148] fix(checkboxes):fixed checkboxes (#58) * fix(checkboxes):fixed checkboxes * fix(checkbox):fixed checkob in html --- .../addapplication.component.html | 6 +- .../applications/addapplication.component.ts | 97 ++++++++++--------- 2 files changed, 52 insertions(+), 51 deletions(-) diff --git a/src/app/applications/addapplication.component.html b/src/app/applications/addapplication.component.html index 8c2798ac75..8639ec2cfa 100755 --- a/src/app/applications/addapplication.component.html +++ b/src/app/applications/addapplication.component.html @@ -136,11 +136,11 @@
    Resources
    - +
    -
    +
    diff --git a/src/app/applications/addapplication.component.ts b/src/app/applications/addapplication.component.ts index 539a8ebebf..996c6aa502 100644 --- a/src/app/applications/addapplication.component.ts +++ b/src/app/applications/addapplication.component.ts @@ -8,65 +8,66 @@ import {ApiSettings} from '../api-connector/api-settings.service' import {ApplicationsService} from '../api-connector/applications.service' @Component({ - templateUrl: 'addapplication.component.html', - providers: [SpecialHardwareService, ApiSettings, ApplicationsService] + templateUrl: 'addapplication.component.html', + providers: [SpecialHardwareService, ApiSettings, ApplicationsService] }) export class AddApplicationComponent { - //notification Modal variables - public notificationModalTitle: string = "Notification"; - public notificationModalMessage: string = "Please wait..."; - public notificationModalType: string = "info"; - public notificationModalIsClosable: boolean = false; - public notificationModalStay: boolean = true; + //notification Modal variables + public notificationModalTitle: string = "Notification"; + public notificationModalMessage: string = "Please wait..."; + public notificationModalType: string = "info"; + public notificationModalIsClosable: boolean = false; + public notificationModalStay: boolean = true; - csrf: Object = Cookie.get("csrftoken"); - special_hardware: SpecialHardware[] = new Array(); + csrf: Object = Cookie.get("csrftoken"); + special_hardware: SpecialHardware[] = new Array(); - constructor(private specialhardwareservice: SpecialHardwareService, - private applicationsservice: ApplicationsService) { - this.getSpecialHardware(); - } + constructor(private specialhardwareservice: SpecialHardwareService, + private applicationsservice: ApplicationsService) { + this.getSpecialHardware(); + } - getSpecialHardware() { - this.specialhardwareservice.getAllSpecialHardware().toPromise() - .then(result => { - let res = result.json(); - for (let key in res) { - let shj = res[key]; - let sh = new SpecialHardware(shj["special_hardware_id"], shj["special_hardware_key"], shj["special_hardware_name"]); - this.special_hardware.push(sh) - } - }); - } + getSpecialHardware() { + this.specialhardwareservice.getAllSpecialHardware().toPromise() + .then(result => { + let res = result.json(); + for (let key in res) { + let shj = res[key]; + let sh = new SpecialHardware(shj["special_hardware_id"], shj["special_hardware_key"], shj["special_hardware_name"]); + this.special_hardware.push(sh) + } + }); + } - onSubmit(f: NgForm) { - f.controls['project_application_special_hardware'] - .setValue(this.special_hardware.filter(hardware => hardware.Checked).map(hardware => hardware.Id)) - let values={}; - for(let v in f.controls){ + onSubmit(f: NgForm) { + let values = {}; + values['project_application_special_hardware'] = this.special_hardware.filter(hardware => hardware.Checked).map(hardware => hardware.Id) + for (let v in f.controls) { - if(f.controls[v].value){ - values[v]=f.controls[v].value; + if (f.controls[v].value) { + values[v] = f.controls[v].value; + } } - } - this.applicationsservice.addNewApplication(values).toPromise() - .then(result => { - this.updateNotificaitonModal("Success", "The application was submitted", true, "success"); - this.notificationModalStay = false; - }).catch(error => { - this.updateNotificaitonModal("Failed", "The application was not submitted, please check the required fields and try again.", true, "danger"); - this.notificationModalStay = true; - }) - } + this.applicationsservice.addNewApplication(values).toPromise() + .then(result => { + this.updateNotificaitonModal("Success", "The application was submitted", true, "success"); + this.notificationModalStay = false; + }).catch(error => { + this.updateNotificaitonModal("Failed", "The application was not submitted, please check the required fields and try again.", true, "danger"); + this.notificationModalStay = true; + }) - public updateNotificaitonModal(title: string, message: string, closable: true, type: string) { - this.notificationModalTitle = title; - this.notificationModalMessage = message; - this.notificationModalIsClosable = closable; - this.notificationModalType = type; - } + + } + + public updateNotificaitonModal(title: string, message: string, closable: true, type: string) { + this.notificationModalTitle = title; + this.notificationModalMessage = message; + this.notificationModalIsClosable = closable; + this.notificationModalType = type; + } } From 961be80e54cec8c59d5442b5a9ed513443f6a8b4 Mon Sep 17 00:00:00 2001 From: DavidWein94 Date: Tue, 20 Mar 2018 18:36:10 +0100 Subject: [PATCH 034/148] Feature/shortnames (#60) * feat(shortnames):added shortnames * feat(shortnames) :added shrnames to applicationsverview * fix(application): add text for shortname field * fix(application): rename shortname to short name * fix(application): add range for the short name * fix(projects): shortname to short name --- .../applications/addapplication.component.html | 16 ++++++++++++++-- src/app/applications/application.model.ts | 8 ++++++++ src/app/applications/applications.component.html | 8 +++++++- src/app/applications/applications.component.ts | 2 ++ 4 files changed, 31 insertions(+), 3 deletions(-) diff --git a/src/app/applications/addapplication.component.html b/src/app/applications/addapplication.component.html index 8639ec2cfa..1d2d37ce35 100755 --- a/src/app/applications/addapplication.component.html +++ b/src/app/applications/addapplication.component.html @@ -22,8 +22,20 @@
    General Information
    - Name your project pricesly with few words. + placeholder="e.g. Assembler benchmarking based on A. thaliana genome" ngModel> + Name your project. +
    +
    + +
    + +
    + + Enter a short name (between 5 and 15 characters).
    diff --git a/src/app/applications/application.model.ts b/src/app/applications/application.model.ts index 9e178c3272..627475accc 100644 --- a/src/app/applications/application.model.ts +++ b/src/app/applications/application.model.ts @@ -1,6 +1,7 @@ export class Application { private _Id: number; private _Name: string; + private _Shortname: string; private _Institute: string; private _Workgroup: string; private _Lifetime: number; @@ -52,6 +53,13 @@ export class Application { set Name(value: string) { this._Name = value; } + get Shortname(): string { + return this._Shortname; + } + + set Shortname(value: string) { + this._Shortname = value; + } get Institute(): string { return this._Institute; diff --git a/src/app/applications/applications.component.html b/src/app/applications/applications.component.html index a43ad27871..670dc8d35a 100755 --- a/src/app/applications/applications.component.html +++ b/src/app/applications/applications.component.html @@ -17,6 +17,7 @@

    Applications Overview

     + @@ -27,6 +28,7 @@

    Applications Overview

    + @@ -108,6 +110,7 @@

    Applications Overview

    + @@ -120,6 +123,7 @@

    Applications Overview

    + + @@ -252,6 +257,7 @@

    Applications Overview

    + diff --git a/src/app/applications/applications.component.ts b/src/app/applications/applications.component.ts index eb8363d0ad..aa32e28213 100644 --- a/src/app/applications/applications.component.ts +++ b/src/app/applications/applications.component.ts @@ -73,6 +73,7 @@ export class ApplicationsComponent { let a = new Application(); a.Id = aj["project_application_id"]; a.Name = aj["project_application_name"]; + a.Shortname=aj["project_application_shortname"]; a.Lifetime = aj["project_application_lifetime"]; a.DateSubmitted = aj["project_application_date_submitted"]; a.Status = aj["project_application_status"]["application_status_name"]; @@ -141,6 +142,7 @@ export class ApplicationsComponent { a.Id = aj["project_application_id"]; a.Name = aj["project_application_name"]; + a.Shortname=aj["project_application_shortname"]; a.Description = aj["project_application_description"]; a.Lifetime = aj["project_application_lifetime"]; From 7517591a57769020cdc1a9a3b8c939b50956a2e9 Mon Sep 17 00:00:00 2001 From: DavidWein94 Date: Wed, 21 Mar 2018 14:06:29 +0100 Subject: [PATCH 035/148] Feature/projects startingvm (#33) * feat(applications): now you can choose if openstack project * feat(applications): now see denbiaccess attribute will be set * fix(addaplication): now if the openstack checkbox never is used it sets to false * feat(application): now seperate projects types * feat(application): now checks if there is a value for the project fields, if not wont send none anymore * feat(startingvm): swapped positions in html * feat(newapplication): added resuestet vms to single vms * fix(applications):fixed removed function * fix(applications): fixed more merge errors * fix(merge):hopefully fixed last errors * fix(merge):hopefully fixed last errors * fix(application): rewording the text * fix(addapplications): removed one and. --- .../addapplication.component.html | 89 +++- .../applications/addapplication.component.ts | 25 +- src/app/applications/application.model.ts | 15 +- .../applications/applications.component.html | 403 +++++++++--------- .../applications/applications.component.ts | 9 +- .../perun-connector/groups-manager.service.ts | 15 + 6 files changed, 341 insertions(+), 215 deletions(-) diff --git a/src/app/applications/addapplication.component.html b/src/app/applications/addapplication.component.html index 1d2d37ce35..ca5eb69a66 100755 --- a/src/app/applications/addapplication.component.html +++ b/src/app/applications/addapplication.component.html @@ -67,11 +67,40 @@
    General Information

    +
    -
    Resources
    +
    Choose the type of your Project
    +
    +
    + +
    + +
    -
    + +
    + +
    +
    +
    +
    Resources
    +
    + +
    @@ -87,7 +116,7 @@
    Resources
    -
    +
    @@ -102,7 +131,7 @@
    Resources
    -
    +
    @@ -117,7 +146,7 @@
    Resources
    -
    +
    @@ -132,14 +161,14 @@
    Resources
    -
    +
    + type="number" min="0" step="1" ngModel> GB
    @@ -147,7 +176,8 @@
    Resources
    -
    + +
    @@ -159,6 +189,37 @@
    Resources
    Which special Hardware would you need?
    + +
    + +
    + +
    +
    + + VMs + +
    + How many VMs would you run simultaneously? +
    +
    +
    + +
    +
      +
    • de.NBI Large (CPUs:32, RAM:64)
      • +
    • de.NBI Medium (CPUs:16, RAM:32)
      • +
    • de.NBI Small (CPUs:8, RAM:16)
      • +
    +
    +
    + +
    Institutional Information
    @@ -193,7 +254,8 @@
    Institutional Information
    - @@ -223,10 +285,11 @@

    {{ notificationModalTitle }}

    (click)="notificationModal.hide();" type="reset" class="btn btn-secondary"> Close - -
    diff --git a/src/app/applications/addapplication.component.ts b/src/app/applications/addapplication.component.ts index 996c6aa502..ea6eda7012 100644 --- a/src/app/applications/addapplication.component.ts +++ b/src/app/applications/addapplication.component.ts @@ -21,12 +21,31 @@ export class AddApplicationComponent { public notificationModalIsClosable: boolean = false; public notificationModalStay: boolean = true; + showjustvm: boolean; + project_application_openstack_project: boolean; + + csrf: Object = Cookie.get("csrftoken"); special_hardware: SpecialHardware[] = new Array(); constructor(private specialhardwareservice: SpecialHardwareService, private applicationsservice: ApplicationsService) { this.getSpecialHardware(); + + } + + chosenProjectType(checkbox: number) { + if (checkbox == 0) { + if (this.project_application_openstack_project) { + this.showjustvm = false; + } + } + + else if (checkbox == 1) { + if (this.showjustvm) { + this.project_application_openstack_project = false; + } + } } getSpecialHardware() { @@ -42,15 +61,16 @@ export class AddApplicationComponent { } onSubmit(f: NgForm) { + let values = {}; values['project_application_special_hardware'] = this.special_hardware.filter(hardware => hardware.Checked).map(hardware => hardware.Id) for (let v in f.controls) { - if (f.controls[v].value) { values[v] = f.controls[v].value; } } + this.applicationsservice.addNewApplication(values).toPromise() .then(result => { this.updateNotificaitonModal("Success", "The application was submitted", true, "success"); @@ -59,10 +79,9 @@ export class AddApplicationComponent { this.updateNotificaitonModal("Failed", "The application was not submitted, please check the required fields and try again.", true, "danger"); this.notificationModalStay = true; }) - - } + public updateNotificaitonModal(title: string, message: string, closable: true, type: string) { this.notificationModalTitle = title; this.notificationModalMessage = message; diff --git a/src/app/applications/application.model.ts b/src/app/applications/application.model.ts index 627475accc..b67168af50 100644 --- a/src/app/applications/application.model.ts +++ b/src/app/applications/application.model.ts @@ -18,18 +18,31 @@ export class Application { private _UserEmail: number; private _Status: number; private _ComputeCenter: string; - private _ComputeCenterDetails:[string,string][]; + private _OpenStackProject: boolean; + private _ComputeCenterDetails:[string,string][]; + constructor() { } + + get OpenStackProject(): boolean { + return this._OpenStackProject + } + + set OpenStackProject(value: boolean) { + this._OpenStackProject = value; + } + + get ComputeCenterDetails(){ return this._ComputeCenterDetails; } set ComputecenterDetails(value:[string,string][]){ this._ComputeCenterDetails=value; } + get ComputeCenter(): string { return this._ComputeCenter } diff --git a/src/app/applications/applications.component.html b/src/app/applications/applications.component.html index 670dc8d35a..447e9ef100 100755 --- a/src/app/applications/applications.component.html +++ b/src/app/applications/applications.component.html @@ -34,76 +34,80 @@

    Applications Overview

     - + + - - - - - -
    first name last name
    Facility Details -
      -
    • Name: {{application.ComputeCenter}}
      • -
    • - {{detail}} -
      • -
    +
      +
    • Name: {{application.ComputeCenter}}
      • +
    • + {{details[0]}}: {{details[1]}} + {{details[1]}} +
      • +
    {{project.ComputeCenter}} -
      -
    • {{details}}
      • -
    +     		{{ project.DateCreated }}
    Project NameShort Name Lifetime Date submitted Status
    {{ application.Name }}{{application.Shortname}} {{ application.Lifetime }} {{ application.DateSubmitted }} {{ application.Status }}
    Project NameShort Name Date submitted User Institute
    {{ application.Name }}{{application.Shortname}} {{ application.DateSubmitted }} {{ application.User }} @@ -138,7 +142,7 @@

    Applications Overview
    Project NameShort Name Date submitted User Institute
    {{ application.Name }}{{application.Shortname}} {{ application.DateSubmitted }} {{ application.User }} {{ application.Institute }}{{ application.Status }} - + -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Description{{ application.Description }}
    VMs{{ application.VMsRequested }} VMs
    Cores/VM{{ application.CoresPerVM }} Cores per VM
    RAM{{ application.RamPerVM }} GB
    Disk{{ application.DiskSpace }} GB
    ObjectStorage{{ application.ObjectStorage }} GB
    Special Hardware{{ sh["special_hardware_name"] }} -
    -
    -
    -

    + + +
    -
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Description{{ application.Description }}
    VMs{{ application.VMsRequested }} VMs
    Cores/VM{{ application.CoresPerVM }} Cores per VM
    RAM{{ application.RamPerVM }} GB
    Disk{{ application.DiskSpace }} GB
    ObjectStorage{{ application.ObjectStorage }} GB
    Special Hardware{{ sh["special_hardware_name"] }} +
    OpenStackProject{{application.OpenStackProject}}
    +
    + + + + +
    -
    -
    -
    - Applications for review -
    -
    - -
    +
    +
    + +
    +
    +
    + Applications for review +
    +
    + +
    @@ -128,120 +132,126 @@

    Applications Overview

    + - - - - - - - - + -
    {{ application.User }} {{application.Institute}}{{ application.Institute }} + + + - + + - + + - -
    -
    + +
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - -
    Description{{ application.Description }}
    Workgroup{{ application.Workgroup }}
    Lifetime{{ application.Lifetime }} months
    VMs{{ application.VMsRequested }} VMs
    Cores/VM{{ application.CoresPerVM }} Cores per VM
    RAM{{ application.RamPerVM }} GB
    Disk{{ application.DiskSpace }} GB
    ObjectStorage{{ application.ObjectStorage }} GB
    Special Hardware{{ sh["special_hardware_name"] }} -
    Last status changed{{ application.DateStatusChanged }}
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
    Description{{ application.Description }}
    Workgroup{{ application.Workgroup }}
    Lifetime{{ application.Lifetime }} months
    VMs{{ application.VMsRequested }} VMs
    Cores/VM{{ application.CoresPerVM }} Cores per VM
    RAM{{ application.RamPerVM }} GB
    Disk{{ application.DiskSpace }} GB
    ObjectStorage{{ application.ObjectStorage }} GB
    Special Hardware{{ sh["special_hardware_name"] }} +
    OpenStackProject{{application.OpenStackProject}}
    Last status changed{{ application.DateStatusChanged }}
    -
    -
    -
    -
    + +
    + + + + + +
    -
    -
    -
    - Application history -
    -
    - -
    +
    +
    + +
    +
    +
    + Application history +
    +
    + +
    + +
    + + + -
    -
    - - @@ -323,6 +333,7 @@

    Applications Overview

    + +
    Project Name Short Name Date submitted {{ application.DateStatusChanged }}
    Facility Details
      @@ -338,45 +349,45 @@

      Applications Overview

    - - -
    - - - - +
    + + + - - - -
    -
    + + +
    - + + + + + diff --git a/src/app/applications/applications.component.ts b/src/app/applications/applications.component.ts index aa32e28213..a72645faa1 100644 --- a/src/app/applications/applications.component.ts +++ b/src/app/applications/applications.component.ts @@ -55,6 +55,7 @@ export class ApplicationsComponent { this.getSpecialHardware(); this.getComputeCenters(); + } getComputeCenters() { @@ -84,6 +85,7 @@ export class ApplicationsComponent { a.DiskSpace = aj["project_application_disk_space"]; a.ObjectStorage = aj["project_application_object_storage"]; a.SpecialHardware = aj["project_application_special_hardware"]; + a.OpenStackProject = aj["project_application_openstack_project"]; this.user_applications.push(a) } @@ -161,6 +163,7 @@ export class ApplicationsComponent { a.User = aj["project_application_user"]["username"]; a.UserEmail = aj["project_application_user"]["email"]; a.Status = aj["project_application_status"]; + a.OpenStackProject = aj["project_application_openstack_project"]; if (a.Status !== 1) { this.groupservice.getFacilityByGroup(a.Name).subscribe(result => { @@ -233,7 +236,7 @@ export class ApplicationsComponent { this.notificationModalType = type; } - public createGroup(name, description, manager_elixir_id, application_id, compute_center) { + public createGroup(name, description, manager_elixir_id, application_id, compute_center, openstack_project) { //get memeber id in order to add the user later as the new member and manager of the group let manager_member_id: number; let manager_member_user_id: number; @@ -261,6 +264,7 @@ export class ApplicationsComponent { }).then(null_result => { //setting approved status for Perun Group this.groupsmanager.setPerunGroupStatus(new_group_id, 2).toPromise(); + this.groupsmanager.setdeNBIDirectAcces(new_group_id, openstack_project).toPromise(); this.groupservice.assignGroupToResource(new_group_id.toString(), compute_center).subscribe(); //update modal this.updateNotificaitonModal("Success", "The new project was created", true, "success"); @@ -289,6 +293,7 @@ export class ApplicationsComponent { }); } + public activeApplicationsAvailable(): boolean { for (let application of this.all_applications) { if (application.Status == 1) { @@ -296,7 +301,7 @@ export class ApplicationsComponent { } } return false; - } +} public comingSoon() { alert("This functinality will be implemented soon!") diff --git a/src/app/perun-connector/groups-manager.service.ts b/src/app/perun-connector/groups-manager.service.ts index 172d642d8a..97282290e1 100644 --- a/src/app/perun-connector/groups-manager.service.ts +++ b/src/app/perun-connector/groups-manager.service.ts @@ -53,6 +53,21 @@ export class GroupsManager { }); } + setdeNBIDirectAcces(group_id: number, value: boolean) { + var parameter = JSON.stringify({ + group: group_id, + attribute: {id: 3279, + namespace: 'urn:perun:group:attribute-def:opt', + friendlyName: 'denbiDirectAccess', type: 'java.lang.Boolean', + value: value + } + }); + return this.http.post(this.settings.getPerunBaseURL() + 'attributesManager/setAttribute', parameter, + { + headers: new Headers({'Authorization': 'Bearer ' + this.apiSettings.getAccessToken()}), + }); + } + setPerunGroupStatus(group_id: number, status: number) { /* 1:submitted 2: approved From aa60657cb7b412fb316f04139bc8d083fa4be9c3 Mon Sep 17 00:00:00 2001 From: David Weinholz Date: Wed, 21 Mar 2018 15:11:02 +0100 Subject: [PATCH 036/148] feat(shortname):nwo creates perun group with sshortname --- src/app/applications/applications.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/applications/applications.component.html b/src/app/applications/applications.component.html index 447e9ef100..4c51621aa6 100755 --- a/src/app/applications/applications.component.html +++ b/src/app/applications/applications.component.html @@ -145,7 +145,7 @@

    Applications Overview

    - + +
  • {{details[0]}}: {{details[1]}} + {{details[1]}} +
    • + - {{ project.DateCreated }} @@ -289,3 +296,37 @@

    {{ notificationModalTitle }}

    + + diff --git a/src/app/projectmanagement/overview.component.ts b/src/app/projectmanagement/overview.component.ts index a43ef7619f..0058a0d026 100644 --- a/src/app/projectmanagement/overview.component.ts +++ b/src/app/projectmanagement/overview.component.ts @@ -14,10 +14,11 @@ import {isNumber} from "util"; import {environment} from '../../environments/environment' import {ApiSettings} from "../api-connector/api-settings.service"; import {GroupService} from "../api-connector/group.service"; +import {UserService} from "../api-connector/user.service"; @Component({ templateUrl: 'overview.component.html', - providers: [GroupService, ResourcesManager, AuthzResolver, GroupsManager, MembersManager, UsersManager, PerunSettings, ApiSettings] + providers: [UserService, GroupService, ResourcesManager, AuthzResolver, GroupsManager, MembersManager, UsersManager, PerunSettings, ApiSettings] }) export class OverviewComponent { @@ -45,24 +46,35 @@ export class OverviewComponent { public addUserModal; public addUserModalProjectID: number; public addUserModalProjectName: string; + public UserModalFacilityDetails: [string,string][]; public UserModalFacility: [string,number]; + //notification Modal variables public notificationModal; public notificationModalTitle: string = "Notification"; public notificationModalMessage: string = "Please wait..."; public notificationModalType: string = "info"; + public notificationModalInfoMessage: string='' public notificationModalIsClosable: boolean = false; + public passwordModalTitle: string= "Changing Password"; + public passwordModalType : string='info'; + public passwordModalPassword: string =''; + public passwordModalFacility: string=''; + public passwordModalEmail: string=''; + constructor(private authzresolver: AuthzResolver, private perunsettings: PerunSettings, private useresmanager: UsersManager, private groupsmanager: GroupsManager, private membersmanager: MembersManager, private resourceManager: ResourcesManager, - private groupservice: GroupService) { + private groupservice: GroupService, + private userservice: UserService) { this.getUserProjects(groupsmanager, membersmanager, useresmanager); + } public updateUserProjects() { @@ -71,6 +83,30 @@ export class OverviewComponent { } + setUserFacilityPassword(facility: string,details:string) { + this.userservice.setUserFacilityPassword(facility).subscribe(result => { + console.log(result); + result = result.json() + for(let key of details){ + if (key[0] == 'Email'){ + this.passwordModalEmail=key[1]; + } + } + + this.passwordModalFacility=facility; + + if (result['Error']) { + this.passwordModalTitle='Set or update password' + this.passwordModalType='warning' + } + else { + this.passwordModalTitle='Success' + this.passwordModalType='success' + this.passwordModalPassword=result.toString() + } + }) + } + getUserProjects(groupsmanager: GroupsManager, membersmanager: MembersManager, usersmanager: UsersManager) { @@ -155,7 +191,7 @@ export class OverviewComponent { let details = result['Details']; let details_array = []; for (let detail in details) { - let detail_tuple = [detail,details[detail]]; + let detail_tuple = [detail, details[detail]]; details_array.push(detail_tuple); } newProject.ComputecenterDetails = details_array; @@ -214,6 +250,15 @@ export class OverviewComponent { } + public resetPasswordModal() { + this.passwordModalTitle= "Changing Password"; + this.passwordModalType ='info'; + this.passwordModalPassword=''; + this.passwordModalFacility=''; + this.passwordModalEmail=''; + + } + public resetNotificaitonModal() { this.notificationModalTitle = "Notification"; this.notificationModalMessage = "Please wait..."; @@ -286,7 +331,10 @@ export class OverviewComponent { this.updateNotificaitonModal("Failed", "Member" + name + " could not be removed !", true, "danger"); }); } - + public resetFacilityDetailsModal(){ + this.UserModalFacility=null; + this.UserModalFacilityDetails=null; + } public comingSoon() { alert("This function will be implemented soon.") } From 5ba609388c015fe2f8fa64aeb6b00f5c76d824a8 Mon Sep 17 00:00:00 2001 From: DavidWein94 Date: Tue, 17 Apr 2018 09:47:29 +0200 Subject: [PATCH 069/148] fix(facility):if shortname is empty use name (#102) --- .../applications/applications.component.ts | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/app/applications/applications.component.ts b/src/app/applications/applications.component.ts index 4f88f0c400..9666476e57 100644 --- a/src/app/applications/applications.component.ts +++ b/src/app/applications/applications.component.ts @@ -144,7 +144,7 @@ export class ApplicationsComponent { a.Id = aj["project_application_id"]; a.Name = aj["project_application_name"]; - a.Shortname=aj["project_application_shortname"]; + a.Shortname=aj["project_application_shortname"]; a.Description = aj["project_application_description"]; a.Lifetime = aj["project_application_lifetime"]; @@ -165,6 +165,7 @@ export class ApplicationsComponent { a.Status = aj["project_application_status"]; a.OpenStackProject = aj["project_application_openstack_project"]; if (a.Status !== 1) { + if (a.Shortname){ this.groupservice.getFacilityByGroup(a.Shortname).subscribe(result => { let details = result['Details']; @@ -179,7 +180,25 @@ export class ApplicationsComponent { this.all_applications.push(a) + })} + else { + this.groupservice.getFacilityByGroup(a.Name).subscribe(result => { + + let details = result['Details']; + let details_array = []; + for (let detail in details) { + let detail_tuple = [detail, details[detail]]; + details_array.push(detail_tuple); + } + + a.ComputecenterDetails = details_array; + a.ComputeCenter = [result['Facility'],result['FacilityID']]; + + this.all_applications.push(a) + }) + + } } else { a.ComputeCenter = ['None',-1] From 446ae8a81d77bbf4de1d1a2dd707385b7826f2a0 Mon Sep 17 00:00:00 2001 From: DavidWein94 Date: Wed, 18 Apr 2018 10:28:08 +0200 Subject: [PATCH 070/148] Feeature/do not allow 0 (#98) * feat(projects): 0 is not allowed anymore * feat(projects):make fields required strong * fix(applications): fixed bug,also object storage can be zero again * fix(applications):removead an console.log --- .../addapplication.component.html | 6 +- .../applications/addapplication.component.ts | 182 ++++++++++-------- 2 files changed, 105 insertions(+), 83 deletions(-) diff --git a/src/app/applications/addapplication.component.html b/src/app/applications/addapplication.component.html index 8a71dec355..d5a5344953 100755 --- a/src/app/applications/addapplication.component.html +++ b/src/app/applications/addapplication.component.html @@ -122,7 +122,7 @@
    Resources
    - +
    Resources

    - +
    Resources
    - +
    { - let res = result.json(); - for (let key in res) { - let shj = res[key]; - let sh = new SpecialHardware(shj['special_hardware_id'], shj['special_hardware_key'], shj['special_hardware_name']); - this.special_hardware.push(sh) + chosenProjectType(checkbox: number) { + if (checkbox == 0) { + if (this.project_application_openstack_project) { + this.showjustvm = false; + } } - }); - } - onSubmit(f: NgForm) { - if (this.wronginput == true) { - this.updateNotificaitonModal('Failed', 'The application was not submitted, please check the required fields and try again.', true, 'danger'); - this.notificationModalStay = true; - } - else { - let values = {}; - values['project_application_special_hardware'] = this.special_hardware.filter(hardware => hardware.Checked).map(hardware => hardware.Id) - for (let v in f.controls) { - if (f.controls[v].value) { - values[v] = f.controls[v].value; + else if (checkbox == 1) { + if (this.showjustvm) { + this.project_application_openstack_project = false; + } } - } + } + + getSpecialHardware() { + this.specialhardwareservice.getAllSpecialHardware().toPromise() + .then(result => { + let res = result.json(); + for (let key in res) { + let shj = res[key]; + let sh = new SpecialHardware(shj['special_hardware_id'], shj['special_hardware_key'], shj['special_hardware_name']); + this.special_hardware.push(sh) + } + }); + } + check_not_zero(values: {}) { + if ('project_application_openstack_project' in values) { + - this.applicationsservice.addNewApplication(values).toPromise() - .then(result => { - this.updateNotificaitonModal('Success', 'The application was submitted', true, 'success'); - this.notificationModalStay = false; - }).catch(error => { - this.updateNotificaitonModal('Failed', 'The application was not submitted, please check the required fields and try again.', true, 'danger'); - this.notificationModalStay = true; - }) + if ('project_application_cores_per_vm' in values && values['project_application_cores_per_vm'] > 0 && 'project_application_ram_per_vm' in values + && values['project_application_ram_per_vm'] > 0 && 'project_application_disk_space' in values && values['project_application_disk_space'] > 0) { + return true; + } + + return false; + } + else { + + return true; + } } - } + onSubmit(f: NgForm) { + if (this.wronginput == true) { + this.updateNotificaitonModal('Failed', 'The application was not submitted, please check the required fields and try again.', true, 'danger'); + this.notificationModalStay = true; + } + else { + let values = {}; + values['project_application_special_hardware'] = this.special_hardware.filter(hardware => hardware.Checked).map(hardware => hardware.Id) + for (let v in f.controls) { + if (f.controls[v].value) { + values[v] = f.controls[v].value; + } + } + if (this.check_not_zero(values) == false) { + this.updateNotificaitonModal('Failed', 'The application was not submitted, please check the required fields and try again.', true, 'danger'); + this.notificationModalStay = true; + return; + } + + + this.applicationsservice.addNewApplication(values).toPromise() + .then(result => { + this.updateNotificaitonModal('Success', 'The application was submitted', true, 'success'); + this.notificationModalStay = false; + }).catch(error => { + this.updateNotificaitonModal('Failed', 'The application was not submitted, please check the required fields and try again.', true, 'danger'); + this.notificationModalStay = true; + }) + } + } - public updateNotificaitonModal(title: string, message: string, closable: true, type: string) { - this.notificationModalTitle = title; - this.notificationModalMessage = message; - this.notificationModalIsClosable = closable; - this.notificationModalType = type; - } - public resetModal(){ + public updateNotificaitonModal(title: string, message: string, closable: true, type: string) { + this.notificationModalTitle = title; + this.notificationModalMessage = message; + this.notificationModalIsClosable = closable; + this.notificationModalType = type; + } - this.notificationModalTitle = 'Notification'; - this.notificationModalMessage = 'Please wait...'; - this.notificationModalType = 'info'; - this.notificationModalIsClosable = false; - this.notificationModalStay = true; - } + public resetModal() { - public checkShortname(shortname: string) { - if (/^[a-zA-Z0-9\s]*$/.test(shortname) == false) { - this.wronginput = true; + this.notificationModalTitle = 'Notification'; + this.notificationModalMessage = 'Please wait...'; + this.notificationModalType = 'info'; + this.notificationModalIsClosable = false; + this.notificationModalStay = true; } - else { - this.wronginput = false; + + public checkShortname(shortname: string) { + if (/^[a-zA-Z0-9\s]*$/.test(shortname) == false) { + this.wronginput = true; + } + else { + this.wronginput = false; + } } - } } From 010212eaf663f7a5bbebdbe0d45eb9258a16ca24 Mon Sep 17 00:00:00 2001 From: DavidWein94 Date: Wed, 18 Apr 2018 10:54:46 +0200 Subject: [PATCH 071/148] feat(password).added another verify modal (#101) * feat(password).added another verify modal * fix(overview):fixed type bug * feat(password): aligned info box to cancel --- .../projectmanagement/overview.component.html | 55 ++++++++++++++----- .../projectmanagement/overview.component.ts | 4 +- 2 files changed, 42 insertions(+), 17 deletions(-) diff --git a/src/app/projectmanagement/overview.component.html b/src/app/projectmanagement/overview.component.html index 4e9d010666..b341b172c2 100755 --- a/src/app/projectmanagement/overview.component.html +++ b/src/app/projectmanagement/overview.component.html @@ -27,20 +27,20 @@

    Projects Overview

    {{ project.Description }} -

    None

    -

    {{project.ComputeCenter[0]}}

    -
      - - -
    • {{details[0]}}: {{details[1]}} - {{details[1]}} -
      • -
    +

    None

    +

    {{project.ComputeCenter[0]}}

    +
      + + +
    • {{details[0]}}: {{details[1]}} + {{details[1]}} +
      • +
    @@ -296,6 +296,33 @@

    {{ notificationModalTitle }}

    + + + @@ -143,7 +143,7 @@
    Resources
    + type="number" min="1" step="1" [ngModel]="8"> GB
    @@ -157,8 +157,8 @@
    Resources
    + placeholder="e.g. 20" + type="number" min="1" step="1" [ngModel]="20"> GB
    @@ -207,7 +207,7 @@
    Resources
    + type="number" min="1" step="1" [ngModel]="3"> VMs
    From c89bfa8fee171fd303c30df87ff65879d401e2dd Mon Sep 17 00:00:00 2001 From: DavidWein94 Date: Wed, 18 Apr 2018 15:50:31 +0200 Subject: [PATCH 074/148] Feautre/facility overview (#100) * feat(facility):first view * feat(facility):startet to change html * feat(facility):change html * feat(facility):now you can choose the facility * feat(facility):just visisble if you are manager * fix(errors):fixed some errors * fix(error):fixed other error --- src/app/api-connector/facility.service.ts | 36 ++++++ src/app/api-connector/group.service.ts | 16 +++ src/app/app.routing.ts | 2 +- src/app/layouts/full-layout.component.html | 8 ++ src/app/layouts/full-layout.component.ts | 15 ++- .../facilityprojectsoverview.component.html | 104 +++++++++++++++ .../facilityprojectsoverview.component.ts | 119 ++++++++++++++++++ .../projectmanagement-routing.module.ts | 12 +- .../projectmanagement.module.ts | 7 +- 9 files changed, 312 insertions(+), 7 deletions(-) create mode 100644 src/app/api-connector/facility.service.ts create mode 100644 src/app/projectmanagement/facilityprojectsoverview.component.html create mode 100644 src/app/projectmanagement/facilityprojectsoverview.component.ts diff --git a/src/app/api-connector/facility.service.ts b/src/app/api-connector/facility.service.ts new file mode 100644 index 0000000000..897006cde7 --- /dev/null +++ b/src/app/api-connector/facility.service.ts @@ -0,0 +1,36 @@ +import {Injectable} from '@angular/core'; +import {Http, Response, Headers, RequestOptions} from '@angular/http'; +import {Observable} from 'rxjs/Rx'; +import {URLSearchParams} from '@angular/http'; +import {ApiSettings} from './api-settings.service'; +import 'rxjs/add/operator/map'; +import 'rxjs/add/operator/catch'; + + +@Injectable() +export class FacilityService { + constructor(private http: Http, private settings: ApiSettings) { + } + + getManagerFacilities(): Observable { + + return this.http.get(this.settings.getApiBaseURL()+ 'facilityManager/getFacilitiesWhereUserIsManager/', { + withCredentials: true, + }).map((res: Response) => res.json()).catch((error: any) => Observable.throw(error.json().error || 'Server error')) + + } + + getFacilityAllowedGroups(facility): Observable { + + let urlSearchParams = new URLSearchParams(); + return this.http.get(this.settings.getApiBaseURL()+ 'facilityManager/getFacilityAllowedGroups/', { + withCredentials: true, + params: {facility_id: facility} + }).map((res: Response) => res.json()).catch((error: any) => Observable.throw(error.json().error || 'Server error')) + + + + + } + +} diff --git a/src/app/api-connector/group.service.ts b/src/app/api-connector/group.service.ts index 07d79be5da..c53f414916 100644 --- a/src/app/api-connector/group.service.ts +++ b/src/app/api-connector/group.service.ts @@ -99,6 +99,22 @@ export class GroupService { } + + + + + getGroupMembers(groupid: string): Observable { + let header = new Headers({ + 'X-CSRFToken': this.settings.getCSRFToken(), + }); + return this.http.get(this.settings.getApiBaseURL() + 'group/getGroupMembers/', { + withCredentials: true, + params:{groupid:groupid} + }).map((res: Response) => res.json()).catch((error: any) => Observable.throw(error.json().error || 'Server error')) + + + } + setNumberOfVms(groupid: string, numberofVms: string): Observable { let urlSearchParams = new URLSearchParams(); let header = new Headers({ diff --git a/src/app/app.routing.ts b/src/app/app.routing.ts index c0c466c1fe..3ab046dfe4 100644 --- a/src/app/app.routing.ts +++ b/src/app/app.routing.ts @@ -31,7 +31,7 @@ export const routes: Routes = [ loadChildren: './userinfo/userinfo.module#UserinfoModule' }, { - path: 'project-management', + path: '', loadChildren: './projectmanagement/projectmanagement.module#ProjectManagementModule' }, { diff --git a/src/app/layouts/full-layout.component.html b/src/app/layouts/full-layout.component.html index db40f72f51..c003cc8da0 100755 --- a/src/app/layouts/full-layout.component.html +++ b/src/app/layouts/full-layout.component.html @@ -46,6 +46,14 @@ Instance Overview +
  • + Facilities +
    • +
  • + Facility Projects +
    • +
    diff --git a/src/app/layouts/full-layout.component.ts b/src/app/layouts/full-layout.component.ts index b4dfbc5303..29ceefebd8 100644 --- a/src/app/layouts/full-layout.component.ts +++ b/src/app/layouts/full-layout.component.ts @@ -5,12 +5,13 @@ import {PerunSettings} from "../perun-connector/connector-settings.service"; import {ApiSettings} from "../api-connector/api-settings.service"; import {ClientService} from "../api-connector/vmClients.service"; import {GroupsManager} from "../perun-connector/groups-manager.service"; +import {FacilityService} from "../api-connector/facility.service"; @Component({ selector: 'app-dashboard', templateUrl: './full-layout.component.html', - providers: [GroupsManager,ClientService, AuthzResolver, UsersManager, PerunSettings, ApiSettings] + providers: [FacilityService,GroupsManager,ClientService, AuthzResolver, UsersManager, PerunSettings, ApiSettings] }) export class FullLayoutComponent implements OnInit { @@ -18,12 +19,15 @@ export class FullLayoutComponent implements OnInit { public disabled = false; public status: { isopen: boolean } = {isopen: false}; private is_vo_admin = false; + public is_facility_manager=false public vm_project_member=false; client_avaiable; - constructor(private groupsManager:GroupsManager,private clientservice: ClientService, private perunsettings: PerunSettings, private usersmanager: UsersManager, private authzresolver: AuthzResolver) { + constructor(private facilityservice:FacilityService,private groupsManager:GroupsManager,private clientservice: ClientService, private perunsettings: PerunSettings, private usersmanager: UsersManager, private authzresolver: AuthzResolver) { this.is_client_avaiable(); this.is_vm_project_member(); + this.get_is_facility_manager(); + } public get_is_vo_admin(): boolean { @@ -39,6 +43,13 @@ export class FullLayoutComponent implements OnInit { $event.stopPropagation(); this.status.isopen = !this.status.isopen; } + + public get_is_facility_manager(){ + this.facilityservice.getManagerFacilities().subscribe(result => { + if (result.length > 0 ) { + this.is_facility_manager=true } + }) + } is_vm_project_member(){ this.groupsManager.getMemberGroupsStatus().subscribe(result => { if (result.json().length > 0 ) { diff --git a/src/app/projectmanagement/facilityprojectsoverview.component.html b/src/app/projectmanagement/facilityprojectsoverview.component.html new file mode 100644 index 0000000000..57d8421e51 --- /dev/null +++ b/src/app/projectmanagement/facilityprojectsoverview.component.html @@ -0,0 +1,104 @@ +
    +
    + +

    Projects Overview: {{selectedFacility['Facility']}} + + +

    + +
    + +
    +
    +
    + Projects +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + +
    Project IDProject NameDescriptionDate createdDays runningActions
    {{ project.Id }}{{ project.Name }}{{ project.Description }}{{ project.DateCreated }}{{ project.DaysRunning }} + +
    +
    +
    +
    + +
    +
    + + + + + + + + + diff --git a/src/app/projectmanagement/facilityprojectsoverview.component.ts b/src/app/projectmanagement/facilityprojectsoverview.component.ts new file mode 100644 index 0000000000..e8ad767a89 --- /dev/null +++ b/src/app/projectmanagement/facilityprojectsoverview.component.ts @@ -0,0 +1,119 @@ +import {Component, Input, ViewChild} from '@angular/core'; +import {AuthzResolver} from '../perun-connector/authz-resolver.service' +import {GroupsManager} from '../perun-connector/groups-manager.service' +import {MembersManager} from '../perun-connector/members-manager.service' +import {UsersManager} from '../perun-connector/users-manager.service' +import {Http} from '@angular/http'; +import {PerunSettings} from "../perun-connector/connector-settings.service"; +import {Project} from './project.model'; +import {ModalDirective} from 'ngx-bootstrap/modal/modal.component'; +import {ProjectMember} from './project_member.model' +import {ResourcesManager} from "../perun-connector/resources_manager"; +import 'rxjs/add/operator/toPromise'; +import {environment} from '../../environments/environment' +import {ApiSettings} from "../api-connector/api-settings.service"; +import {GroupService} from "../api-connector/group.service"; +import {UserService} from "../api-connector/user.service"; +import {FacilityService} from "../api-connector/facility.service"; +import {FormsModule} from '@angular/forms'; + +@Component({ + templateUrl: 'facilityprojectsoverview.component.html', + providers: [FacilityService,UserService, GroupService, ResourcesManager, AuthzResolver, GroupsManager, MembersManager, UsersManager, PerunSettings, ApiSettings] +}) +export class FacilityProjectsOverviewComponent { + + debug_module = false; + + @Input() voRegistrationLink: string = environment.voRegistrationLink; + + member_id: number; + projects: Project[] = new Array(); + + + // modal variables for User list + public usersModal; + public usersModalProjectMembers: ProjectMember[] = new Array; + public usersModalProjectID: number; + public usersModalProjectName: string; + + public managerFacilities: [string,number][]; + public selectedFacility: [string,number] + + + + + + constructor( + private groupservice: GroupService, + private facilityservice :FacilityService) { + + this.facilityservice.getManagerFacilities().subscribe(result => { + this.managerFacilities=result + this.selectedFacility=this.managerFacilities[0] + this.getFacilityProjects(this.managerFacilities[0]['FacilityId']) + + }) + + } + + + onChangeSelectedFacility(value){ + this.getFacilityProjects(this.selectedFacility['FacilityId']) + } + getFacilityProjects(facility) { + + this.facilityservice.getFacilityAllowedGroups(facility).subscribe(result => { + for (let group of result) { + let dateCreated = new Date(group["createdAt"]); + let dateDayDifference = Math.ceil((Math.abs(Date.now() - dateCreated.getTime())) / (1000 * 3600 * 24)); + let is_pi = false; + let is_admin = false; + let newProject = new Project( + group["id"], + group["name"], + group["description"], + dateCreated.getDate() + "." + (dateCreated.getMonth() + 1) + "." + dateCreated.getFullYear(), + dateDayDifference, + is_pi, + is_admin, + [result['Facility'], result['FacilityId']] + ) + this.projects.push(newProject); + } + + + + }) + + + } + + + + getMembesOfTheProject(projectid: number, projectname: string) { + this.groupservice.getGroupMembers(projectid.toString()).subscribe(members => { + this.usersModalProjectID = projectid; + this.usersModalProjectName = projectname; + this.usersModalProjectMembers = new Array(); + for (let member of members) { + let member_id = member["id"]; + let user_id = member["userId"]; + let fullName = member["user"]["firstName"] + " " + member["user"]["lastName"]; + this.usersModalProjectMembers.push(new ProjectMember(user_id, fullName, member_id)); + } + + } + ) + } + + public showMembersOfTheProject(projectid: number, projectname: string, facility: [string,number]) { + this.getMembesOfTheProject(projectid, projectname); + + } + + + public comingSoon() { + alert("This function will be implemented soon.") + } +} diff --git a/src/app/projectmanagement/projectmanagement-routing.module.ts b/src/app/projectmanagement/projectmanagement-routing.module.ts index 759948ac61..7fccd29e39 100644 --- a/src/app/projectmanagement/projectmanagement-routing.module.ts +++ b/src/app/projectmanagement/projectmanagement-routing.module.ts @@ -1,16 +1,24 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; - +import {FacilityProjectsOverviewComponent} from "./facilityprojectsoverview.component"; import { OverviewComponent } from './overview.component'; const routes: Routes = [ { - path: '', + path: 'project-management', component: OverviewComponent, data: { title: 'Project overview' } + }, + { + path: 'facilityProjects', + component: FacilityProjectsOverviewComponent, + data: { + title: 'Facility Projects' + } + } ]; diff --git a/src/app/projectmanagement/projectmanagement.module.ts b/src/app/projectmanagement/projectmanagement.module.ts index 176cc09b0b..db8a28263c 100644 --- a/src/app/projectmanagement/projectmanagement.module.ts +++ b/src/app/projectmanagement/projectmanagement.module.ts @@ -1,19 +1,22 @@ import { NgModule } from '@angular/core'; - +import { FacilityProjectsOverviewComponent} from "./facilityprojectsoverview.component"; import { TabsModule } from 'ngx-bootstrap/tabs'; import { OverviewComponent } from './overview.component'; import { ProjectManagementRoutingModule } from './projectmanagement-routing.module'; import {CommonModule} from "@angular/common"; import { ModalModule } from 'ngx-bootstrap/modal'; +import {FormsModule} from '@angular/forms'; @NgModule({ imports: [ ProjectManagementRoutingModule, TabsModule, + FormsModule, CommonModule, ModalModule.forRoot(), ], declarations: [ - OverviewComponent + OverviewComponent, + FacilityProjectsOverviewComponent ] }) export class ProjectManagementModule { } From 136efa786c40476256a46d2664cf21480ca3a24f Mon Sep 17 00:00:00 2001 From: sgiller Date: Mon, 23 Apr 2018 19:39:24 +0200 Subject: [PATCH 075/148] feat(fac_mail): added modals for facilitymail --- .../facilityprojectsoverview.component.html | 223 +++++++++++------- .../facilityprojectsoverview.component.ts | 4 +- 2 files changed, 146 insertions(+), 81 deletions(-) diff --git a/src/app/projectmanagement/facilityprojectsoverview.component.html b/src/app/projectmanagement/facilityprojectsoverview.component.html index 57d8421e51..abe638b41e 100644 --- a/src/app/projectmanagement/facilityprojectsoverview.component.html +++ b/src/app/projectmanagement/facilityprojectsoverview.component.html @@ -1,102 +1,165 @@
    -
    - -

    Projects Overview: {{selectedFacility['Facility']}} +
    + +

    Projects Overview: {{selectedFacility['Facility']}} -

    +

    -
    +
    -
    -
    + -
    -
    - Projects -
    +
    +
    + Projects + +
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - -
    Project IDProject NameDescriptionDate createdDays runningActions
    {{ project.Id }}{{ project.Name }}{{ project.Description }}{{ project.DateCreated }}{{ project.DaysRunning }} - -
    -
    -
    +
    + + + + + + + + + + + + + + + + + + + + + + + + +
    Project IDProject NameDescriptionDate createdDays runningActions
    {{ project.Id }}{{ project.Name }}{{ project.Description }}{{ project.DateCreated }}{{ project.DaysRunning }} + +
    - +
    + +
    + + + + diff --git a/src/app/projectmanagement/facilityprojectsoverview.component.ts b/src/app/projectmanagement/facilityprojectsoverview.component.ts index e8ad767a89..1254987de7 100644 --- a/src/app/projectmanagement/facilityprojectsoverview.component.ts +++ b/src/app/projectmanagement/facilityprojectsoverview.component.ts @@ -37,6 +37,9 @@ export class FacilityProjectsOverviewComponent { public usersModalProjectID: number; public usersModalProjectName: string; + public emailSubject: string = ''; + public emailText: string = ''; + public managerFacilities: [string,number][]; public selectedFacility: [string,number] @@ -54,7 +57,6 @@ export class FacilityProjectsOverviewComponent { this.getFacilityProjects(this.managerFacilities[0]['FacilityId']) }) - } From 37fe0de333938626ee35c0f0a5ac78ceca353291 Mon Sep 17 00:00:00 2001 From: sgiller Date: Mon, 23 Apr 2018 19:49:45 +0200 Subject: [PATCH 076/148] feat(fac_mail): some logic fixes --- .../facilityprojectsoverview.component.html | 10 +++++----- .../facilityprojectsoverview.component.ts | 6 ++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/app/projectmanagement/facilityprojectsoverview.component.html b/src/app/projectmanagement/facilityprojectsoverview.component.html index abe638b41e..4f346ee8f7 100644 --- a/src/app/projectmanagement/facilityprojectsoverview.component.html +++ b/src/app/projectmanagement/facilityprojectsoverview.component.html @@ -129,7 +129,7 @@

    Send email to all members of {
    - +
    @@ -144,16 +144,16 @@

    Send email

    - diff --git a/src/app/projectmanagement/facilityprojectsoverview.component.ts b/src/app/projectmanagement/facilityprojectsoverview.component.ts index 1254987de7..0bdc665e3e 100644 --- a/src/app/projectmanagement/facilityprojectsoverview.component.ts +++ b/src/app/projectmanagement/facilityprojectsoverview.component.ts @@ -114,6 +114,12 @@ export class FacilityProjectsOverviewComponent { } + public resetEmailModal() { + + this.emailSubject = ''; + this.emailText = ''; + } + public comingSoon() { alert("This function will be implemented soon.") From 52d85a968d77c104785073003e1c913b5bbce14c Mon Sep 17 00:00:00 2001 From: David Weinholz Date: Mon, 23 Apr 2018 22:42:35 +0200 Subject: [PATCH 077/148] feat(mail):added servcie to send mail --- src/app/api-connector/facility.service.ts | 15 +++++++++++++++ .../facilityprojectsoverview.component.html | 2 +- .../facilityprojectsoverview.component.ts | 10 ++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/src/app/api-connector/facility.service.ts b/src/app/api-connector/facility.service.ts index 897006cde7..36c68ea1f1 100644 --- a/src/app/api-connector/facility.service.ts +++ b/src/app/api-connector/facility.service.ts @@ -31,6 +31,21 @@ export class FacilityService { + } + + sendMailToFacility(facility,subject,message): Observable { + + + return this.http.get(this.settings.getApiBaseURL()+ 'facilityManager/sendMailToAllMembers/', { + withCredentials: true, + params: {facility_id: facility,subject:subject,message:message} + }).map((res: Response) => res.json()).catch((error: any) => Observable.throw(error.json().error || 'Server error')) + + + + + + } } diff --git a/src/app/projectmanagement/facilityprojectsoverview.component.html b/src/app/projectmanagement/facilityprojectsoverview.component.html index 4f346ee8f7..d86ba90df4 100644 --- a/src/app/projectmanagement/facilityprojectsoverview.component.html +++ b/src/app/projectmanagement/facilityprojectsoverview.component.html @@ -149,7 +149,7 @@

    Send email

     - + @@ -89,3 +72,55 @@

    This is your personal data page.

    + + + diff --git a/src/app/userinfo/userinfo.module.ts b/src/app/userinfo/userinfo.module.ts index cd46815686..4fae35b095 100644 --- a/src/app/userinfo/userinfo.module.ts +++ b/src/app/userinfo/userinfo.module.ts @@ -5,14 +5,18 @@ import { UserinfoComponent } from './userinfo.component'; import { UserinfoRoutingModule } from './userinfo-routing.module'; import {CommonModule} from "@angular/common"; import {FormsModule} from "@angular/forms"; +import { ModalModule } from 'ngx-bootstrap/modal'; +import { AlertModule } from 'ngx-bootstrap'; @NgModule({ imports: [ UserinfoRoutingModule, TabsModule, CommonModule, - FormsModule + FormsModule, ModalModule.forRoot(), + AlertModule.forRoot() ], + declarations: [ UserinfoComponent ] From 4299a4fc3f0af652e65e01a4aa017d4808cd6266 Mon Sep 17 00:00:00 2001 From: DavidWein94 Date: Thu, 17 May 2018 17:28:10 +0200 Subject: [PATCH 099/148] Feature/depending images (#117) * feat(vm):splitted the methods * feat(vm):fixed * feat(refresh):added refresh button * feat(images): scheduling should depend on images * feat(image):scheduling depending on images --- src/app/api-connector/flavor.service.ts | 7 ++----- src/app/api-connector/image.service.ts | 6 ++---- src/app/api-connector/virtualmachine.service.ts | 7 ++++--- src/app/api-connector/vmClients.service.ts | 4 ++-- src/app/layouts/full-layout.component.ts | 4 ++-- src/app/virtualmachines/addvm.component.ts | 17 +++++++++++------ .../virtualmachines/vmClients.component.html | 7 ++++--- 7 files changed, 27 insertions(+), 25 deletions(-) diff --git a/src/app/api-connector/flavor.service.ts b/src/app/api-connector/flavor.service.ts index 4a30d5a307..ea7fe8ee86 100644 --- a/src/app/api-connector/flavor.service.ts +++ b/src/app/api-connector/flavor.service.ts @@ -13,13 +13,10 @@ export class FlavorService { constructor(private http: Http, private settings: ApiSettings) { } - getFlavors(host: string, port: string): Observable { + getFlavors(): Observable { let urlSearchParams = new URLSearchParams(); - urlSearchParams.append('host', host); - urlSearchParams.append('port', port); - - return this.http.get(this.settings.getConnectorBaseUrl() + 'flavors/getFlavorByClient/', { + return this.http.get(this.settings.getConnectorBaseUrl() + 'flavors/getFlavors/', { withCredentials: true, search: urlSearchParams }).map((res: Response) => res.json()).catch((error: any) => Observable.throw(error.json().error || 'Server error')) diff --git a/src/app/api-connector/image.service.ts b/src/app/api-connector/image.service.ts index bae73916e4..ff43fae31a 100644 --- a/src/app/api-connector/image.service.ts +++ b/src/app/api-connector/image.service.ts @@ -13,14 +13,12 @@ export class ImageService { constructor(private http: Http, private settings: ApiSettings) { } - getImages(host: string, port: string): Observable { + getImages(): Observable { let urlSearchParams = new URLSearchParams(); - urlSearchParams.set('host', host); - urlSearchParams.set('port', port); - return this.http.get(this.settings.getConnectorBaseUrl() + 'images/getImageByClient/', { + return this.http.get(this.settings.getConnectorBaseUrl() + 'images/getImages/', { withCredentials: true, search: urlSearchParams }).map((res: Response) => res.json()).catch((error: any) => Observable.throw(error.json().error || 'Server error')) diff --git a/src/app/api-connector/virtualmachine.service.ts b/src/app/api-connector/virtualmachine.service.ts index adb52f2a51..b398961de5 100644 --- a/src/app/api-connector/virtualmachine.service.ts +++ b/src/app/api-connector/virtualmachine.service.ts @@ -17,7 +17,9 @@ export class VirtualmachineService { } - startVM(flavor: string, image: string, servername: string, host: string, port: string, project: string, projectid: string, diskspace?: string): Observable { + + startVM(flavor: string, image: string, servername: string, project: string, projectid: string, diskspace?: string): Observable { + let header = new Headers({ 'X-CSRFToken': this.settings.getCSRFToken(), }); @@ -25,8 +27,7 @@ export class VirtualmachineService { urlSearchParams.append('flavor', flavor); urlSearchParams.append('image', image); urlSearchParams.append('servername', servername); - urlSearchParams.append('host', host); - urlSearchParams.append('port', port); + urlSearchParams.append('project', project); urlSearchParams.append('projectid', projectid); urlSearchParams.append('diskspace', diskspace); diff --git a/src/app/api-connector/vmClients.service.ts b/src/app/api-connector/vmClients.service.ts index 2d76c9e331..794a00681c 100644 --- a/src/app/api-connector/vmClients.service.ts +++ b/src/app/api-connector/vmClients.service.ts @@ -24,11 +24,11 @@ export class ClientService { } - getRRFirstClient(): Observable { + isClientAvaiable(): Observable { let urlSearchParams = new URLSearchParams(); - return this.http.get(this.clientURL + 'getFirstClient/', { + return this.http.get(this.clientURL + 'isClientAvaiable/', { withCredentials: true, search: urlSearchParams }).map((res: Response) => res.json()).catch((error: any) => Observable.throw(error.json().error || 'Server error')); diff --git a/src/app/layouts/full-layout.component.ts b/src/app/layouts/full-layout.component.ts index 29ceefebd8..ae4fb1718e 100644 --- a/src/app/layouts/full-layout.component.ts +++ b/src/app/layouts/full-layout.component.ts @@ -57,9 +57,9 @@ export class FullLayoutComponent implements OnInit { }) } is_client_avaiable() { - this.clientservice.getRRFirstClient().subscribe(result => { + this.clientservice.isClientAvaiable().subscribe(result => { try { - if (result['status'] === 'Connected') { + if (result.toString() === 'true') { this.client_avaiable = true; return } diff --git a/src/app/virtualmachines/addvm.component.ts b/src/app/virtualmachines/addvm.component.ts index d095ca17e0..5499029127 100644 --- a/src/app/virtualmachines/addvm.component.ts +++ b/src/app/virtualmachines/addvm.component.ts @@ -58,14 +58,17 @@ export class VirtualMachineComponent implements OnInit { getImages(): void { - this.imageService.getImages(this.vmclient.host, this.vmclient.port).subscribe(images => this.images = images); + + this.imageService.getImages().subscribe(images => this.images = images); } getFlavors(): void { - this.flavorService.getFlavors(this.vmclient.host, this.vmclient.port).subscribe(flavors => this.flavors = flavors); + this.flavorService.getFlavors().subscribe(flavors => this.flavors = flavors); } + + getClientData() { this.clientservice.getClientsChecked().subscribe(response => { this.getRRFirstClient(); @@ -74,9 +77,9 @@ export class VirtualMachineComponent implements OnInit { } getRRFirstClient(): void { - this.clientservice.getRRFirstClient().subscribe(client => { - this.vmclient = client; - if (this.vmclient.status === "Connected") { + this.clientservice.isClientAvaiable().subscribe(client => { + if (client.toString() === "true") { + this.client_avaiable = true; this.getImages(); this.getFlavors(); @@ -151,7 +154,9 @@ export class VirtualMachineComponent implements OnInit { if (image && flavor && servername && project) { - this.virtualmachineservice.startVM(flavor, image, servername, this.vmclient.host, this.vmclient.port, project, projectid, diskspace).subscribe(data => { + + this.virtualmachineservice.startVM(flavor, image, servername, project, projectid, diskspace).subscribe(data => { + if (data.json()['Created']) { this.check_status_loop(data.json()['Created']); diff --git a/src/app/virtualmachines/vmClients.component.html b/src/app/virtualmachines/vmClients.component.html index 10ce877a58..1c8b1019ce 100755 --- a/src/app/virtualmachines/vmClients.component.html +++ b/src/app/virtualmachines/vmClients.component.html @@ -12,6 +12,7 @@ Host Port Status + Actions @@ -44,11 +45,11 @@ - - - + + From b814e7d96aa27931a8cd832c3b908512d5a11bb5 Mon Sep 17 00:00:00 2001 From: sgiller Date: Tue, 22 May 2018 12:34:53 +0200 Subject: [PATCH 100/148] fix(build): fix build (#131) --- src/app/userinfo/userinfo.component.html | 3 +-- src/app/userinfo/userinfo.component.ts | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/app/userinfo/userinfo.component.html b/src/app/userinfo/userinfo.component.html index ce30e5890c..e04ccbf6c3 100755 --- a/src/app/userinfo/userinfo.component.html +++ b/src/app/userinfo/userinfo.component.html @@ -53,7 +53,6 @@

    This is your personal data page.

    - Tutorial: How @@ -82,7 +81,7 @@

    This is your personal data page.

    Set public key

    - + Info: Enter a valid public key! diff --git a/src/app/userinfo/userinfo.component.ts b/src/app/userinfo/userinfo.component.ts index 57b0cc15e1..f791c3baf5 100644 --- a/src/app/userinfo/userinfo.component.ts +++ b/src/app/userinfo/userinfo.component.ts @@ -19,7 +19,7 @@ export class UserinfoComponent { userinfo: Userinfo; key: string = 'Show Public Key'; key_visible = false; - public_key: string; + public_key: string=''; constructor(private authzresolver: AuthzResolver, private memberssmanager: MembersManager, private keyService: keyService, private usersmanager: UsersManager, private attributemanager: AttributesManager) { this.userinfo = new Userinfo(); From 3b3077d7caa13f9a15ce07ea176f654702561d45 Mon Sep 17 00:00:00 2001 From: DavidWein94 Date: Tue, 22 May 2018 16:44:38 +0200 Subject: [PATCH 101/148] Feature/image tags (#127) * feat(vm):splitted the methods * feat(vm):fixed * feat(refresh):added refresh button * feat(images): scheduling should depend on images * feat(image):scheduling depending on images * feat(image):first link to image tags * feat(imageTags):added view * feat(tag): now posssible to add tags * feat(tag):changed table * feat(tag):added method to delete tag --- src/app/api-connector/image.service.ts | 66 ++++++++++++++++--- src/app/layouts/full-layout.component.html | 4 ++ .../projectmanagement/imageTag.component.html | 43 ++++++++++++ .../projectmanagement/imagetags.component.ts | 37 +++++++++++ .../projectmanagement-routing.module.ts | 47 +++++++------ .../projectmanagement.module.ts | 4 +- 6 files changed, 172 insertions(+), 29 deletions(-) create mode 100644 src/app/projectmanagement/imageTag.component.html create mode 100644 src/app/projectmanagement/imagetags.component.ts diff --git a/src/app/api-connector/image.service.ts b/src/app/api-connector/image.service.ts index ff43fae31a..acfb508177 100644 --- a/src/app/api-connector/image.service.ts +++ b/src/app/api-connector/image.service.ts @@ -10,19 +10,67 @@ import 'rxjs/add/operator/catch'; @Injectable() export class ImageService { - constructor(private http: Http, private settings: ApiSettings) { - } + constructor(private http: Http, private settings: ApiSettings) { + } - getImages(): Observable { - let urlSearchParams = new URLSearchParams(); + getImages(): Observable { + let urlSearchParams = new URLSearchParams(); - return this.http.get(this.settings.getConnectorBaseUrl() + 'images/getImages/', { - withCredentials: true, - search: urlSearchParams - }).map((res: Response) => res.json()).catch((error: any) => Observable.throw(error.json().error || 'Server error')) + return this.http.get(this.settings.getConnectorBaseUrl() + 'images/getImages/', { + withCredentials: true, + search: urlSearchParams + }).map((res: Response) => res.json()).catch((error: any) => Observable.throw(error.json().error || 'Server error')) + + + } + + + getImageTags(): Observable { + let urlSearchParams = new URLSearchParams(); + + + return this.http.get(this.settings.getConnectorBaseUrl() + 'images/getImageTags/', { + withCredentials: true, + search: urlSearchParams + }).map((res: Response) => res.json()).catch((error: any) => Observable.throw(error.json().error || 'Server error')) + + } + + + addImageTags(imageTag:string, description:string): Observable { + let header = new Headers({ + 'X-CSRFToken': this.settings.getCSRFToken(), + }); + let urlSearchParams = new URLSearchParams(); + + urlSearchParams.append('imageTag',imageTag) + urlSearchParams.append('description',description) + + return this.http.post(this.settings.getConnectorBaseUrl() + 'images/addImageTag/', urlSearchParams,{ + withCredentials: true, + headers:header + }).map((res: Response) => res.json()).catch((error: any) => Observable.throw(error.json().error || 'Server error')) + + } + + + deleteImageTag(imageTag:string): Observable { + let header = new Headers({ + 'X-CSRFToken': this.settings.getCSRFToken(), + }); + let urlSearchParams = new URLSearchParams(); + + urlSearchParams.append('imageTag',imageTag) + + + return this.http.post(this.settings.getConnectorBaseUrl() + 'images/deleteImageTag/', urlSearchParams,{ + withCredentials: true, + headers:header + }).map((res: Response) => res.json()).catch((error: any) => Observable.throw(error.json().error || 'Server error')) + + } - } } diff --git a/src/app/layouts/full-layout.component.html b/src/app/layouts/full-layout.component.html index c003cc8da0..014643798a 100755 --- a/src/app/layouts/full-layout.component.html +++ b/src/app/layouts/full-layout.component.html @@ -52,6 +52,10 @@
  • Facility Projects +
    • +
  • + Image Tags
    • diff --git a/src/app/projectmanagement/imageTag.component.html b/src/app/projectmanagement/imageTag.component.html new file mode 100644 index 0000000000..a5391382fb --- /dev/null +++ b/src/app/projectmanagement/imageTag.component.html @@ -0,0 +1,43 @@ + +
    +
    + +

    Image tags

    +
    +
    +
    + Image Tags +
    +
    + + + + + + + + + + + + + + + + + + +
    TagDescriptionActions
    {{imageTag['name']}}{{imageTag['description']}}
    + + +
    +
    +
    +
    +
    +
    + + + diff --git a/src/app/projectmanagement/imagetags.component.ts b/src/app/projectmanagement/imagetags.component.ts new file mode 100644 index 0000000000..2942a84d09 --- /dev/null +++ b/src/app/projectmanagement/imagetags.component.ts @@ -0,0 +1,37 @@ +import {ImageService} from "../api-connector/image.service"; +import {Component, Input, ViewChild} from '@angular/core'; + +@Component({ + templateUrl: 'imageTag.component.html', + providers: [ImageService] +}) +export class ImageTagComponent { + + imageTags: [string, string][] + + + constructor(private imageService: ImageService,) { + this.imageService.getImageTags().subscribe(result => { + this.imageTags = result; + }) + } + + addTag(tag: string, description: string){ + this.imageService.addImageTags(tag,description).subscribe(result =>{ + this.imageService.getImageTags().subscribe(result=>{ + this.imageTags=result + }) + }) + } + + deleteTag(tag: string){ + this.imageService.deleteImageTag(tag).subscribe(result =>{ + this.imageService.getImageTags().subscribe(result=>{ + this.imageTags=result + }) + }) + } + + + +} diff --git a/src/app/projectmanagement/projectmanagement-routing.module.ts b/src/app/projectmanagement/projectmanagement-routing.module.ts index 7fccd29e39..84a69a42b4 100644 --- a/src/app/projectmanagement/projectmanagement-routing.module.ts +++ b/src/app/projectmanagement/projectmanagement-routing.module.ts @@ -1,29 +1,38 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import {NgModule} from '@angular/core'; +import {Routes, RouterModule} from '@angular/router'; import {FacilityProjectsOverviewComponent} from "./facilityprojectsoverview.component"; -import { OverviewComponent } from './overview.component'; +import {OverviewComponent} from './overview.component'; +import {ImageTagComponent} from "./imagetags.component"; const routes: Routes = [ - { - path: 'project-management', - component: OverviewComponent, - data: { - title: 'Project overview' - } + { + path: 'project-management', + component: OverviewComponent, + data: { + title: 'Project overview' + } + + }, + { + path: 'facilityProjects', + component: FacilityProjectsOverviewComponent, + data: { + title: 'Facility Projects' + } - }, - { - path: 'facilityProjects', - component: FacilityProjectsOverviewComponent, - data: { - title: 'Facility Projects' + }, { + path: 'imageTags', + component: ImageTagComponent, + data: { + title: 'Image Tags' + } } - } ]; @NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule] + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] }) -export class ProjectManagementRoutingModule {} +export class ProjectManagementRoutingModule { +} diff --git a/src/app/projectmanagement/projectmanagement.module.ts b/src/app/projectmanagement/projectmanagement.module.ts index db8a28263c..b1886e5e73 100644 --- a/src/app/projectmanagement/projectmanagement.module.ts +++ b/src/app/projectmanagement/projectmanagement.module.ts @@ -6,6 +6,7 @@ import { ProjectManagementRoutingModule } from './projectmanagement-routing.modu import {CommonModule} from "@angular/common"; import { ModalModule } from 'ngx-bootstrap/modal'; import {FormsModule} from '@angular/forms'; +import {ImageTagComponent} from "./imagetags.component"; @NgModule({ imports: [ ProjectManagementRoutingModule, @@ -16,7 +17,8 @@ import {FormsModule} from '@angular/forms'; ], declarations: [ OverviewComponent, - FacilityProjectsOverviewComponent + FacilityProjectsOverviewComponent, + ImageTagComponent ] }) export class ProjectManagementModule { } From e383376cea9a1313345eadfbd6ad8c4a867694db Mon Sep 17 00:00:00 2001 From: DavidWein94 Date: Wed, 23 May 2018 12:58:20 +0200 Subject: [PATCH 102/148] feat(newsletter):added newsletter fiedl to userinfo (#133) --- src/app/api-connector/user.service.ts | 25 ++++++++++++++++++++++++ src/app/userinfo/userinfo.component.html | 19 ++++++++++++------ src/app/userinfo/userinfo.component.ts | 19 ++++++++++++++++-- 3 files changed, 55 insertions(+), 8 deletions(-) diff --git a/src/app/api-connector/user.service.ts b/src/app/api-connector/user.service.ts index 1f42a8aa79..9af6fc3dd5 100644 --- a/src/app/api-connector/user.service.ts +++ b/src/app/api-connector/user.service.ts @@ -25,5 +25,30 @@ export class UserService { }); } + setNewsletterSubscription(subscribed: boolean): Observable { + let header = new Headers({ + 'X-CSRFToken': this.settings.getCSRFToken(), + }); + let urlSearchParams = new URLSearchParams(); + urlSearchParams.append('subscribed',subscribed.toString()); + + return this.http.post(this.settings.getApiBaseURL() + 'newsletter/setNewsletterSubscription/', urlSearchParams, { + withCredentials: true, + headers: header, + }); + } + + getNewsletterSubscription(): Observable { + let header = new Headers({ + 'X-CSRFToken': this.settings.getCSRFToken(), + }); + return this.http.get(this.settings.getApiBaseURL() + 'newsletter/getNewsletterSubscription/', { + withCredentials: true, + }); + + + } + + } diff --git a/src/app/userinfo/userinfo.component.html b/src/app/userinfo/userinfo.component.html index e04ccbf6c3..afa2179c10 100755 --- a/src/app/userinfo/userinfo.component.html +++ b/src/app/userinfo/userinfo.component.html @@ -65,6 +65,15 @@

    This is your personal data page.

    + + Newsletter + + +
    @@ -100,18 +109,16 @@

    Set public key


    - - - Warning! If the key is changed,all your running machines may become - unreachable! - + + Warning! If the key is changed,all your running machines may become + unreachable! +
    -
    - +
    +
    + +
    + + Additional information you want to share? +
    +

    Institutional Information
    diff --git a/src/app/applications/application.model.ts b/src/app/applications/application.model.ts index abf74464f7..1aa0ad059a 100644 --- a/src/app/applications/application.model.ts +++ b/src/app/applications/application.model.ts @@ -12,6 +12,7 @@ export class Application { private _ObjectStorage: number; private _SpecialHardware: number; private _Description: string; + private _Comment: string; private _DateSubmitted: string; private _DateStatusChanged: string; private _User: number; @@ -66,6 +67,14 @@ export class Application { set Name(value: string) { this._Name = value; } + + set Comment(value: string){ + this._Comment = value; + } + + get Comment():string { + return this._Comment; + } get Shortname(): string { return this._Shortname; } diff --git a/src/app/applications/applications.component.html b/src/app/applications/applications.component.html index 8cc938d763..5bae5fab79 100755 --- a/src/app/applications/applications.component.html +++ b/src/app/applications/applications.component.html @@ -34,81 +34,85 @@

    Applications Overview

    {{ application.Status }} - - - - - - - -
    + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Description{{ application.Description }}
    VMs{{ application.VMsRequested }} VMs
    Cores/VM{{ application.CoresPerVM }} Cores per VM
    RAM{{ application.RamPerVM }} GB
    Disk{{ application.DiskSpace }} GB
    ObjectStorage{{ application.ObjectStorage }} GB
    Special Hardware{{ sh["special_hardware_name"] }} -
    OpenStackProject{{application.OpenStackProject}}
    -
    - - - - - -
    + + - - + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Description{{ application.Description }}
    Comment{{ application.Comment }}
    VMs{{ application.VMsRequested }} VMs
    Cores/VM{{ application.CoresPerVM }} Cores per VM
    RAM{{ application.RamPerVM }} GB
    Disk{{ application.DiskSpace }} GB
    ObjectStorage{{ application.ObjectStorage }} GB
    Special Hardware{{ sh["special_hardware_name"] }} +
    OpenStackProject{{application.OpenStackProject}}
    +
    + + + + + + -
    -
    -
    - Applications for review -
    -
    - +
    +
    +
    +
    + Applications for review +
    +
    + +
    +
    @@ -132,127 +136,131 @@

    Applications Overview

    - - - + + - + - - - + + - + + + + +
    {{ application.User }} {{application.Institute}} - - {{application.Institute}} + + - + type="button" class="btn btn-secondary">  + Approve + & Create + - + + +
    +
    -
    -
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
    Description{{ application.Description }}
    Comment{{ application.Comment }}
    Workgroup{{ application.Workgroup }}
    Lifetime{{ application.Lifetime }} months
    VMs{{ application.VMsRequested }} VMs
    Cores/VM{{ application.CoresPerVM }} Cores per VM
    RAM{{ application.RamPerVM }} GB
    Disk{{ application.DiskSpace }} GB
    ObjectStorage{{ application.ObjectStorage }} GB
    Special Hardware{{ sh["special_hardware_name"] }} +
    OpenStackProject{{application.OpenStackProject}}
    Last status changed{{ application.DateStatusChanged }}
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
    Description{{ application.Description }}
    Workgroup{{ application.Workgroup }}
    Lifetime{{ application.Lifetime }} months
    VMs{{ application.VMsRequested }} VMs
    Cores/VM{{ application.CoresPerVM }} Cores per VM
    RAM{{ application.RamPerVM }} GB
    Disk{{ application.DiskSpace }} GB
    ObjectStorage{{ application.ObjectStorage }} GB
    Special Hardware{{ sh["special_hardware_name"] }} -
    OpenStackProject{{application.OpenStackProject}}
    Last status changed{{ application.DateStatusChanged }}
    +
    +
    +
    - -
    - - - - - - +
    - - - -
    -
    -
    - Application history -
    -
    - -
    +
    +
    +
    + Application history +
    +
    + +
    -
    - - - +
    +
    + + @@ -296,6 +304,10 @@

    Applications Overview

    + + + + @@ -351,45 +363,45 @@

    Applications Overview

    -
    Project Name Short Name Description {{ application.Description }}
    Comment{{ application.Comment }}
    Workgroup {{ application.Workgroup }}
    + -
    - - +
    + + - + - - - -
    + + + +
    -
    + + + - - diff --git a/src/app/applications/applications.component.ts b/src/app/applications/applications.component.ts index 059b7b3138..3b005b85b0 100644 --- a/src/app/applications/applications.component.ts +++ b/src/app/applications/applications.component.ts @@ -86,6 +86,7 @@ export class ApplicationsComponent { a.ObjectStorage = aj["project_application_object_storage"]; a.SpecialHardware = aj["project_application_special_hardware"]; a.OpenStackProject = aj["project_application_openstack_project"]; + a.Comment= aj["project_application_comment"]; this.user_applications.push(a) } @@ -163,6 +164,7 @@ export class ApplicationsComponent { a.User = aj["project_application_user"]["username"]; a.UserEmail = aj["project_application_user"]["email"]; a.Status = aj["project_application_status"]; + a.Comment= aj["project_application_comment"]; a.OpenStackProject = aj["project_application_openstack_project"]; if (a.Status !== 1) { if (a.Shortname){ From 964c2dde168f431150ccd77b2eb7f7a16434ace6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Giller?= Date: Wed, 23 May 2018 13:53:55 +0200 Subject: [PATCH 104/148] feat(ack): added acknowledge --- .../addapplication.component.html | 29 +++++++++++++++++-- .../applications/addapplication.component.ts | 10 +++++-- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/src/app/applications/addapplication.component.html b/src/app/applications/addapplication.component.html index 70e8913b53..34fa023c3e 100755 --- a/src/app/applications/addapplication.component.html +++ b/src/app/applications/addapplication.component.html @@ -284,7 +284,7 @@
    Institutional Information
    -
    @@ -326,3 +326,26 @@

    {{ notificationModalTitle }}

    + + diff --git a/src/app/applications/addapplication.component.ts b/src/app/applications/addapplication.component.ts index 9dc57849d2..3d99ecd3e9 100644 --- a/src/app/applications/addapplication.component.ts +++ b/src/app/applications/addapplication.component.ts @@ -23,6 +23,12 @@ export class AddApplicationComponent { public notificationModalIsClosable: boolean = false; public notificationModalStay: boolean = true; + public acknowledgeModalMessage: string = 'The development and support of the cloud is possible above all through the funding of the cloud infrastructure by the Federal Ministry of Education and Research (BMBF)!\n' + + 'We would highly appreciate the following citation in your next publication(s): ‘This work was supported by the BMBF-funded de.NBI Cloud within the German Network for Bioinformatics Infrastructure (de.NBI) (031A537B, 031A533A, 031A538A, 031A533B, 031A535A, 031A537C, 031A534A, 031A532B).'; + public acknowledgeModalTitle: string = 'Acknowledge'; + public acknowledgeModalType: string = 'info'; + + showjustvm: boolean; project_application_openstack_project: boolean; @@ -64,7 +70,7 @@ export class AddApplicationComponent { check_not_zero(values: {}) { if ('project_application_openstack_project' in values) { - + if ('project_application_cores_per_vm' in values && values['project_application_cores_per_vm'] > 0 && 'project_application_ram_per_vm' in values && values['project_application_ram_per_vm'] > 0 && 'project_application_disk_space' in values && values['project_application_disk_space'] > 0) { @@ -118,7 +124,7 @@ export class AddApplicationComponent { this.notificationModalType = type; } - public resetModal() { + public resetNotificationModal() { this.notificationModalTitle = 'Notification'; this.notificationModalMessage = 'Please wait...'; From ae6edfda9ca23810ff7af8f45d72f9273d9b5f35 Mon Sep 17 00:00:00 2001 From: DavidWein94 Date: Wed, 23 May 2018 17:21:20 +0200 Subject: [PATCH 105/148] Update imageTag.component.html --- src/app/projectmanagement/imageTag.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/projectmanagement/imageTag.component.html b/src/app/projectmanagement/imageTag.component.html index a5391382fb..7efa5d4426 100644 --- a/src/app/projectmanagement/imageTag.component.html +++ b/src/app/projectmanagement/imageTag.component.html @@ -24,7 +24,7 @@

    Image tags

    From 08a8bdbf5c0a5ff8d9c3535927a221d2341e6d64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Giller?= Date: Sun, 27 May 2018 18:22:34 +0200 Subject: [PATCH 106/148] refactor(command): renamed ssh command to command --- src/app/virtualmachines/vmOverview.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/virtualmachines/vmOverview.component.html b/src/app/virtualmachines/vmOverview.component.html index 0ac3477673..16bc706e2b 100755 --- a/src/app/virtualmachines/vmOverview.component.html +++ b/src/app/virtualmachines/vmOverview.component.html @@ -27,7 +27,7 @@ Project Status Created at - SSH Command + Command Elixir ID Stopped at Actions From 76f25a8ad4e2b16f7076531812f90af1184ab48d Mon Sep 17 00:00:00 2001 From: David Weinholz Date: Mon, 28 May 2018 18:02:31 +0200 Subject: [PATCH 107/148] refactor(perungroup): now uses always the id --- src/app/api-connector/group.service.ts | 4 ++-- src/app/projectmanagement/overview.component.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/api-connector/group.service.ts b/src/app/api-connector/group.service.ts index 90b7c8fef5..dd83d4a08b 100644 --- a/src/app/api-connector/group.service.ts +++ b/src/app/api-connector/group.service.ts @@ -31,11 +31,11 @@ export class GroupService { } - getFacilityByGroup(groupname: string): Observable { + getFacilityByGroup(groupid: string): Observable { return this.http.get(this.settings.getApiBaseURL() + 'getFacilityByGroup/', { withCredentials: true, - params: {groupname: groupname} + params: {groupid: groupid} }).map((res: Response) => res.json()).catch((error: any) => Observable.throw(error.json().error || 'Server error')) } diff --git a/src/app/projectmanagement/overview.component.ts b/src/app/projectmanagement/overview.component.ts index ceb0109b56..b664744038 100644 --- a/src/app/projectmanagement/overview.component.ts +++ b/src/app/projectmanagement/overview.component.ts @@ -175,7 +175,7 @@ export class OverviewComponent { } else { is_pi = true; } - this.groupservice.getFacilityByGroup(group["name"]).subscribe(result => { + this.groupservice.getFacilityByGroup(group["id"]).subscribe(result => { let newProject = new Project( group["id"], From 17adb0c201c447f39117f4b6213b0456c0984cad Mon Sep 17 00:00:00 2001 From: DavidWein94 Date: Tue, 29 May 2018 18:09:52 +0200 Subject: [PATCH 108/148] refactor(diskspace):renamed to storage (#137) --- src/app/applications/addapplication.component.html | 4 ++-- src/app/applications/applications.component.html | 6 +++--- src/app/virtualmachines/addvm.component.html | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/applications/addapplication.component.html b/src/app/applications/addapplication.component.html index 34fa023c3e..19dd4ed502 100755 --- a/src/app/applications/addapplication.component.html +++ b/src/app/applications/addapplication.component.html @@ -153,7 +153,7 @@
    Resources
    - +
    Resources GB
    - How many disk space should every VM have? + How many storage should every VM have?
    diff --git a/src/app/applications/applications.component.html b/src/app/applications/applications.component.html index 5bae5fab79..6f263f23cf 100755 --- a/src/app/applications/applications.component.html +++ b/src/app/applications/applications.component.html @@ -73,7 +73,7 @@

    Applications Overview

    {{ application.RamPerVM }} GB - Disk + Storage {{ application.DiskSpace }} GB @@ -210,7 +210,7 @@

    Applications Overview

    {{ application.RamPerVM }} GB - Disk + Storage {{ application.DiskSpace }} GB @@ -329,7 +329,7 @@

    Applications Overview

    {{ application.RamPerVM }} - Disk + Storage {{ application.DiskSpace }} diff --git a/src/app/virtualmachines/addvm.component.html b/src/app/virtualmachines/addvm.component.html index 2f52dad3ed..453ab42765 100755 --- a/src/app/virtualmachines/addvm.component.html +++ b/src/app/virtualmachines/addvm.component.html @@ -97,7 +97,7 @@

    {{selectedProjectVmsUsed}} / {{selectedProjectVmsMax}} Vms

    - +
    GB From afbfb07695a261a5e9e62c7e815a6badd892797b Mon Sep 17 00:00:00 2001 From: DavidWein94 Date: Tue, 29 May 2018 18:11:36 +0200 Subject: [PATCH 109/148] feat(params):now the optional params are hidden in the start vm tab (#136) --- src/app/userinfo/userinfo.component.ts | 4 +--- src/app/virtualmachines/addvm.component.html | 15 +++++++++++++-- src/app/virtualmachines/addvm.component.ts | 1 + 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/app/userinfo/userinfo.component.ts b/src/app/userinfo/userinfo.component.ts index 4e7c71ef2f..f74ed61ab0 100644 --- a/src/app/userinfo/userinfo.component.ts +++ b/src/app/userinfo/userinfo.component.ts @@ -63,9 +63,7 @@ export class UserinfoComponent { } - changi(e){ - console.log(this.newsletter_subscribed); - } + getUserPublicKey() { this.keyService.getKey(this.userinfo.ElxirId).subscribe(result => { diff --git a/src/app/virtualmachines/addvm.component.html b/src/app/virtualmachines/addvm.component.html index 453ab42765..cfda91490f 100755 --- a/src/app/virtualmachines/addvm.component.html +++ b/src/app/virtualmachines/addvm.component.html @@ -93,18 +93,29 @@
    -

    {{selectedProjectVmsUsed}} / {{selectedProjectVmsMax}} Vms

    + {{selectedProjectVmsUsed}} / {{selectedProjectVmsMax}} Vms
    + + +
    +
    +
    +
    + +
    GB
    -

    {{selectedProjectDiskspaceUsed}} / {{selectedProjectDiskspaceMax}} GB

    + {{selectedProjectDiskspaceUsed}} / {{selectedProjectDiskspaceMax}} + GB
    diff --git a/src/app/virtualmachines/addvm.component.ts b/src/app/virtualmachines/addvm.component.ts index 5499029127..5e33d65667 100644 --- a/src/app/virtualmachines/addvm.component.ts +++ b/src/app/virtualmachines/addvm.component.ts @@ -49,6 +49,7 @@ export class VirtualMachineComponent implements OnInit { selectedProjectVmsUsed:number; selectedProject: [string, number]; client_avaiable: boolean; + optional_params=false; projects: string[] = new Array(); private checkStatusTimeout: number = 5000; From d8e5139c9b0c7f6ad6f3864c80c5a97035a95c4d Mon Sep 17 00:00:00 2001 From: DavidWein94 Date: Wed, 30 May 2018 11:07:17 +0200 Subject: [PATCH 110/148] Feature/vo manager (#139) * refactor(urls):refactored url and fixed denbi/denbi bug * refactor(urls):refactored url and fixed denbi/denbi bug * feat(vo-mail):added vo guard for canActivate * fix(vo-guard):fixed type bug * feat(mail):now the vo can send a mail to all members of vo with newsletter * refactor(newsletter):changed send mail to send neswletter --- src/app/api-connector/vo.service.ts | 47 +++++++ src/app/app.routing.ts | 14 ++- .../applications-routing.module.ts | 2 +- .../facilitymanager-routing.module.ts | 30 +++++ .../facilitymanager.module.ts | 22 ++++ .../facilityprojectsoverview.component.html | 2 +- .../facilityprojectsoverview.component.ts | 7 +- .../imageTag.component.html | 0 .../imagetags.component.ts | 0 src/app/layouts/full-layout.component.html | 20 ++- .../projectmanagement-routing.module.ts | 20 +-- .../projectmanagement.module.ts | 7 +- src/app/userinfo/userinfo.component.ts | 24 +++- .../vo_manager/VoManager-routing.module.ts | 26 ++++ src/app/vo_manager/VoManager.module.ts | 30 +++++ src/app/vo_manager/VoOverviewComponent.ts | 54 ++++++++ src/app/vo_manager/vo-guard.service.ts | 38 ++++++ src/app/vo_manager/voOverview.component.html | 119 ++++++++++++++++++ 18 files changed, 423 insertions(+), 39 deletions(-) create mode 100644 src/app/api-connector/vo.service.ts create mode 100644 src/app/facility_manager/facilitymanager-routing.module.ts create mode 100644 src/app/facility_manager/facilitymanager.module.ts rename src/app/{projectmanagement => facility_manager}/facilityprojectsoverview.component.html (99%) rename src/app/{projectmanagement => facility_manager}/facilityprojectsoverview.component.ts (97%) rename src/app/{projectmanagement => facility_manager}/imageTag.component.html (100%) rename src/app/{projectmanagement => facility_manager}/imagetags.component.ts (100%) create mode 100644 src/app/vo_manager/VoManager-routing.module.ts create mode 100644 src/app/vo_manager/VoManager.module.ts create mode 100644 src/app/vo_manager/VoOverviewComponent.ts create mode 100644 src/app/vo_manager/vo-guard.service.ts create mode 100644 src/app/vo_manager/voOverview.component.html diff --git a/src/app/api-connector/vo.service.ts b/src/app/api-connector/vo.service.ts new file mode 100644 index 0000000000..83a437b0cd --- /dev/null +++ b/src/app/api-connector/vo.service.ts @@ -0,0 +1,47 @@ +import {Injectable} from '@angular/core'; +import {Http, Response, Headers, RequestOptions} from '@angular/http'; +import {Observable} from 'rxjs/Rx'; +import {URLSearchParams} from '@angular/http'; +import {ApiSettings} from './api-settings.service'; +import 'rxjs/add/operator/map'; +import 'rxjs/add/operator/catch'; + +@Injectable() +export class VoService{ + constructor(private http: Http, private settings: ApiSettings) { + } + + + + isVo(){ + + return this.http.get(this.settings.getApiBaseURL()+ 'vo_manager/isVoManager/', { + withCredentials: true, + }) + + } + + + + + sendMailToVo(subject,message): Observable { + let urlSearchParams = new URLSearchParams(); + urlSearchParams.append('subject', subject); + urlSearchParams.append('message',message); + + let header = new Headers({ + 'X-CSRFToken': this.settings.getCSRFToken(), + }); + return this.http.post(this.settings.getApiBaseURL()+ 'vo_manager/sendMailToAllMembers/',urlSearchParams, { + withCredentials: true, + headers: header, + }).map((res: Response) => res.json()).catch((error: any) => Observable.throw(error.json().error || 'Server error')) + + + + + + + } + +} diff --git a/src/app/app.routing.ts b/src/app/app.routing.ts index 3ab046dfe4..3813059ebe 100644 --- a/src/app/app.routing.ts +++ b/src/app/app.routing.ts @@ -31,16 +31,24 @@ export const routes: Routes = [ loadChildren: './userinfo/userinfo.module#UserinfoModule' }, { - path: '', + path: 'project-management', loadChildren: './projectmanagement/projectmanagement.module#ProjectManagementModule' }, { - path: '', + path: 'applications', loadChildren: './applications/applications.module#ApplicationsModule' }, { - path: '', + path: 'virtualmachines', loadChildren: './virtualmachines/vm.module#VmModule' + }, + { + path: 'vo-manager', + loadChildren: './vo_manager/VoManager.module#VoManagerModule' + }, + { + path: 'facility-manager', + loadChildren: './facility_manager/facilitymanager.module#FacilitymanagerModule' } ] diff --git a/src/app/applications/applications-routing.module.ts b/src/app/applications/applications-routing.module.ts index 8529078a18..dd73e7599b 100644 --- a/src/app/applications/applications-routing.module.ts +++ b/src/app/applications/applications-routing.module.ts @@ -7,7 +7,7 @@ import { AddApplicationComponent } from './addapplication.component'; const routes: Routes = [ { - path: 'applications', + path: '', component: ApplicationsComponent, data: { title: 'Application overview' diff --git a/src/app/facility_manager/facilitymanager-routing.module.ts b/src/app/facility_manager/facilitymanager-routing.module.ts new file mode 100644 index 0000000000..8e9a72e55a --- /dev/null +++ b/src/app/facility_manager/facilitymanager-routing.module.ts @@ -0,0 +1,30 @@ +import {NgModule} from '@angular/core'; +import {Routes, RouterModule} from '@angular/router'; +import {FacilityProjectsOverviewComponent} from "../facility_manager/facilityprojectsoverview.component"; +import {ImageTagComponent} from "../facility_manager/imagetags.component"; + +const routes: Routes = [ + + { + path: 'facilityProjects', + component: FacilityProjectsOverviewComponent, + data: { + title: 'Facility Projects' + } + + }, { + path: 'imageTags', + component: ImageTagComponent, + data: { + title: 'Image Tags' + } + } + +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class FacilitymanagerRoutingModule { +} diff --git a/src/app/facility_manager/facilitymanager.module.ts b/src/app/facility_manager/facilitymanager.module.ts new file mode 100644 index 0000000000..efd99e59d8 --- /dev/null +++ b/src/app/facility_manager/facilitymanager.module.ts @@ -0,0 +1,22 @@ +import { NgModule } from '@angular/core'; +import { FacilityProjectsOverviewComponent} from "../facility_manager/facilityprojectsoverview.component"; +import { TabsModule } from 'ngx-bootstrap/tabs'; +import {CommonModule} from "@angular/common"; +import { ModalModule } from 'ngx-bootstrap/modal'; +import {FormsModule} from '@angular/forms'; +import {ImageTagComponent} from "../facility_manager/imagetags.component"; +import {FacilitymanagerRoutingModule} from "./facilitymanager-routing.module"; +@NgModule({ + imports: [ + FacilitymanagerRoutingModule, + TabsModule, + FormsModule, + CommonModule, + ModalModule.forRoot(), + ], + declarations: [ + FacilityProjectsOverviewComponent, + ImageTagComponent + ] +}) +export class FacilitymanagerModule { } diff --git a/src/app/projectmanagement/facilityprojectsoverview.component.html b/src/app/facility_manager/facilityprojectsoverview.component.html similarity index 99% rename from src/app/projectmanagement/facilityprojectsoverview.component.html rename to src/app/facility_manager/facilityprojectsoverview.component.html index c114167f06..a2da259f4e 100644 --- a/src/app/projectmanagement/facilityprojectsoverview.component.html +++ b/src/app/facility_manager/facilityprojectsoverview.component.html @@ -178,7 +178,7 @@

    Error

    Sending the email.
    diff --git a/src/app/projectmanagement/projectmanagement-routing.module.ts b/src/app/projectmanagement/projectmanagement-routing.module.ts index 84a69a42b4..555f286acd 100644 --- a/src/app/projectmanagement/projectmanagement-routing.module.ts +++ b/src/app/projectmanagement/projectmanagement-routing.module.ts @@ -1,32 +1,20 @@ import {NgModule} from '@angular/core'; import {Routes, RouterModule} from '@angular/router'; -import {FacilityProjectsOverviewComponent} from "./facilityprojectsoverview.component"; +import {FacilityProjectsOverviewComponent} from "../facility_manager/facilityprojectsoverview.component"; import {OverviewComponent} from './overview.component'; -import {ImageTagComponent} from "./imagetags.component"; +import {ImageTagComponent} from "../facility_manager/imagetags.component"; const routes: Routes = [ { - path: 'project-management', + path: '', component: OverviewComponent, data: { title: 'Project overview' } }, - { - path: 'facilityProjects', - component: FacilityProjectsOverviewComponent, - data: { - title: 'Facility Projects' - } - }, { - path: 'imageTags', - component: ImageTagComponent, - data: { - title: 'Image Tags' - } - } + ]; diff --git a/src/app/projectmanagement/projectmanagement.module.ts b/src/app/projectmanagement/projectmanagement.module.ts index b1886e5e73..d8d496ca33 100644 --- a/src/app/projectmanagement/projectmanagement.module.ts +++ b/src/app/projectmanagement/projectmanagement.module.ts @@ -1,12 +1,12 @@ import { NgModule } from '@angular/core'; -import { FacilityProjectsOverviewComponent} from "./facilityprojectsoverview.component"; +import { FacilityProjectsOverviewComponent} from "../facility_manager/facilityprojectsoverview.component"; import { TabsModule } from 'ngx-bootstrap/tabs'; import { OverviewComponent } from './overview.component'; import { ProjectManagementRoutingModule } from './projectmanagement-routing.module'; import {CommonModule} from "@angular/common"; import { ModalModule } from 'ngx-bootstrap/modal'; import {FormsModule} from '@angular/forms'; -import {ImageTagComponent} from "./imagetags.component"; +import {ImageTagComponent} from "../facility_manager/imagetags.component"; @NgModule({ imports: [ ProjectManagementRoutingModule, @@ -17,8 +17,7 @@ import {ImageTagComponent} from "./imagetags.component"; ], declarations: [ OverviewComponent, - FacilityProjectsOverviewComponent, - ImageTagComponent + ] }) export class ProjectManagementModule { } diff --git a/src/app/userinfo/userinfo.component.ts b/src/app/userinfo/userinfo.component.ts index f74ed61ab0..595ce19ed1 100644 --- a/src/app/userinfo/userinfo.component.ts +++ b/src/app/userinfo/userinfo.component.ts @@ -1,4 +1,4 @@ -import {Component} from '@angular/core'; +import {Component,OnInit} from '@angular/core'; import 'rxjs/add/operator/toPromise'; import {Userinfo} from './userinfo.model' @@ -16,7 +16,7 @@ import {UserService} from "../api-connector/user.service"; templateUrl: 'userinfo.component.html', providers: [UserService, AuthzResolver, PerunSettings, MembersManager, ApiSettings, keyService, UsersManager, AttributesManager] }) -export class UserinfoComponent { +export class UserinfoComponent implements OnInit{ userinfo: Userinfo; key: string = 'Show Public Key'; key_visible = false; @@ -26,17 +26,29 @@ export class UserinfoComponent { constructor(private userservice: UserService,private authzresolver: AuthzResolver, private memberssmanager: MembersManager, private keyService: keyService, private usersmanager: UsersManager, private attributemanager: AttributesManager) { this.userinfo = new Userinfo(); this.getUserinfo(); - this.userservice.getNewsletterSubscription().subscribe(result =>{ - this.newsletter_subscribed=result.json();}) } + ngOnInit(): void { + + this.userservice.getNewsletterSubscription().subscribe(result => { + result = result.json()['subscribed'] + if (result.toString() == 'true') { + this.newsletter_subscribed = true; + } + else { + this.newsletter_subscribed = false; + } + + }) + + + } + setNewsletterSubscription(e){ this.userservice.setNewsletterSubscription(this.newsletter_subscribed).subscribe(result => { - this.userservice.getNewsletterSubscription().subscribe(result =>{ - this.newsletter_subscribed=result.json()}) }) } diff --git a/src/app/vo_manager/VoManager-routing.module.ts b/src/app/vo_manager/VoManager-routing.module.ts new file mode 100644 index 0000000000..91efce294c --- /dev/null +++ b/src/app/vo_manager/VoManager-routing.module.ts @@ -0,0 +1,26 @@ +import {NgModule} from '@angular/core'; +import {Routes, RouterModule} from '@angular/router'; +import {VoOverviewComponent} from "./VoOverviewComponent"; +import {VoGuardService} from "./vo-guard.service"; + + +const routes: Routes = [ + { + path: 'overview', + component: VoOverviewComponent, + canActivate:[VoGuardService], + data: { + title: 'Vo manager overview' + } + + }, + + +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class VoManagerRoutingModule { +} diff --git a/src/app/vo_manager/VoManager.module.ts b/src/app/vo_manager/VoManager.module.ts new file mode 100644 index 0000000000..95711f8625 --- /dev/null +++ b/src/app/vo_manager/VoManager.module.ts @@ -0,0 +1,30 @@ +import { NgModule } from '@angular/core'; + +import { TabsModule } from 'ngx-bootstrap/tabs'; + +import {CommonModule} from "@angular/common"; +import { ModalModule } from 'ngx-bootstrap/modal'; +import {FormsModule} from '@angular/forms'; +import {VoManagerRoutingModule} from "./VoManager-routing.module"; +import {VoOverviewComponent} from "./VoOverviewComponent"; +import {VoGuardService} from "./vo-guard.service"; +import {VoService} from "../api-connector/vo.service"; + +@NgModule({ + imports: [ + VoManagerRoutingModule, + TabsModule, + FormsModule, + CommonModule, + ModalModule.forRoot(), + ], + declarations: [ + VoOverviewComponent + ], + providers:[ + VoService, + VoGuardService + + ] +}) +export class VoManagerModule { } diff --git a/src/app/vo_manager/VoOverviewComponent.ts b/src/app/vo_manager/VoOverviewComponent.ts new file mode 100644 index 0000000000..590a1f8877 --- /dev/null +++ b/src/app/vo_manager/VoOverviewComponent.ts @@ -0,0 +1,54 @@ +import {Component, Input, OnInit} from '@angular/core'; +import {VoService} from "../api-connector/vo.service"; + + +@Component({ + selector: 'voOverview', + templateUrl: 'voOverview.component.html', + providers:[VoService] + + +}) + +export class VoOverviewComponent { + + public emailSubject: string = ''; + public emailText: string = ''; + public emailStatus: number = 0; + + + + + + + constructor(private voserice:VoService) { + + + } + + sendMailToVo(subject:string,message:string){ + this.voserice.sendMailToVo(encodeURIComponent(subject), encodeURIComponent(message)).subscribe(result =>{ + if (result == 1){ + this.emailStatus = 1; + } + else { + this.emailStatus = 2; + } + }) + + } + + + public resetEmailModal() { + + this.emailSubject = ''; + this.emailText = ''; + this.emailStatus = 0; + + } + + + + + +} diff --git a/src/app/vo_manager/vo-guard.service.ts b/src/app/vo_manager/vo-guard.service.ts new file mode 100644 index 0000000000..9ba6fd9639 --- /dev/null +++ b/src/app/vo_manager/vo-guard.service.ts @@ -0,0 +1,38 @@ +import {Injectable} from "@angular/core"; +import {CanActivate, Router, RouterStateSnapshot, ActivatedRouteSnapshot} from "@angular/router"; +import {VoService} from "../api-connector/vo.service"; +import {Observable} from "rxjs/Observable"; + + +@Injectable() +export class VoGuardService implements CanActivate { + + + constructor(private router: Router, private voservice:VoService){ + } + + + canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) { + return new Promise((resolve, reject) => { + this.voservice.isVo().toPromise() + .then(result => { + console.log(result) + let res = result.json(); + if (res['Is_Vo_Manager'].toString() == 'true'){ + return resolve(true)} + else{ + return resolve(false) + } + }).catch(rejection => { + this.router.navigate(['/userinfo']); + resolve(false); + + }); + }); + + + } +} + + + diff --git a/src/app/vo_manager/voOverview.component.html b/src/app/vo_manager/voOverview.component.html new file mode 100644 index 0000000000..6cb9b7638b --- /dev/null +++ b/src/app/vo_manager/voOverview.component.html @@ -0,0 +1,119 @@ +
    +
    + +

    Vo Manager} + + +

    + +
    + +
    +
    +
    + + + + + + + + + + + + + From 47c1c937effe5c1dcb8846b1338c3bd55f4b2424 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Giller?= Date: Fri, 1 Jun 2018 16:51:06 +0200 Subject: [PATCH 111/148] fix(facility error): selectedfacility not needed here --- src/app/vo_manager/voOverview.component.html | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/app/vo_manager/voOverview.component.html b/src/app/vo_manager/voOverview.component.html index 6cb9b7638b..04c3f04b23 100644 --- a/src/app/vo_manager/voOverview.component.html +++ b/src/app/vo_manager/voOverview.component.html @@ -1,10 +1,6 @@
    -

    Vo Manager} - - -

    - +
    - GB + GB +
    {{selectedProjectDiskspaceUsed}} / {{selectedProjectDiskspaceMax}} @@ -170,7 +171,7 @@
    -->


    diff --git a/src/app/virtualmachines/addvm.component.ts b/src/app/virtualmachines/addvm.component.ts index 5e33d65667..a0009ebda0 100644 --- a/src/app/virtualmachines/addvm.component.ts +++ b/src/app/virtualmachines/addvm.component.ts @@ -50,6 +50,7 @@ export class VirtualMachineComponent implements OnInit { selectedProject: [string, number]; client_avaiable: boolean; optional_params=false; + diskspace:number=0; projects: string[] = new Array(); private checkStatusTimeout: number = 5000; diff --git a/src/app/virtualmachines/vmOverview.component.html b/src/app/virtualmachines/vmOverview.component.html index 16bc706e2b..353fc47008 100755 --- a/src/app/virtualmachines/vmOverview.component.html +++ b/src/app/virtualmachines/vmOverview.component.html @@ -173,7 +173,7 @@

    Error

    From 09245c9f9f8db6fcc9810eb0fd88de1e276d191c Mon Sep 17 00:00:00 2001 From: David Weinholz Date: Mon, 4 Jun 2018 12:19:13 +0200 Subject: [PATCH 113/148] feat(applicaton):now it shows in the modal which inputs where wrong --- .../addapplication.component.html | 651 ++++++++++-------- .../applications/addapplication.component.ts | 13 +- 2 files changed, 363 insertions(+), 301 deletions(-) diff --git a/src/app/applications/addapplication.component.html b/src/app/applications/addapplication.component.html index 19dd4ed502..b37b85b57d 100755 --- a/src/app/applications/addapplication.component.html +++ b/src/app/applications/addapplication.component.html @@ -1,351 +1,402 @@
    -
    -
    -
    -
    - New Application - – Form -
    -
    -
    - Please be aware: Only applications submitted by a principal investigator of a german university or research facility will be accepted!
    -
    -
    -
    General Information
    -
    -
    - -
    - - Name your project. -
    -
    - -
    - -
    -
    - Umlauts and special characters are prohibited in the shortname. +
    +
    +
    +
    + New Application + – Form
    - - Enter a short name (between 5 and 15 characters). -
    -
    +
    +
    + Please be aware: Only applications submitted by a principal investigator of a + german university or research facility will be accepted! +
    + +
    +
    General Information
    +
    +
    + +
    + + Name your project. +
    +
    + +
    + +
    +
    + Umlauts and special characters are prohibited in the + shortname. +
    + + Enter a short name (between 5 and 15 characters). +
    +
    -
    -
    +
    -
    - -
    -
    - - months +
    + +
    +
    + + months -
    - How long would you like to run this project? -
    -
    -
    -
    -
    -
    Choose the type of your Project
    -
    -
    - -
    - -
    -
    -
    - This project mode is a beta version. Virtual machines might get lost or can not be started temporarily. -
    -
    - -
    - -
    -
    -
    -
    Resources
    -
    +
    + How long would you like to run this project? +
    +
    +
    +
    +
    +
    Choose the type of your Project
    +
    +
    + +
    + +
    +
    +
    + This project mode is a beta version. Virtual machines might get lost or can not be started + temporarily. +
    +
    + +
    + +
    +
    +
    +
    Resources
    +
    -
    - -
    -
    - - VMs +
    + +
    +
    + + VMs -
    - How many VMs would you run simultaneously? -
    -
    +
    + How many VMs would you run simultaneously? +
    +
    -
    - -
    -
    - - cores/VM +
    + +
    +
    + + cores/VM -
    - How many cores should every VM have? -
    -
    +
    + How many cores should every VM have? +
    +
    -
    - -
    -
    - - GB +
    + +
    +
    + + GB -
    - How much RAM should every VM have? -
    -
    +
    + How much RAM should every VM have? +
    +
    -
    - -
    -
    - - GB +
    + +
    +
    + + GB -
    - How many storage should every VM have? -
    -
    +
    + How many storage should every VM have? +
    +
    -
    - -
    -
    - - GB +
    + +
    +
    + + GB -
    - How much object storage would you need? -
    -
    +
    + How much object storage would you need? +
    +
    -
    - -
    -
    - -
    - Which special Hardware would you need? -
    -
    +
    + +
    +
    + +
    + Which special Hardware would you need? +
    +
    -
    -
    Resources
    -
    +
    +
    Resources
    +
    -
    - -
    -
    - - VMs +
    + +
    +
    + + VMs -
    - How many VMs would you run simultaneously? -
    -
    -
    - -
    -
    - - GB +
    + How many VMs would you run simultaneously? +
    +
    +
    + +
    +
    + + GB -
    - How much disk space do you need per VM? -
    -
    -
    - -
    -
      -
    • de.NBI Large (CPUs:32, RAM:64 GB)
      • -
    • de.NBI Medium (CPUs:16, RAM:32 GB)
      • -
    • de.NBI Small (CPUs:8, RAM:16 GB)
      • -
    -
    -
    +
    + How much disk space do you need per VM? +
    +
    +
    + +
    +
      +
    • de.NBI Large (CPUs:32, RAM:64 GB)
      • +
    • de.NBI Medium (CPUs:16, RAM:32 GB)
      • +
    • de.NBI Small (CPUs:8, RAM:16 GB)
      • +
    +
    +
    -
    -
    - -
    +
    +
    + +
    - Additional information you want to share? -
    -
    -
    -
    -
    Institutional Information
    -
    + Additional information you want to share? +
    +
    +
    +
    +
    Institutional Information
    +
    -
    - -
    - - To which institute do you belong? -
    -
    +
    + +
    + + To which institute do you belong? +
    +
    -
    - -
    - - To which workgroup do you belong? -
    -
    +
    + +
    + + To which workgroup do you belong? +
    +
    -
    -

    By submitting this application you agree to the - cloud - usage policy.

    -
    +
    +

    By submitting this application you agree to the + cloud + usage policy.

    +
    - -
    -
    - + +
    +
    + +
    +
    -
    +
    - -
    diff --git a/src/app/applications/addapplication.component.ts b/src/app/applications/addapplication.component.ts index 3d99ecd3e9..c2a84f4e2f 100644 --- a/src/app/applications/addapplication.component.ts +++ b/src/app/applications/addapplication.component.ts @@ -22,9 +22,11 @@ export class AddApplicationComponent { public notificationModalType: string = 'info'; public notificationModalIsClosable: boolean = false; public notificationModalStay: boolean = true; + public error: string[]; + public acknowledgeModalMessage: string = 'The development and support of the cloud is possible above all through the funding of the cloud infrastructure by the Federal Ministry of Education and Research (BMBF)!\n' + - 'We would highly appreciate the following citation in your next publication(s): ‘This work was supported by the BMBF-funded de.NBI Cloud within the German Network for Bioinformatics Infrastructure (de.NBI) (031A537B, 031A533A, 031A538A, 031A533B, 031A535A, 031A537C, 031A534A, 031A532B).'; + 'We would highly appreciate the following citation in your next publication(s): ‘This work was supported by the BMBF-funded de.NBI Cloud within the German Network for Bioinformatics Infrastructure (de.NBI) (031A537B, 031A533A, 031A538A, 031A533B, 031A535A, 031A537C, 031A534A, 031A532B).'; public acknowledgeModalTitle: string = 'Acknowledge'; public acknowledgeModalType: string = 'info'; @@ -86,6 +88,7 @@ export class AddApplicationComponent { } onSubmit(f: NgForm) { + this.error = null; if (this.wronginput == true) { this.updateNotificaitonModal('Failed', 'The application was not submitted, please check the required fields and try again.', true, 'danger'); this.notificationModalStay = true; @@ -110,6 +113,14 @@ export class AddApplicationComponent { this.updateNotificaitonModal('Success', 'The application was submitted', true, 'success'); this.notificationModalStay = false; }).catch(error => { + var error_json = error.json() + this.error = [] + for (let key of Object.keys(error_json)) { + this.error.push(key.split('_',)[2]) + + } + + this.updateNotificaitonModal('Failed', 'The application was not submitted, please check the required fields and try again.', true, 'danger'); this.notificationModalStay = true; }) From 79beebef724407bb06dc678b558de902c43b6ee3 Mon Sep 17 00:00:00 2001 From: DavidWein94 Date: Mon, 4 Jun 2018 20:21:12 +0200 Subject: [PATCH 114/148] feat(applicaton):now it shows in the modal which inputs where wrong (#143) --- .../addapplication.component.html | 651 ++++++++++-------- .../applications/addapplication.component.ts | 13 +- 2 files changed, 363 insertions(+), 301 deletions(-) diff --git a/src/app/applications/addapplication.component.html b/src/app/applications/addapplication.component.html index 19dd4ed502..b37b85b57d 100755 --- a/src/app/applications/addapplication.component.html +++ b/src/app/applications/addapplication.component.html @@ -1,351 +1,402 @@
    -
    -
    -
    -
    - New Application - – Form -
    -
    -
    - Please be aware: Only applications submitted by a principal investigator of a german university or research facility will be accepted!
    -
    -
    -
    General Information
    -
    -
    - -
    - - Name your project. -
    -
    - -
    - -
    -
    - Umlauts and special characters are prohibited in the shortname. +
    +
    +
    +
    + New Application + – Form
    - - Enter a short name (between 5 and 15 characters). -
    -
    +
    +
    + Please be aware: Only applications submitted by a principal investigator of a + german university or research facility will be accepted! +
    + +
    +
    General Information
    +
    +
    + +
    + + Name your project. +
    +
    + +
    + +
    +
    + Umlauts and special characters are prohibited in the + shortname. +
    + + Enter a short name (between 5 and 15 characters). +
    +
    -
    -
    +
    -
    - -
    -
    - - months +
    + +
    +
    + + months -
    - How long would you like to run this project? -
    -
    -
    -
    -
    -
    Choose the type of your Project
    -
    -
    - -
    - -
    -
    -
    - This project mode is a beta version. Virtual machines might get lost or can not be started temporarily. -
    -
    - -
    - -
    -
    -
    -
    Resources
    -
    +
    + How long would you like to run this project? +
    +
    +
    +
    +
    +
    Choose the type of your Project
    +
    +
    + +
    + +
    +
    +
    + This project mode is a beta version. Virtual machines might get lost or can not be started + temporarily. +
    +
    + +
    + +
    +
    +
    +
    Resources
    +
    -
    - -
    -
    - - VMs +
    + +
    +
    + + VMs -
    - How many VMs would you run simultaneously? -
    -
    +
    + How many VMs would you run simultaneously? +
    +
    -
    - -
    -
    - - cores/VM +
    + +
    +
    + + cores/VM -
    - How many cores should every VM have? -
    -
    +
    + How many cores should every VM have? +
    +
    -
    - -
    -
    - - GB +
    + +
    +
    + + GB -
    - How much RAM should every VM have? -
    -
    +
    + How much RAM should every VM have? +
    +
    -
    - -
    -
    - - GB +
    + +
    +
    + + GB -
    - How many storage should every VM have? -
    -
    +
    + How many storage should every VM have? +
    +
    -
    - -
    -
    - - GB +
    + +
    +
    + + GB -
    - How much object storage would you need? -
    -
    +
    + How much object storage would you need? +
    +
    -
    - -
    -
    - -
    - Which special Hardware would you need? -
    -
    +
    + +
    +
    + +
    + Which special Hardware would you need? +
    +
    -
    -
    Resources
    -
    +
    +
    Resources
    +
    -
    - -
    -
    - - VMs +
    + +
    +
    + + VMs -
    - How many VMs would you run simultaneously? -
    -
    -
    - -
    -
    - - GB +
    + How many VMs would you run simultaneously? +
    +
    +
    + +
    +
    + + GB -
    - How much disk space do you need per VM? -
    -
    -
    - -
    -
      -
    • de.NBI Large (CPUs:32, RAM:64 GB)
      • -
    • de.NBI Medium (CPUs:16, RAM:32 GB)
      • -
    • de.NBI Small (CPUs:8, RAM:16 GB)
      • -
    -
    -
    +
    + How much disk space do you need per VM? +
    +
    +
    + +
    +
      +
    • de.NBI Large (CPUs:32, RAM:64 GB)
      • +
    • de.NBI Medium (CPUs:16, RAM:32 GB)
      • +
    • de.NBI Small (CPUs:8, RAM:16 GB)
      • +
    +
    +
    -
    -
    - -
    +
    +
    + +
    - Additional information you want to share? -
    -
    -
    -
    -
    Institutional Information
    -
    + Additional information you want to share? +
    +
    +
    +
    +
    Institutional Information
    +
    -
    - -
    - - To which institute do you belong? -
    -
    +
    + +
    + + To which institute do you belong? +
    +
    -
    - -
    - - To which workgroup do you belong? -
    -
    +
    + +
    + + To which workgroup do you belong? +
    +
    -
    -

    By submitting this application you agree to the - cloud - usage policy.

    -
    +
    +

    By submitting this application you agree to the + cloud + usage policy.

    +
    - -
    -
    - + +
    +
    + +
    +
    -
    +
    - -
    diff --git a/src/app/applications/addapplication.component.ts b/src/app/applications/addapplication.component.ts index 3d99ecd3e9..c2a84f4e2f 100644 --- a/src/app/applications/addapplication.component.ts +++ b/src/app/applications/addapplication.component.ts @@ -22,9 +22,11 @@ export class AddApplicationComponent { public notificationModalType: string = 'info'; public notificationModalIsClosable: boolean = false; public notificationModalStay: boolean = true; + public error: string[]; + public acknowledgeModalMessage: string = 'The development and support of the cloud is possible above all through the funding of the cloud infrastructure by the Federal Ministry of Education and Research (BMBF)!\n' + - 'We would highly appreciate the following citation in your next publication(s): ‘This work was supported by the BMBF-funded de.NBI Cloud within the German Network for Bioinformatics Infrastructure (de.NBI) (031A537B, 031A533A, 031A538A, 031A533B, 031A535A, 031A537C, 031A534A, 031A532B).'; + 'We would highly appreciate the following citation in your next publication(s): ‘This work was supported by the BMBF-funded de.NBI Cloud within the German Network for Bioinformatics Infrastructure (de.NBI) (031A537B, 031A533A, 031A538A, 031A533B, 031A535A, 031A537C, 031A534A, 031A532B).'; public acknowledgeModalTitle: string = 'Acknowledge'; public acknowledgeModalType: string = 'info'; @@ -86,6 +88,7 @@ export class AddApplicationComponent { } onSubmit(f: NgForm) { + this.error = null; if (this.wronginput == true) { this.updateNotificaitonModal('Failed', 'The application was not submitted, please check the required fields and try again.', true, 'danger'); this.notificationModalStay = true; @@ -110,6 +113,14 @@ export class AddApplicationComponent { this.updateNotificaitonModal('Success', 'The application was submitted', true, 'success'); this.notificationModalStay = false; }).catch(error => { + var error_json = error.json() + this.error = [] + for (let key of Object.keys(error_json)) { + this.error.push(key.split('_',)[2]) + + } + + this.updateNotificaitonModal('Failed', 'The application was not submitted, please check the required fields and try again.', true, 'danger'); this.notificationModalStay = true; }) From d4c9ac48d2be06d0b1a83ff057ee23d7a75db8fd Mon Sep 17 00:00:00 2001 From: DavidWein94 Date: Tue, 5 Jun 2018 14:06:17 +0200 Subject: [PATCH 115/148] fix(modal):now the applicationmodala will be resetted (#142) --- src/app/applications/applications.component.html | 2 +- src/app/applications/applications.component.ts | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/app/applications/applications.component.html b/src/app/applications/applications.component.html index 6f263f23cf..f024cac9a4 100755 --- a/src/app/applications/applications.component.html +++ b/src/app/applications/applications.component.html @@ -151,7 +151,7 @@

    Applications Overview

    + @@ -405,3 +408,29 @@

    {{ notificationModalTitle }}

    + diff --git a/src/app/applications/applications.component.ts b/src/app/applications/applications.component.ts index 3b005b85b0..eec8229d0a 100644 --- a/src/app/applications/applications.component.ts +++ b/src/app/applications/applications.component.ts @@ -28,6 +28,7 @@ export class ApplicationsComponent { application_status: ApplicationStatus[] = []; special_hardware: SpecialHardware[] = []; computeCenters: [string,number][]; + public deleteId: number; //notification Modal variables public notificationModal; @@ -257,6 +258,7 @@ export class ApplicationsComponent { this.notificationModalType = type; } + public createGroup(name, description, manager_elixir_id, application_id, compute_center, openstack_project,numberofVms,diskspace) { //get memeber id in order to add the user later as the new member and manager of the group let manager_member_id: number; @@ -317,6 +319,18 @@ export class ApplicationsComponent { }); } + public deleteApplication(application_id){ + this.applicataionsservice.deleteApplication(application_id).toPromise() + .then(result => { + this.updateNotificaitonModal('Success', 'The application has been successfully removed', true, 'success'); + }).then( result => { + this.user_applications=[]; + this.getUserApplications(); + }) + .catch(error => { + this.updateNotificaitonModal("Failed", "Application could not be removed!", true, "danger"); + }); + } public activeApplicationsAvailable(): boolean { for (let application of this.all_applications) { @@ -327,6 +341,11 @@ export class ApplicationsComponent { } + public setDeleteId(applicationId) { + this.deleteId = applicationId; + } + + From b879613dd7e0b47c68fee4395903f3976f8aebf5 Mon Sep 17 00:00:00 2001 From: DavidWein94 Date: Wed, 6 Jun 2018 13:37:31 +0200 Subject: [PATCH 117/148] Feature/lifetime synchron (#145) * feat(lifetime): now lifetime will be set in perun and the perun id will be added to the application in django * feat(facilityoverviw):now if lifetime reached the details to the projects are red * feat(application):now the vo can see in the application history if some projects lifetime is reached * fix(application):fixed approval bug * fix(facility:fixed lifetime bug --- src/app/api-connector/group.service.ts | 31 +++++++++++++++++++ src/app/applications/application.model.ts | 7 +++++ .../applications/applications.component.html | 17 +++++++--- .../applications/applications.component.ts | 21 ++++++++++--- .../facilityprojectsoverview.component.html | 4 ++- .../facilityprojectsoverview.component.ts | 5 ++- src/app/projectmanagement/project.model.ts | 9 +++++- 7 files changed, 82 insertions(+), 12 deletions(-) diff --git a/src/app/api-connector/group.service.ts b/src/app/api-connector/group.service.ts index dd83d4a08b..87f91fd259 100644 --- a/src/app/api-connector/group.service.ts +++ b/src/app/api-connector/group.service.ts @@ -101,6 +101,37 @@ export class GroupService { } + setLifetime(groupid: string, lifetime: string): Observable { + let urlSearchParams = new URLSearchParams(); + let header = new Headers({ + 'X-CSRFToken': this.settings.getCSRFToken(), + }); + urlSearchParams.append('lifetime', lifetime); + urlSearchParams.append('groupid', groupid); + return this.http.post(this.settings.getApiBaseURL() + 'group/setLifetime/', urlSearchParams, { + withCredentials: true, + headers: header + }).map((res: Response) => res.json()).catch((error: any) => Observable.throw(error.json().error || 'Server error')) + + + } + setPerunId(groupid: string,applicationId: string): Observable { + let urlSearchParams = new URLSearchParams(); + let header = new Headers({ + 'X-CSRFToken': this.settings.getCSRFToken(), + }); + + urlSearchParams.append('groupid', groupid); + urlSearchParams.append('applicationId',applicationId); + return this.http.post(this.settings.getApiBaseURL() + 'group/setPerunId/', urlSearchParams, { + withCredentials: true, + headers: header + }).map((res: Response) => res.json()).catch((error: any) => Observable.throw(error.json().error || 'Server error')) + + + } + + getGroupMembers(groupid: string): Observable { diff --git a/src/app/applications/application.model.ts b/src/app/applications/application.model.ts index 1aa0ad059a..98d87bf1ac 100644 --- a/src/app/applications/application.model.ts +++ b/src/app/applications/application.model.ts @@ -21,13 +21,20 @@ export class Application { private _ComputeCenter: [string,number]; private _OpenStackProject: boolean; private _ComputeCenterDetails:[string,string][]; + private _DaysRunning: number; constructor() { } + get DaysRunning():number{ + return this._DaysRunning; + } + set DaysRunning(value:number){ + this._DaysRunning=value; + } get OpenStackProject(): boolean { return this._OpenStackProject } diff --git a/src/app/applications/applications.component.html b/src/app/applications/applications.component.html index 1fa0785328..a01afedbbe 100755 --- a/src/app/applications/applications.component.html +++ b/src/app/applications/applications.component.html @@ -154,7 +154,8 @@

    Applications Overview

    - +
    Applications Overview Last status changed {{ application.DateStatusChanged }} + + DaysRunning + + {{application.DaysRunning}} + + Facility Details diff --git a/src/app/applications/applications.component.ts b/src/app/applications/applications.component.ts index a79e2f8299..5e44d64da0 100644 --- a/src/app/applications/applications.component.ts +++ b/src/app/applications/applications.component.ts @@ -36,6 +36,7 @@ export class ApplicationsComponent { public notificationModalMessage: string = "Please wait..."; public notificationModalType: string = "info"; public notificationModalIsClosable: boolean = false; + private APPROVED_STATUS=2; collapse_status: { [id: string]: boolean } = {}; @@ -165,6 +166,11 @@ export class ApplicationsComponent { a.User = aj["project_application_user"]["username"]; a.UserEmail = aj["project_application_user"]["email"]; a.Status = aj["project_application_status"]; + if (a.Status==this.APPROVED_STATUS){ + a.DaysRunning=Math.ceil((Math.abs(Date.now() - new Date(a.DateStatusChanged).getTime())) / (1000 * 3600 * 24)); + + + } a.Comment= aj["project_application_comment"]; a.OpenStackProject = aj["project_application_openstack_project"]; if (a.Status !== 1) { @@ -241,6 +247,10 @@ export class ApplicationsComponent { return s; } + public lifeTimeReached(lifetime:number,running:number):string{ + return (lifetime - running) < 0 ? "red" :"black"; + } + public getIdByStatus(name: string): number { let s = -1; for (let status of this.application_status) { @@ -265,7 +275,8 @@ export class ApplicationsComponent { } - public createGroup(name, description, manager_elixir_id, application_id, compute_center, openstack_project,numberofVms,diskspace) { + public createGroup(name, description, manager_elixir_id, application_id, compute_center, openstack_project,numberofVms,diskspace,lifetime) { + //get memeber id in order to add the user later as the new member and manager of the group let manager_member_id: number; let manager_member_user_id: number; @@ -295,9 +306,11 @@ export class ApplicationsComponent { this.groupsmanager.setdeNBIDirectAcces(new_group_id, openstack_project).toPromise(); if (compute_center != 'undefined'){ this.groupservice.assignGroupToResource(new_group_id.toString(), compute_center).subscribe();} - this.groupservice.setNumberOfVms(new_group_id.toString(),numberofVms.toString()).subscribe() - this.groupservice.setDescription(new_group_id.toString(),description).subscribe() - this.groupsmanager.setGroupDiskSpace(new_group_id,diskspace,numberofVms).subscribe() + this.groupservice.setNumberOfVms(new_group_id.toString(),numberofVms.toString()).subscribe(); + this.groupservice.setDescription(new_group_id.toString(),description).subscribe(); + this.groupservice.setLifetime(new_group_id.toString(),lifetime.toString()).subscribe(); + this.groupservice.setPerunId(new_group_id.toString(),application_id).subscribe(); + this.groupsmanager.setGroupDiskSpace(new_group_id,diskspace,numberofVms).subscribe(); //update modal this.updateNotificaitonModal("Success", "The new project was created", true, "success"); //update applications diff --git a/src/app/facility_manager/facilityprojectsoverview.component.html b/src/app/facility_manager/facilityprojectsoverview.component.html index a2da259f4e..873b833563 100644 --- a/src/app/facility_manager/facilityprojectsoverview.component.html +++ b/src/app/facility_manager/facilityprojectsoverview.component.html @@ -29,11 +29,12 @@

    Projects Overview: {{selectedFacility['Facility']}} Date created Days running + Lifetime in Days Actions - + {{ project.Id }} {{ project.Name }} {{ project.Description }} @@ -41,6 +42,7 @@

    Projects Overview: {{selectedFacility['Facility']}} {{ project.DateCreated }} {{ project.DaysRunning }} + {{project.Lifetime * 30}}

    From 87280419405cdf2dc477c7a232d40909112a1407 Mon Sep 17 00:00:00 2001 From: DavidWein94 Date: Fri, 8 Jun 2018 19:07:19 +0200 Subject: [PATCH 120/148] feat(vo):vo overview now shows all groups (#147) --- src/app/api-connector/vo.service.ts | 9 +- .../facilityprojectsoverview.component.html | 358 +++++++++--------- .../facilityprojectsoverview.component.ts | 4 + src/app/vo_manager/VoOverviewComponent.ts | 85 ++++- src/app/vo_manager/voOverview.component.html | 98 ++++- 5 files changed, 371 insertions(+), 183 deletions(-) diff --git a/src/app/api-connector/vo.service.ts b/src/app/api-connector/vo.service.ts index c3857b833b..2b2c7dcfc7 100644 --- a/src/app/api-connector/vo.service.ts +++ b/src/app/api-connector/vo.service.ts @@ -30,8 +30,14 @@ export class VoService { }).map((res: Response) => res.json()).catch((error: any) => Observable.throw(error.json().error || 'Server error')) - } + getAllVoGroups(): Observable { + + return this.http.get(this.settings.getApiBaseURL()+ 'vo_manager/getAllGroups/', { + withCredentials: true, + }).map((res: Response) => res.json()).catch((error: any) => Observable.throw(error.json().error || 'Server error')) + + } sendMailToVo(subject, message): Observable { let urlSearchParams = new URLSearchParams(); @@ -48,4 +54,5 @@ export class VoService { } + } diff --git a/src/app/facility_manager/facilityprojectsoverview.component.html b/src/app/facility_manager/facilityprojectsoverview.component.html index 873b833563..487bbd863e 100644 --- a/src/app/facility_manager/facilityprojectsoverview.component.html +++ b/src/app/facility_manager/facilityprojectsoverview.component.html @@ -1,199 +1,207 @@
    -
    - -

    Projects Overview: {{selectedFacility['Facility']}} - - -

    - -
    - - -
    -
    -
    - Projects -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Project IDProject NameDescriptionDate createdDays runningLifetime in DaysActions
    {{ project.Id }}{{ project.Name }}{{ project.Description }}{{ project.DateCreated }}{{ project.DaysRunning }}{{project.Lifetime * 30}} - -
    +
    + +

    Projects Overview: {{selectedFacility['Facility']}} + + +

    + +
    + + +
    +
    +
    + Projects + +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Project IDProject NameDescriptionDate createdDays runningLifetime in DaysActions
    {{ project.Id }}{{ project.Name }}{{ project.Description }}{{ project.DateCreated }}{{ project.DaysRunning }}{{project.Lifetime * 30}} + +
    +
    +
    -
    +
    - -
    diff --git a/src/app/facility_manager/facilityprojectsoverview.component.ts b/src/app/facility_manager/facilityprojectsoverview.component.ts index 0ca8215ca0..30ae45e345 100644 --- a/src/app/facility_manager/facilityprojectsoverview.component.ts +++ b/src/app/facility_manager/facilityprojectsoverview.component.ts @@ -94,6 +94,10 @@ export class FacilityProjectsOverviewComponent { } lifeTimeReached(lifetime:number,running:number):string{ + console.log(lifetime) + if (lifetime == -1){ + return "blue"; + } return (lifetime * 30 - running) < 0 ? "red" :"black"; } sendMailToFacility(facility: number,subject:string,message:string){ diff --git a/src/app/vo_manager/VoOverviewComponent.ts b/src/app/vo_manager/VoOverviewComponent.ts index 39aec062fe..1e566c0284 100644 --- a/src/app/vo_manager/VoOverviewComponent.ts +++ b/src/app/vo_manager/VoOverviewComponent.ts @@ -1,11 +1,14 @@ import {Component, Input, OnInit} from '@angular/core'; import {VoService} from "../api-connector/vo.service"; +import {Project} from "../projectmanagement/project.model"; +import {ProjectMember} from "../projectmanagement/project_member.model"; +import {GroupService} from "../api-connector/group.service"; @Component({ selector: 'voOverview', templateUrl: 'voOverview.component.html', - providers:[VoService] + providers:[VoService,GroupService] }) @@ -17,18 +20,31 @@ export class VoOverviewComponent { public emailStatus: number = 0; public newsletterSubscriptionCounter:number; + member_id: number; + projects: Project[] = new Array(); + // modal variables for User list + public usersModal; + public usersModalProjectMembers: ProjectMember[] = new Array; + public usersModalProjectID: number; + public usersModalProjectName: string; + + + public managerFacilities: [string,number][]; + public selectedFacility: [string,number] - constructor(private voserice:VoService) { - this.voserice.getNewsletterSubscriptionCounter().subscribe(result => { - this.newsletterSubscriptionCounter=result['subscribed']; - }) + + constructor(private voserice:VoService,private groupservice:GroupService) { + this.getVoProjects(); + this.voserice.getNewsletterSubscriptionCounter().subscribe(result => { + this.newsletterSubscriptionCounter=result['subscribed']; + } sendMailToVo(subject:string,message:string){ @@ -53,6 +69,65 @@ export class VoOverviewComponent { } + getVoProjects() { + + this.voserice.getAllVoGroups().subscribe(result => { + for (let group of result) { + let dateCreated = new Date(group["createdAt"]); + let dateDayDifference = Math.ceil((Math.abs(Date.now() - dateCreated.getTime())) / (1000 * 3600 * 24)); + let is_pi = false; + let is_admin = false; + let newProject = new Project( + group["id"], + group["name"], + group["description"], + dateCreated.getDate() + "." + (dateCreated.getMonth() + 1) + "." + dateCreated.getFullYear(), + dateDayDifference, + is_pi, + is_admin, + [result['Facility'], result['FacilityId']] + ) + newProject.Lifetime=group['lifetime'] + this.projects.push(newProject); + } + + + + }) + + + } + + lifeTimeReached(lifetime:number,running:number):string{ + console.log(lifetime) + if (lifetime == -1){ + return "blue"; + } + return (lifetime * 30 - running) < 0 ? "red" :"black"; + } + + getMembesOfTheProject(projectid: number, projectname: string) { + this.groupservice.getGroupMembers(projectid.toString()).subscribe(members => { + this.usersModalProjectID = projectid; + this.usersModalProjectName = projectname; + this.usersModalProjectMembers = new Array(); + for (let member of members) { + let member_id = member["id"]; + let user_id = member["userId"]; + let fullName = member["user"]["firstName"] + " " + member["user"]["lastName"]; + this.usersModalProjectMembers.push(new ProjectMember(user_id, fullName, member_id)); + } + + } + ) + } + + public showMembersOfTheProject(projectid: number, projectname: string, facility: [string,number]) { + this.getMembesOfTheProject(projectid, projectname); + + } + + diff --git a/src/app/vo_manager/voOverview.component.html b/src/app/vo_manager/voOverview.component.html index 3e80280269..17079ee7fe 100644 --- a/src/app/vo_manager/voOverview.component.html +++ b/src/app/vo_manager/voOverview.component.html @@ -1,19 +1,110 @@
    +

    Vo Overview + + +

    + + -
    -
    + + +
    +
    + Projects + +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Project IDProject NameDescriptionDate createdDays runningLifetime in DaysActions
    {{ project.Id }}{{ project.Name }}{{ project.Description }}{{ project.DateCreated }}{{ project.DaysRunning }}{{project.Lifetime * 30}} + +
    +
    +
    +
    + +
    + + -
    -
    -
    + + +
    - @@ -173,7 +206,10 @@
    Resources
    -
    +
    @@ -190,7 +226,11 @@
    Resources
    -
    +
    @@ -230,7 +270,10 @@
    Resources
    Resources
    -
    +
    @@ -246,19 +289,22 @@
    Resources
    How many VMs would you run simultaneously?
    -
    -
    - + + +

    Please note that if you can not find the user, he is not a member of the de.NBI @@ -226,6 +238,10 @@

    Add member to the project {{ addUserModalProjectID }} (click)="addMember(addUserModalProjectID,member['member_id'],member['firstName'],member['lastName'],UserModalFacility);filteredMembers=null;addUserModalProjectID = -1; addUserModal.hide();notificationModal.show();" class="btn btn-primary"> Add Member + {{member['firstName']}} {{member['lastName']}} diff --git a/src/app/projectmanagement/overview.component.ts b/src/app/projectmanagement/overview.component.ts index 873e3f0254..34f5240092 100644 --- a/src/app/projectmanagement/overview.component.ts +++ b/src/app/projectmanagement/overview.component.ts @@ -78,7 +78,8 @@ export class OverviewComponent { public updateUserProjects() { this.projects = []; - this.getUserProjects(this.groupsmanager, this.membersmanager, this.useresmanager); + + } @@ -174,6 +175,7 @@ export class OverviewComponent { } else { is_pi = true; } + this.groupservice.getShortame(group['id']).subscribe(name => { this.groupservice.getFacilityByGroup(group["id"]).subscribe(result => { let shortname= name['shortname'] @@ -208,8 +210,6 @@ export class OverviewComponent { else { this.projects.push(newProject); } - - }) }) @@ -253,16 +253,40 @@ export class OverviewComponent { this.usersModalProjectID = projectid; this.usersModalProjectName = projectname; this.usersModalProjectMembers = new Array(); - for (let member of members) { - let member_id = member["id"]; - let user_id = member["userId"]; - let fullName = member["user"]["firstName"] + " " + member["user"]["lastName"]; - this.usersModalProjectMembers.push(new ProjectMember(user_id, fullName, member_id)); - } + this.groupservice.getGroupAdminIds(projectid.toString()).subscribe(result => { + let admindIds = result['adminIds'] + for (let member of members) { + let member_id = member["id"]; + let user_id = member["userId"]; + let fullName = member["user"]["firstName"] + " " + member["user"]["lastName"]; + let projectMember = new ProjectMember(user_id, fullName, member_id); + if (admindIds.indexOf(user_id) != -1) { + projectMember.IsPi = true; + } + else { + projectMember.IsPi = false; + } + + + this.usersModalProjectMembers.push(projectMember); + + } + }) + }); } + isPi(member:ProjectMember):string{ + + if (member.IsPi){ + return 'blue' + } + else{return 'black'} + + } + + public showMembersOfTheProject(projectid: number, projectname: string, facility: [string, number]) { this.getMembesOfTheProject(projectid, projectname); if (facility[0] === 'None') { @@ -341,8 +365,58 @@ export class OverviewComponent { }); } - public removeMember(groupid: number, memberid: number, name: string, facility_id: number) { - this.groupservice.removeMember(groupid, memberid, facility_id).toPromise() + + public addAdmin(groupid: number, userid: number, firstName: string, lastName: string, facility_id: number) { + this.groupservice.addAdmin(groupid, userid, facility_id).toPromise() + .then(result => { + + if (result.status == 200) { + this.updateNotificaitonModal("Success", "Admin " + firstName + " " + lastName + " added.", true, "success"); + + } else { + this.updateNotificaitonModal("Failed", "Admin could not be added!", true, "danger"); + } + }).catch(error => { + this.updateNotificaitonModal("Failed", "Admin could not be added!", true, "danger"); + }); + } + + + public promoteAdmin(groupid: number, userid: number, username: string, facility_id: number) { + this.groupservice.addAdmin(groupid, userid, facility_id).toPromise() + .then(result => { + + if (result.status == 200) { + this.updateNotificaitonModal("Success", username + " promoted to Admin", true, "success"); + + } else { + this.updateNotificaitonModal("Failed", username + " could not be promoted to Admin!", true, "danger"); + } + }).catch(error => { + this.updateNotificaitonModal("Failed", username + " could not be promoted to Admin!", true, "danger"); + }); + } + + + + + public removeAdmin(groupid: number,userid:number, name: string, facility_id: number) { + this.groupservice.removeAdmin(groupid, userid, facility_id).toPromise() + .then(result => { + + if (result.status == 200) { + this.updateNotificaitonModal("Success", name + " was removed as Admin", true, "success"); + + } else { + this.updateNotificaitonModal("Failed", name + " could not be removed as Admin!", true, "danger"); + } + }).catch(error => { + this.updateNotificaitonModal("Failed", name + " could not be removed as Admin!", true, "danger"); + }); + } + + public removeMember(groupid: number, memberid: number,userid:number, name: string, facility_id: number) { + this.groupservice.removeMember(groupid, memberid,userid, facility_id).toPromise() .then(result => { if (result.status == 200) { diff --git a/src/app/projectmanagement/project_member.model.ts b/src/app/projectmanagement/project_member.model.ts index 5917d7b273..1d21c6c058 100644 --- a/src/app/projectmanagement/project_member.model.ts +++ b/src/app/projectmanagement/project_member.model.ts @@ -2,14 +2,23 @@ export class ProjectMember { private _Id: number; private _MemberId: number; private _Username: string; + private _IsPi: boolean; constructor(Id: number, Username: string, MemberId: number) { this._Id = Id; this._Username = Username; this._MemberId = MemberId; + } + + get IsPi():boolean{ + return this._IsPi; + } + set IsPi(value:boolean){ + this._IsPi=value; + } get Id(): number { return this._Id; } From 98ea8067103a82e2465643062f2515e89e839b09 Mon Sep 17 00:00:00 2001 From: DavidWein94 Date: Wed, 13 Jun 2018 22:50:40 +0200 Subject: [PATCH 131/148] Feat/freemium (#155) * feat(freemium): if project is freemium project it wont show optional params * feat(freemium):added freemium_group_id to environment --- src/app/virtualmachines/addvm.component.html | 6 +++--- src/app/virtualmachines/addvm.component.ts | 2 ++ src/environments/environment.prod.ts | 2 +- src/environments/environment.stage.ts | 2 +- src/environments/environment.ts | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/app/virtualmachines/addvm.component.html b/src/app/virtualmachines/addvm.component.html index 40c31191ce..7a7eb7b9a1 100755 --- a/src/app/virtualmachines/addvm.component.html +++ b/src/app/virtualmachines/addvm.component.html @@ -90,13 +90,13 @@

    -
    +
    {{selectedProjectVmsUsed}} / {{selectedProjectVmsMax}} Vms
    -
    +
    @@ -104,7 +104,7 @@ ShowHide
    -
    +
    diff --git a/src/app/virtualmachines/addvm.component.ts b/src/app/virtualmachines/addvm.component.ts index a0009ebda0..c650ec70bc 100644 --- a/src/app/virtualmachines/addvm.component.ts +++ b/src/app/virtualmachines/addvm.component.ts @@ -25,6 +25,7 @@ import {Application} from "../applications/application.model"; import {keyService} from "../api-connector/key.service"; import {Project} from "../projectmanagement/project.model"; import {GroupService} from "../api-connector/group.service"; +import {environment} from "../../environments/environment"; @Component({ selector: 'new-vm', @@ -52,6 +53,7 @@ export class VirtualMachineComponent implements OnInit { optional_params=false; diskspace:number=0; projects: string[] = new Array(); + FREEMIUM_ID=environment.freemium_project_id; private checkStatusTimeout: number = 5000; diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 4830c26688..950593599a 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,7 +1,7 @@ export const environment = { production: true, vo: 3335, - + freemium_project_id:-1, apiBaseUrl: 'https://cloud.denbi.de/portal/api/v0/', voRegistrationLink: 'https://perun.elixir-czech.cz/registrar/?vo=denbi', connectorBaseUrl : 'https://cloud.denbi.de/portal/connector/', diff --git a/src/environments/environment.stage.ts b/src/environments/environment.stage.ts index 14a454421e..0430ef0375 100644 --- a/src/environments/environment.stage.ts +++ b/src/environments/environment.stage.ts @@ -1,7 +1,7 @@ export const environment = { vo: 3334, production: true, - + freemium_project_id:10392, apiBaseUrl: 'https://portal-dev.denbi.de/portal/api/v0/', voRegistrationLink: 'https://perun.elixir-czech.cz/registrar/?vo=denbi-dev', connectorBaseUrl : 'https://portal-dev.denbi.de/portal/connector/' diff --git a/src/environments/environment.ts b/src/environments/environment.ts index feaeac0e96..1c02f883de 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -6,7 +6,7 @@ export const environment = { production: false, vo: 3334, - + freemium_project_id:10392, apiBaseUrl: 'https://portal-dev.denbi.de/api/v0/', voRegistrationLink: 'https://perun.elixir-czech.cz/registrar/?vo=denbi-dev', connectorBaseUrl : 'https://portal-dev.denbi.de/connector/' From 80f13b4a7e235466061b1dc8de530e826ebb35d4 Mon Sep 17 00:00:00 2001 From: DavidWein94 Date: Thu, 14 Jun 2018 13:05:09 +0200 Subject: [PATCH 132/148] refactor(mail):email to support (#157) --- src/app/projectmanagement/overview.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/projectmanagement/overview.component.ts b/src/app/projectmanagement/overview.component.ts index 34f5240092..3474f8f1d6 100644 --- a/src/app/projectmanagement/overview.component.ts +++ b/src/app/projectmanagement/overview.component.ts @@ -87,7 +87,7 @@ export class OverviewComponent { this.userservice.setUserFacilityPassword(facility).subscribe(result => { result = result.json() for (let key of details) { - if (key[0] == 'Email') { + if (key[0] == 'Support') { this.passwordModalEmail = key[1]; } } From 1f74552404f76712a86e7b7492b59e554c8a94ac Mon Sep 17 00:00:00 2001 From: pbelmann Date: Thu, 14 Jun 2018 16:43:40 +0200 Subject: [PATCH 133/148] Feature/split images (#148) * feat(submodule): webapp is now independent of cloud-api * feat(docker): add build arg * feat(docker): build image on dockerhub using hooks * fix(docker): fix shebang * feat(hooks): try to run build in one line * fix(Dockerfile): do not use cache * fix(Dockerfile): evaluate tag * feat(guard):if logged in registration, if not redirect to login (#153) * fix(typo):fixed typo * fix(typo):fixed typo --- Dockerfile | 36 +++++++++++++++++++++ hooks/build | 4 +++ hooks/env | 7 +++++ nginx/default.conf | 30 ++++++++++++++++++ src/app/member-guard.service.ts | 45 +++++++++++++++++---------- src/environments/environment.prod.ts | 1 + src/environments/environment.stage.ts | 3 +- src/environments/environment.ts | 3 +- 8 files changed, 111 insertions(+), 18 deletions(-) create mode 100644 Dockerfile create mode 100644 hooks/build create mode 100644 hooks/env create mode 100644 nginx/default.conf diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000000..50cb327591 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,36 @@ +### STAGE 1: Build ### + +# We label our stage as 'builder' +FROM node:6-alpine as builder + +ARG ANGULAR_MODE +ENV ANGULAR_MODE=${ANGULAR_MODE} + +COPY package.json ./ + +RUN npm set progress=false && npm config set depth 0 && npm cache clean --force + +## Storing node modules on a separate layer will prevent unnecessary npm installs at each build +RUN npm i && mkdir /ng-app && cp -R ./node_modules ./ng-app + +WORKDIR /ng-app + +COPY . . + +## Build the angular app in production mode and store the artifacts in dist folder +RUN $(npm bin)/ng build --env=${ANGULAR_MODE} --prod --build-optimizer + +### STAGE 2: Setup ### +FROM nginx:1.13.3-alpine + +## Copy our default nginx config +COPY nginx/default.conf /etc/nginx/conf.d/ + +## Remove default nginx website +RUN rm -rf /usr/share/nginx/html/* + +RUN mkdir -p /usr/share/nginx/html/portal/webapp +## From 'builder' stage copy over the artifacts in dist folder to default nginx public folder +COPY --from=builder /ng-app/dist /usr/share/nginx/html/portal/webapp + +CMD ["nginx", "-g", "daemon off;"] diff --git a/hooks/build b/hooks/build new file mode 100644 index 0000000000..a6796e17ae --- /dev/null +++ b/hooks/build @@ -0,0 +1,4 @@ +#!/bin/bash -xe + +. ./hooks/env +docker build --no-cache --build-arg "ANGULAR_MODE=${ANGULAR_MODE}" -t $IMAGE_NAME . diff --git a/hooks/env b/hooks/env new file mode 100644 index 0000000000..5bde6fa55c --- /dev/null +++ b/hooks/env @@ -0,0 +1,7 @@ +[ -n "$SOURCE_BRANCH" ] || SOURCE_BRANCH=$(git symbolic-ref -q --short HEAD) + +if [[ $SOURCE_BRANCH = "prod" ]] || [[ $SOURCE_BRANCH == *.*.* ]] ; then + ANGULAR_MODE="prod" +else + ANGULAR_MODE="stage" +fi diff --git a/nginx/default.conf b/nginx/default.conf new file mode 100644 index 0000000000..5c967f936b --- /dev/null +++ b/nginx/default.conf @@ -0,0 +1,30 @@ + + + +server { + + listen 80; + + sendfile on; + + default_type application/octet-stream; + + + gzip on; + gzip_http_version 1.1; + gzip_disable "MSIE [1-6]\."; + gzip_min_length 256; + gzip_vary on; + gzip_proxied expired no-cache no-store private auth; + gzip_types text/plain text/css application/json application/javascript application/x-javascript text/xml application/xml application/xml+rss text/javascript; + gzip_comp_level 9; + + + root /usr/share/nginx/html; + + + location / { + try_files $uri $uri/ /index.html =404; + } + +} diff --git a/src/app/member-guard.service.ts b/src/app/member-guard.service.ts index 7d18eb2102..193d132466 100644 --- a/src/app/member-guard.service.ts +++ b/src/app/member-guard.service.ts @@ -3,36 +3,49 @@ import {CanActivate, Router, RouterStateSnapshot, ActivatedRouteSnapshot} from " import {MembersManager} from "./perun-connector/members-manager.service"; import {AuthzResolver} from "./perun-connector/authz-resolver.service"; import {Observable} from "rxjs/Observable"; +import {environment} from "../environments/environment"; @Injectable() export class MemberGuardService implements CanActivate { - constructor(private router: Router, private authzresolver: AuthzResolver, private memberssmanager: MembersManager) { - } + constructor(private router: Router, private authzresolver: AuthzResolver, private memberssmanager: MembersManager) { + } - canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) { - return new Promise((resolve, reject) => { - this.authzresolver.getLoggedUser().toPromise() - .then(result => { - let res = result.json(); - return this.memberssmanager.getMemberByUser(res['id']).toPromise(); + canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) { + return new Promise((resolve, reject) => { + this.authzresolver.getLoggedUser().toPromise() + .then(result => { - }).then(memberinfo => { - return resolve(true); + let res = result.json(); + return res - }).catch(rejection => { - this.router.navigate(['/registration-info']); - resolve(false); + }).then(res => { - }); - }); + this.memberssmanager.getMemberByUser(res['id']).toPromise().then(memberinfo => { + return resolve(true); + }).catch(rejection => { - } + this.router.navigate(['/registration-info']); + resolve(false); + + }); + }).catch(rejection => { + + //this.router.navigate(['/portal']); + window.location.href=environment.login + resolve(false); + + }); + + }) + + + } } diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 950593599a..756a0559b5 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -5,4 +5,5 @@ export const environment = { apiBaseUrl: 'https://cloud.denbi.de/portal/api/v0/', voRegistrationLink: 'https://perun.elixir-czech.cz/registrar/?vo=denbi', connectorBaseUrl : 'https://cloud.denbi.de/portal/connector/', + login :'https://cloud.denbi.de/portal/' }; diff --git a/src/environments/environment.stage.ts b/src/environments/environment.stage.ts index 0430ef0375..ef0f32139a 100644 --- a/src/environments/environment.stage.ts +++ b/src/environments/environment.stage.ts @@ -4,5 +4,6 @@ export const environment = { freemium_project_id:10392, apiBaseUrl: 'https://portal-dev.denbi.de/portal/api/v0/', voRegistrationLink: 'https://perun.elixir-czech.cz/registrar/?vo=denbi-dev', - connectorBaseUrl : 'https://portal-dev.denbi.de/portal/connector/' + connectorBaseUrl : 'https://portal-dev.denbi.de/portal/connector/', + login: 'https://portal-dev.denbi.de/portal/' }; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 1c02f883de..ad44e2de8d 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -9,5 +9,6 @@ export const environment = { freemium_project_id:10392, apiBaseUrl: 'https://portal-dev.denbi.de/api/v0/', voRegistrationLink: 'https://perun.elixir-czech.cz/registrar/?vo=denbi-dev', - connectorBaseUrl : 'https://portal-dev.denbi.de/connector/' + connectorBaseUrl : 'https://portal-dev.denbi.de/connector/', + login: 'https://portal-dev.denbi.de/portal/' }; From 2f6bfc1053380179f696ed00b8b6f5294317374a Mon Sep 17 00:00:00 2001 From: DavidWein94 Date: Mon, 18 Jun 2018 22:19:32 +0200 Subject: [PATCH 134/148] Refactor/lifetime check (#156) * feat(lifetime):added momentjs to add months properly * feat(lifetime):also changed the other views --- package-lock.json | 9601 +++++++++++++++++ package.json | 2 +- .../applications/applications.component.html | 2 +- .../applications/applications.component.ts | 9 +- .../facilityprojectsoverview.component.html | 4 +- .../facilityprojectsoverview.component.ts | 14 +- .../projectmanagement/overview.component.html | 5 +- .../projectmanagement/overview.component.ts | 15 +- src/app/projectmanagement/project.model.ts | 7 + .../virtualmachines/vmClients.component.ts | 8 +- src/app/vo_manager/VoOverviewComponent.ts | 21 +- src/app/vo_manager/vo-guard.service.ts | 2 +- src/app/vo_manager/voOverview.component.html | 4 +- 13 files changed, 9665 insertions(+), 29 deletions(-) create mode 100644 package-lock.json diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000000..22e9c39439 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,9601 @@ +{ + "name": "coreui-angular", + "version": "1.0.0-alpha.6", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "@angular-devkit/build-optimizer": { + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.0.33.tgz", + "integrity": "sha512-qdGAwI3Yd3QIJ4FJsJcAyBVThUVEGKqSm0E3njSVSQkEatjvxHXNDvexBieQDPiUhjYG2Yyobor8nW5EMxPieQ==", + "dev": true, + "requires": { + "loader-utils": "1.1.0", + "source-map": "0.5.7", + "typescript": "2.3.3", + "webpack-sources": "1.0.2" + }, + "dependencies": { + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } + } + }, + "@angular-devkit/core": { + "version": "0.0.20", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.0.20.tgz", + "integrity": "sha512-lg5BvMxOfbVD//SOQvpq6TPIKTXYNMj0I9N/kfXbXkUGgiBGFLyFMf2fc+qNvDoa7lulKMPT8OJWS1YlGt93eg==", + "dev": true, + "requires": { + "source-map": "0.5.7" + }, + "dependencies": { + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } + } + }, + "@angular-devkit/schematics": { + "version": "0.0.35", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-0.0.35.tgz", + "integrity": "sha512-+qGUWhmMpHqHkYKMk1yKQDjXb/vqXGkzbMiRs/u5rSnlrH+/TzkCO0UsM7/p9WPcModuDxkf5FItpw/AgdcPeQ==", + "dev": true, + "requires": { + "@angular-devkit/core": "0.0.20", + "@ngtools/json-schema": "1.1.0", + "minimist": "1.2.0", + "rxjs": "5.5.2" + }, + "dependencies": { + "rxjs": { + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.2.tgz", + "integrity": "sha512-oRYoIKWBU3Ic37fLA5VJu31VqQO4bWubRntcHSJ+cwaDQBwdnZ9x4zmhJfm/nFQ2E82/I4loSioHnACamrKGgA==", + "dev": true, + "requires": { + "symbol-observable": "1.0.4" + } + } + } + }, + "@angular/cli": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-1.5.0.tgz", + "integrity": "sha512-nCXvqNCdi+8aOU2v6EABZsMg5bB7iM+wfaoWKnu9M5fOW2Rm+7/3Y1gDQKyFkgXCzXdy3J/xpfmwT0gjmjlvIA==", + "dev": true, + "requires": { + "@angular-devkit/build-optimizer": "0.0.33", + "@angular-devkit/schematics": "0.0.35", + "@ngtools/json-schema": "1.1.0", + "@ngtools/webpack": "1.8.0", + "@schematics/angular": "0.1.3", + "autoprefixer": "6.7.7", + "chalk": "2.2.2", + "circular-dependency-plugin": "3.0.0", + "common-tags": "1.4.0", + "copy-webpack-plugin": "4.2.0", + "core-object": "3.1.5", + "css-loader": "0.28.7", + "cssnano": "3.10.0", + "denodeify": "1.2.1", + "ember-cli-string-utils": "1.1.0", + "exports-loader": "0.6.4", + "extract-text-webpack-plugin": "3.0.0", + "file-loader": "1.1.5", + "fs-extra": "4.0.2", + "glob": "7.1.2", + "html-webpack-plugin": "2.30.1", + "istanbul-instrumenter-loader": "2.0.0", + "karma-source-map-support": "1.2.0", + "less": "2.7.3", + "less-loader": "4.0.5", + "license-webpack-plugin": "1.1.1", + "lodash": "4.17.4", + "memory-fs": "0.4.1", + "node-modules-path": "1.0.1", + "node-sass": "4.6.1", + "nopt": "4.0.1", + "opn": "5.1.0", + "portfinder": "1.0.13", + "postcss-custom-properties": "6.2.0", + "postcss-loader": "1.3.3", + "postcss-url": "5.1.2", + "raw-loader": "0.5.1", + "resolve": "1.5.0", + "rxjs": "5.5.2", + "sass-loader": "6.0.6", + "semver": "5.4.1", + "silent-error": "1.1.0", + "source-map-loader": "0.2.3", + "source-map-support": "0.4.18", + "style-loader": "0.13.2", + "stylus": "0.54.5", + "stylus-loader": "3.0.1", + "uglifyjs-webpack-plugin": "1.0.0", + "url-loader": "0.6.2", + "webpack": "3.8.1", + "webpack-concat-plugin": "1.4.0", + "webpack-dev-middleware": "1.12.0", + "webpack-dev-server": "2.9.4", + "webpack-merge": "4.1.1", + "webpack-sources": "1.0.2", + "webpack-subresource-integrity": "1.0.1", + "zone.js": "0.8.18" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", + "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + }, + "chalk": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.2.2.tgz", + "integrity": "sha512-LvixLAQ4MYhbf7hgL4o5PeK32gJKvVzDRiSNIApDofQvyhl8adgG2lJVXn4+ekQoK7HL9RF8lqxwerpe0x2pCw==", + "dev": true, + "requires": { + "ansi-styles": "3.2.0", + "escape-string-regexp": "1.0.5", + "supports-color": "4.5.0" + } + }, + "color-convert": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz", + "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "file-loader": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.1.5.tgz", + "integrity": "sha512-RzGHDatcVNpGISTvCpfUfOGpYuSR7HSsSg87ki+wF6rw1Hm0RALPTiAdsxAq1UwLf0RRhbe22/eHK6nhXspiOQ==", + "dev": true, + "requires": { + "loader-utils": "1.1.0", + "schema-utils": "0.3.0" + } + }, + "nopt": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz", + "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", + "dev": true, + "requires": { + "abbrev": "1.1.1", + "osenv": "0.1.4" + } + }, + "rxjs": { + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.2.tgz", + "integrity": "sha512-oRYoIKWBU3Ic37fLA5VJu31VqQO4bWubRntcHSJ+cwaDQBwdnZ9x4zmhJfm/nFQ2E82/I4loSioHnACamrKGgA==", + "dev": true, + "requires": { + "symbol-observable": "1.0.4" + } + }, + "supports-color": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } + }, + "url-loader": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.6.2.tgz", + "integrity": "sha512-h3qf9TNn53BpuXTTcpC+UehiRrl0Cv45Yr/xWayApjw6G8Bg2dGke7rIwDQ39piciWCWrC+WiqLjOh3SUp9n0Q==", + "dev": true, + "requires": { + "loader-utils": "1.1.0", + "mime": "1.4.1", + "schema-utils": "0.3.0" + } + }, + "zone.js": { + "version": "0.8.18", + "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.18.tgz", + "integrity": "sha512-knKOBQM0oea3/x9pdyDuDi7RhxDlJhOIkeixXSiTKWLgs4LpK37iBc+1HaHwzlciHUKT172CymJFKo8Xgh+44Q==", + "dev": true + } + } + }, + "@angular/common": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.1.3.tgz", + "integrity": "sha1-58R5HjITHPdMI5QowqZ9qrLu8Bc=" + }, + "@angular/compiler": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.1.3.tgz", + "integrity": "sha1-0t0whTsM9KVHWLSjFGMsIx+clMM=" + }, + "@angular/compiler-cli": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-4.1.3.tgz", + "integrity": "sha1-wjYv/fZXVkcUgfg5+rZ1vKwhP5Y=", + "dev": true, + "requires": { + "@angular/tsc-wrapped": "4.1.3", + "minimist": "1.2.0", + "reflect-metadata": "0.1.10" + } + }, + "@angular/core": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.1.3.tgz", + "integrity": "sha1-KFSY64arfQtvmC+Pn0h+9hABOzU=" + }, + "@angular/forms": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.1.3.tgz", + "integrity": "sha1-OAq0w6+ExdHXSMKn0EFRx9yOSYI=" + }, + "@angular/http": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/@angular/http/-/http-4.1.3.tgz", + "integrity": "sha1-650cMCoBcoFfmlczENm+C964Ra4=" + }, + "@angular/platform-browser": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.1.3.tgz", + "integrity": "sha1-T6HbURndF4sxXdrlsym+4akypb0=" + }, + "@angular/platform-browser-dynamic": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.1.3.tgz", + "integrity": "sha1-PBP9z1kdSH9u/cHUaRPygMbYwuw=" + }, + "@angular/router": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-4.1.3.tgz", + "integrity": "sha1-3a/UaufMyLH3SQT/tF85TkRiUhY=" + }, + "@angular/tsc-wrapped": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/@angular/tsc-wrapped/-/tsc-wrapped-4.1.3.tgz", + "integrity": "sha1-LWNyyRh78WIerNlguUs5xPlSk80=", + "dev": true, + "requires": { + "tsickle": "0.21.6" + } + }, + "@angular/upgrade": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/@angular/upgrade/-/upgrade-4.1.3.tgz", + "integrity": "sha1-j2g3MPATM1gmPpI3OcdA43fAhrc=" + }, + "@ngtools/json-schema": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@ngtools/json-schema/-/json-schema-1.1.0.tgz", + "integrity": "sha1-w6DFRNYjkqzCgTpCyKDcb1j4aSI=", + "dev": true + }, + "@ngtools/webpack": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-1.8.0.tgz", + "integrity": "sha512-QefALj8VUakHMI/Z/7RjyQR4UpAAfCXeoHqqD9+7Td3CZkuryyGQILqOSAg3d+cP+64iCwIb2jSKC+YAIy722Q==", + "dev": true, + "requires": { + "chalk": "2.2.2", + "enhanced-resolve": "3.4.1", + "loader-utils": "1.1.0", + "magic-string": "0.22.4", + "semver": "5.4.1", + "source-map": "0.5.7", + "tree-kill": "1.2.0" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", + "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + }, + "chalk": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.2.2.tgz", + "integrity": "sha512-LvixLAQ4MYhbf7hgL4o5PeK32gJKvVzDRiSNIApDofQvyhl8adgG2lJVXn4+ekQoK7HL9RF8lqxwerpe0x2pCw==", + "dev": true, + "requires": { + "ansi-styles": "3.2.0", + "escape-string-regexp": "1.0.5", + "supports-color": "4.5.0" + } + }, + "color-convert": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz", + "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + }, + "supports-color": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } + } + } + }, + "@schematics/angular": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-0.1.3.tgz", + "integrity": "sha512-om37dNp1/604/BMOi6JIj/hUoOgqATgxTy/mT97akXkiWejDtWAcEF8wJAiMFBEVtNLOBQhj+R4+7wKzOC4ALg==", + "dev": true, + "requires": { + "@angular-devkit/core": "0.0.20" + } + }, + "@types/jasmine": { + "version": "2.5.47", + "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.5.47.tgz", + "integrity": "sha1-u7qbzw6V54kMb0pHOU6LrKqWDrY=", + "dev": true + }, + "@types/node": { + "version": "7.0.22", + "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.22.tgz", + "integrity": "sha1-RZP02Ci91hKSlHjqQMZ7T0A8olU=", + "dev": true + }, + "@types/q": { + "version": "0.0.32", + "resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.32.tgz", + "integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=", + "dev": true + }, + "@types/selenium-webdriver": { + "version": "2.53.43", + "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-2.53.43.tgz", + "integrity": "sha512-UBYHWph6P3tutkbXpW6XYg9ZPbTKjw/YC2hGG1/GEvWwTbvezBUv3h+mmUFw79T3RFPnmedpiXdOBbXX+4l0jg==", + "dev": true + }, + "abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" + }, + "accepts": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz", + "integrity": "sha1-hiRnWMfdbSGmR0/whKR0DsBesh8=", + "dev": true, + "requires": { + "mime-types": "2.1.17", + "negotiator": "0.6.1" + } + }, + "acorn": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.2.1.tgz", + "integrity": "sha512-jG0u7c4Ly+3QkkW18V+NRDN+4bWHdln30NL1ZL2AvFZZmQe/BfopYCtghCKKVBUSetZ4QKcyA0pY6/4Gw8Pv8w==", + "dev": true + }, + "acorn-dynamic-import": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz", + "integrity": "sha1-x1K9IQvvZ5UBtsbLf8hPj0cVjMQ=", + "dev": true, + "requires": { + "acorn": "4.0.13" + }, + "dependencies": { + "acorn": { + "version": "4.0.13", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz", + "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=", + "dev": true + } + } + }, + "adm-zip": { + "version": "0.4.7", + "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz", + "integrity": "sha1-hgbCy/HEJs6MjsABdER/1Jtur8E=", + "dev": true + }, + "after": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz", + "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=", + "dev": true + }, + "agent-base": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz", + "integrity": "sha1-1t4Q1a9hMtW9aSQn1G/FOFOQlMc=", + "dev": true, + "requires": { + "extend": "3.0.1", + "semver": "5.0.3" + }, + "dependencies": { + "semver": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz", + "integrity": "sha1-d0Zt5YnNXTyV8TiqeLxWmjy10no=", + "dev": true + } + } + }, + "ajv": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz", + "integrity": "sha1-RBT/dKUIecII7l/cgm4ywwNUnto=", + "requires": { + "co": "4.6.0", + "fast-deep-equal": "1.0.0", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.3.1" + } + }, + "ajv-keywords": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz", + "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=", + "dev": true + }, + "align-text": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", + "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", + "dev": true, + "requires": { + "kind-of": "3.2.2", + "longest": "1.0.1", + "repeat-string": "1.6.1" + } + }, + "alphanum-sort": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz", + "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=", + "dev": true + }, + "amdefine": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", + "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" + }, + "angular2-modal": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/angular2-modal/-/angular2-modal-3.0.3.tgz", + "integrity": "sha512-1I1lO9NTeIBfwehrDfFVNLiTcCDIfzzCNj72mByCTdtP3oJgkx/s53yX2tV1r2Bg+v44GZjhDsWB5gxvGBKGnA==" + }, + "ansi-html": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz", + "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=", + "dev": true + }, + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + }, + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" + }, + "anymatch": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", + "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", + "dev": true, + "requires": { + "micromatch": "2.3.11", + "normalize-path": "2.1.1" + } + }, + "app-root-path": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.0.1.tgz", + "integrity": "sha1-zWLc+OT9WkF+/GZNLlsQZTxlG0Y=", + "dev": true + }, + "append-transform": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-0.4.0.tgz", + "integrity": "sha1-126/jKlNJ24keja61EpLdKthGZE=", + "dev": true, + "requires": { + "default-require-extensions": "1.0.0" + } + }, + "aproba": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", + "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" + }, + "are-we-there-yet": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz", + "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=", + "requires": { + "delegates": "1.0.0", + "readable-stream": "2.3.3" + } + }, + "argparse": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz", + "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=", + "dev": true, + "requires": { + "sprintf-js": "1.0.3" + } + }, + "arr-diff": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", + "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", + "dev": true, + "requires": { + "arr-flatten": "1.1.0" + } + }, + "arr-flatten": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", + "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", + "dev": true + }, + "array-find-index": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", + "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=" + }, + "array-flatten": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.1.tgz", + "integrity": "sha1-Qmu52oQJDBg42BLIFQryCoMx4pY=", + "dev": true + }, + "array-includes": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz", + "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=", + "dev": true, + "requires": { + "define-properties": "1.1.2", + "es-abstract": "1.9.0" + } + }, + "array-slice": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz", + "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=", + "dev": true + }, + "array-union": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", + "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", + "dev": true, + "requires": { + "array-uniq": "1.0.3" + } + }, + "array-uniq": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", + "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=", + "dev": true + }, + "array-unique": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", + "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", + "dev": true + }, + "arraybuffer.slice": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz", + "integrity": "sha1-8zshWfBTKj8xB6JywMz70a0peco=", + "dev": true + }, + "arrify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", + "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", + "dev": true + }, + "asap": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", + "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=", + "dev": true, + "optional": true + }, + "asn1": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", + "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=" + }, + "asn1.js": { + "version": "4.9.2", + "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.2.tgz", + "integrity": "sha512-b/OsSjvWEo8Pi8H0zsDd2P6Uqo2TK2pH8gNLSJtNLM2Db0v2QaAZ0pBQJXVjAn4gBuugeVDr7s63ZogpUIwWDg==", + "dev": true, + "requires": { + "bn.js": "4.11.8", + "inherits": "2.0.3", + "minimalistic-assert": "1.0.0" + } + }, + "assert": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz", + "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=", + "dev": true, + "requires": { + "util": "0.10.3" + } + }, + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + }, + "async": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz", + "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", + "dev": true, + "requires": { + "lodash": "4.17.4" + } + }, + "async-each": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz", + "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=", + "dev": true + }, + "async-foreach": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz", + "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=" + }, + "asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" + }, + "autoprefixer": { + "version": "6.7.7", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz", + "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=", + "dev": true, + "requires": { + "browserslist": "1.7.7", + "caniuse-db": "1.0.30000764", + "normalize-range": "0.1.2", + "num2fraction": "1.2.2", + "postcss": "5.2.18", + "postcss-value-parser": "3.3.0" + } + }, + "aws-sign2": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" + }, + "aws4": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz", + "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=" + }, + "babel-code-frame": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", + "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "esutils": "2.0.2", + "js-tokens": "3.0.2" + } + }, + "babel-generator": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.0.tgz", + "integrity": "sha1-rBriAHC3n248odMmlhMFN3TyDcU=", + "dev": true, + "requires": { + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "detect-indent": "4.0.0", + "jsesc": "1.3.0", + "lodash": "4.17.4", + "source-map": "0.5.7", + "trim-right": "1.0.1" + }, + "dependencies": { + "jsesc": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", + "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=", + "dev": true + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } + } + }, + "babel-messages": { + "version": "6.23.0", + "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", + "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0" + } + }, + "babel-runtime": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", + "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", + "dev": true, + "requires": { + "core-js": "2.4.1", + "regenerator-runtime": "0.11.0" + } + }, + "babel-template": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", + "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "lodash": "4.17.4" + } + }, + "babel-traverse": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", + "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", + "dev": true, + "requires": { + "babel-code-frame": "6.26.0", + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "debug": "2.6.9", + "globals": "9.18.0", + "invariant": "2.2.2", + "lodash": "4.17.4" + } + }, + "babel-types": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", + "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "esutils": "2.0.2", + "lodash": "4.17.4", + "to-fast-properties": "1.0.3" + } + }, + "babylon": { + "version": "6.18.0", + "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", + "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", + "dev": true + }, + "backo2": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz", + "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=", + "dev": true + }, + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + }, + "base64-arraybuffer": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz", + "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=", + "dev": true + }, + "base64-js": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz", + "integrity": "sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw==", + "dev": true + }, + "base64id": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz", + "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=", + "dev": true + }, + "batch": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz", + "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=", + "dev": true + }, + "bcrypt-pbkdf": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", + "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", + "optional": true, + "requires": { + "tweetnacl": "0.14.5" + } + }, + "better-assert": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz", + "integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=", + "dev": true, + "requires": { + "callsite": "1.0.0" + } + }, + "big.js": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz", + "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==", + "dev": true + }, + "binary-extensions": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.10.0.tgz", + "integrity": "sha1-muuabF6IY4qtFx4Wf1kAq+JINdA=", + "dev": true + }, + "blob": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz", + "integrity": "sha1-vPEwUspURj8w+fx+lbmkdjCpSSE=", + "dev": true + }, + "block-stream": { + "version": "0.0.9", + "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", + "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", + "requires": { + "inherits": "2.0.3" + } + }, + "blocking-proxy": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/blocking-proxy/-/blocking-proxy-0.0.5.tgz", + "integrity": "sha1-RikF4Nz76pcPQao3Ij3anAexkSs=", + "dev": true, + "requires": { + "minimist": "1.2.0" + } + }, + "bluebird": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", + "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==", + "dev": true + }, + "bn.js": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", + "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==", + "dev": true + }, + "body-parser": { + "version": "1.18.2", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz", + "integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=", + "dev": true, + "requires": { + "bytes": "3.0.0", + "content-type": "1.0.4", + "debug": "2.6.9", + "depd": "1.1.1", + "http-errors": "1.6.2", + "iconv-lite": "0.4.19", + "on-finished": "2.3.0", + "qs": "6.5.1", + "raw-body": "2.3.2", + "type-is": "1.6.15" + } + }, + "bonjour": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz", + "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=", + "dev": true, + "requires": { + "array-flatten": "2.1.1", + "deep-equal": "1.0.1", + "dns-equal": "1.0.0", + "dns-txt": "2.0.2", + "multicast-dns": "6.1.1", + "multicast-dns-service-types": "1.1.0" + } + }, + "boolbase": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", + "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=", + "dev": true + }, + "boom": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz", + "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=", + "requires": { + "hoek": "4.2.0" + } + }, + "brace-expansion": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", + "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + } + }, + "braces": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", + "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", + "dev": true, + "requires": { + "expand-range": "1.8.2", + "preserve": "0.2.0", + "repeat-element": "1.1.2" + } + }, + "brorand": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", + "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=", + "dev": true + }, + "browserify-aes": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.1.1.tgz", + "integrity": "sha512-UGnTYAnB2a3YuYKIRy1/4FB2HdM866E0qC46JXvVTYKlBlZlnvfpSfY6OKfXZAkv70eJ2a1SqzpAo5CRhZGDFg==", + "dev": true, + "requires": { + "buffer-xor": "1.0.3", + "cipher-base": "1.0.4", + "create-hash": "1.1.3", + "evp_bytestokey": "1.0.3", + "inherits": "2.0.3", + "safe-buffer": "5.1.1" + } + }, + "browserify-cipher": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz", + "integrity": "sha1-mYgkSHS/XtTijalWZtzWasj8Njo=", + "dev": true, + "requires": { + "browserify-aes": "1.1.1", + "browserify-des": "1.0.0", + "evp_bytestokey": "1.0.3" + } + }, + "browserify-des": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz", + "integrity": "sha1-2qJ3cXRwki7S/hhZQRihdUOXId0=", + "dev": true, + "requires": { + "cipher-base": "1.0.4", + "des.js": "1.0.0", + "inherits": "2.0.3" + } + }, + "browserify-rsa": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", + "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", + "dev": true, + "requires": { + "bn.js": "4.11.8", + "randombytes": "2.0.5" + } + }, + "browserify-sign": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz", + "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=", + "dev": true, + "requires": { + "bn.js": "4.11.8", + "browserify-rsa": "4.0.1", + "create-hash": "1.1.3", + "create-hmac": "1.1.6", + "elliptic": "6.4.0", + "inherits": "2.0.3", + "parse-asn1": "5.1.0" + } + }, + "browserify-zlib": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz", + "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=", + "dev": true, + "requires": { + "pako": "0.2.9" + } + }, + "browserslist": { + "version": "1.7.7", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz", + "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", + "dev": true, + "requires": { + "caniuse-db": "1.0.30000764", + "electron-to-chromium": "1.3.27" + } + }, + "buffer": { + "version": "4.9.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", + "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", + "dev": true, + "requires": { + "base64-js": "1.2.1", + "ieee754": "1.1.8", + "isarray": "1.0.0" + } + }, + "buffer-indexof": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz", + "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==", + "dev": true + }, + "buffer-xor": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", + "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=", + "dev": true + }, + "builtin-modules": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", + "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=" + }, + "builtin-status-codes": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", + "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=", + "dev": true + }, + "bytes": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", + "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=", + "dev": true + }, + "cacache": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.0.tgz", + "integrity": "sha512-s9h6I9NY3KcBjfuS28K6XNmrv/HNFSzlpVD6eYMXugZg3Y8jjI1lUzTeUMa0oKByCDtHfsIy5Ec7KgWRnC5gtg==", + "dev": true, + "requires": { + "bluebird": "3.5.1", + "chownr": "1.0.1", + "glob": "7.1.2", + "graceful-fs": "4.1.11", + "lru-cache": "4.1.1", + "mississippi": "1.3.0", + "mkdirp": "0.5.1", + "move-concurrently": "1.0.1", + "promise-inflight": "1.0.1", + "rimraf": "2.6.2", + "ssri": "5.0.0", + "unique-filename": "1.1.0", + "y18n": "3.2.1" + } + }, + "callsite": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz", + "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=", + "dev": true + }, + "camel-case": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz", + "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=", + "dev": true, + "requires": { + "no-case": "2.3.2", + "upper-case": "1.1.3" + } + }, + "camelcase": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", + "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=" + }, + "camelcase-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", + "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", + "requires": { + "camelcase": "2.1.1", + "map-obj": "1.0.1" + } + }, + "caniuse-api": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-1.6.1.tgz", + "integrity": "sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=", + "dev": true, + "requires": { + "browserslist": "1.7.7", + "caniuse-db": "1.0.30000764", + "lodash.memoize": "4.1.2", + "lodash.uniq": "4.5.0" + } + }, + "caniuse-db": { + "version": "1.0.30000764", + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000764.tgz", + "integrity": "sha1-1zqxGuYvap4vaYZ9bZwjrj8uXY0=", + "dev": true + }, + "caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" + }, + "center-align": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", + "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", + "dev": true, + "requires": { + "align-text": "0.1.4", + "lazy-cache": "1.0.4" + }, + "dependencies": { + "lazy-cache": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", + "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", + "dev": true + } + } + }, + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "requires": { + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" + } + }, + "charenc": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz", + "integrity": "sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=", + "dev": true + }, + "chart.js": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.5.0.tgz", + "integrity": "sha1-/m51Gok3afVucr7lrZEgfhxZKVc=", + "requires": { + "chartjs-color": "2.2.0", + "moment": "2.18.1" + } + }, + "chartjs-color": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/chartjs-color/-/chartjs-color-2.2.0.tgz", + "integrity": "sha1-hKL7dVeH7YXDndbdjHsdiEKbrq4=", + "requires": { + "chartjs-color-string": "0.5.0", + "color-convert": "0.5.3" + } + }, + "chartjs-color-string": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/chartjs-color-string/-/chartjs-color-string-0.5.0.tgz", + "integrity": "sha512-amWNvCOXlOUYxZVDSa0YOab5K/lmEhbFNKI55PWc4mlv28BDzA7zaoQTGxSBgJMHIW+hGX8YUrvw/FH4LyhwSQ==", + "requires": { + "color-name": "1.1.3" + } + }, + "chokidar": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz", + "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", + "dev": true, + "requires": { + "anymatch": "1.3.2", + "async-each": "1.0.1", + "glob-parent": "2.0.0", + "inherits": "2.0.3", + "is-binary-path": "1.0.1", + "is-glob": "2.0.1", + "path-is-absolute": "1.0.1", + "readdirp": "2.1.0" + }, + "dependencies": { + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", + "dev": true + }, + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "dev": true, + "requires": { + "is-extglob": "1.0.0" + } + } + } + }, + "chownr": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz", + "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=", + "dev": true + }, + "cipher-base": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", + "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", + "dev": true, + "requires": { + "inherits": "2.0.3", + "safe-buffer": "5.1.1" + } + }, + "circular-dependency-plugin": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-3.0.0.tgz", + "integrity": "sha1-m2hpLjWw41EJmNAWS2rlARvqV2A=", + "dev": true + }, + "clap": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.3.tgz", + "integrity": "sha512-4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA==", + "dev": true, + "requires": { + "chalk": "1.1.3" + } + }, + "clean-css": { + "version": "4.1.9", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.9.tgz", + "integrity": "sha1-Nc7ornaHpJuYA09w3gDE7dOCYwE=", + "dev": true, + "requires": { + "source-map": "0.5.7" + }, + "dependencies": { + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } + } + }, + "cliui": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", + "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", + "requires": { + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wrap-ansi": "2.1.0" + } + }, + "clone": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz", + "integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=", + "dev": true + }, + "clone-deep": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-0.3.0.tgz", + "integrity": "sha1-NIxhrpzb4O3+BT2R/0zFIdeQ7eg=", + "dev": true, + "requires": { + "for-own": "1.0.0", + "is-plain-object": "2.0.4", + "kind-of": "3.2.2", + "shallow-clone": "0.1.2" + } + }, + "co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=" + }, + "coa": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/coa/-/coa-1.0.4.tgz", + "integrity": "sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=", + "dev": true, + "requires": { + "q": "1.5.1" + } + }, + "code-point-at": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" + }, + "codelyzer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-3.0.1.tgz", + "integrity": "sha1-uma3sqpWT+n0XWAEtAA60s8RaCg=", + "dev": true, + "requires": { + "app-root-path": "2.0.1", + "css-selector-tokenizer": "0.7.0", + "cssauron": "1.4.0", + "semver-dsl": "1.0.1", + "source-map": "0.5.7", + "sprintf-js": "1.0.3" + }, + "dependencies": { + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } + } + }, + "color": { + "version": "0.11.4", + "resolved": "https://registry.npmjs.org/color/-/color-0.11.4.tgz", + "integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=", + "dev": true, + "requires": { + "clone": "1.0.3", + "color-convert": "1.9.1", + "color-string": "0.3.0" + }, + "dependencies": { + "color-convert": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz", + "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + } + } + }, + "color-convert": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz", + "integrity": "sha1-vbbGnOZg+t/+CwAHzER+G59ygr0=" + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" + }, + "color-string": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz", + "integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "colormin": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/colormin/-/colormin-1.1.2.tgz", + "integrity": "sha1-6i90IKcrlogaOKrlnsEkpvcpgTM=", + "dev": true, + "requires": { + "color": "0.11.4", + "css-color-names": "0.0.4", + "has": "1.0.1" + } + }, + "colors": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", + "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=", + "dev": true + }, + "combine-lists": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz", + "integrity": "sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=", + "dev": true, + "requires": { + "lodash": "4.17.4" + } + }, + "combined-stream": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", + "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=", + "requires": { + "delayed-stream": "1.0.0" + } + }, + "commander": { + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", + "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==", + "dev": true + }, + "common-tags": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.4.0.tgz", + "integrity": "sha1-EYe+Tz1M8MBCfUP3Tu8fc1AWFMA=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0" + } + }, + "commondir": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", + "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", + "dev": true + }, + "component-bind": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz", + "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=", + "dev": true + }, + "component-emitter": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz", + "integrity": "sha1-KWWU8nU9qmOZbSrwjRWpURbJrsM=", + "dev": true + }, + "component-inherit": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz", + "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=", + "dev": true + }, + "compressible": { + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.12.tgz", + "integrity": "sha1-xZpcmdt2dn6YdlAOJx72OzSTvWY=", + "dev": true, + "requires": { + "mime-db": "1.30.0" + } + }, + "compression": { + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.1.tgz", + "integrity": "sha1-7/JgPvwuIs+G810uuTWJ+YdTc9s=", + "dev": true, + "requires": { + "accepts": "1.3.4", + "bytes": "3.0.0", + "compressible": "2.0.12", + "debug": "2.6.9", + "on-headers": "1.0.1", + "safe-buffer": "5.1.1", + "vary": "1.1.2" + } + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + }, + "concat-stream": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz", + "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=", + "dev": true, + "requires": { + "inherits": "2.0.3", + "readable-stream": "2.3.3", + "typedarray": "0.0.6" + } + }, + "connect": { + "version": "3.6.5", + "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.5.tgz", + "integrity": "sha1-+43ee6B2OHfQ7J352sC0tA5yx9o=", + "dev": true, + "requires": { + "debug": "2.6.9", + "finalhandler": "1.0.6", + "parseurl": "1.3.2", + "utils-merge": "1.0.1" + }, + "dependencies": { + "finalhandler": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.6.tgz", + "integrity": "sha1-AHrqM9Gk0+QgF/YkhIrVjSEvgU8=", + "dev": true, + "requires": { + "debug": "2.6.9", + "encodeurl": "1.0.1", + "escape-html": "1.0.3", + "on-finished": "2.3.0", + "parseurl": "1.3.2", + "statuses": "1.3.1", + "unpipe": "1.0.0" + } + } + } + }, + "connect-history-api-fallback": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz", + "integrity": "sha1-sGhzk0vF40T+9hGhlqb6rgruAVo=", + "dev": true + }, + "console-browserify": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz", + "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=", + "dev": true, + "requires": { + "date-now": "0.1.4" + } + }, + "console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" + }, + "constants-browserify": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", + "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=", + "dev": true + }, + "content-disposition": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz", + "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=", + "dev": true + }, + "content-type": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", + "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", + "dev": true + }, + "convert-source-map": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz", + "integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=", + "dev": true + }, + "cookie": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", + "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=", + "dev": true + }, + "cookie-signature": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=", + "dev": true + }, + "copy-concurrently": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz", + "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==", + "dev": true, + "requires": { + "aproba": "1.2.0", + "fs-write-stream-atomic": "1.0.10", + "iferr": "0.1.5", + "mkdirp": "0.5.1", + "rimraf": "2.6.2", + "run-queue": "1.0.3" + } + }, + "copy-webpack-plugin": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.2.0.tgz", + "integrity": "sha512-eZERim02YjJcepLjrToQMapOoRLfiXewJi9zJON6xXNNJSUhkGzL1L/yFjOufS0KxsnWUzc2szg9t8ZaZKJXAg==", + "dev": true, + "requires": { + "bluebird": "3.5.1", + "fs-extra": "4.0.2", + "glob": "7.1.2", + "is-glob": "4.0.0", + "loader-utils": "0.2.17", + "lodash": "4.17.4", + "minimatch": "3.0.4", + "node-dir": "0.1.17" + }, + "dependencies": { + "loader-utils": { + "version": "0.2.17", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", + "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", + "dev": true, + "requires": { + "big.js": "3.2.0", + "emojis-list": "2.1.0", + "json5": "0.5.1", + "object-assign": "4.1.1" + } + } + } + }, + "core-js": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz", + "integrity": "sha1-TekR5mew6ukSTjQlS1OupvxhjT4=" + }, + "core-object": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/core-object/-/core-object-3.1.5.tgz", + "integrity": "sha512-sA2/4+/PZ/KV6CKgjrVrrUVBKCkdDO02CUlQ0YKTQoYUwPYNOtOAcWlbYhd5v/1JqYaA6oZ4sDlOU4ppVw6Wbg==", + "dev": true, + "requires": { + "chalk": "2.3.0" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", + "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + }, + "chalk": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", + "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", + "dev": true, + "requires": { + "ansi-styles": "3.2.0", + "escape-string-regexp": "1.0.5", + "supports-color": "4.5.0" + } + }, + "color-convert": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz", + "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "supports-color": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } + } + } + }, + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + }, + "cosmiconfig": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz", + "integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==", + "dev": true, + "requires": { + "is-directory": "0.3.1", + "js-yaml": "3.7.0", + "minimist": "1.2.0", + "object-assign": "4.1.1", + "os-homedir": "1.0.2", + "parse-json": "2.2.0", + "require-from-string": "1.2.1" + } + }, + "create-ecdh": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz", + "integrity": "sha1-iIxyNZbN92EvZJgjPuvXo1MBc30=", + "dev": true, + "requires": { + "bn.js": "4.11.8", + "elliptic": "6.4.0" + } + }, + "create-hash": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz", + "integrity": "sha1-YGBCrIuSYnUPSDyt2rD1gZFy2P0=", + "dev": true, + "requires": { + "cipher-base": "1.0.4", + "inherits": "2.0.3", + "ripemd160": "2.0.1", + "sha.js": "2.4.9" + } + }, + "create-hmac": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz", + "integrity": "sha1-rLniIaThe9sHbpBlfEK5PjcmzwY=", + "dev": true, + "requires": { + "cipher-base": "1.0.4", + "create-hash": "1.1.3", + "inherits": "2.0.3", + "ripemd160": "2.0.1", + "safe-buffer": "5.1.1", + "sha.js": "2.4.9" + } + }, + "cross-spawn": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz", + "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", + "requires": { + "lru-cache": "4.1.1", + "which": "1.3.0" + } + }, + "crypt": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz", + "integrity": "sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=", + "dev": true + }, + "cryptiles": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz", + "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=", + "requires": { + "boom": "5.2.0" + }, + "dependencies": { + "boom": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz", + "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==", + "requires": { + "hoek": "4.2.0" + } + } + } + }, + "crypto-browserify": { + "version": "3.12.0", + "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", + "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", + "dev": true, + "requires": { + "browserify-cipher": "1.0.0", + "browserify-sign": "4.0.4", + "create-ecdh": "4.0.0", + "create-hash": "1.1.3", + "create-hmac": "1.1.6", + "diffie-hellman": "5.0.2", + "inherits": "2.0.3", + "pbkdf2": "3.0.14", + "public-encrypt": "4.0.0", + "randombytes": "2.0.5", + "randomfill": "1.0.3" + } + }, + "css-color-names": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz", + "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=", + "dev": true + }, + "css-loader": { + "version": "0.28.7", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.7.tgz", + "integrity": "sha512-GxMpax8a/VgcfRrVy0gXD6yLd5ePYbXX/5zGgTVYp4wXtJklS8Z2VaUArJgc//f6/Dzil7BaJObdSv8eKKCPgg==", + "dev": true, + "requires": { + "babel-code-frame": "6.26.0", + "css-selector-tokenizer": "0.7.0", + "cssnano": "3.10.0", + "icss-utils": "2.1.0", + "loader-utils": "1.1.0", + "lodash.camelcase": "4.3.0", + "object-assign": "4.1.1", + "postcss": "5.2.18", + "postcss-modules-extract-imports": "1.1.0", + "postcss-modules-local-by-default": "1.2.0", + "postcss-modules-scope": "1.1.0", + "postcss-modules-values": "1.3.0", + "postcss-value-parser": "3.3.0", + "source-list-map": "2.0.0" + } + }, + "css-parse": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz", + "integrity": "sha1-Mh9s9zeCpv91ERE5D8BeLGV9jJs=", + "dev": true + }, + "css-select": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", + "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", + "dev": true, + "requires": { + "boolbase": "1.0.0", + "css-what": "2.1.0", + "domutils": "1.5.1", + "nth-check": "1.0.1" + } + }, + "css-selector-tokenizer": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz", + "integrity": "sha1-5piEdK6MlTR3v15+/s/OzNnPTIY=", + "dev": true, + "requires": { + "cssesc": "0.1.0", + "fastparse": "1.1.1", + "regexpu-core": "1.0.0" + } + }, + "css-what": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.0.tgz", + "integrity": "sha1-lGfQMsOM+u+58teVASUwYvh/ob0=", + "dev": true + }, + "cssauron": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/cssauron/-/cssauron-1.4.0.tgz", + "integrity": "sha1-pmAt/34EqDBtwNuaVR6S6LVmKtg=", + "dev": true, + "requires": { + "through": "2.3.8" + } + }, + "cssesc": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz", + "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=", + "dev": true + }, + "cssnano": { + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-3.10.0.tgz", + "integrity": "sha1-Tzj2zqK5sX+gFJDyPx3GjqZcHDg=", + "dev": true, + "requires": { + "autoprefixer": "6.7.7", + "decamelize": "1.2.0", + "defined": "1.0.0", + "has": "1.0.1", + "object-assign": "4.1.1", + "postcss": "5.2.18", + "postcss-calc": "5.3.1", + "postcss-colormin": "2.2.2", + "postcss-convert-values": "2.6.1", + "postcss-discard-comments": "2.0.4", + "postcss-discard-duplicates": "2.1.0", + "postcss-discard-empty": "2.1.0", + "postcss-discard-overridden": "0.1.1", + "postcss-discard-unused": "2.2.3", + "postcss-filter-plugins": "2.0.2", + "postcss-merge-idents": "2.1.7", + "postcss-merge-longhand": "2.0.2", + "postcss-merge-rules": "2.1.2", + "postcss-minify-font-values": "1.0.5", + "postcss-minify-gradients": "1.0.5", + "postcss-minify-params": "1.2.2", + "postcss-minify-selectors": "2.1.1", + "postcss-normalize-charset": "1.1.1", + "postcss-normalize-url": "3.0.8", + "postcss-ordered-values": "2.2.3", + "postcss-reduce-idents": "2.4.0", + "postcss-reduce-initial": "1.0.1", + "postcss-reduce-transforms": "1.0.4", + "postcss-svgo": "2.1.6", + "postcss-unique-selectors": "2.0.2", + "postcss-value-parser": "3.3.0", + "postcss-zindex": "2.2.0" + } + }, + "csso": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz", + "integrity": "sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=", + "dev": true, + "requires": { + "clap": "1.2.3", + "source-map": "0.5.7" + }, + "dependencies": { + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } + } + }, + "currently-unhandled": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", + "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", + "requires": { + "array-find-index": "1.0.2" + } + }, + "custom-event": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz", + "integrity": "sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=", + "dev": true + }, + "cyclist": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz", + "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=", + "dev": true + }, + "d": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz", + "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", + "dev": true, + "requires": { + "es5-ext": "0.10.35" + } + }, + "dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "requires": { + "assert-plus": "1.0.0" + } + }, + "date-now": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", + "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=", + "dev": true + }, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" + }, + "deep-equal": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz", + "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=", + "dev": true + }, + "default-require-extensions": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-1.0.0.tgz", + "integrity": "sha1-836hXT4T/9m0N9M+GnW1+5eHTLg=", + "dev": true, + "requires": { + "strip-bom": "2.0.0" + } + }, + "define-properties": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz", + "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=", + "dev": true, + "requires": { + "foreach": "2.0.5", + "object-keys": "1.0.11" + } + }, + "defined": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz", + "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=", + "dev": true + }, + "del": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz", + "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=", + "dev": true, + "requires": { + "globby": "6.1.0", + "is-path-cwd": "1.0.0", + "is-path-in-cwd": "1.0.0", + "p-map": "1.2.0", + "pify": "3.0.0", + "rimraf": "2.6.2" + }, + "dependencies": { + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true + } + } + }, + "delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" + }, + "delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" + }, + "denodeify": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/denodeify/-/denodeify-1.2.1.tgz", + "integrity": "sha1-OjYof1A05pnnV3kBBSwubJQlFjE=", + "dev": true + }, + "depd": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz", + "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=", + "dev": true + }, + "des.js": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz", + "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=", + "dev": true, + "requires": { + "inherits": "2.0.3", + "minimalistic-assert": "1.0.0" + } + }, + "destroy": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", + "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=", + "dev": true + }, + "detect-indent": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz", + "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", + "dev": true, + "requires": { + "repeating": "2.0.1" + } + }, + "detect-node": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.3.tgz", + "integrity": "sha1-ogM8CcyOFY03dI+951B4Mr1s4Sc=", + "dev": true + }, + "di": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz", + "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=", + "dev": true + }, + "diff": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.4.0.tgz", + "integrity": "sha512-QpVuMTEoJMF7cKzi6bvWhRulU1fZqZnvyVQgNhPaxxuTYwyjn/j1v9falseQ/uXWwPnO56RBfwtg4h/EQXmucA==", + "dev": true + }, + "diffie-hellman": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz", + "integrity": "sha1-tYNXOScM/ias9jIJn97SoH8gnl4=", + "dev": true, + "requires": { + "bn.js": "4.11.8", + "miller-rabin": "4.0.1", + "randombytes": "2.0.5" + } + }, + "directory-encoder": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/directory-encoder/-/directory-encoder-0.7.2.tgz", + "integrity": "sha1-WbTiqk8lQi9sY7UntGL14tDdLFg=", + "dev": true, + "requires": { + "fs-extra": "0.23.1", + "handlebars": "1.3.0", + "img-stats": "0.5.2" + }, + "dependencies": { + "fs-extra": { + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.23.1.tgz", + "integrity": "sha1-ZhHbpq3yq43Jxp+rN83fiBgVfj0=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "jsonfile": "2.4.0", + "path-is-absolute": "1.0.1", + "rimraf": "2.6.2" + } + }, + "jsonfile": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", + "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11" + } + } + } + }, + "dns-equal": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz", + "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=", + "dev": true + }, + "dns-packet": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.2.2.tgz", + "integrity": "sha512-kN+DjfGF7dJGUL7nWRktL9Z18t1rWP3aQlyZdY8XlpvU3Nc6GeFTQApftcjtWKxAZfiggZSGrCEoszNgvnpwDg==", + "dev": true, + "requires": { + "ip": "1.1.5", + "safe-buffer": "5.1.1" + } + }, + "dns-txt": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz", + "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=", + "dev": true, + "requires": { + "buffer-indexof": "1.1.1" + } + }, + "dom-converter": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.1.4.tgz", + "integrity": "sha1-pF71cnuJDJv/5tfIduexnLDhfzs=", + "dev": true, + "requires": { + "utila": "0.3.3" + }, + "dependencies": { + "utila": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/utila/-/utila-0.3.3.tgz", + "integrity": "sha1-1+jn1+MJEHCSsF+NloiCTWM6QiY=", + "dev": true + } + } + }, + "dom-serialize": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz", + "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=", + "dev": true, + "requires": { + "custom-event": "1.0.1", + "ent": "2.2.0", + "extend": "3.0.1", + "void-elements": "2.0.1" + } + }, + "dom-serializer": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz", + "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", + "dev": true, + "requires": { + "domelementtype": "1.1.3", + "entities": "1.1.1" + }, + "dependencies": { + "domelementtype": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", + "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=", + "dev": true + } + } + }, + "domain-browser": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz", + "integrity": "sha1-hnqksJP6oF8d4IwG9NeyH9+GmLw=", + "dev": true + }, + "domelementtype": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz", + "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=", + "dev": true + }, + "domhandler": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.1.0.tgz", + "integrity": "sha1-0mRvXlf2w7qxHPbLBdPArPdBJZQ=", + "dev": true, + "requires": { + "domelementtype": "1.3.0" + } + }, + "domutils": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", + "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", + "dev": true, + "requires": { + "dom-serializer": "0.1.0", + "domelementtype": "1.3.0" + } + }, + "duplexify": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz", + "integrity": "sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ==", + "dev": true, + "requires": { + "end-of-stream": "1.4.0", + "inherits": "2.0.3", + "readable-stream": "2.3.3", + "stream-shift": "1.0.0" + } + }, + "ecc-jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", + "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", + "optional": true, + "requires": { + "jsbn": "0.1.1" + } + }, + "ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=", + "dev": true + }, + "ejs": { + "version": "2.5.7", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.5.7.tgz", + "integrity": "sha1-zIcsFoiArjxxiXYv1f/ACJbJUYo=", + "dev": true + }, + "electron-to-chromium": { + "version": "1.3.27", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz", + "integrity": "sha1-eOy4o5kGYYe7N07t412ccFZagD0=", + "dev": true + }, + "elliptic": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz", + "integrity": "sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=", + "dev": true, + "requires": { + "bn.js": "4.11.8", + "brorand": "1.1.0", + "hash.js": "1.1.3", + "hmac-drbg": "1.0.1", + "inherits": "2.0.3", + "minimalistic-assert": "1.0.0", + "minimalistic-crypto-utils": "1.0.1" + } + }, + "ember-cli-string-utils": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/ember-cli-string-utils/-/ember-cli-string-utils-1.1.0.tgz", + "integrity": "sha1-ObZ3/CgF9VFzc1N2/O8njqpEUqE=", + "dev": true + }, + "emojis-list": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz", + "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=", + "dev": true + }, + "encodeurl": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz", + "integrity": "sha1-eePVhlU0aQn+bw9Fpd5oEDspTSA=", + "dev": true + }, + "end-of-stream": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz", + "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=", + "dev": true, + "requires": { + "once": "1.4.0" + } + }, + "engine.io": { + "version": "1.8.3", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-1.8.3.tgz", + "integrity": "sha1-jef5eJXSDTm4X4ju7nd7K9QrE9Q=", + "dev": true, + "requires": { + "accepts": "1.3.3", + "base64id": "1.0.0", + "cookie": "0.3.1", + "debug": "2.3.3", + "engine.io-parser": "1.3.2", + "ws": "1.1.2" + }, + "dependencies": { + "accepts": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz", + "integrity": "sha1-w8p0NJOGSMPg2cHjKN1otiLChMo=", + "dev": true, + "requires": { + "mime-types": "2.1.17", + "negotiator": "0.6.1" + } + }, + "debug": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", + "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", + "dev": true, + "requires": { + "ms": "0.7.2" + } + }, + "ms": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", + "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", + "dev": true + } + } + }, + "engine.io-client": { + "version": "1.8.3", + "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.3.tgz", + "integrity": "sha1-F5jtk0USRkU9TG9jXXogH+lA1as=", + "dev": true, + "requires": { + "component-emitter": "1.2.1", + "component-inherit": "0.0.3", + "debug": "2.3.3", + "engine.io-parser": "1.3.2", + "has-cors": "1.1.0", + "indexof": "0.0.1", + "parsejson": "0.0.3", + "parseqs": "0.0.5", + "parseuri": "0.0.5", + "ws": "1.1.2", + "xmlhttprequest-ssl": "1.5.3", + "yeast": "0.1.2" + }, + "dependencies": { + "component-emitter": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", + "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", + "dev": true + }, + "debug": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", + "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", + "dev": true, + "requires": { + "ms": "0.7.2" + } + }, + "ms": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", + "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", + "dev": true + } + } + }, + "engine.io-parser": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.2.tgz", + "integrity": "sha1-k3sHnwAH0Ik+xW1GyyILjLQ1Igo=", + "dev": true, + "requires": { + "after": "0.8.2", + "arraybuffer.slice": "0.0.6", + "base64-arraybuffer": "0.1.5", + "blob": "0.0.4", + "has-binary": "0.1.7", + "wtf-8": "1.0.0" + } + }, + "enhanced-resolve": { + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz", + "integrity": "sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "memory-fs": "0.4.1", + "object-assign": "4.1.1", + "tapable": "0.2.8" + } + }, + "ent": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz", + "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=", + "dev": true + }, + "entities": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz", + "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=", + "dev": true + }, + "errno": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz", + "integrity": "sha1-uJbiOp5ei6M4cfyZar02NfyaHH0=", + "dev": true, + "requires": { + "prr": "0.0.0" + } + }, + "error-ex": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", + "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", + "requires": { + "is-arrayish": "0.2.1" + } + }, + "es-abstract": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.9.0.tgz", + "integrity": "sha512-kk3IJoKo7A3pWJc0OV8yZ/VEX2oSUytfekrJiqoxBlKJMFAJVJVpGdHClCCTdv+Fn2zHfpDHHIelMFhZVfef3Q==", + "dev": true, + "requires": { + "es-to-primitive": "1.1.1", + "function-bind": "1.1.1", + "has": "1.0.1", + "is-callable": "1.1.3", + "is-regex": "1.0.4" + } + }, + "es-to-primitive": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz", + "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=", + "dev": true, + "requires": { + "is-callable": "1.1.3", + "is-date-object": "1.0.1", + "is-symbol": "1.0.1" + } + }, + "es5-ext": { + "version": "0.10.35", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.35.tgz", + "integrity": "sha1-GO6FjOajxFx9eekcFfzKnsVoSU8=", + "dev": true, + "requires": { + "es6-iterator": "2.0.3", + "es6-symbol": "3.1.1" + } + }, + "es6-iterator": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", + "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", + "dev": true, + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.35", + "es6-symbol": "3.1.1" + } + }, + "es6-map": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz", + "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=", + "dev": true, + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.35", + "es6-iterator": "2.0.3", + "es6-set": "0.1.5", + "es6-symbol": "3.1.1", + "event-emitter": "0.3.5" + } + }, + "es6-set": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz", + "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=", + "dev": true, + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.35", + "es6-iterator": "2.0.3", + "es6-symbol": "3.1.1", + "event-emitter": "0.3.5" + } + }, + "es6-symbol": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz", + "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", + "dev": true, + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.35" + } + }, + "es6-weak-map": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz", + "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=", + "dev": true, + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.35", + "es6-iterator": "2.0.3", + "es6-symbol": "3.1.1" + } + }, + "escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=", + "dev": true + }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" + }, + "escope": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz", + "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=", + "dev": true, + "requires": { + "es6-map": "0.1.5", + "es6-weak-map": "2.0.2", + "esrecurse": "4.2.0", + "estraverse": "4.2.0" + } + }, + "esprima": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", + "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=", + "dev": true + }, + "esrecurse": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz", + "integrity": "sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=", + "dev": true, + "requires": { + "estraverse": "4.2.0", + "object-assign": "4.1.1" + } + }, + "estraverse": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", + "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", + "dev": true + }, + "esutils": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", + "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", + "dev": true + }, + "etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", + "dev": true + }, + "event-emitter": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", + "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", + "dev": true, + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.35" + } + }, + "eventemitter3": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz", + "integrity": "sha1-HIaZHYFq0eUEdQ5zh0Ik7PO+xQg=", + "dev": true + }, + "events": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz", + "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=", + "dev": true + }, + "eventsource": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-0.1.6.tgz", + "integrity": "sha1-Cs7ehJ7X3RzMMsgRuxG5RNTykjI=", + "dev": true, + "requires": { + "original": "1.0.0" + } + }, + "evp_bytestokey": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", + "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", + "dev": true, + "requires": { + "md5.js": "1.3.4", + "safe-buffer": "5.1.1" + } + }, + "execa": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", + "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", + "dev": true, + "requires": { + "cross-spawn": "5.1.0", + "get-stream": "3.0.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", + "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", + "dev": true, + "requires": { + "lru-cache": "4.1.1", + "shebang-command": "1.2.0", + "which": "1.3.0" + } + } + } + }, + "exit": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", + "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=", + "dev": true + }, + "expand-braces": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz", + "integrity": "sha1-SIsdHSRRyz06axks/AMPRMWFX+o=", + "dev": true, + "requires": { + "array-slice": "0.2.3", + "array-unique": "0.2.1", + "braces": "0.1.5" + }, + "dependencies": { + "braces": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz", + "integrity": "sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=", + "dev": true, + "requires": { + "expand-range": "0.1.1" + } + }, + "expand-range": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz", + "integrity": "sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=", + "dev": true, + "requires": { + "is-number": "0.1.1", + "repeat-string": "0.2.2" + } + }, + "is-number": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz", + "integrity": "sha1-aaevEWlj1HIG7JvZtIoUIW8eOAY=", + "dev": true + }, + "repeat-string": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz", + "integrity": "sha1-x6jTI2BoNiBZp+RlH8aITosftK4=", + "dev": true + } + } + }, + "expand-brackets": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", + "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", + "dev": true, + "requires": { + "is-posix-bracket": "0.1.1" + } + }, + "expand-range": { + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", + "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", + "dev": true, + "requires": { + "fill-range": "2.2.3" + } + }, + "exports-loader": { + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/exports-loader/-/exports-loader-0.6.4.tgz", + "integrity": "sha1-1w/GEhl1s1/BKDDPUnVL4nQPyIY=", + "dev": true, + "requires": { + "loader-utils": "1.1.0", + "source-map": "0.5.7" + }, + "dependencies": { + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } + } + }, + "express": { + "version": "4.16.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.16.2.tgz", + "integrity": "sha1-41xt/i1kt9ygpc1PIXgb4ymeB2w=", + "dev": true, + "requires": { + "accepts": "1.3.4", + "array-flatten": "1.1.1", + "body-parser": "1.18.2", + "content-disposition": "0.5.2", + "content-type": "1.0.4", + "cookie": "0.3.1", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "1.1.1", + "encodeurl": "1.0.1", + "escape-html": "1.0.3", + "etag": "1.8.1", + "finalhandler": "1.1.0", + "fresh": "0.5.2", + "merge-descriptors": "1.0.1", + "methods": "1.1.2", + "on-finished": "2.3.0", + "parseurl": "1.3.2", + "path-to-regexp": "0.1.7", + "proxy-addr": "2.0.2", + "qs": "6.5.1", + "range-parser": "1.2.0", + "safe-buffer": "5.1.1", + "send": "0.16.1", + "serve-static": "1.13.1", + "setprototypeof": "1.1.0", + "statuses": "1.3.1", + "type-is": "1.6.15", + "utils-merge": "1.0.1", + "vary": "1.1.2" + }, + "dependencies": { + "array-flatten": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=", + "dev": true + } + } + }, + "extend": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", + "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=" + }, + "extglob": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", + "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", + "dev": true, + "requires": { + "is-extglob": "1.0.0" + }, + "dependencies": { + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", + "dev": true + } + } + }, + "extract-text-webpack-plugin": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.0.tgz", + "integrity": "sha1-kMqnkHvESfM1AF46x1MrQbAN5hI=", + "dev": true, + "requires": { + "async": "2.6.0", + "loader-utils": "1.1.0", + "schema-utils": "0.3.0", + "webpack-sources": "1.0.2" + } + }, + "extsprintf": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" + }, + "fast-deep-equal": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz", + "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=" + }, + "fast-json-stable-stringify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", + "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=" + }, + "fastparse": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.1.tgz", + "integrity": "sha1-0eJkOzipTXWDtHkGDmxK/8lAcfg=", + "dev": true + }, + "faye-websocket": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz", + "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=", + "dev": true, + "requires": { + "websocket-driver": "0.7.0" + } + }, + "file-loader": { + "version": "0.10.1", + "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.10.1.tgz", + "integrity": "sha1-gVA0EZiR/GRB+1pkwRvJPCLd2EI=", + "dev": true, + "requires": { + "loader-utils": "1.1.0" + } + }, + "filename-regex": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", + "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=", + "dev": true + }, + "fileset": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/fileset/-/fileset-2.0.3.tgz", + "integrity": "sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=", + "dev": true, + "requires": { + "glob": "7.1.2", + "minimatch": "3.0.4" + } + }, + "fill-range": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", + "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=", + "dev": true, + "requires": { + "is-number": "2.1.0", + "isobject": "2.1.0", + "randomatic": "1.1.7", + "repeat-element": "1.1.2", + "repeat-string": "1.6.1" + }, + "dependencies": { + "isobject": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", + "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", + "dev": true, + "requires": { + "isarray": "1.0.0" + } + } + } + }, + "finalhandler": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz", + "integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=", + "dev": true, + "requires": { + "debug": "2.6.9", + "encodeurl": "1.0.1", + "escape-html": "1.0.3", + "on-finished": "2.3.0", + "parseurl": "1.3.2", + "statuses": "1.3.1", + "unpipe": "1.0.0" + } + }, + "find-cache-dir": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz", + "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=", + "dev": true, + "requires": { + "commondir": "1.0.1", + "make-dir": "1.1.0", + "pkg-dir": "2.0.0" + } + }, + "find-up": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", + "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", + "requires": { + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" + } + }, + "flatten": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz", + "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=", + "dev": true + }, + "flush-write-stream": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.2.tgz", + "integrity": "sha1-yBuQ2HRnZvGmCaRoCZRsRd2K5Bc=", + "dev": true, + "requires": { + "inherits": "2.0.3", + "readable-stream": "2.3.3" + } + }, + "for-in": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", + "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", + "dev": true + }, + "for-own": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", + "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", + "dev": true, + "requires": { + "for-in": "1.0.2" + } + }, + "foreach": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", + "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=", + "dev": true + }, + "forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" + }, + "form-data": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz", + "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=", + "requires": { + "asynckit": "0.4.0", + "combined-stream": "1.0.5", + "mime-types": "2.1.17" + } + }, + "forwarded": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", + "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=", + "dev": true + }, + "fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=", + "dev": true + }, + "from2": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", + "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", + "dev": true, + "requires": { + "inherits": "2.0.3", + "readable-stream": "2.3.3" + } + }, + "fs-access": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz", + "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=", + "dev": true, + "requires": { + "null-check": "1.0.0" + } + }, + "fs-extra": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.2.tgz", + "integrity": "sha1-+RcExT0bRh+JNFKwwwfZmXZHq2s=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "jsonfile": "4.0.0", + "universalify": "0.1.1" + } + }, + "fs-write-stream-atomic": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz", + "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "iferr": "0.1.5", + "imurmurhash": "0.1.4", + "readable-stream": "2.3.3" + } + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + }, + "fstream": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz", + "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=", + "requires": { + "graceful-fs": "4.1.11", + "inherits": "2.0.3", + "mkdirp": "0.5.1", + "rimraf": "2.6.2" + } + }, + "function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "dev": true + }, + "gauge": { + "version": "2.7.4", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", + "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", + "requires": { + "aproba": "1.2.0", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.2" + } + }, + "gaze": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.2.tgz", + "integrity": "sha1-hHIkZ3rbiHDWeSV+0ziP22HkAQU=", + "requires": { + "globule": "1.2.0" + } + }, + "get-caller-file": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", + "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=" + }, + "get-stdin": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", + "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=" + }, + "get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", + "dev": true + }, + "getpass": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "requires": { + "assert-plus": "1.0.0" + } + }, + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "glob-base": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", + "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", + "dev": true, + "requires": { + "glob-parent": "2.0.0", + "is-glob": "2.0.1" + }, + "dependencies": { + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", + "dev": true + }, + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "dev": true, + "requires": { + "is-extglob": "1.0.0" + } + } + } + }, + "glob-parent": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", + "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", + "dev": true, + "requires": { + "is-glob": "2.0.1" + }, + "dependencies": { + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", + "dev": true + }, + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "dev": true, + "requires": { + "is-extglob": "1.0.0" + } + } + } + }, + "globals": { + "version": "9.18.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", + "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", + "dev": true + }, + "globby": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", + "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", + "dev": true, + "requires": { + "array-union": "1.0.2", + "glob": "7.1.2", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" + } + }, + "globule": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.0.tgz", + "integrity": "sha1-HcScaCLdnoovoAuiopUAboZkvQk=", + "requires": { + "glob": "7.1.2", + "lodash": "4.17.4", + "minimatch": "3.0.4" + } + }, + "graceful-fs": { + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", + "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=" + }, + "handle-thing": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-1.2.5.tgz", + "integrity": "sha1-/Xqtcmvxpf0W38KbL3pmAdJxOcQ=", + "dev": true + }, + "handlebars": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-1.3.0.tgz", + "integrity": "sha1-npsTCpPjiUkTItl1zz7BgYw3zjQ=", + "dev": true, + "requires": { + "optimist": "0.3.7", + "uglify-js": "2.3.6" + }, + "dependencies": { + "async": { + "version": "0.2.10", + "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz", + "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=", + "dev": true, + "optional": true + }, + "source-map": { + "version": "0.1.43", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", + "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", + "dev": true, + "optional": true, + "requires": { + "amdefine": "1.0.1" + } + }, + "uglify-js": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz", + "integrity": "sha1-+gmEdwtCi3qbKoBY9GNV0U/vIRo=", + "dev": true, + "optional": true, + "requires": { + "async": "0.2.10", + "optimist": "0.3.7", + "source-map": "0.1.43" + } + } + } + }, + "har-schema": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" + }, + "har-validator": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz", + "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", + "requires": { + "ajv": "5.3.0", + "har-schema": "2.0.0" + } + }, + "has": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz", + "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=", + "dev": true, + "requires": { + "function-bind": "1.1.1" + } + }, + "has-ansi": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "requires": { + "ansi-regex": "2.1.1" + } + }, + "has-binary": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz", + "integrity": "sha1-aOYesWIQyVRaClzOBqhzkS/h5ow=", + "dev": true, + "requires": { + "isarray": "0.0.1" + }, + "dependencies": { + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + } + } + }, + "has-cors": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz", + "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=", + "dev": true + }, + "has-flag": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", + "dev": true + }, + "has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" + }, + "hash-base": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz", + "integrity": "sha1-ZuodhW206KVHDK32/OI65SRO8uE=", + "dev": true, + "requires": { + "inherits": "2.0.3" + } + }, + "hash.js": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz", + "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==", + "dev": true, + "requires": { + "inherits": "2.0.3", + "minimalistic-assert": "1.0.0" + } + }, + "hawk": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz", + "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==", + "requires": { + "boom": "4.3.1", + "cryptiles": "3.1.2", + "hoek": "4.2.0", + "sntp": "2.1.0" + } + }, + "he": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", + "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=", + "dev": true + }, + "hmac-drbg": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", + "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", + "dev": true, + "requires": { + "hash.js": "1.1.3", + "minimalistic-assert": "1.0.0", + "minimalistic-crypto-utils": "1.0.1" + } + }, + "hoek": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz", + "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==" + }, + "hosted-git-info": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", + "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==" + }, + "hpack.js": { + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz", + "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=", + "dev": true, + "requires": { + "inherits": "2.0.3", + "obuf": "1.1.1", + "readable-stream": "2.3.3", + "wbuf": "1.7.2" + } + }, + "html-comment-regex": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.1.tgz", + "integrity": "sha1-ZouTd26q5V696POtRkswekljYl4=", + "dev": true + }, + "html-entities": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz", + "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=", + "dev": true + }, + "html-minifier": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.6.tgz", + "integrity": "sha512-88FjtKrlak2XjczhxrBomgzV4jmGzM3UnHRBScRkJcmcRum0kb+IwhVAETJ8AVp7j0p3xugjSaw9L+RmI5/QOA==", + "dev": true, + "requires": { + "camel-case": "3.0.0", + "clean-css": "4.1.9", + "commander": "2.11.0", + "he": "1.1.1", + "ncname": "1.0.0", + "param-case": "2.1.1", + "relateurl": "0.2.7", + "uglify-js": "3.1.9" + } + }, + "html-webpack-plugin": { + "version": "2.30.1", + "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-2.30.1.tgz", + "integrity": "sha1-f5xCG36pHsRg9WUn1430hO51N9U=", + "dev": true, + "requires": { + "bluebird": "3.5.1", + "html-minifier": "3.5.6", + "loader-utils": "0.2.17", + "lodash": "4.17.4", + "pretty-error": "2.1.1", + "toposort": "1.0.6" + }, + "dependencies": { + "loader-utils": { + "version": "0.2.17", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", + "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", + "dev": true, + "requires": { + "big.js": "3.2.0", + "emojis-list": "2.1.0", + "json5": "0.5.1", + "object-assign": "4.1.1" + } + } + } + }, + "htmlparser2": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.3.0.tgz", + "integrity": "sha1-zHDQWln2VC5D8OaFyYLhTJJKnv4=", + "dev": true, + "requires": { + "domelementtype": "1.3.0", + "domhandler": "2.1.0", + "domutils": "1.1.6", + "readable-stream": "1.0.34" + }, + "dependencies": { + "domutils": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.1.6.tgz", + "integrity": "sha1-vdw94Jm5ou+sxRxiPyj0FuzFdIU=", + "dev": true, + "requires": { + "domelementtype": "1.3.0" + } + }, + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + }, + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true + } + } + }, + "http-deceiver": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz", + "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=", + "dev": true + }, + "http-errors": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz", + "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=", + "dev": true, + "requires": { + "depd": "1.1.1", + "inherits": "2.0.3", + "setprototypeof": "1.0.3", + "statuses": "1.3.1" + }, + "dependencies": { + "setprototypeof": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz", + "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=", + "dev": true + } + } + }, + "http-parser-js": { + "version": "0.4.9", + "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.9.tgz", + "integrity": "sha1-6hoE+2St/wJC6ZdPKX3Uw8rSceE=", + "dev": true + }, + "http-proxy": { + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz", + "integrity": "sha1-Bt/ykpUr9k2+hHH6nfcwZtTzd0I=", + "dev": true, + "requires": { + "eventemitter3": "1.2.0", + "requires-port": "1.0.0" + } + }, + "http-proxy-middleware": { + "version": "0.17.4", + "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.17.4.tgz", + "integrity": "sha1-ZC6ISIUdZvCdTxJJEoRtuutBuDM=", + "dev": true, + "requires": { + "http-proxy": "1.16.2", + "is-glob": "3.1.0", + "lodash": "4.17.4", + "micromatch": "2.3.11" + }, + "dependencies": { + "is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "dev": true, + "requires": { + "is-extglob": "2.1.1" + } + } + } + }, + "http-signature": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", + "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", + "requires": { + "assert-plus": "1.0.0", + "jsprim": "1.4.1", + "sshpk": "1.13.1" + } + }, + "https-browserify": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz", + "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=", + "dev": true + }, + "https-proxy-agent": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz", + "integrity": "sha1-NffabEjOTdv6JkiRrFk+5f+GceY=", + "dev": true, + "requires": { + "agent-base": "2.1.1", + "debug": "2.6.9", + "extend": "3.0.1" + } + }, + "iconv-lite": { + "version": "0.4.19", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", + "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==", + "dev": true + }, + "icss-replace-symbols": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz", + "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=", + "dev": true + }, + "icss-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-2.1.0.tgz", + "integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=", + "dev": true, + "requires": { + "postcss": "6.0.14" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", + "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + }, + "chalk": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", + "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", + "dev": true, + "requires": { + "ansi-styles": "3.2.0", + "escape-string-regexp": "1.0.5", + "supports-color": "4.5.0" + } + }, + "color-convert": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz", + "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "postcss": { + "version": "6.0.14", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz", + "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==", + "dev": true, + "requires": { + "chalk": "2.3.0", + "source-map": "0.6.1", + "supports-color": "4.5.0" + } + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "supports-color": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } + } + } + }, + "ieee754": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz", + "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=", + "dev": true + }, + "iferr": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz", + "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=", + "dev": true + }, + "image-size": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz", + "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=", + "dev": true, + "optional": true + }, + "img-stats": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/img-stats/-/img-stats-0.5.2.tgz", + "integrity": "sha1-wgNJbELy2esuWrgjL6dWurMsnis=", + "dev": true, + "requires": { + "xmldom": "0.1.27" + } + }, + "import-local": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-0.1.1.tgz", + "integrity": "sha1-sReVcqrNwRxqkQCftDDbyrX2aKg=", + "dev": true, + "requires": { + "pkg-dir": "2.0.0", + "resolve-cwd": "2.0.0" + } + }, + "imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", + "dev": true + }, + "in-publish": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz", + "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=" + }, + "indent-string": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", + "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", + "requires": { + "repeating": "2.0.1" + } + }, + "indexes-of": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz", + "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=", + "dev": true + }, + "indexof": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", + "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=", + "dev": true + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + } + }, + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + }, + "ini": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz", + "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=", + "dev": true + }, + "internal-ip": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-1.2.0.tgz", + "integrity": "sha1-rp+/k7mEh4eF1QqN4bNWlWBYz1w=", + "dev": true, + "requires": { + "meow": "3.7.0" + } + }, + "interpret": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.4.tgz", + "integrity": "sha1-ggzdWIuGj/sZGoCVBtbJyPISsbA=", + "dev": true + }, + "invariant": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz", + "integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=", + "dev": true, + "requires": { + "loose-envify": "1.3.1" + } + }, + "invert-kv": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", + "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=" + }, + "ip": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", + "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=", + "dev": true + }, + "ipaddr.js": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.5.2.tgz", + "integrity": "sha1-1LUFvemUaYfM8PxY2QEP+WB+P6A=", + "dev": true + }, + "is-absolute-url": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz", + "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=", + "dev": true + }, + "is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" + }, + "is-binary-path": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", + "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", + "dev": true, + "requires": { + "binary-extensions": "1.10.0" + } + }, + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", + "dev": true + }, + "is-builtin-module": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", + "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", + "requires": { + "builtin-modules": "1.1.1" + } + }, + "is-callable": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz", + "integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI=", + "dev": true + }, + "is-date-object": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz", + "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=", + "dev": true + }, + "is-directory": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz", + "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=", + "dev": true + }, + "is-dotfile": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", + "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=", + "dev": true + }, + "is-equal-shallow": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", + "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", + "dev": true, + "requires": { + "is-primitive": "2.0.0" + } + }, + "is-extendable": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", + "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", + "dev": true + }, + "is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "dev": true + }, + "is-finite": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", + "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", + "requires": { + "number-is-nan": "1.0.1" + } + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "requires": { + "number-is-nan": "1.0.1" + } + }, + "is-glob": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", + "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", + "dev": true, + "requires": { + "is-extglob": "2.1.1" + } + }, + "is-number": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", + "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + } + }, + "is-path-cwd": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz", + "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=", + "dev": true + }, + "is-path-in-cwd": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz", + "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=", + "dev": true, + "requires": { + "is-path-inside": "1.0.0" + } + }, + "is-path-inside": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz", + "integrity": "sha1-/AbloWg/vaE95mev9xe7wQpI838=", + "dev": true, + "requires": { + "path-is-inside": "1.0.2" + } + }, + "is-plain-obj": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", + "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=", + "dev": true + }, + "is-plain-object": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", + "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "dev": true, + "requires": { + "isobject": "3.0.1" + } + }, + "is-posix-bracket": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", + "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=", + "dev": true + }, + "is-primitive": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", + "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=", + "dev": true + }, + "is-regex": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", + "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", + "dev": true, + "requires": { + "has": "1.0.1" + } + }, + "is-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", + "dev": true + }, + "is-svg": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz", + "integrity": "sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk=", + "dev": true, + "requires": { + "html-comment-regex": "1.1.1" + } + }, + "is-symbol": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz", + "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=", + "dev": true + }, + "is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" + }, + "is-utf8": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", + "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=" + }, + "is-wsl": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", + "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=", + "dev": true + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "isbinaryfile": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.2.tgz", + "integrity": "sha1-Sj6XTsDLqQBNP8bN5yCeppNopiE=", + "dev": true + }, + "isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" + }, + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true + }, + "isstream": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" + }, + "istanbul-api": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-1.2.1.tgz", + "integrity": "sha512-oFCwXvd65amgaPCzqrR+a2XjanS1MvpXN6l/MlMUTv6uiA1NOgGX+I0uyq8Lg3GDxsxPsaP1049krz3hIJ5+KA==", + "dev": true, + "requires": { + "async": "2.6.0", + "fileset": "2.0.3", + "istanbul-lib-coverage": "1.1.1", + "istanbul-lib-hook": "1.1.0", + "istanbul-lib-instrument": "1.9.1", + "istanbul-lib-report": "1.1.2", + "istanbul-lib-source-maps": "1.2.2", + "istanbul-reports": "1.1.3", + "js-yaml": "3.7.0", + "mkdirp": "0.5.1", + "once": "1.4.0" + } + }, + "istanbul-instrumenter-loader": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-2.0.0.tgz", + "integrity": "sha1-5UkpAKsLuoNe+oAkywC+mz7qJwA=", + "dev": true, + "requires": { + "convert-source-map": "1.5.0", + "istanbul-lib-instrument": "1.9.1", + "loader-utils": "0.2.17", + "object-assign": "4.1.1" + }, + "dependencies": { + "loader-utils": { + "version": "0.2.17", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", + "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", + "dev": true, + "requires": { + "big.js": "3.2.0", + "emojis-list": "2.1.0", + "json5": "0.5.1", + "object-assign": "4.1.1" + } + } + } + }, + "istanbul-lib-coverage": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.1.tgz", + "integrity": "sha512-0+1vDkmzxqJIn5rcoEqapSB4DmPxE31EtI2dF2aCkV5esN9EWHxZ0dwgDClivMXJqE7zaYQxq30hj5L0nlTN5Q==", + "dev": true + }, + "istanbul-lib-hook": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-1.1.0.tgz", + "integrity": "sha512-U3qEgwVDUerZ0bt8cfl3dSP3S6opBoOtk3ROO5f2EfBr/SRiD9FQqzwaZBqFORu8W7O0EXpai+k7kxHK13beRg==", + "dev": true, + "requires": { + "append-transform": "0.4.0" + } + }, + "istanbul-lib-instrument": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.9.1.tgz", + "integrity": "sha512-RQmXeQ7sphar7k7O1wTNzVczF9igKpaeGQAG9qR2L+BS4DCJNTI9nytRmIVYevwO0bbq+2CXvJmYDuz0gMrywA==", + "dev": true, + "requires": { + "babel-generator": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "istanbul-lib-coverage": "1.1.1", + "semver": "5.4.1" + } + }, + "istanbul-lib-report": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-1.1.2.tgz", + "integrity": "sha512-UTv4VGx+HZivJQwAo1wnRwe1KTvFpfi/NYwN7DcsrdzMXwpRT/Yb6r4SBPoHWj4VuQPakR32g4PUUeyKkdDkBA==", + "dev": true, + "requires": { + "istanbul-lib-coverage": "1.1.1", + "mkdirp": "0.5.1", + "path-parse": "1.0.5", + "supports-color": "3.2.3" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "istanbul-lib-source-maps": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.2.tgz", + "integrity": "sha512-8BfdqSfEdtip7/wo1RnrvLpHVEd8zMZEDmOFEnpC6dg0vXflHt9nvoAyQUzig2uMSXfF2OBEYBV3CVjIL9JvaQ==", + "dev": true, + "requires": { + "debug": "3.1.0", + "istanbul-lib-coverage": "1.1.1", + "mkdirp": "0.5.1", + "rimraf": "2.6.2", + "source-map": "0.5.7" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } + } + }, + "istanbul-reports": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-1.1.3.tgz", + "integrity": "sha512-ZEelkHh8hrZNI5xDaKwPMFwDsUf5wIEI2bXAFGp1e6deR2mnEKBPhLJEgr4ZBt8Gi6Mj38E/C8kcy9XLggVO2Q==", + "dev": true, + "requires": { + "handlebars": "4.0.11" + }, + "dependencies": { + "async": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", + "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", + "dev": true + }, + "camelcase": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", + "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", + "dev": true, + "optional": true + }, + "cliui": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", + "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", + "dev": true, + "optional": true, + "requires": { + "center-align": "0.1.3", + "right-align": "0.1.3", + "wordwrap": "0.0.2" + }, + "dependencies": { + "wordwrap": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", + "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", + "dev": true, + "optional": true + } + } + }, + "handlebars": { + "version": "4.0.11", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz", + "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=", + "dev": true, + "requires": { + "async": "1.5.2", + "optimist": "0.6.1", + "source-map": "0.4.4", + "uglify-js": "2.8.29" + } + }, + "minimist": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", + "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", + "dev": true + }, + "optimist": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", + "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", + "dev": true, + "requires": { + "minimist": "0.0.10", + "wordwrap": "0.0.3" + } + }, + "uglify-js": { + "version": "2.8.29", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", + "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", + "dev": true, + "optional": true, + "requires": { + "source-map": "0.5.7", + "uglify-to-browserify": "1.0.2", + "yargs": "3.10.0" + }, + "dependencies": { + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true, + "optional": true + } + } + }, + "yargs": { + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", + "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", + "dev": true, + "optional": true, + "requires": { + "camelcase": "1.2.1", + "cliui": "2.1.0", + "decamelize": "1.2.0", + "window-size": "0.1.0" + } + } + } + }, + "jasmine": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-2.8.0.tgz", + "integrity": "sha1-awicChFXax8W3xG4AUbZHU6Lij4=", + "dev": true, + "requires": { + "exit": "0.1.2", + "glob": "7.1.2", + "jasmine-core": "2.8.0" + }, + "dependencies": { + "jasmine-core": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.8.0.tgz", + "integrity": "sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=", + "dev": true + } + } + }, + "jasmine-core": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.6.2.tgz", + "integrity": "sha1-dOoffPQoaRryARB9YxI0AnoJ2qs=", + "dev": true + }, + "jasmine-spec-reporter": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-4.1.0.tgz", + "integrity": "sha1-uKp1hN9Y5Nq2Gs2++3bQlqo4Zj8=", + "dev": true, + "requires": { + "colors": "1.1.2" + } + }, + "jasminewd2": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/jasminewd2/-/jasminewd2-2.2.0.tgz", + "integrity": "sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=", + "dev": true + }, + "js-base64": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.3.2.tgz", + "integrity": "sha512-Y2/+DnfJJXT1/FCwUebUhLWb3QihxiSC42+ctHLGogmW2jPY6LCapMdFZXRvVP2z6qyKW7s6qncE/9gSqZiArw==" + }, + "js-tokens": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", + "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", + "dev": true + }, + "js-yaml": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz", + "integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=", + "dev": true, + "requires": { + "argparse": "1.0.9", + "esprima": "2.7.3" + } + }, + "jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", + "optional": true + }, + "jsesc": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", + "dev": true + }, + "json-loader": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz", + "integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==", + "dev": true + }, + "json-schema": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" + }, + "json-schema-traverse": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", + "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=" + }, + "json-stable-stringify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", + "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", + "dev": true, + "optional": true, + "requires": { + "jsonify": "0.0.0" + } + }, + "json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" + }, + "json3": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz", + "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=", + "dev": true + }, + "json5": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", + "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", + "dev": true + }, + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11" + } + }, + "jsonify": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", + "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=", + "dev": true, + "optional": true + }, + "jsprim": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", + "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", + "requires": { + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.2.3", + "verror": "1.10.0" + } + }, + "karma": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/karma/-/karma-1.7.0.tgz", + "integrity": "sha1-b3oaQGRG+i4YfslTmGmPTO5HYmk=", + "dev": true, + "requires": { + "bluebird": "3.5.1", + "body-parser": "1.18.2", + "chokidar": "1.7.0", + "colors": "1.1.2", + "combine-lists": "1.0.1", + "connect": "3.6.5", + "core-js": "2.4.1", + "di": "0.0.1", + "dom-serialize": "2.2.1", + "expand-braces": "0.1.2", + "glob": "7.1.2", + "graceful-fs": "4.1.11", + "http-proxy": "1.16.2", + "isbinaryfile": "3.0.2", + "lodash": "3.10.1", + "log4js": "0.6.38", + "mime": "1.4.1", + "minimatch": "3.0.4", + "optimist": "0.6.1", + "qjobs": "1.1.5", + "range-parser": "1.2.0", + "rimraf": "2.6.2", + "safe-buffer": "5.1.1", + "socket.io": "1.7.3", + "source-map": "0.5.7", + "tmp": "0.0.31", + "useragent": "2.2.1" + }, + "dependencies": { + "lodash": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", + "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=", + "dev": true + }, + "minimist": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", + "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", + "dev": true + }, + "optimist": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", + "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", + "dev": true, + "requires": { + "minimist": "0.0.10", + "wordwrap": "0.0.3" + } + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } + } + }, + "karma-chrome-launcher": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-2.1.1.tgz", + "integrity": "sha1-IWh5xorATY1RQOmWGboEtZr9Rs8=", + "dev": true, + "requires": { + "fs-access": "1.0.1", + "which": "1.3.0" + } + }, + "karma-cli": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/karma-cli/-/karma-cli-1.0.1.tgz", + "integrity": "sha1-rmw8WKMTodALRRZMRVubhs4X+WA=", + "dev": true, + "requires": { + "resolve": "1.5.0" + } + }, + "karma-coverage-istanbul-reporter": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-1.2.1.tgz", + "integrity": "sha1-XjynuaFT2xy63/70xG2XjTilMVQ=", + "dev": true, + "requires": { + "istanbul-api": "1.2.1" + } + }, + "karma-jasmine": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-1.1.0.tgz", + "integrity": "sha1-IuTAa/mhguUpTR9wXjczgRuBCs8=", + "dev": true + }, + "karma-jasmine-html-reporter": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-0.2.2.tgz", + "integrity": "sha1-SKjl7xiAdhfuK14zwRlMNbQ5Ukw=", + "dev": true, + "requires": { + "karma-jasmine": "1.1.0" + } + }, + "karma-source-map-support": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/karma-source-map-support/-/karma-source-map-support-1.2.0.tgz", + "integrity": "sha1-G/gee7SwiWJ6s1LsQXnhF8QGpUA=", + "dev": true, + "requires": { + "source-map-support": "0.4.18" + } + }, + "killable": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.0.tgz", + "integrity": "sha1-2ouEvUfeU5WHj5XWTQLyRJ/gXms=", + "dev": true + }, + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + }, + "lazy-cache": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz", + "integrity": "sha1-f+3fLctu23fRHvHRF6tf/fCrG2U=", + "dev": true + }, + "lcid": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", + "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", + "requires": { + "invert-kv": "1.0.0" + } + }, + "less": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/less/-/less-2.7.3.tgz", + "integrity": "sha512-KPdIJKWcEAb02TuJtaLrhue0krtRLoRoo7x6BNJIBelO00t/CCdJQUnHW5V34OnHMWzIktSalJxRO+FvytQlCQ==", + "dev": true, + "requires": { + "errno": "0.1.4", + "graceful-fs": "4.1.11", + "image-size": "0.5.5", + "mime": "1.4.1", + "mkdirp": "0.5.1", + "promise": "7.3.1", + "request": "2.81.0", + "source-map": "0.5.7" + }, + "dependencies": { + "ajv": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", + "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", + "dev": true, + "optional": true, + "requires": { + "co": "4.6.0", + "json-stable-stringify": "1.0.1" + } + }, + "assert-plus": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", + "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=", + "dev": true, + "optional": true + }, + "aws-sign2": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", + "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=", + "dev": true, + "optional": true + }, + "boom": { + "version": "2.10.1", + "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", + "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", + "dev": true, + "requires": { + "hoek": "2.16.3" + } + }, + "cryptiles": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", + "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", + "dev": true, + "optional": true, + "requires": { + "boom": "2.10.1" + } + }, + "form-data": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz", + "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=", + "dev": true, + "optional": true, + "requires": { + "asynckit": "0.4.0", + "combined-stream": "1.0.5", + "mime-types": "2.1.17" + } + }, + "har-schema": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz", + "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=", + "dev": true, + "optional": true + }, + "har-validator": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz", + "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=", + "dev": true, + "optional": true, + "requires": { + "ajv": "4.11.8", + "har-schema": "1.0.5" + } + }, + "hawk": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", + "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", + "dev": true, + "optional": true, + "requires": { + "boom": "2.10.1", + "cryptiles": "2.0.5", + "hoek": "2.16.3", + "sntp": "1.0.9" + } + }, + "hoek": { + "version": "2.16.3", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", + "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=", + "dev": true + }, + "http-signature": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", + "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", + "dev": true, + "optional": true, + "requires": { + "assert-plus": "0.2.0", + "jsprim": "1.4.1", + "sshpk": "1.13.1" + } + }, + "performance-now": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz", + "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=", + "dev": true, + "optional": true + }, + "qs": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", + "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=", + "dev": true, + "optional": true + }, + "request": { + "version": "2.81.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz", + "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=", + "dev": true, + "optional": true, + "requires": { + "aws-sign2": "0.6.0", + "aws4": "1.6.0", + "caseless": "0.12.0", + "combined-stream": "1.0.5", + "extend": "3.0.1", + "forever-agent": "0.6.1", + "form-data": "2.1.4", + "har-validator": "4.2.1", + "hawk": "3.1.3", + "http-signature": "1.1.1", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.17", + "oauth-sign": "0.8.2", + "performance-now": "0.2.0", + "qs": "6.4.0", + "safe-buffer": "5.1.1", + "stringstream": "0.0.5", + "tough-cookie": "2.3.3", + "tunnel-agent": "0.6.0", + "uuid": "3.1.0" + } + }, + "sntp": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", + "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", + "dev": true, + "optional": true, + "requires": { + "hoek": "2.16.3" + } + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true, + "optional": true + } + } + }, + "less-loader": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-4.0.5.tgz", + "integrity": "sha1-rhVadAbKxqzSk9eFWH/P8PR4xN0=", + "dev": true, + "requires": { + "clone": "2.1.1", + "loader-utils": "1.1.0", + "pify": "2.3.0" + }, + "dependencies": { + "clone": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz", + "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=", + "dev": true + } + } + }, + "license-webpack-plugin": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-1.1.1.tgz", + "integrity": "sha512-TjKOyiC0exqd4Idy/4M8/DETR22dXBZks387DuS5LbslxHiMRXGx/Q2F/j9IUtvEoH5uFvt72vRgk/G6f8j3Dg==", + "dev": true, + "requires": { + "ejs": "2.5.7" + } + }, + "load-json-file": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "requires": { + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" + } + }, + "loader-runner": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz", + "integrity": "sha1-9IKuqC1UPgeSFwDVpG7yb9rGuKI=", + "dev": true + }, + "loader-utils": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz", + "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=", + "dev": true, + "requires": { + "big.js": "3.2.0", + "emojis-list": "2.1.0", + "json5": "0.5.1" + } + }, + "locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "dev": true, + "requires": { + "p-locate": "2.0.0", + "path-exists": "3.0.0" + }, + "dependencies": { + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true + } + } + }, + "lodash": { + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", + "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=" + }, + "lodash.assign": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz", + "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=" + }, + "lodash.camelcase": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", + "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=", + "dev": true + }, + "lodash.clonedeep": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", + "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=" + }, + "lodash.memoize": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", + "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=", + "dev": true + }, + "lodash.mergewith": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz", + "integrity": "sha1-FQzwoWeR9ZA7iJHqsVRgknS96lU=" + }, + "lodash.tail": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz", + "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=", + "dev": true + }, + "lodash.uniq": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", + "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=", + "dev": true + }, + "log4js": { + "version": "0.6.38", + "resolved": "https://registry.npmjs.org/log4js/-/log4js-0.6.38.tgz", + "integrity": "sha1-LElBFmldb7JUgJQ9P8hy5mKlIv0=", + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "semver": "4.3.6" + }, + "dependencies": { + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + }, + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "semver": { + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz", + "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=", + "dev": true + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true + } + } + }, + "loglevel": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.0.tgz", + "integrity": "sha1-rgyqVhERSYxboTcj1vtjHSQAOTQ=", + "dev": true + }, + "longest": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", + "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", + "dev": true + }, + "loose-envify": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", + "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", + "dev": true, + "requires": { + "js-tokens": "3.0.2" + } + }, + "loud-rejection": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", + "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", + "requires": { + "currently-unhandled": "0.4.1", + "signal-exit": "3.0.2" + } + }, + "lower-case": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz", + "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=", + "dev": true + }, + "lru-cache": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", + "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", + "requires": { + "pseudomap": "1.0.2", + "yallist": "2.1.2" + } + }, + "macaddress": { + "version": "0.2.8", + "resolved": "https://registry.npmjs.org/macaddress/-/macaddress-0.2.8.tgz", + "integrity": "sha1-WQTcU3w57G2+/q6QIycTX6hRHxI=", + "dev": true + }, + "magic-string": { + "version": "0.22.4", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.22.4.tgz", + "integrity": "sha512-kxBL06p6iO2qPBHsqGK2b3cRwiRGpnmSuVWNhwHcMX7qJOUr1HvricYP1LZOCdkQBUp0jiWg2d6WJwR3vYgByw==", + "dev": true, + "requires": { + "vlq": "0.2.3" + } + }, + "make-dir": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.1.0.tgz", + "integrity": "sha512-0Pkui4wLJ7rxvmfUvs87skoEaxmu0hCUApF8nonzpl7q//FWp9zu8W61Scz4sd/kUiqDxvUhtoam2efDyiBzcA==", + "dev": true, + "requires": { + "pify": "3.0.0" + }, + "dependencies": { + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true + } + } + }, + "make-error": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.0.tgz", + "integrity": "sha1-Uq06M5zPEM5itAQLcI/nByRLi5Y=", + "dev": true + }, + "map-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", + "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=" + }, + "math-expression-evaluator": { + "version": "1.2.17", + "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz", + "integrity": "sha1-3oGf282E3M2PrlnGrreWFbnSZqw=", + "dev": true + }, + "md5": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz", + "integrity": "sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=", + "dev": true, + "requires": { + "charenc": "0.0.2", + "crypt": "0.0.2", + "is-buffer": "1.1.6" + } + }, + "md5.js": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz", + "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=", + "dev": true, + "requires": { + "hash-base": "3.0.4", + "inherits": "2.0.3" + }, + "dependencies": { + "hash-base": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz", + "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=", + "dev": true, + "requires": { + "inherits": "2.0.3", + "safe-buffer": "5.1.1" + } + } + } + }, + "media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", + "dev": true + }, + "mem": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", + "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", + "dev": true, + "requires": { + "mimic-fn": "1.1.0" + } + }, + "memory-fs": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", + "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", + "dev": true, + "requires": { + "errno": "0.1.4", + "readable-stream": "2.3.3" + } + }, + "meow": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", + "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", + "requires": { + "camelcase-keys": "2.1.0", + "decamelize": "1.2.0", + "loud-rejection": "1.6.0", + "map-obj": "1.0.1", + "minimist": "1.2.0", + "normalize-package-data": "2.4.0", + "object-assign": "4.1.1", + "read-pkg-up": "1.0.1", + "redent": "1.0.0", + "trim-newlines": "1.0.0" + } + }, + "merge-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", + "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=", + "dev": true + }, + "methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", + "dev": true + }, + "micromatch": { + "version": "2.3.11", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", + "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", + "dev": true, + "requires": { + "arr-diff": "2.0.0", + "array-unique": "0.2.1", + "braces": "1.8.5", + "expand-brackets": "0.1.5", + "extglob": "0.3.2", + "filename-regex": "2.0.1", + "is-extglob": "1.0.0", + "is-glob": "2.0.1", + "kind-of": "3.2.2", + "normalize-path": "2.1.1", + "object.omit": "2.0.1", + "parse-glob": "3.0.4", + "regex-cache": "0.4.4" + }, + "dependencies": { + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", + "dev": true + }, + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "dev": true, + "requires": { + "is-extglob": "1.0.0" + } + } + } + }, + "miller-rabin": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz", + "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", + "dev": true, + "requires": { + "bn.js": "4.11.8", + "brorand": "1.1.0" + } + }, + "mime": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", + "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==", + "dev": true + }, + "mime-db": { + "version": "1.30.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz", + "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=" + }, + "mime-types": { + "version": "2.1.17", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz", + "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=", + "requires": { + "mime-db": "1.30.0" + } + }, + "mimic-fn": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz", + "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=", + "dev": true + }, + "minimalistic-assert": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz", + "integrity": "sha1-cCvi3aazf0g2vLP121ZkG2Sh09M=", + "dev": true + }, + "minimalistic-crypto-utils": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", + "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=", + "dev": true + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "requires": { + "brace-expansion": "1.1.8" + } + }, + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" + }, + "mississippi": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-1.3.0.tgz", + "integrity": "sha1-0gFYPrEjJ+PFwWQqQEqcrPlONPU=", + "dev": true, + "requires": { + "concat-stream": "1.6.0", + "duplexify": "3.5.1", + "end-of-stream": "1.4.0", + "flush-write-stream": "1.0.2", + "from2": "2.3.0", + "parallel-transform": "1.1.0", + "pump": "1.0.2", + "pumpify": "1.3.5", + "stream-each": "1.2.2", + "through2": "2.0.3" + } + }, + "mixin-object": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz", + "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=", + "dev": true, + "requires": { + "for-in": "0.1.8", + "is-extendable": "0.1.1" + }, + "dependencies": { + "for-in": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz", + "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=", + "dev": true + } + } + }, + "mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "requires": { + "minimist": "0.0.8" + }, + "dependencies": { + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" + } + } + }, + "moment": { + "version": "2.18.1", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz", + "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8=" + }, + "move-concurrently": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", + "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=", + "dev": true, + "requires": { + "aproba": "1.2.0", + "copy-concurrently": "1.0.5", + "fs-write-stream-atomic": "1.0.10", + "mkdirp": "0.5.1", + "rimraf": "2.6.2", + "run-queue": "1.0.3" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, + "multicast-dns": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.1.1.tgz", + "integrity": "sha1-bn3oalcIcqsXBYrepxYLvsqBTd4=", + "dev": true, + "requires": { + "dns-packet": "1.2.2", + "thunky": "0.1.0" + } + }, + "multicast-dns-service-types": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz", + "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=", + "dev": true + }, + "nan": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz", + "integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo=" + }, + "ncname": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/ncname/-/ncname-1.0.0.tgz", + "integrity": "sha1-W1etGLHKCShk72Kwse2BlPODtxw=", + "dev": true, + "requires": { + "xml-char-classes": "1.0.0" + } + }, + "negotiator": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz", + "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=", + "dev": true + }, + "ng2-charts": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/ng2-charts/-/ng2-charts-1.5.0.tgz", + "integrity": "sha1-clVqH/D2dYwhq8fsz+cZhMgunC0=", + "requires": { + "chart.js": "2.5.0" + } + }, + "ng2-cookies": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/ng2-cookies/-/ng2-cookies-1.0.12.tgz", + "integrity": "sha1-Pz5hPgE3sGSbcFxngHS0vQgUnMw=" + }, + "ngx-bootstrap": { + "version": "1.6.6", + "resolved": "https://registry.npmjs.org/ngx-bootstrap/-/ngx-bootstrap-1.6.6.tgz", + "integrity": "sha1-AFcUHPvdfopQ6Bvac1+tjpWssN0=", + "requires": { + "moment": "2.18.1" + } + }, + "ngx-modialog": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/ngx-modialog/-/ngx-modialog-3.0.4.tgz", + "integrity": "sha512-rkjLI2GPsikdEKqDxooBdTl8BXh4ndGnLg8iLk4xGNSq+ltRzm7QH4C62V8XcKdG7Kk7VSVc7tGKMtooxLcORQ==" + }, + "no-case": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", + "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", + "dev": true, + "requires": { + "lower-case": "1.1.4" + } + }, + "node-dir": { + "version": "0.1.17", + "resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz", + "integrity": "sha1-X1Zl2TNRM1yqvvjxxVRRbPXx5OU=", + "dev": true, + "requires": { + "minimatch": "3.0.4" + } + }, + "node-forge": { + "version": "0.6.33", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.6.33.tgz", + "integrity": "sha1-RjgRh59XPUUVWtap9D3ClujoXrw=", + "dev": true + }, + "node-gyp": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz", + "integrity": "sha1-m/vlRWIoYoSDjnUOrAUpWFP6HGA=", + "requires": { + "fstream": "1.0.11", + "glob": "7.1.2", + "graceful-fs": "4.1.11", + "minimatch": "3.0.4", + "mkdirp": "0.5.1", + "nopt": "3.0.6", + "npmlog": "4.1.2", + "osenv": "0.1.4", + "request": "2.83.0", + "rimraf": "2.6.2", + "semver": "5.3.0", + "tar": "2.2.1", + "which": "1.3.0" + }, + "dependencies": { + "semver": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", + "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=" + } + } + }, + "node-libs-browser": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.0.0.tgz", + "integrity": "sha1-o6WeyXAkmFtG6Vg3lkb5bEthZkY=", + "dev": true, + "requires": { + "assert": "1.4.1", + "browserify-zlib": "0.1.4", + "buffer": "4.9.1", + "console-browserify": "1.1.0", + "constants-browserify": "1.0.0", + "crypto-browserify": "3.12.0", + "domain-browser": "1.1.7", + "events": "1.1.1", + "https-browserify": "0.0.1", + "os-browserify": "0.2.1", + "path-browserify": "0.0.0", + "process": "0.11.10", + "punycode": "1.4.1", + "querystring-es3": "0.2.1", + "readable-stream": "2.3.3", + "stream-browserify": "2.0.1", + "stream-http": "2.7.2", + "string_decoder": "0.10.31", + "timers-browserify": "2.0.4", + "tty-browserify": "0.0.0", + "url": "0.11.0", + "util": "0.10.3", + "vm-browserify": "0.0.4" + }, + "dependencies": { + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true + } + } + }, + "node-modules-path": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/node-modules-path/-/node-modules-path-1.0.1.tgz", + "integrity": "sha1-QAlrCM560OoUaAhjr0ScfHWl0cg=", + "dev": true + }, + "node-sass": { + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.6.1.tgz", + "integrity": "sha512-0zQQ7tjEK5W8RfW9LiQrkzfo7uLZ0QtZGV69rdKn5cFzdweHLJ14lR6xLPvI6UimkXMO8m0qDsXwUCNdnqV3sA==", + "requires": { + "async-foreach": "0.1.3", + "chalk": "1.1.3", + "cross-spawn": "3.0.1", + "gaze": "1.1.2", + "get-stdin": "4.0.1", + "glob": "7.1.2", + "in-publish": "2.0.0", + "lodash.assign": "4.2.0", + "lodash.clonedeep": "4.5.0", + "lodash.mergewith": "4.6.0", + "meow": "3.7.0", + "mkdirp": "0.5.1", + "nan": "2.8.0", + "node-gyp": "3.6.2", + "npmlog": "4.1.2", + "request": "2.83.0", + "sass-graph": "2.2.4", + "stdout-stream": "1.4.0" + } + }, + "nopt": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", + "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", + "requires": { + "abbrev": "1.1.1" + } + }, + "normalize-package-data": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", + "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", + "requires": { + "hosted-git-info": "2.5.0", + "is-builtin-module": "1.0.0", + "semver": "5.4.1", + "validate-npm-package-license": "3.0.1" + } + }, + "normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "dev": true, + "requires": { + "remove-trailing-separator": "1.1.0" + } + }, + "normalize-range": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", + "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=", + "dev": true + }, + "normalize-url": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz", + "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=", + "dev": true, + "requires": { + "object-assign": "4.1.1", + "prepend-http": "1.0.4", + "query-string": "4.3.4", + "sort-keys": "1.1.2" + } + }, + "npm-run-path": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", + "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", + "dev": true, + "requires": { + "path-key": "2.0.1" + } + }, + "npmlog": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", + "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", + "requires": { + "are-we-there-yet": "1.1.4", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" + } + }, + "nth-check": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz", + "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=", + "dev": true, + "requires": { + "boolbase": "1.0.0" + } + }, + "null-check": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/null-check/-/null-check-1.0.0.tgz", + "integrity": "sha1-l33/1xdgErnsMNKjnbXPcqBDnt0=", + "dev": true + }, + "num2fraction": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz", + "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=", + "dev": true + }, + "number-is-nan": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" + }, + "oauth-sign": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", + "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=" + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + }, + "object-component": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz", + "integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=", + "dev": true + }, + "object-keys": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz", + "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=", + "dev": true + }, + "object.omit": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", + "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", + "dev": true, + "requires": { + "for-own": "0.1.5", + "is-extendable": "0.1.1" + }, + "dependencies": { + "for-own": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", + "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", + "dev": true, + "requires": { + "for-in": "1.0.2" + } + } + } + }, + "obuf": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.1.tgz", + "integrity": "sha1-EEEktsYCxnlogaBCVB0220OlJk4=", + "dev": true + }, + "on-finished": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", + "dev": true, + "requires": { + "ee-first": "1.1.1" + } + }, + "on-headers": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz", + "integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=", + "dev": true + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "requires": { + "wrappy": "1.0.2" + } + }, + "opn": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/opn/-/opn-5.1.0.tgz", + "integrity": "sha512-iPNl7SyM8L30Rm1sjGdLLheyHVw5YXVfi3SKWJzBI7efxRwHojfRFjwE/OLM6qp9xJYMgab8WicTU1cPoY+Hpg==", + "dev": true, + "requires": { + "is-wsl": "1.1.0" + } + }, + "optimist": { + "version": "0.3.7", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz", + "integrity": "sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=", + "dev": true, + "requires": { + "wordwrap": "0.0.3" + } + }, + "options": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz", + "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=", + "dev": true + }, + "original": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/original/-/original-1.0.0.tgz", + "integrity": "sha1-kUf5P6FpbQS+YeAb1QuurKZWvTs=", + "dev": true, + "requires": { + "url-parse": "1.0.5" + }, + "dependencies": { + "url-parse": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.0.5.tgz", + "integrity": "sha1-CFSGBCKv3P7+tsllxmLUgAFpkns=", + "dev": true, + "requires": { + "querystringify": "0.0.4", + "requires-port": "1.0.0" + } + } + } + }, + "os-browserify": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz", + "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8=", + "dev": true + }, + "os-homedir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" + }, + "os-locale": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", + "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", + "requires": { + "lcid": "1.0.0" + } + }, + "os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" + }, + "osenv": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz", + "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=", + "requires": { + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" + } + }, + "p-finally": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", + "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", + "dev": true + }, + "p-limit": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz", + "integrity": "sha1-sH/y2aXYi+yAYDWJWiurZqJ5iLw=", + "dev": true + }, + "p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "dev": true, + "requires": { + "p-limit": "1.1.0" + } + }, + "p-map": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz", + "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==", + "dev": true + }, + "pako": { + "version": "0.2.9", + "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz", + "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=", + "dev": true + }, + "parallel-transform": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz", + "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=", + "dev": true, + "requires": { + "cyclist": "0.2.2", + "inherits": "2.0.3", + "readable-stream": "2.3.3" + } + }, + "param-case": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz", + "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=", + "dev": true, + "requires": { + "no-case": "2.3.2" + } + }, + "parse-asn1": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz", + "integrity": "sha1-N8T5t+06tlx0gXtfJICTf7+XxxI=", + "dev": true, + "requires": { + "asn1.js": "4.9.2", + "browserify-aes": "1.1.1", + "create-hash": "1.1.3", + "evp_bytestokey": "1.0.3", + "pbkdf2": "3.0.14" + } + }, + "parse-glob": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", + "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", + "dev": true, + "requires": { + "glob-base": "0.3.0", + "is-dotfile": "1.0.3", + "is-extglob": "1.0.0", + "is-glob": "2.0.1" + }, + "dependencies": { + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", + "dev": true + }, + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "dev": true, + "requires": { + "is-extglob": "1.0.0" + } + } + } + }, + "parse-json": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", + "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "requires": { + "error-ex": "1.3.1" + } + }, + "parsejson": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz", + "integrity": "sha1-q343WfIJ7OmUN5c/fQ8fZK4OZKs=", + "dev": true, + "requires": { + "better-assert": "1.0.2" + } + }, + "parseqs": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz", + "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=", + "dev": true, + "requires": { + "better-assert": "1.0.2" + } + }, + "parseuri": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz", + "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=", + "dev": true, + "requires": { + "better-assert": "1.0.2" + } + }, + "parseurl": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz", + "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=", + "dev": true + }, + "path-browserify": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz", + "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=", + "dev": true + }, + "path-exists": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", + "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", + "requires": { + "pinkie-promise": "2.0.1" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" + }, + "path-is-inside": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", + "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=", + "dev": true + }, + "path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", + "dev": true + }, + "path-parse": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", + "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=", + "dev": true + }, + "path-to-regexp": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", + "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=", + "dev": true + }, + "path-type": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", + "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", + "requires": { + "graceful-fs": "4.1.11", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" + } + }, + "pbkdf2": { + "version": "3.0.14", + "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz", + "integrity": "sha512-gjsZW9O34fm0R7PaLHRJmLLVfSoesxztjPjE9o6R+qtVJij90ltg1joIovN9GKrRW3t1PzhDDG3UMEMFfZ+1wA==", + "dev": true, + "requires": { + "create-hash": "1.1.3", + "create-hmac": "1.1.6", + "ripemd160": "2.0.1", + "safe-buffer": "5.1.1", + "sha.js": "2.4.9" + } + }, + "performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" + }, + "pinkie": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=" + }, + "pinkie-promise": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "requires": { + "pinkie": "2.0.4" + } + }, + "pkg-dir": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", + "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", + "dev": true, + "requires": { + "find-up": "2.1.0" + }, + "dependencies": { + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "dev": true, + "requires": { + "locate-path": "2.0.0" + } + } + } + }, + "portfinder": { + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.13.tgz", + "integrity": "sha1-uzLs2HwnEErm7kS1o8y/Drsa7ek=", + "dev": true, + "requires": { + "async": "1.5.2", + "debug": "2.6.9", + "mkdirp": "0.5.1" + }, + "dependencies": { + "async": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", + "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", + "dev": true + } + } + }, + "postcss": { + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.3.2", + "source-map": "0.5.7", + "supports-color": "3.2.3" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "postcss-calc": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.1.tgz", + "integrity": "sha1-d7rnypKK2FcW4v2kLyYb98HWW14=", + "dev": true, + "requires": { + "postcss": "5.2.18", + "postcss-message-helpers": "2.0.0", + "reduce-css-calc": "1.3.0" + } + }, + "postcss-colormin": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-2.2.2.tgz", + "integrity": "sha1-ZjFBfV8OkJo9fsJrJMio0eT5bks=", + "dev": true, + "requires": { + "colormin": "1.1.2", + "postcss": "5.2.18", + "postcss-value-parser": "3.3.0" + } + }, + "postcss-convert-values": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz", + "integrity": "sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0=", + "dev": true, + "requires": { + "postcss": "5.2.18", + "postcss-value-parser": "3.3.0" + } + }, + "postcss-custom-properties": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-6.2.0.tgz", + "integrity": "sha512-eNR2h9T9ciKMoQEORrPjH33XeN/nuvVuxArOKmHtsFbGbNss631tgTrKou3/pmjAZbA4QQkhLIkPQkIk3WW+8w==", + "dev": true, + "requires": { + "balanced-match": "1.0.0", + "postcss": "6.0.14" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", + "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + }, + "chalk": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", + "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", + "dev": true, + "requires": { + "ansi-styles": "3.2.0", + "escape-string-regexp": "1.0.5", + "supports-color": "4.5.0" + } + }, + "color-convert": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz", + "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "postcss": { + "version": "6.0.14", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz", + "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==", + "dev": true, + "requires": { + "chalk": "2.3.0", + "source-map": "0.6.1", + "supports-color": "4.5.0" + } + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "supports-color": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } + } + } + }, + "postcss-discard-comments": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz", + "integrity": "sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0=", + "dev": true, + "requires": { + "postcss": "5.2.18" + } + }, + "postcss-discard-duplicates": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz", + "integrity": "sha1-uavye4isGIFYpesSq8riAmO5GTI=", + "dev": true, + "requires": { + "postcss": "5.2.18" + } + }, + "postcss-discard-empty": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz", + "integrity": "sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU=", + "dev": true, + "requires": { + "postcss": "5.2.18" + } + }, + "postcss-discard-overridden": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz", + "integrity": "sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg=", + "dev": true, + "requires": { + "postcss": "5.2.18" + } + }, + "postcss-discard-unused": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz", + "integrity": "sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM=", + "dev": true, + "requires": { + "postcss": "5.2.18", + "uniqs": "2.0.0" + } + }, + "postcss-filter-plugins": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz", + "integrity": "sha1-bYWGJTTXNaxCDkqFgG4fXUKG2Ew=", + "dev": true, + "requires": { + "postcss": "5.2.18", + "uniqid": "4.1.1" + } + }, + "postcss-load-config": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-1.2.0.tgz", + "integrity": "sha1-U56a/J3chiASHr+djDZz4M5Q0oo=", + "dev": true, + "requires": { + "cosmiconfig": "2.2.2", + "object-assign": "4.1.1", + "postcss-load-options": "1.2.0", + "postcss-load-plugins": "2.3.0" + } + }, + "postcss-load-options": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/postcss-load-options/-/postcss-load-options-1.2.0.tgz", + "integrity": "sha1-sJixVZ3awt8EvAuzdfmaXP4rbYw=", + "dev": true, + "requires": { + "cosmiconfig": "2.2.2", + "object-assign": "4.1.1" + } + }, + "postcss-load-plugins": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/postcss-load-plugins/-/postcss-load-plugins-2.3.0.tgz", + "integrity": "sha1-dFdoEWWZrKLwCfrUJrABdQSdjZI=", + "dev": true, + "requires": { + "cosmiconfig": "2.2.2", + "object-assign": "4.1.1" + } + }, + "postcss-loader": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-1.3.3.tgz", + "integrity": "sha1-piHqH6KQYqg5cqRvVEhncTAZFus=", + "dev": true, + "requires": { + "loader-utils": "1.1.0", + "object-assign": "4.1.1", + "postcss": "5.2.18", + "postcss-load-config": "1.2.0" + } + }, + "postcss-merge-idents": { + "version": "2.1.7", + "resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz", + "integrity": "sha1-TFUwMTwI4dWzu/PSu8dH4njuonA=", + "dev": true, + "requires": { + "has": "1.0.1", + "postcss": "5.2.18", + "postcss-value-parser": "3.3.0" + } + }, + "postcss-merge-longhand": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz", + "integrity": "sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg=", + "dev": true, + "requires": { + "postcss": "5.2.18" + } + }, + "postcss-merge-rules": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz", + "integrity": "sha1-0d9d+qexrMO+VT8OnhDofGG19yE=", + "dev": true, + "requires": { + "browserslist": "1.7.7", + "caniuse-api": "1.6.1", + "postcss": "5.2.18", + "postcss-selector-parser": "2.2.3", + "vendors": "1.0.1" + } + }, + "postcss-message-helpers": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz", + "integrity": "sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4=", + "dev": true + }, + "postcss-minify-font-values": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz", + "integrity": "sha1-S1jttWZB66fIR0qzUmyv17vey2k=", + "dev": true, + "requires": { + "object-assign": "4.1.1", + "postcss": "5.2.18", + "postcss-value-parser": "3.3.0" + } + }, + "postcss-minify-gradients": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz", + "integrity": "sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE=", + "dev": true, + "requires": { + "postcss": "5.2.18", + "postcss-value-parser": "3.3.0" + } + }, + "postcss-minify-params": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz", + "integrity": "sha1-rSzgcTc7lDs9kwo/pZo1jCjW8fM=", + "dev": true, + "requires": { + "alphanum-sort": "1.0.2", + "postcss": "5.2.18", + "postcss-value-parser": "3.3.0", + "uniqs": "2.0.0" + } + }, + "postcss-minify-selectors": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz", + "integrity": "sha1-ssapjAByz5G5MtGkllCBFDEXNb8=", + "dev": true, + "requires": { + "alphanum-sort": "1.0.2", + "has": "1.0.1", + "postcss": "5.2.18", + "postcss-selector-parser": "2.2.3" + } + }, + "postcss-modules-extract-imports": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz", + "integrity": "sha1-thTJcgvmgW6u41+zpfqh26agXds=", + "dev": true, + "requires": { + "postcss": "6.0.14" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", + "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + }, + "chalk": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", + "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", + "dev": true, + "requires": { + "ansi-styles": "3.2.0", + "escape-string-regexp": "1.0.5", + "supports-color": "4.5.0" + } + }, + "color-convert": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz", + "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "postcss": { + "version": "6.0.14", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz", + "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==", + "dev": true, + "requires": { + "chalk": "2.3.0", + "source-map": "0.6.1", + "supports-color": "4.5.0" + } + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "supports-color": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } + } + } + }, + "postcss-modules-local-by-default": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz", + "integrity": "sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=", + "dev": true, + "requires": { + "css-selector-tokenizer": "0.7.0", + "postcss": "6.0.14" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", + "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + }, + "chalk": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", + "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", + "dev": true, + "requires": { + "ansi-styles": "3.2.0", + "escape-string-regexp": "1.0.5", + "supports-color": "4.5.0" + } + }, + "color-convert": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz", + "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "postcss": { + "version": "6.0.14", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz", + "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==", + "dev": true, + "requires": { + "chalk": "2.3.0", + "source-map": "0.6.1", + "supports-color": "4.5.0" + } + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "supports-color": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } + } + } + }, + "postcss-modules-scope": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz", + "integrity": "sha1-1upkmUx5+XtipytCb75gVqGUu5A=", + "dev": true, + "requires": { + "css-selector-tokenizer": "0.7.0", + "postcss": "6.0.14" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", + "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + }, + "chalk": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", + "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", + "dev": true, + "requires": { + "ansi-styles": "3.2.0", + "escape-string-regexp": "1.0.5", + "supports-color": "4.5.0" + } + }, + "color-convert": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz", + "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "postcss": { + "version": "6.0.14", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz", + "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==", + "dev": true, + "requires": { + "chalk": "2.3.0", + "source-map": "0.6.1", + "supports-color": "4.5.0" + } + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "supports-color": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } + } + } + }, + "postcss-modules-values": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz", + "integrity": "sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=", + "dev": true, + "requires": { + "icss-replace-symbols": "1.1.0", + "postcss": "6.0.14" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", + "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + }, + "chalk": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", + "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", + "dev": true, + "requires": { + "ansi-styles": "3.2.0", + "escape-string-regexp": "1.0.5", + "supports-color": "4.5.0" + } + }, + "color-convert": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz", + "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "postcss": { + "version": "6.0.14", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz", + "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==", + "dev": true, + "requires": { + "chalk": "2.3.0", + "source-map": "0.6.1", + "supports-color": "4.5.0" + } + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "supports-color": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } + } + } + }, + "postcss-normalize-charset": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz", + "integrity": "sha1-757nEhLX/nWceO0WL2HtYrXLk/E=", + "dev": true, + "requires": { + "postcss": "5.2.18" + } + }, + "postcss-normalize-url": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz", + "integrity": "sha1-EI90s/L82viRov+j6kWSJ5/HgiI=", + "dev": true, + "requires": { + "is-absolute-url": "2.1.0", + "normalize-url": "1.9.1", + "postcss": "5.2.18", + "postcss-value-parser": "3.3.0" + } + }, + "postcss-ordered-values": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz", + "integrity": "sha1-7sbCpntsQSqNsgQud/6NpD+VwR0=", + "dev": true, + "requires": { + "postcss": "5.2.18", + "postcss-value-parser": "3.3.0" + } + }, + "postcss-reduce-idents": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz", + "integrity": "sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM=", + "dev": true, + "requires": { + "postcss": "5.2.18", + "postcss-value-parser": "3.3.0" + } + }, + "postcss-reduce-initial": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz", + "integrity": "sha1-aPgGlfBF0IJjqHmtJA343WT2ROo=", + "dev": true, + "requires": { + "postcss": "5.2.18" + } + }, + "postcss-reduce-transforms": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz", + "integrity": "sha1-/3b02CEkN7McKYpC0uFEQCV3GuE=", + "dev": true, + "requires": { + "has": "1.0.1", + "postcss": "5.2.18", + "postcss-value-parser": "3.3.0" + } + }, + "postcss-selector-parser": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz", + "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=", + "dev": true, + "requires": { + "flatten": "1.0.2", + "indexes-of": "1.0.1", + "uniq": "1.0.1" + } + }, + "postcss-svgo": { + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-2.1.6.tgz", + "integrity": "sha1-tt8YqmE7Zm4TPwittSGcJoSsEI0=", + "dev": true, + "requires": { + "is-svg": "2.1.0", + "postcss": "5.2.18", + "postcss-value-parser": "3.3.0", + "svgo": "0.7.2" + } + }, + "postcss-unique-selectors": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz", + "integrity": "sha1-mB1X0p3csz57Hf4f1DuGSfkzyh0=", + "dev": true, + "requires": { + "alphanum-sort": "1.0.2", + "postcss": "5.2.18", + "uniqs": "2.0.0" + } + }, + "postcss-url": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/postcss-url/-/postcss-url-5.1.2.tgz", + "integrity": "sha1-mLMWW+jVkkccsMqt3iwNH4MvEz4=", + "dev": true, + "requires": { + "directory-encoder": "0.7.2", + "js-base64": "2.3.2", + "mime": "1.4.1", + "minimatch": "3.0.4", + "mkdirp": "0.5.1", + "path-is-absolute": "1.0.1", + "postcss": "5.2.18" + } + }, + "postcss-value-parser": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz", + "integrity": "sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=", + "dev": true + }, + "postcss-zindex": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-2.2.0.tgz", + "integrity": "sha1-0hCd3AVbka9n/EyzsCWUZjnSryI=", + "dev": true, + "requires": { + "has": "1.0.1", + "postcss": "5.2.18", + "uniqs": "2.0.0" + } + }, + "prepend-http": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", + "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=", + "dev": true + }, + "preserve": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", + "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=", + "dev": true + }, + "pretty-error": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz", + "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=", + "dev": true, + "requires": { + "renderkid": "2.0.1", + "utila": "0.4.0" + } + }, + "process": { + "version": "0.11.10", + "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", + "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=", + "dev": true + }, + "process-nextick-args": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", + "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=" + }, + "promise": { + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", + "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", + "dev": true, + "optional": true, + "requires": { + "asap": "2.0.6" + } + }, + "promise-inflight": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", + "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=", + "dev": true + }, + "protractor": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/protractor/-/protractor-5.1.2.tgz", + "integrity": "sha1-myIXQXCaTGLVzVPGqt1UpxE36V8=", + "dev": true, + "requires": { + "@types/node": "6.0.91", + "@types/q": "0.0.32", + "@types/selenium-webdriver": "2.53.43", + "blocking-proxy": "0.0.5", + "chalk": "1.1.3", + "glob": "7.1.2", + "jasmine": "2.8.0", + "jasminewd2": "2.2.0", + "optimist": "0.6.1", + "q": "1.4.1", + "saucelabs": "1.3.0", + "selenium-webdriver": "3.0.1", + "source-map-support": "0.4.18", + "webdriver-js-extender": "1.0.0", + "webdriver-manager": "12.0.6" + }, + "dependencies": { + "@types/node": { + "version": "6.0.91", + "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.91.tgz", + "integrity": "sha512-0Ev07CZ/Hrc/4qIX3DCNVaaTS9JLn1k2k/omXIkOsJD2q1/JGtwV72slKPZuPBTjq8X7RstutlsIBqkSwP9AKQ==", + "dev": true + }, + "del": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz", + "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=", + "dev": true, + "requires": { + "globby": "5.0.0", + "is-path-cwd": "1.0.0", + "is-path-in-cwd": "1.0.0", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "rimraf": "2.6.2" + } + }, + "globby": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz", + "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", + "dev": true, + "requires": { + "array-union": "1.0.2", + "arrify": "1.0.1", + "glob": "7.1.2", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" + } + }, + "minimist": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", + "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", + "dev": true + }, + "optimist": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", + "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", + "dev": true, + "requires": { + "minimist": "0.0.10", + "wordwrap": "0.0.3" + } + }, + "q": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz", + "integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=", + "dev": true + }, + "webdriver-manager": { + "version": "12.0.6", + "resolved": "https://registry.npmjs.org/webdriver-manager/-/webdriver-manager-12.0.6.tgz", + "integrity": "sha1-PfGkgZdwELTL+MnYXHpXeCjA5ws=", + "dev": true, + "requires": { + "adm-zip": "0.4.7", + "chalk": "1.1.3", + "del": "2.2.2", + "glob": "7.1.2", + "ini": "1.3.4", + "minimist": "1.2.0", + "q": "1.4.1", + "request": "2.83.0", + "rimraf": "2.6.2", + "semver": "5.4.1", + "xml2js": "0.4.19" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + } + } + } + } + }, + "proxy-addr": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.2.tgz", + "integrity": "sha1-ZXFQT0e7mI7IGAJT+F3X4UlSvew=", + "dev": true, + "requires": { + "forwarded": "0.1.2", + "ipaddr.js": "1.5.2" + } + }, + "prr": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz", + "integrity": "sha1-GoS4WQgyVQFBGFPQCB7j+obikmo=", + "dev": true + }, + "pseudomap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", + "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" + }, + "public-encrypt": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz", + "integrity": "sha1-OfaZ86RlYN1eusvKaTyvfGXBjMY=", + "dev": true, + "requires": { + "bn.js": "4.11.8", + "browserify-rsa": "4.0.1", + "create-hash": "1.1.3", + "parse-asn1": "5.1.0", + "randombytes": "2.0.5" + } + }, + "pump": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz", + "integrity": "sha1-Oz7mUS+U8OV1U4wXmV+fFpkKXVE=", + "dev": true, + "requires": { + "end-of-stream": "1.4.0", + "once": "1.4.0" + } + }, + "pumpify": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.3.5.tgz", + "integrity": "sha1-G2ccYZlAq8rqwK0OOjwWS+dgmTs=", + "dev": true, + "requires": { + "duplexify": "3.5.1", + "inherits": "2.0.3", + "pump": "1.0.2" + } + }, + "punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + }, + "q": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", + "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=", + "dev": true + }, + "qjobs": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.1.5.tgz", + "integrity": "sha1-ZZ3p8s+NzCehSBJ28gU3cnI4LnM=", + "dev": true + }, + "qs": { + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz", + "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==" + }, + "query-string": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz", + "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=", + "dev": true, + "requires": { + "object-assign": "4.1.1", + "strict-uri-encode": "1.1.0" + } + }, + "querystring": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", + "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", + "dev": true + }, + "querystring-es3": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", + "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=", + "dev": true + }, + "querystringify": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-0.0.4.tgz", + "integrity": "sha1-DPf4T5Rj/wrlHExLFC2VvjdyTZw=", + "dev": true + }, + "randomatic": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", + "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==", + "dev": true, + "requires": { + "is-number": "3.0.0", + "kind-of": "4.0.0" + }, + "dependencies": { + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "kind-of": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", + "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "randombytes": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz", + "integrity": "sha512-8T7Zn1AhMsQ/HI1SjcCfT/t4ii3eAqco3yOcSzS4mozsOz69lHLsoMXmF9nZgnFanYscnSlUSgs8uZyKzpE6kg==", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" + } + }, + "randomfill": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.3.tgz", + "integrity": "sha512-YL6GrhrWoic0Eq8rXVbMptH7dAxCs0J+mh5Y0euNekPPYaxEmdVGim6GdoxoRzKW2yJoU8tueifS7mYxvcFDEQ==", + "dev": true, + "requires": { + "randombytes": "2.0.5", + "safe-buffer": "5.1.1" + } + }, + "range-parser": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz", + "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=", + "dev": true + }, + "raw-body": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz", + "integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=", + "dev": true, + "requires": { + "bytes": "3.0.0", + "http-errors": "1.6.2", + "iconv-lite": "0.4.19", + "unpipe": "1.0.0" + } + }, + "raw-loader": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz", + "integrity": "sha1-DD0L6u2KAclm2Xh793goElKpeao=", + "dev": true + }, + "read-pkg": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", + "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", + "requires": { + "load-json-file": "1.1.0", + "normalize-package-data": "2.4.0", + "path-type": "1.1.0" + } + }, + "read-pkg-up": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", + "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", + "requires": { + "find-up": "1.1.2", + "read-pkg": "1.1.0" + } + }, + "readable-stream": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "readdirp": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz", + "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "minimatch": "3.0.4", + "readable-stream": "2.3.3", + "set-immediate-shim": "1.0.1" + } + }, + "redent": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", + "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", + "requires": { + "indent-string": "2.1.0", + "strip-indent": "1.0.1" + } + }, + "reduce-css-calc": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz", + "integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=", + "dev": true, + "requires": { + "balanced-match": "0.4.2", + "math-expression-evaluator": "1.2.17", + "reduce-function-call": "1.0.2" + }, + "dependencies": { + "balanced-match": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", + "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=", + "dev": true + } + } + }, + "reduce-function-call": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.2.tgz", + "integrity": "sha1-WiAL+S4ON3UXUv5FsKszD9S2vpk=", + "dev": true, + "requires": { + "balanced-match": "0.4.2" + }, + "dependencies": { + "balanced-match": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", + "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=", + "dev": true + } + } + }, + "reflect-metadata": { + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.10.tgz", + "integrity": "sha1-tPg3BEFqytiZiMmxVjXUfgO5NEo=", + "dev": true + }, + "regenerate": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.3.tgz", + "integrity": "sha512-jVpo1GadrDAK59t/0jRx5VxYWQEDkkEKi6+HjE3joFVLfDOh9Xrdh0dF1eSq+BI/SwvTQ44gSscJ8N5zYL61sg==", + "dev": true + }, + "regenerator-runtime": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz", + "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A==", + "dev": true + }, + "regex-cache": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz", + "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", + "dev": true, + "requires": { + "is-equal-shallow": "0.1.3" + } + }, + "regexpu-core": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz", + "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=", + "dev": true, + "requires": { + "regenerate": "1.3.3", + "regjsgen": "0.2.0", + "regjsparser": "0.1.5" + } + }, + "regjsgen": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", + "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=", + "dev": true + }, + "regjsparser": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", + "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", + "dev": true, + "requires": { + "jsesc": "0.5.0" + } + }, + "relateurl": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", + "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=", + "dev": true + }, + "remove-trailing-separator": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", + "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", + "dev": true + }, + "renderkid": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.1.tgz", + "integrity": "sha1-iYyr/Ivt5Le5ETWj/9Mj5YwNsxk=", + "dev": true, + "requires": { + "css-select": "1.2.0", + "dom-converter": "0.1.4", + "htmlparser2": "3.3.0", + "strip-ansi": "3.0.1", + "utila": "0.3.3" + }, + "dependencies": { + "utila": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/utila/-/utila-0.3.3.tgz", + "integrity": "sha1-1+jn1+MJEHCSsF+NloiCTWM6QiY=", + "dev": true + } + } + }, + "repeat-element": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz", + "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=", + "dev": true + }, + "repeat-string": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", + "dev": true + }, + "repeating": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", + "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", + "requires": { + "is-finite": "1.0.2" + } + }, + "request": { + "version": "2.83.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz", + "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==", + "requires": { + "aws-sign2": "0.7.0", + "aws4": "1.6.0", + "caseless": "0.12.0", + "combined-stream": "1.0.5", + "extend": "3.0.1", + "forever-agent": "0.6.1", + "form-data": "2.3.1", + "har-validator": "5.0.3", + "hawk": "6.0.2", + "http-signature": "1.2.0", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.17", + "oauth-sign": "0.8.2", + "performance-now": "2.1.0", + "qs": "6.5.1", + "safe-buffer": "5.1.1", + "stringstream": "0.0.5", + "tough-cookie": "2.3.3", + "tunnel-agent": "0.6.0", + "uuid": "3.1.0" + } + }, + "require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" + }, + "require-from-string": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz", + "integrity": "sha1-UpyczvJzgK3+yaL5ZbZJu+5jZBg=", + "dev": true + }, + "require-main-filename": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", + "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" + }, + "requires-port": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", + "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", + "dev": true + }, + "resolve": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz", + "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==", + "dev": true, + "requires": { + "path-parse": "1.0.5" + } + }, + "resolve-cwd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz", + "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", + "dev": true, + "requires": { + "resolve-from": "3.0.0" + } + }, + "resolve-from": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", + "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", + "dev": true + }, + "right-align": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", + "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", + "dev": true, + "requires": { + "align-text": "0.1.4" + } + }, + "rimraf": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", + "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", + "requires": { + "glob": "7.1.2" + } + }, + "ripemd160": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz", + "integrity": "sha1-D0WEKVxTo2KK9+bXmsohzlfRxuc=", + "dev": true, + "requires": { + "hash-base": "2.0.2", + "inherits": "2.0.3" + } + }, + "run-queue": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz", + "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=", + "dev": true, + "requires": { + "aproba": "1.2.0" + } + }, + "rxjs": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.4.0.tgz", + "integrity": "sha1-p9sUqxV/nXqsalbmVeejhg05vyY=", + "requires": { + "symbol-observable": "1.0.4" + } + }, + "safe-buffer": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", + "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" + }, + "sass-graph": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz", + "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=", + "requires": { + "glob": "7.1.2", + "lodash": "4.17.4", + "scss-tokenizer": "0.2.3", + "yargs": "7.1.0" + } + }, + "sass-loader": { + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-6.0.6.tgz", + "integrity": "sha512-c3/Zc+iW+qqDip6kXPYLEgsAu2lf4xz0EZDplB7EmSUMda12U1sGJPetH55B/j9eu0bTtKzKlNPWWyYC7wFNyQ==", + "dev": true, + "requires": { + "async": "2.6.0", + "clone-deep": "0.3.0", + "loader-utils": "1.1.0", + "lodash.tail": "4.1.1", + "pify": "3.0.0" + }, + "dependencies": { + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true + } + } + }, + "saucelabs": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/saucelabs/-/saucelabs-1.3.0.tgz", + "integrity": "sha1-0kDoAJ33+ocwbsRXimm6O1xCT+4=", + "dev": true, + "requires": { + "https-proxy-agent": "1.0.0" + } + }, + "sax": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", + "dev": true + }, + "schema-utils": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz", + "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=", + "dev": true, + "requires": { + "ajv": "5.3.0" + } + }, + "script-loader": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/script-loader/-/script-loader-0.7.2.tgz", + "integrity": "sha512-UMNLEvgOAQuzK8ji8qIscM3GIrRCWN6MmMXGD4SD5l6cSycgGsCo0tX5xRnfQcoghqct0tjHjcykgI1PyBE2aA==", + "dev": true, + "requires": { + "raw-loader": "0.5.1" + } + }, + "scss-tokenizer": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz", + "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=", + "requires": { + "js-base64": "2.3.2", + "source-map": "0.4.4" + } + }, + "select-hose": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", + "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=", + "dev": true + }, + "selenium-webdriver": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-3.0.1.tgz", + "integrity": "sha1-ot6l2kqX9mcuiefKcnbO+jZRR6c=", + "dev": true, + "requires": { + "adm-zip": "0.4.7", + "rimraf": "2.6.2", + "tmp": "0.0.30", + "xml2js": "0.4.19" + }, + "dependencies": { + "tmp": { + "version": "0.0.30", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.30.tgz", + "integrity": "sha1-ckGdSovn1s51FI/YsyTlk6cRwu0=", + "dev": true, + "requires": { + "os-tmpdir": "1.0.2" + } + } + } + }, + "selfsigned": { + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.1.tgz", + "integrity": "sha1-v4y3uDJWxFUeMTR8YxF3jbme7FI=", + "dev": true, + "requires": { + "node-forge": "0.6.33" + } + }, + "semver": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", + "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==" + }, + "semver-dsl": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/semver-dsl/-/semver-dsl-1.0.1.tgz", + "integrity": "sha1-02eN5VVeimH2Ke7QJTZq5fJzQKA=", + "dev": true, + "requires": { + "semver": "5.4.1" + } + }, + "send": { + "version": "0.16.1", + "resolved": "https://registry.npmjs.org/send/-/send-0.16.1.tgz", + "integrity": "sha512-ElCLJdJIKPk6ux/Hocwhk7NFHpI3pVm/IZOYWqUmoxcgeyM+MpxHHKhb8QmlJDX1pU6WrgaHBkVNm73Sv7uc2A==", + "dev": true, + "requires": { + "debug": "2.6.9", + "depd": "1.1.1", + "destroy": "1.0.4", + "encodeurl": "1.0.1", + "escape-html": "1.0.3", + "etag": "1.8.1", + "fresh": "0.5.2", + "http-errors": "1.6.2", + "mime": "1.4.1", + "ms": "2.0.0", + "on-finished": "2.3.0", + "range-parser": "1.2.0", + "statuses": "1.3.1" + } + }, + "serve-index": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz", + "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=", + "dev": true, + "requires": { + "accepts": "1.3.4", + "batch": "0.6.1", + "debug": "2.6.9", + "escape-html": "1.0.3", + "http-errors": "1.6.2", + "mime-types": "2.1.17", + "parseurl": "1.3.2" + } + }, + "serve-static": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.1.tgz", + "integrity": "sha512-hSMUZrsPa/I09VYFJwa627JJkNs0NrfL1Uzuup+GqHfToR2KcsXFymXSV90hoyw3M+msjFuQly+YzIH/q0MGlQ==", + "dev": true, + "requires": { + "encodeurl": "1.0.1", + "escape-html": "1.0.3", + "parseurl": "1.3.2", + "send": "0.16.1" + } + }, + "set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" + }, + "set-immediate-shim": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", + "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=", + "dev": true + }, + "setimmediate": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=", + "dev": true + }, + "setprototypeof": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", + "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==", + "dev": true + }, + "sha.js": { + "version": "2.4.9", + "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.9.tgz", + "integrity": "sha512-G8zektVqbiPHrylgew9Zg1VRB1L/DtXNUVAM6q4QLy8NE3qtHlFXTf8VLL4k1Yl6c7NMjtZUTdXV+X44nFaT6A==", + "dev": true, + "requires": { + "inherits": "2.0.3", + "safe-buffer": "5.1.1" + } + }, + "shallow-clone": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz", + "integrity": "sha1-WQnodLp3EG1zrEFM/sH/yofZcGA=", + "dev": true, + "requires": { + "is-extendable": "0.1.1", + "kind-of": "2.0.1", + "lazy-cache": "0.2.7", + "mixin-object": "2.0.1" + }, + "dependencies": { + "kind-of": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz", + "integrity": "sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "shebang-command": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", + "dev": true, + "requires": { + "shebang-regex": "1.0.0" + } + }, + "shebang-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", + "dev": true + }, + "signal-exit": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" + }, + "silent-error": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/silent-error/-/silent-error-1.1.0.tgz", + "integrity": "sha1-IglwbxyFCp8dENDYQJGLRvJuG8k=", + "dev": true, + "requires": { + "debug": "2.6.9" + } + }, + "sntp": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz", + "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==", + "requires": { + "hoek": "4.2.0" + } + }, + "socket.io": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-1.7.3.tgz", + "integrity": "sha1-uK+cq6AJSeVo42nxMn6pvp6iRhs=", + "dev": true, + "requires": { + "debug": "2.3.3", + "engine.io": "1.8.3", + "has-binary": "0.1.7", + "object-assign": "4.1.0", + "socket.io-adapter": "0.5.0", + "socket.io-client": "1.7.3", + "socket.io-parser": "2.3.1" + }, + "dependencies": { + "debug": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", + "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", + "dev": true, + "requires": { + "ms": "0.7.2" + } + }, + "ms": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", + "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", + "dev": true + }, + "object-assign": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz", + "integrity": "sha1-ejs9DpgGPUP0wD8uiubNUahog6A=", + "dev": true + } + } + }, + "socket.io-adapter": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz", + "integrity": "sha1-y21LuL7IHhB4uZZ3+c7QBGBmu4s=", + "dev": true, + "requires": { + "debug": "2.3.3", + "socket.io-parser": "2.3.1" + }, + "dependencies": { + "debug": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", + "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", + "dev": true, + "requires": { + "ms": "0.7.2" + } + }, + "ms": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", + "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", + "dev": true + } + } + }, + "socket.io-client": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.3.tgz", + "integrity": "sha1-sw6GqhDV7zVGYBwJzeR2Xjgdo3c=", + "dev": true, + "requires": { + "backo2": "1.0.2", + "component-bind": "1.0.0", + "component-emitter": "1.2.1", + "debug": "2.3.3", + "engine.io-client": "1.8.3", + "has-binary": "0.1.7", + "indexof": "0.0.1", + "object-component": "0.0.3", + "parseuri": "0.0.5", + "socket.io-parser": "2.3.1", + "to-array": "0.1.4" + }, + "dependencies": { + "component-emitter": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", + "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", + "dev": true + }, + "debug": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", + "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", + "dev": true, + "requires": { + "ms": "0.7.2" + } + }, + "ms": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", + "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", + "dev": true + } + } + }, + "socket.io-parser": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz", + "integrity": "sha1-3VMgJRA85Clpcya+/WQAX8/ltKA=", + "dev": true, + "requires": { + "component-emitter": "1.1.2", + "debug": "2.2.0", + "isarray": "0.0.1", + "json3": "3.3.2" + }, + "dependencies": { + "debug": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", + "dev": true, + "requires": { + "ms": "0.7.1" + } + }, + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + }, + "ms": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", + "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=", + "dev": true + } + } + }, + "sockjs": { + "version": "0.3.18", + "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.18.tgz", + "integrity": "sha1-2bKJMWyn33dZXvKZ4HXw+TfrQgc=", + "dev": true, + "requires": { + "faye-websocket": "0.10.0", + "uuid": "2.0.3" + }, + "dependencies": { + "uuid": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz", + "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=", + "dev": true + } + } + }, + "sockjs-client": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.1.4.tgz", + "integrity": "sha1-W6vjhrd15M8U51IJEUUmVAFsixI=", + "dev": true, + "requires": { + "debug": "2.6.9", + "eventsource": "0.1.6", + "faye-websocket": "0.11.1", + "inherits": "2.0.3", + "json3": "3.3.2", + "url-parse": "1.2.0" + }, + "dependencies": { + "faye-websocket": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz", + "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=", + "dev": true, + "requires": { + "websocket-driver": "0.7.0" + } + } + } + }, + "sort-keys": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz", + "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=", + "dev": true, + "requires": { + "is-plain-obj": "1.1.0" + } + }, + "source-list-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz", + "integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==", + "dev": true + }, + "source-map": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", + "requires": { + "amdefine": "1.0.1" + } + }, + "source-map-loader": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-0.2.3.tgz", + "integrity": "sha512-MYbFX9DYxmTQFfy2v8FC1XZwpwHKYxg3SK8Wb7VPBKuhDjz8gi9re2819MsG4p49HDyiOSUKlmZ+nQBArW5CGw==", + "dev": true, + "requires": { + "async": "2.6.0", + "loader-utils": "0.2.17", + "source-map": "0.6.1" + }, + "dependencies": { + "loader-utils": { + "version": "0.2.17", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", + "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", + "dev": true, + "requires": { + "big.js": "3.2.0", + "emojis-list": "2.1.0", + "json5": "0.5.1", + "object-assign": "4.1.1" + } + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, + "source-map-support": { + "version": "0.4.18", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz", + "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", + "dev": true, + "requires": { + "source-map": "0.5.7" + }, + "dependencies": { + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } + } + }, + "spdx-correct": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", + "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=", + "requires": { + "spdx-license-ids": "1.2.2" + } + }, + "spdx-expression-parse": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", + "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=" + }, + "spdx-license-ids": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz", + "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=" + }, + "spdy": { + "version": "3.4.7", + "resolved": "https://registry.npmjs.org/spdy/-/spdy-3.4.7.tgz", + "integrity": "sha1-Qv9B7OXMD5mjpsKKq7c/XDsDrLw=", + "dev": true, + "requires": { + "debug": "2.6.9", + "handle-thing": "1.2.5", + "http-deceiver": "1.2.7", + "safe-buffer": "5.1.1", + "select-hose": "2.0.0", + "spdy-transport": "2.0.20" + } + }, + "spdy-transport": { + "version": "2.0.20", + "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-2.0.20.tgz", + "integrity": "sha1-c15yBUxIayNU/onnAiVgBKOazk0=", + "dev": true, + "requires": { + "debug": "2.6.9", + "detect-node": "2.0.3", + "hpack.js": "2.1.6", + "obuf": "1.1.1", + "readable-stream": "2.3.3", + "safe-buffer": "5.1.1", + "wbuf": "1.7.2" + } + }, + "sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", + "dev": true + }, + "sshpk": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz", + "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=", + "requires": { + "asn1": "0.2.3", + "assert-plus": "1.0.0", + "bcrypt-pbkdf": "1.0.1", + "dashdash": "1.14.1", + "ecc-jsbn": "0.1.1", + "getpass": "0.1.7", + "jsbn": "0.1.1", + "tweetnacl": "0.14.5" + } + }, + "ssri": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.0.0.tgz", + "integrity": "sha512-728D4yoQcQm1ooZvSbywLkV1RjfITZXh0oWrhM/lnsx3nAHx7LsRGJWB/YyvoceAYRq98xqbstiN4JBv1/wNHg==", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" + } + }, + "statuses": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz", + "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=", + "dev": true + }, + "stdout-stream": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.0.tgz", + "integrity": "sha1-osfIWH5U2UJ+qe2zrD8s1SLfN4s=", + "requires": { + "readable-stream": "2.3.3" + } + }, + "stream-browserify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz", + "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=", + "dev": true, + "requires": { + "inherits": "2.0.3", + "readable-stream": "2.3.3" + } + }, + "stream-each": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.2.tgz", + "integrity": "sha512-mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA==", + "dev": true, + "requires": { + "end-of-stream": "1.4.0", + "stream-shift": "1.0.0" + } + }, + "stream-http": { + "version": "2.7.2", + "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz", + "integrity": "sha512-c0yTD2rbQzXtSsFSVhtpvY/vS6u066PcXOX9kBB3mSO76RiUQzL340uJkGBWnlBg4/HZzqiUXtaVA7wcRcJgEw==", + "dev": true, + "requires": { + "builtin-status-codes": "3.0.0", + "inherits": "2.0.3", + "readable-stream": "2.3.3", + "to-arraybuffer": "1.0.1", + "xtend": "4.0.1" + } + }, + "stream-shift": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz", + "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=", + "dev": true + }, + "strict-uri-encode": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", + "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=", + "dev": true + }, + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "requires": { + "safe-buffer": "5.1.1" + } + }, + "stringstream": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", + "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=" + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "requires": { + "ansi-regex": "2.1.1" + } + }, + "strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "requires": { + "is-utf8": "0.2.1" + } + }, + "strip-eof": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", + "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", + "dev": true + }, + "strip-indent": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", + "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", + "requires": { + "get-stdin": "4.0.1" + } + }, + "strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", + "dev": true + }, + "style-loader": { + "version": "0.13.2", + "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.13.2.tgz", + "integrity": "sha1-dFMzhM9pjHEEx5URULSXF63C87s=", + "dev": true, + "requires": { + "loader-utils": "1.1.0" + } + }, + "stylus": { + "version": "0.54.5", + "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz", + "integrity": "sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=", + "dev": true, + "requires": { + "css-parse": "1.7.0", + "debug": "2.6.9", + "glob": "7.0.6", + "mkdirp": "0.5.1", + "sax": "0.5.8", + "source-map": "0.1.43" + }, + "dependencies": { + "glob": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz", + "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "sax": { + "version": "0.5.8", + "resolved": "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz", + "integrity": "sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=", + "dev": true + }, + "source-map": { + "version": "0.1.43", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", + "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", + "dev": true, + "requires": { + "amdefine": "1.0.1" + } + } + } + }, + "stylus-loader": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.1.tgz", + "integrity": "sha1-d/SzT9Aw0lsmF7z1UT21sHMMQIk=", + "dev": true, + "requires": { + "loader-utils": "1.1.0", + "lodash.clonedeep": "4.5.0", + "when": "3.6.4" + } + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" + }, + "svgo": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz", + "integrity": "sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U=", + "dev": true, + "requires": { + "coa": "1.0.4", + "colors": "1.1.2", + "csso": "2.3.2", + "js-yaml": "3.7.0", + "mkdirp": "0.5.1", + "sax": "1.2.4", + "whet.extend": "0.9.9" + } + }, + "symbol-observable": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.4.tgz", + "integrity": "sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0=" + }, + "tapable": { + "version": "0.2.8", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.8.tgz", + "integrity": "sha1-mTcqXJmb8t8WCvwNdL7U9HlIzSI=", + "dev": true + }, + "tar": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", + "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", + "requires": { + "block-stream": "0.0.9", + "fstream": "1.0.11", + "inherits": "2.0.3" + } + }, + "through": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", + "dev": true + }, + "through2": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", + "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", + "dev": true, + "requires": { + "readable-stream": "2.3.3", + "xtend": "4.0.1" + } + }, + "thunky": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/thunky/-/thunky-0.1.0.tgz", + "integrity": "sha1-vzAUaCTituZ7Dy16Ssi+smkIaE4=", + "dev": true + }, + "time-stamp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-2.0.0.tgz", + "integrity": "sha1-lcakRTDhW6jW9KPsuMOj+sRto1c=", + "dev": true + }, + "timers-browserify": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.4.tgz", + "integrity": "sha512-uZYhyU3EX8O7HQP+J9fTVYwsq90Vr68xPEFo7yrVImIxYvHgukBEgOB/SgGoorWVTzGM/3Z+wUNnboA4M8jWrg==", + "dev": true, + "requires": { + "setimmediate": "1.0.5" + } + }, + "tmp": { + "version": "0.0.31", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz", + "integrity": "sha1-jzirlDjhcxXl29izZX6L+yd65Kc=", + "dev": true, + "requires": { + "os-tmpdir": "1.0.2" + } + }, + "to-array": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz", + "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=", + "dev": true + }, + "to-arraybuffer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", + "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=", + "dev": true + }, + "to-fast-properties": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", + "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=", + "dev": true + }, + "toposort": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.6.tgz", + "integrity": "sha1-wxdI5V0hDv/AD9zcfW5o19e7nOw=", + "dev": true + }, + "tough-cookie": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz", + "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=", + "requires": { + "punycode": "1.4.1" + } + }, + "tree-kill": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.0.tgz", + "integrity": "sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg==", + "dev": true + }, + "trim-newlines": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", + "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=" + }, + "trim-right": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", + "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=", + "dev": true + }, + "ts-helpers": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/ts-helpers/-/ts-helpers-1.1.2.tgz", + "integrity": "sha1-/Gm+nx87rtAfsaDvjUz+dIgU2DU=" + }, + "ts-node": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-3.0.4.tgz", + "integrity": "sha1-oUdevyT9Ti7i+6ixqhYFuXe95QY=", + "dev": true, + "requires": { + "arrify": "1.0.1", + "chalk": "1.1.3", + "diff": "3.4.0", + "make-error": "1.3.0", + "minimist": "1.2.0", + "mkdirp": "0.5.1", + "source-map-support": "0.4.18", + "tsconfig": "6.0.0", + "v8flags": "2.1.1", + "yn": "1.3.0" + } + }, + "tsconfig": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/tsconfig/-/tsconfig-6.0.0.tgz", + "integrity": "sha1-aw6DdgA9evGGT434+J3QBZ/80DI=", + "dev": true, + "requires": { + "strip-bom": "3.0.0", + "strip-json-comments": "2.0.1" + }, + "dependencies": { + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "dev": true + } + } + }, + "tsickle": { + "version": "0.21.6", + "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.21.6.tgz", + "integrity": "sha1-U7Abl5xcE/2xOvs/uVgXflmRWI0=", + "dev": true, + "requires": { + "minimist": "1.2.0", + "mkdirp": "0.5.1", + "source-map": "0.5.7", + "source-map-support": "0.4.18" + }, + "dependencies": { + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } + } + }, + "tslib": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.8.0.tgz", + "integrity": "sha512-ymKWWZJST0/CkgduC2qkzjMOWr4bouhuURNXCn/inEX0L57BnRG6FhX76o7FOnsjHazCjfU2LKeSrlS2sIKQJg==", + "dev": true + }, + "tslint": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.3.2.tgz", + "integrity": "sha1-5WRZ+wlacwfxA7hAUhdPXju+9u0=", + "dev": true, + "requires": { + "babel-code-frame": "6.26.0", + "colors": "1.1.2", + "diff": "3.4.0", + "glob": "7.1.2", + "optimist": "0.6.1", + "resolve": "1.5.0", + "semver": "5.4.1", + "tslib": "1.8.0", + "tsutils": "2.12.2" + }, + "dependencies": { + "minimist": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", + "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", + "dev": true + }, + "optimist": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", + "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", + "dev": true, + "requires": { + "minimist": "0.0.10", + "wordwrap": "0.0.3" + } + } + } + }, + "tsutils": { + "version": "2.12.2", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.12.2.tgz", + "integrity": "sha1-rVikhl0X7D3bZjG2ylO+FKVlb/M=", + "dev": true, + "requires": { + "tslib": "1.8.0" + } + }, + "tty-browserify": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", + "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", + "dev": true + }, + "tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "requires": { + "safe-buffer": "5.1.1" + } + }, + "tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", + "optional": true + }, + "type-is": { + "version": "1.6.15", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz", + "integrity": "sha1-yrEPtJCeRByChC6v4a1kbIGARBA=", + "dev": true, + "requires": { + "media-typer": "0.3.0", + "mime-types": "2.1.17" + } + }, + "typedarray": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", + "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", + "dev": true + }, + "typescript": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.3.3.tgz", + "integrity": "sha1-ljnzw7QBSOjKl/4IpR3RiRu2viI=", + "dev": true + }, + "uglify-js": { + "version": "3.1.9", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.9.tgz", + "integrity": "sha512-ari2E89bD7f+fMU173NgF12JBcOhgoxeyuCs97h5K58IBENrnG9eVj2lFadrOPdqf0KifsxVmUQfzA2cHNxCZQ==", + "dev": true, + "requires": { + "commander": "2.11.0", + "source-map": "0.6.1" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, + "uglify-to-browserify": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", + "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", + "dev": true, + "optional": true + }, + "uglifyjs": { + "version": "2.4.11", + "resolved": "https://registry.npmjs.org/uglifyjs/-/uglifyjs-2.4.11.tgz", + "integrity": "sha1-NEDWTgRXWViVJEGOtkHGi7kNET4=" + }, + "uglifyjs-webpack-plugin": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.0.0.tgz", + "integrity": "sha512-23qmtiLm1X7O0XVSZ54W7XGHykPss+2lo3RYC9zSzK3DDT5W27woZpDFDKguDCnG1RIX8cDnmy5j+dtXxJCA/Q==", + "dev": true, + "requires": { + "cacache": "10.0.0", + "find-cache-dir": "1.0.0", + "schema-utils": "0.3.0", + "source-map": "0.5.7", + "uglify-es": "3.1.9", + "webpack-sources": "1.0.2", + "worker-farm": "1.5.1" + }, + "dependencies": { + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + }, + "uglify-es": { + "version": "3.1.9", + "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.1.9.tgz", + "integrity": "sha512-wVSiJKHDgDDFmxTVVvnbAH6IpamAFHYDI+5JvwPdaqIMnk8kRTX2JKwq1Fx7gb2+Jj5Dus8kzvIpKkWOMNU51w==", + "dev": true, + "requires": { + "commander": "2.11.0", + "source-map": "0.6.1" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + } + } + }, + "ultron": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz", + "integrity": "sha1-rOEWq1V80Zc4ak6I9GhTeMiy5Po=", + "dev": true + }, + "uniq": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz", + "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=", + "dev": true + }, + "uniqid": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/uniqid/-/uniqid-4.1.1.tgz", + "integrity": "sha1-iSIN32t1GuUrX3JISGNShZa7hME=", + "dev": true, + "requires": { + "macaddress": "0.2.8" + } + }, + "uniqs": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz", + "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=", + "dev": true + }, + "unique-filename": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.0.tgz", + "integrity": "sha1-0F8v5AMlYIcfMOk8vnNe6iAVFPM=", + "dev": true, + "requires": { + "unique-slug": "2.0.0" + } + }, + "unique-slug": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.0.tgz", + "integrity": "sha1-22Z258fMBimHj/GWCXx4hVrp9Ks=", + "dev": true, + "requires": { + "imurmurhash": "0.1.4" + } + }, + "universalify": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz", + "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=", + "dev": true + }, + "unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", + "dev": true + }, + "upper-case": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz", + "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=", + "dev": true + }, + "url": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", + "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", + "dev": true, + "requires": { + "punycode": "1.3.2", + "querystring": "0.2.0" + }, + "dependencies": { + "punycode": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", + "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=", + "dev": true + } + } + }, + "url-loader": { + "version": "0.5.9", + "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.5.9.tgz", + "integrity": "sha512-B7QYFyvv+fOBqBVeefsxv6koWWtjmHaMFT6KZWti4KRw8YUD/hOU+3AECvXuzyVawIBx3z7zQRejXCDSO5kk1Q==", + "dev": true, + "requires": { + "loader-utils": "1.1.0", + "mime": "1.3.6" + }, + "dependencies": { + "mime": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz", + "integrity": "sha1-WR2E02U6awtKO5343lqoEI5y5eA=", + "dev": true + } + } + }, + "url-parse": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.2.0.tgz", + "integrity": "sha512-DT1XbYAfmQP65M/mE6OALxmXzZ/z1+e5zk2TcSKe/KiYbNGZxgtttzC0mR/sjopbpOXcbniq7eIKmocJnUWlEw==", + "dev": true, + "requires": { + "querystringify": "1.0.0", + "requires-port": "1.0.0" + }, + "dependencies": { + "querystringify": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-1.0.0.tgz", + "integrity": "sha1-YoYkIRLFtxL6ZU5SZlK/ahP/Bcs=", + "dev": true + } + } + }, + "user-home": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz", + "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=", + "dev": true + }, + "useragent": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.2.1.tgz", + "integrity": "sha1-z1k+9PLRdYdei7ZY6pLhik/QbY4=", + "dev": true, + "requires": { + "lru-cache": "2.2.4", + "tmp": "0.0.31" + }, + "dependencies": { + "lru-cache": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz", + "integrity": "sha1-bGWGGb7PFAMdDQtZSxYELOTcBj0=", + "dev": true + } + } + }, + "util": { + "version": "0.10.3", + "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", + "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", + "dev": true, + "requires": { + "inherits": "2.0.1" + }, + "dependencies": { + "inherits": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", + "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=", + "dev": true + } + } + }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + }, + "utila": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz", + "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=", + "dev": true + }, + "utils-merge": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=", + "dev": true + }, + "uuid": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz", + "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==" + }, + "v8flags": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz", + "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=", + "dev": true, + "requires": { + "user-home": "1.1.1" + } + }, + "validate-npm-package-license": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz", + "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=", + "requires": { + "spdx-correct": "1.0.2", + "spdx-expression-parse": "1.0.4" + } + }, + "vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", + "dev": true + }, + "vendors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.1.tgz", + "integrity": "sha1-N61zyO5Bf7PVgOeFMSMH0nSEfyI=", + "dev": true + }, + "verror": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "requires": { + "assert-plus": "1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "1.3.0" + } + }, + "vlq": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/vlq/-/vlq-0.2.3.tgz", + "integrity": "sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==", + "dev": true + }, + "vm-browserify": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz", + "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=", + "dev": true, + "requires": { + "indexof": "0.0.1" + } + }, + "void-elements": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz", + "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=", + "dev": true + }, + "watchpack": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.4.0.tgz", + "integrity": "sha1-ShRyvLuVK9Cpu0A2gB+VTfs5+qw=", + "dev": true, + "requires": { + "async": "2.6.0", + "chokidar": "1.7.0", + "graceful-fs": "4.1.11" + } + }, + "wbuf": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.2.tgz", + "integrity": "sha1-1pe5nx9ZUS3ydRvkJ2nBWAtYAf4=", + "dev": true, + "requires": { + "minimalistic-assert": "1.0.0" + } + }, + "webdriver-js-extender": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/webdriver-js-extender/-/webdriver-js-extender-1.0.0.tgz", + "integrity": "sha1-gcUzqeM9W/tZe05j4s2yW1R3dRU=", + "dev": true, + "requires": { + "@types/selenium-webdriver": "2.53.43", + "selenium-webdriver": "2.53.3" + }, + "dependencies": { + "adm-zip": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.4.tgz", + "integrity": "sha1-ph7VrmkFw66lizplfSUDMJEFJzY=", + "dev": true + }, + "sax": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz", + "integrity": "sha1-VjsZx8HeiS4Jv8Ty/DDjwn8JUrk=", + "dev": true + }, + "selenium-webdriver": { + "version": "2.53.3", + "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.53.3.tgz", + "integrity": "sha1-0p/1qVff8aG0ncRXdW5OS/vc4IU=", + "dev": true, + "requires": { + "adm-zip": "0.4.4", + "rimraf": "2.6.2", + "tmp": "0.0.24", + "ws": "1.1.2", + "xml2js": "0.4.4" + } + }, + "tmp": { + "version": "0.0.24", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.24.tgz", + "integrity": "sha1-1qXhmNFKmDXMby18PZ4wJCjIzxI=", + "dev": true + }, + "xml2js": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz", + "integrity": "sha1-MREBAAMAiuGSQOuhdJe1fHKcVV0=", + "dev": true, + "requires": { + "sax": "0.6.1", + "xmlbuilder": "9.0.4" + } + } + } + }, + "webpack": { + "version": "3.8.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.8.1.tgz", + "integrity": "sha512-5ZXLWWsMqHKFr5y0N3Eo5IIisxeEeRAajNq4mELb/WELOR7srdbQk2N5XiyNy2A/AgvlR3AmeBCZJW8lHrolbw==", + "dev": true, + "requires": { + "acorn": "5.2.1", + "acorn-dynamic-import": "2.0.2", + "ajv": "5.3.0", + "ajv-keywords": "2.1.1", + "async": "2.6.0", + "enhanced-resolve": "3.4.1", + "escope": "3.6.0", + "interpret": "1.0.4", + "json-loader": "0.5.7", + "json5": "0.5.1", + "loader-runner": "2.3.0", + "loader-utils": "1.1.0", + "memory-fs": "0.4.1", + "mkdirp": "0.5.1", + "node-libs-browser": "2.0.0", + "source-map": "0.5.7", + "supports-color": "4.5.0", + "tapable": "0.2.8", + "uglifyjs-webpack-plugin": "0.4.6", + "watchpack": "1.4.0", + "webpack-sources": "1.0.2", + "yargs": "8.0.2" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "camelcase": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", + "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", + "dev": true + }, + "cliui": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", + "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", + "dev": true, + "requires": { + "center-align": "0.1.3", + "right-align": "0.1.3", + "wordwrap": "0.0.2" + } + }, + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "dev": true, + "requires": { + "locate-path": "2.0.0" + } + }, + "load-json-file": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", + "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "strip-bom": "3.0.0" + } + }, + "os-locale": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", + "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", + "dev": true, + "requires": { + "execa": "0.7.0", + "lcid": "1.0.0", + "mem": "1.1.0" + } + }, + "path-type": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", + "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", + "dev": true, + "requires": { + "pify": "2.3.0" + } + }, + "read-pkg": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", + "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", + "dev": true, + "requires": { + "load-json-file": "2.0.0", + "normalize-package-data": "2.4.0", + "path-type": "2.0.0" + } + }, + "read-pkg-up": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", + "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", + "dev": true, + "requires": { + "find-up": "2.1.0", + "read-pkg": "2.0.0" + } + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + }, + "dependencies": { + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + } + } + }, + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "dev": true + }, + "supports-color": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } + }, + "uglify-js": { + "version": "2.8.29", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", + "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", + "dev": true, + "requires": { + "source-map": "0.5.7", + "uglify-to-browserify": "1.0.2", + "yargs": "3.10.0" + }, + "dependencies": { + "yargs": { + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", + "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", + "dev": true, + "requires": { + "camelcase": "1.2.1", + "cliui": "2.1.0", + "decamelize": "1.2.0", + "window-size": "0.1.0" + } + } + } + }, + "uglifyjs-webpack-plugin": { + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz", + "integrity": "sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=", + "dev": true, + "requires": { + "source-map": "0.5.7", + "uglify-js": "2.8.29", + "webpack-sources": "1.0.2" + } + }, + "which-module": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", + "dev": true + }, + "wordwrap": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", + "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", + "dev": true + }, + "yargs": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz", + "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=", + "dev": true, + "requires": { + "camelcase": "4.1.0", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.2", + "os-locale": "2.1.0", + "read-pkg-up": "2.0.0", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "2.1.1", + "which-module": "2.0.0", + "y18n": "3.2.1", + "yargs-parser": "7.0.0" + }, + "dependencies": { + "camelcase": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", + "dev": true + }, + "cliui": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", + "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", + "dev": true, + "requires": { + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wrap-ansi": "2.1.0" + }, + "dependencies": { + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "dev": true, + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + } + } + } + } + }, + "yargs-parser": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz", + "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=", + "dev": true, + "requires": { + "camelcase": "4.1.0" + }, + "dependencies": { + "camelcase": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", + "dev": true + } + } + } + } + }, + "webpack-concat-plugin": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/webpack-concat-plugin/-/webpack-concat-plugin-1.4.0.tgz", + "integrity": "sha512-Ym9Qm5Sw9oXJYChNJk09I/yaXDaV3UDxsa07wcCvILzIeSJTnSUZjhS4y2YkULzgE8VHOv9X04KtlJPZGwXqMg==", + "dev": true, + "requires": { + "md5": "2.2.1", + "uglify-js": "2.8.29" + }, + "dependencies": { + "camelcase": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", + "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", + "dev": true + }, + "cliui": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", + "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", + "dev": true, + "requires": { + "center-align": "0.1.3", + "right-align": "0.1.3", + "wordwrap": "0.0.2" + } + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + }, + "uglify-js": { + "version": "2.8.29", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", + "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", + "dev": true, + "requires": { + "source-map": "0.5.7", + "uglify-to-browserify": "1.0.2", + "yargs": "3.10.0" + } + }, + "wordwrap": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", + "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", + "dev": true + }, + "yargs": { + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", + "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", + "dev": true, + "requires": { + "camelcase": "1.2.1", + "cliui": "2.1.0", + "decamelize": "1.2.0", + "window-size": "0.1.0" + } + } + } + }, + "webpack-core": { + "version": "0.6.9", + "resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz", + "integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=", + "dev": true, + "requires": { + "source-list-map": "0.1.8", + "source-map": "0.4.4" + }, + "dependencies": { + "source-list-map": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz", + "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=", + "dev": true + } + } + }, + "webpack-dev-middleware": { + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.12.0.tgz", + "integrity": "sha1-007++y7dp+HTtdvgcolRMhllFwk=", + "dev": true, + "requires": { + "memory-fs": "0.4.1", + "mime": "1.4.1", + "path-is-absolute": "1.0.1", + "range-parser": "1.2.0", + "time-stamp": "2.0.0" + } + }, + "webpack-dev-server": { + "version": "2.9.4", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-2.9.4.tgz", + "integrity": "sha512-thrqC0EQEoSjXeYgP6pUXcUCZ+LNrKsDPn+mItLnn5VyyNZOJKd06hUP5vqkYwL8nWWXsii0loSF9NHNccT6ow==", + "dev": true, + "requires": { + "ansi-html": "0.0.7", + "array-includes": "3.0.3", + "bonjour": "3.5.0", + "chokidar": "1.7.0", + "compression": "1.7.1", + "connect-history-api-fallback": "1.5.0", + "debug": "3.1.0", + "del": "3.0.0", + "express": "4.16.2", + "html-entities": "1.2.1", + "http-proxy-middleware": "0.17.4", + "import-local": "0.1.1", + "internal-ip": "1.2.0", + "ip": "1.1.5", + "killable": "1.0.0", + "loglevel": "1.6.0", + "opn": "5.1.0", + "portfinder": "1.0.13", + "selfsigned": "1.10.1", + "serve-index": "1.9.1", + "sockjs": "0.3.18", + "sockjs-client": "1.1.4", + "spdy": "3.4.7", + "strip-ansi": "3.0.1", + "supports-color": "4.5.0", + "webpack-dev-middleware": "1.12.0", + "yargs": "6.6.0" + }, + "dependencies": { + "camelcase": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", + "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", + "dev": true + }, + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "supports-color": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } + }, + "yargs": { + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz", + "integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=", + "dev": true, + "requires": { + "camelcase": "3.0.0", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.2", + "os-locale": "1.4.0", + "read-pkg-up": "1.0.1", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "1.0.2", + "which-module": "1.0.0", + "y18n": "3.2.1", + "yargs-parser": "4.2.1" + } + }, + "yargs-parser": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz", + "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=", + "dev": true, + "requires": { + "camelcase": "3.0.0" + } + } + } + }, + "webpack-merge": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.1.tgz", + "integrity": "sha512-geQsZ86YkXOVOjvPC5yv3JSNnL6/X3Kzh935AQ/gJNEYXEfJDQFu/sdFuktS9OW2JcH/SJec8TGfRdrpHshH7A==", + "dev": true, + "requires": { + "lodash": "4.17.4" + } + }, + "webpack-sources": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.2.tgz", + "integrity": "sha512-Y7UddMCv6dGjy81nBv6nuQeFFIt5aalHm7uyDsAsW86nZwfOVPGRr3XMjEQLaT+WKo8rlzhC9qtbJvYKLtAwaw==", + "dev": true, + "requires": { + "source-list-map": "2.0.0", + "source-map": "0.6.1" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, + "webpack-subresource-integrity": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.0.1.tgz", + "integrity": "sha1-H8CdRkl9pm5GdDoqUdLMOFucsO0=", + "dev": true, + "requires": { + "webpack-core": "0.6.9" + } + }, + "websocket-driver": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz", + "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=", + "dev": true, + "requires": { + "http-parser-js": "0.4.9", + "websocket-extensions": "0.1.3" + } + }, + "websocket-extensions": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz", + "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==", + "dev": true + }, + "when": { + "version": "3.6.4", + "resolved": "https://registry.npmjs.org/when/-/when-3.6.4.tgz", + "integrity": "sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=", + "dev": true + }, + "whet.extend": { + "version": "0.9.9", + "resolved": "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz", + "integrity": "sha1-+HfVv2SMl+WqVC+twW1qJZucEaE=", + "dev": true + }, + "which": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", + "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", + "requires": { + "isexe": "2.0.0" + } + }, + "which-module": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", + "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=" + }, + "wide-align": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz", + "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==", + "requires": { + "string-width": "1.0.2" + } + }, + "window-size": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", + "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", + "dev": true + }, + "wordwrap": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", + "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", + "dev": true + }, + "worker-farm": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.5.1.tgz", + "integrity": "sha512-T5NH6Wqsd8MwGD4AK8BBllUy6LmHaqjEOyo/YIUEegZui6/v5Bqde//3jwyE3PGiGYMmWi06exFBi5LNhhPFNw==", + "dev": true, + "requires": { + "errno": "0.1.4", + "xtend": "4.0.1" + } + }, + "wrap-ansi": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "requires": { + "string-width": "1.0.2", + "strip-ansi": "3.0.1" + } + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + }, + "ws": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.2.tgz", + "integrity": "sha1-iiRPoFJAHgjJiGz0SoUYnh/UBn8=", + "dev": true, + "requires": { + "options": "0.0.6", + "ultron": "1.0.2" + } + }, + "wtf-8": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz", + "integrity": "sha1-OS2LotDxw00e4tYw8V0O+2jhBIo=", + "dev": true + }, + "xml-char-classes": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/xml-char-classes/-/xml-char-classes-1.0.0.tgz", + "integrity": "sha1-ZGV4SKIP/F31g6Qq2KJ3tFErvE0=", + "dev": true + }, + "xml2js": { + "version": "0.4.19", + "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz", + "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==", + "dev": true, + "requires": { + "sax": "1.2.4", + "xmlbuilder": "9.0.4" + } + }, + "xmlbuilder": { + "version": "9.0.4", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.4.tgz", + "integrity": "sha1-UZy0ymhtAFqEINNJbz8MruzKWA8=", + "dev": true + }, + "xmldom": { + "version": "0.1.27", + "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz", + "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk=", + "dev": true + }, + "xmlhttprequest-ssl": { + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz", + "integrity": "sha1-GFqIjATspGw+QHDZn3tJ3jUomS0=", + "dev": true + }, + "xtend": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", + "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", + "dev": true + }, + "y18n": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", + "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=" + }, + "yallist": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" + }, + "yargs": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz", + "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", + "requires": { + "camelcase": "3.0.0", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.2", + "os-locale": "1.4.0", + "read-pkg-up": "1.0.1", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "1.0.2", + "which-module": "1.0.0", + "y18n": "3.2.1", + "yargs-parser": "5.0.0" + }, + "dependencies": { + "camelcase": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", + "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=" + } + } + }, + "yargs-parser": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz", + "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=", + "requires": { + "camelcase": "3.0.0" + }, + "dependencies": { + "camelcase": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", + "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=" + } + } + }, + "yeast": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz", + "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=", + "dev": true + }, + "yn": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/yn/-/yn-1.3.0.tgz", + "integrity": "sha1-GwgSq7jYBdSJZvjfOF3J2syaGdg=", + "dev": true, + "requires": { + "object-assign": "4.1.1" + } + }, + "zone.js": { + "version": "0.8.11", + "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.11.tgz", + "integrity": "sha1-dCvvsX+8SaVxcSuMfYfljKJv2IY=" + } + } +} diff --git a/package.json b/package.json index a96c02b014..dac4bb0b3e 100755 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "angular2-modal": "^3.0.3", "chart.js": "2.5.0", "core-js": "2.4.1", - "moment": "2.18.1", + "moment": "^2.18.1", "ng2-charts": "1.5.0", "ng2-cookies": "^1.0.12", "ngx-bootstrap": "1.6.6", diff --git a/src/app/applications/applications.component.html b/src/app/applications/applications.component.html index ec818cc508..633e5b95a1 100755 --- a/src/app/applications/applications.component.html +++ b/src/app/applications/applications.component.html @@ -279,7 +279,7 @@

    Applications Overview

    - + {{ application.Name }} {{application.Shortname}} {{ application.DateSubmitted }} diff --git a/src/app/applications/applications.component.ts b/src/app/applications/applications.component.ts index ead159c334..6f89ce02ea 100644 --- a/src/app/applications/applications.component.ts +++ b/src/app/applications/applications.component.ts @@ -15,6 +15,8 @@ import {SpecialHardware} from "./special_hardware.model"; import {ModalDirective} from 'ngx-bootstrap/modal/modal.component'; import {ResourcesManager} from "../perun-connector/resources_manager"; import {GroupService} from "../api-connector/group.service"; +import * as moment from 'moment'; + @Component({ templateUrl: 'applications.component.html', @@ -248,8 +250,11 @@ export class ApplicationsComponent { return s; } - public lifeTimeReached(lifetime:number,running:number):string{ - return (lifetime * 30 - running) < 0 ? "red" :"black"; + public lifeTimeReached(lifetime:number,running:number,status_changed_string:string):string{ + let status_changed=new Date(status_changed_string); + let LifetimeDays = Math.ceil(Math.abs(moment(status_changed).add(lifetime, 'months').toDate().getTime() - status_changed.getTime())) / (1000 * 3600 * 24) + + return (LifetimeDays - running) < 0 ? "red" :"black"; } public getIdByStatus(name: string): number { diff --git a/src/app/facility_manager/facilityprojectsoverview.component.html b/src/app/facility_manager/facilityprojectsoverview.component.html index 487bbd863e..519a60f908 100644 --- a/src/app/facility_manager/facilityprojectsoverview.component.html +++ b/src/app/facility_manager/facilityprojectsoverview.component.html @@ -41,7 +41,7 @@

    Projects Overview: {{selectedFacility['Facility']}} + [ngStyle]="{'color':lifeTimeReached(project.LifetimeDays,project.DaysRunning)}"> {{ project.Id }} {{ project.Name }} {{ project.Description }} @@ -49,7 +49,7 @@

    Projects Overview: {{selectedFacility['Facility']}} {{ project.DateCreated }} {{ project.DaysRunning }} - {{project.Lifetime * 30}} + {{project.LifetimeDays}}

    From 360893f388b2660aa828b2d2de4594ef7f65cc75 Mon Sep 17 00:00:00 2001 From: DavidWein94 Date: Wed, 20 Jun 2018 15:01:30 +0200 Subject: [PATCH 136/148] Refactor/split appplication form (#158) * feat(lifetime):added momentjs to add months properly * feat(lifetime):also changed the other views * feat(applications):splitted single vm feature * feat(applications):splitted both forms --- ...tml => addcloudapplication.component.html} | 153 ++------- .../addcloudapplication.component.ts | 147 +++++++++ .../applications/addsinglevm.component.html | 311 ++++++++++++++++++ ....component.ts => addsinglevm.component.ts} | 6 +- .../applications-routing.module.ts | 17 +- src/app/applications/applications.module.ts | 6 +- src/app/layouts/full-layout.component.html | 163 +++++---- src/app/layouts/full-layout.component.ts | 180 +++++----- 8 files changed, 700 insertions(+), 283 deletions(-) rename src/app/applications/{addapplication.component.html => addcloudapplication.component.html} (74%) create mode 100644 src/app/applications/addcloudapplication.component.ts create mode 100644 src/app/applications/addsinglevm.component.html rename src/app/applications/{addapplication.component.ts => addsinglevm.component.ts} (98%) diff --git a/src/app/applications/addapplication.component.html b/src/app/applications/addcloudapplication.component.html similarity index 74% rename from src/app/applications/addapplication.component.html rename to src/app/applications/addcloudapplication.component.html index c4008de0df..326cc0a126 100755 --- a/src/app/applications/addapplication.component.html +++ b/src/app/applications/addcloudapplication.component.html @@ -4,7 +4,7 @@
    - New Application + New Cloud Application – Form
    @@ -16,6 +16,16 @@
    General Information
    +
    + +
    + A cloud project is represented by an Openstack project which allows you to manage your + virtual machines, storage and network configurations. +
    +
    General Information + placeholder="e.g. Assembler benchmarking based on A. thaliana genome" + ngModel> Name your project.
    -
    General Information How long would you like to run this project?
    -
    -
    -
    -
    Choose the type of your Project
    -
    -
    - -
    - -
    -
    -
    - This project mode is a beta version. Virtual machines might get lost or can not be started - temporarily. -
    -
    - -
    - -
    -
    -
    +
    Resources
    -
    -
    -
    -
    @@ -175,7 +145,7 @@
    Resources
    + type="number" min="1" step="1" [ngModel]="2"> VMs
    @@ -184,9 +154,8 @@
    Resources
    - -
    @@ -206,13 +175,14 @@
    Resources
    -
    - +
    Resources
    -
    @@ -248,7 +218,7 @@
    Resources
    -
    +
    - -
    -
    Resources
    -
    - -
    - -
    -
    - - VMs - -
    - How many VMs would you run simultaneously? -
    -
    -
    - -
    -
    - - GB - -
    - How much storage do you need per VM? -
    -
    -
    - -
    -
      -
    • de.NBI Large (CPUs:32, RAM:64 GB)
      • -
    • de.NBI Medium (CPUs:16, RAM:32 GB)
      • -
    • de.NBI Small (CPUs:8, RAM:16 GB)
      • -
    -
    -
    - -
    - +
    + Describe what would you want to do in your project. +
    +
    + +
    + +
    +
    + + months + +
    + How long would you like to run this project? +
    +
    + + +
    +
    Resources
    +
    + +
    + +
    +
    + + VMs + +
    + How many VMs would you run simultaneously? +
    +
    +
    + +
    +
    + + GB + +
    + How much storage do you need per VM? +
    +
    +
    + +
    +
      +
    • de.NBI Large (CPUs:32, RAM:64 GB)
      • +
    • de.NBI Medium (CPUs:16, RAM:32 GB)
      • +
    • de.NBI Small (CPUs:8, RAM:16 GB)
      • +
    +
    +
    + +
    +
    + +
    + + Additional information you want to share? +
    +
    +
    +
    +
    Institutional Information
    +
    + +
    + +
    + + To which institute do you belong? +
    +
    + +
    + +
    + + To which workgroup do you belong? +
    + +
    + +
    +

    By submitting this application you agree to the + cloud + usage policy.

    +
    + + + +
    +
    + +
    +
    +
    + +
    + +
    + + + + + diff --git a/src/app/applications/addapplication.component.ts b/src/app/applications/addsinglevm.component.ts similarity index 98% rename from src/app/applications/addapplication.component.ts rename to src/app/applications/addsinglevm.component.ts index f10a672184..cd8be720fc 100644 --- a/src/app/applications/addapplication.component.ts +++ b/src/app/applications/addsinglevm.component.ts @@ -8,11 +8,11 @@ import {ApiSettings} from '../api-connector/api-settings.service' import {ApplicationsService} from '../api-connector/applications.service' @Component({ - templateUrl: 'addapplication.component.html', + templateUrl: 'addsinglevm.component.html', providers: [SpecialHardwareService, ApiSettings, ApplicationsService] }) -export class AddApplicationComponent { +export class AddsinglevmComponent { public wronginput: boolean = false; @@ -45,7 +45,7 @@ export class AddApplicationComponent { } chosenProjectType(checkbox: number) { - + if (checkbox == 0) { if (this.project_application_openstack_project) { this.showjustvm = false; diff --git a/src/app/applications/applications-routing.module.ts b/src/app/applications/applications-routing.module.ts index dd73e7599b..6360f3025a 100644 --- a/src/app/applications/applications-routing.module.ts +++ b/src/app/applications/applications-routing.module.ts @@ -2,7 +2,9 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; import { ApplicationsComponent } from './applications.component'; -import { AddApplicationComponent } from './addapplication.component'; + +import {AddsinglevmComponent} from "./addsinglevm.component"; +import {AddcloudapplicationComponent} from "./addcloudapplication.component"; const routes: Routes = [ @@ -15,13 +17,22 @@ const routes: Routes = [ }, { - path: 'newApplication', - component: AddApplicationComponent, + path: 'newCloudApplication', + component: AddcloudapplicationComponent, data: { title: 'New Application' } }, + { + path: 'newSingleVmApplication', + component: AddsinglevmComponent, + data: { + title: 'New Application' + } + + + } ]; diff --git a/src/app/applications/applications.module.ts b/src/app/applications/applications.module.ts index c87d48ed0d..91acf548d0 100644 --- a/src/app/applications/applications.module.ts +++ b/src/app/applications/applications.module.ts @@ -2,7 +2,6 @@ import { NgModule } from '@angular/core'; import { TabsModule } from 'ngx-bootstrap/tabs'; import { ApplicationsComponent } from './applications.component'; -import { AddApplicationComponent } from './addapplication.component'; import { ApplicationsRoutingModule } from './applications-routing.module'; import {CommonModule} from "@angular/common"; import {FormsModule} from '@angular/forms'; @@ -13,6 +12,8 @@ import {FlavorDetailComponent} from '../virtualmachines/flavordetail.component'; import {ClientOverviewComponent} from "../virtualmachines/vmClients.component"; import {UserinfoComponent} from "../userinfo/userinfo.component"; import {VmOverviewComponent} from "../virtualmachines/vmOverview.component"; +import {AddsinglevmComponent} from "./addsinglevm.component"; +import {AddcloudapplicationComponent} from "./addcloudapplication.component"; @NgModule({ @@ -27,7 +28,8 @@ import {VmOverviewComponent} from "../virtualmachines/vmOverview.component"; ], declarations: [ ApplicationsComponent, - AddApplicationComponent, + AddsinglevmComponent, + AddcloudapplicationComponent, ] }) export class ApplicationsModule { } diff --git a/src/app/layouts/full-layout.component.html b/src/app/layouts/full-layout.component.html index 73f4b38e22..53d87324df 100755 --- a/src/app/layouts/full-layout.component.html +++ b/src/app/layouts/full-layout.component.html @@ -1,87 +1,104 @@
    -
    If you experience any problems, please contact cloud@denbi.de
    +
    If you experience any problems, please contact cloud@denbi.de
    -
    -
    + +
  • + Virtual Machines +
    • +
  • + -
    + class="icon-pencil"> New Instance +
    • +
  • + Client Overview +
    • +
  • + Instance Overview +
    • +
  • + Facilities +
    • +
  • + Facility Projects +
    • +
  • + Image Tags +
    • - -
      - -
    +
  • + Vo Manager +
    • +
  • + Overview +
    • -
    - -
    - + + +
    + + +
    + + +
      + +
    + +
    + +
    +
    diff --git a/src/app/layouts/full-layout.component.ts b/src/app/layouts/full-layout.component.ts index ae4fb1718e..b0c0552f3c 100644 --- a/src/app/layouts/full-layout.component.ts +++ b/src/app/layouts/full-layout.component.ts @@ -9,95 +9,109 @@ import {FacilityService} from "../api-connector/facility.service"; @Component({ - selector: 'app-dashboard', - templateUrl: './full-layout.component.html', - providers: [FacilityService,GroupsManager,ClientService, AuthzResolver, UsersManager, PerunSettings, ApiSettings] + selector: 'app-dashboard', + templateUrl: './full-layout.component.html', + providers: [FacilityService, GroupsManager, ClientService, AuthzResolver, UsersManager, PerunSettings, ApiSettings] }) export class FullLayoutComponent implements OnInit { - public year = new Date().getFullYear(); - public disabled = false; - public status: { isopen: boolean } = {isopen: false}; - private is_vo_admin = false; - public is_facility_manager=false - public vm_project_member=false; - client_avaiable; - - constructor(private facilityservice:FacilityService,private groupsManager:GroupsManager,private clientservice: ClientService, private perunsettings: PerunSettings, private usersmanager: UsersManager, private authzresolver: AuthzResolver) { - this.is_client_avaiable(); - this.is_vm_project_member(); - this.get_is_facility_manager(); - - } - - public get_is_vo_admin(): boolean { - return this.is_vo_admin; - } - - public toggled(open: boolean): void { - console.log('Dropdown is now: ', open); - } - - public toggleDropdown($event: MouseEvent): void { - $event.preventDefault(); - $event.stopPropagation(); - this.status.isopen = !this.status.isopen; - } - - public get_is_facility_manager(){ - this.facilityservice.getManagerFacilities().subscribe(result => { - if (result.length > 0 ) { - this.is_facility_manager=true } - }) - } - is_vm_project_member(){ - this.groupsManager.getMemberGroupsStatus().subscribe(result => { - if (result.json().length > 0 ) { - this.vm_project_member = true } - }) + public year = new Date().getFullYear(); + public disabled = false; + public status: { isopen: boolean } = {isopen: false}; + private is_vo_admin = false; + public is_facility_manager = false + public vm_project_member = false; + navbar_state = 'closed' + client_avaiable; + + constructor(private facilityservice: FacilityService, private groupsManager: GroupsManager, private clientservice: ClientService, private perunsettings: PerunSettings, private usersmanager: UsersManager, private authzresolver: AuthzResolver) { + this.is_client_avaiable(); + this.is_vm_project_member(); + this.get_is_facility_manager(); + + } + + public get_is_vo_admin(): boolean { + return this.is_vo_admin; + } + + public toggled(open: boolean): void { + console.log('Dropdown is now: ', open); } - is_client_avaiable() { - this.clientservice.isClientAvaiable().subscribe(result => { - try { - if (result.toString() === 'true') { - this.client_avaiable = true; - return + + public toggleDropdown($event: MouseEvent): void { + $event.preventDefault(); + $event.stopPropagation(); + this.status.isopen = !this.status.isopen; + } + + public get_is_facility_manager() { + this.facilityservice.getManagerFacilities().subscribe(result => { + if (result.length > 0) { + this.is_facility_manager = true + } + }) + } + + is_vm_project_member() { + this.groupsManager.getMemberGroupsStatus().subscribe(result => { + if (result.json().length > 0) { + this.vm_project_member = true + } + }) + } + + is_client_avaiable() { + this.clientservice.isClientAvaiable().subscribe(result => { + try { + if (result.toString() === 'true') { + this.client_avaiable = true; + return + } + this.client_avaiable = false; + return; + } + catch (e) { + this.client_avaiable = false; + return; + } + + }) + + } + + toggle_new_application() { + if (this.navbar_state == 'closed') { + this.navbar_state = 'open' } - this.client_avaiable = false; - return; - } - catch (e) { - this.client_avaiable = false; - return; - } - - }) - - } - - checkVOstatus(usersmanager: UsersManager) { - let user_id: number; - let admin_vos: {}; - this.authzresolver - .getLoggedUser().toPromise() - .then(function (userdata) { - //TODO catch errors - user_id = userdata.json()["id"]; - return usersmanager.getVosWhereUserIsAdmin(user_id).toPromise(); - }).then(function (adminvos) { - admin_vos = adminvos.json(); - }).then(result => { - //check if user is a Vo admin so we can serv according buttons - for (let vkey in admin_vos) { - if (admin_vos[vkey]["id"] == this.perunsettings.getPerunVO().toString()) { - this.is_vo_admin = true; + else { + this.navbar_state = 'closed' } + } - } - }); - } + checkVOstatus(usersmanager: UsersManager) { + let user_id: number; + let admin_vos: {}; + this.authzresolver + .getLoggedUser().toPromise() + .then(function (userdata) { + //TODO catch errors + user_id = userdata.json()["id"]; + return usersmanager.getVosWhereUserIsAdmin(user_id).toPromise(); + }).then(function (adminvos) { + admin_vos = adminvos.json(); + }).then(result => { + //check if user is a Vo admin so we can serv according buttons + for (let vkey in admin_vos) { + if (admin_vos[vkey]["id"] == this.perunsettings.getPerunVO().toString()) { + this.is_vo_admin = true; + } - ngOnInit(): void { - this.checkVOstatus(this.usersmanager); - } + } + }); + } + + ngOnInit(): void { + this.checkVOstatus(this.usersmanager); + } } From 4bc0416443ed6ad3d6aac0f0ee6ceb890c8ad816 Mon Sep 17 00:00:00 2001 From: DavidWein94 Date: Wed, 20 Jun 2018 15:01:44 +0200 Subject: [PATCH 137/148] feature(member): if user is already member (or admin ) and you try to add him to the group it now shows he is already member or admin (#161) --- .../projectmanagement/overview.component.html | 2 +- .../projectmanagement/overview.component.ts | 87 +++++++++++++------ 2 files changed, 62 insertions(+), 27 deletions(-) diff --git a/src/app/projectmanagement/overview.component.html b/src/app/projectmanagement/overview.component.html index b1220e7261..ad9d261596 100755 --- a/src/app/projectmanagement/overview.component.html +++ b/src/app/projectmanagement/overview.component.html @@ -238,7 +238,7 @@

    Add member to the project {{ addUserModalProjectID }} class="btn btn-primary"> Add Member diff --git a/src/app/projectmanagement/overview.component.ts b/src/app/projectmanagement/overview.component.ts index 663f6fcaec..5e43b4396e 100644 --- a/src/app/projectmanagement/overview.component.ts +++ b/src/app/projectmanagement/overview.component.ts @@ -15,7 +15,7 @@ import {environment} from '../../environments/environment' import {ApiSettings} from "../api-connector/api-settings.service"; import {GroupService} from "../api-connector/group.service"; import {UserService} from "../api-connector/user.service"; -import * as moment from 'moment'; +import * as moment from 'moment'; @Component({ @@ -180,9 +180,9 @@ export class OverviewComponent { this.groupservice.getShortame(group['id']).subscribe(name => { this.groupservice.getFacilityByGroup(group["id"]).subscribe(result => { - let shortname= name['shortname'] - if(!shortname){ - shortname=group['name'] + let shortname = name['shortname'] + if (!shortname) { + shortname = group['name'] } let newProject = new Project( @@ -286,12 +286,14 @@ export class OverviewComponent { }); } - isPi(member:ProjectMember):string{ + isPi(member: ProjectMember): string { - if (member.IsPi){ - return 'blue' - } - else{return 'black'} + if (member.IsPi) { + return 'blue' + } + else { + return 'black' + } } @@ -367,27 +369,62 @@ export class OverviewComponent { this.updateNotificaitonModal("Success", "Member " + firstName + " " + lastName + " added.", true, "success"); } else { + console.log(result.json()) + this.updateNotificaitonModal("Failed", "Member could not be added!", true, "danger"); } }).catch(error => { - this.updateNotificaitonModal("Failed", "Member could not be added!", true, "danger"); + if (error.json()['name'] == 'AlreadyMemberException') { + this.updateNotificaitonModal("Info", firstName + " " + lastName + " is already a member of the project.", true, "info"); + } + + else { + this.updateNotificaitonModal("Failed", "Member could not be added!", true, "danger"); + } }); } - public addAdmin(groupid: number, userid: number, firstName: string, lastName: string, facility_id: number) { - this.groupservice.addAdmin(groupid, userid, facility_id).toPromise() - .then(result => { + public addAdmin(groupid: number, memberid: number, userid: number, firstName: string, lastName: string, facility_id: number) { + this.groupservice.addMember(groupid, memberid, facility_id).toPromise().then(result => { + this.groupservice.addAdmin(groupid, userid, facility_id).toPromise() + .then(result => { - if (result.status == 200) { - this.updateNotificaitonModal("Success", "Admin " + firstName + " " + lastName + " added.", true, "success"); + if (result.status == 200) { + this.updateNotificaitonModal("Success", "Admin " + firstName + " " + lastName + " added.", true, "success"); - } else { + } else { + this.updateNotificaitonModal("Failed", "Admin could not be added!", true, "danger"); + } + }).catch(error => { + if (error.json()['name'] == 'AlreadyAdminException') { + this.updateNotificaitonModal("Info", firstName + " " + lastName + " is already a admin of the project.", true, "info"); + } + else { this.updateNotificaitonModal("Failed", "Admin could not be added!", true, "danger"); } - }).catch(error => { - this.updateNotificaitonModal("Failed", "Admin could not be added!", true, "danger"); - }); + }) + }).catch(error => { + this.groupservice.addAdmin(groupid, userid, facility_id).toPromise() + .then(result => { + + if (result.status == 200) { + this.updateNotificaitonModal("Success", "Admin " + firstName + " " + lastName + " added.", true, "success"); + + } else { + this.updateNotificaitonModal("Failed", "Admin could not be added!", true, "danger"); + } + }).catch(error => { + if (error.json()['name'] == 'AlreadyAdminException') { + this.updateNotificaitonModal("Info", firstName + " " + lastName + " is already a admin of the project.", true, "info"); + } + else { + this.updateNotificaitonModal("Failed", "Admin could not be added!", true, "danger"); + } + }) + + + }) } @@ -407,25 +444,23 @@ export class OverviewComponent { } - - - public removeAdmin(groupid: number,userid:number, name: string, facility_id: number) { + public removeAdmin(groupid: number, userid: number, name: string, facility_id: number) { this.groupservice.removeAdmin(groupid, userid, facility_id).toPromise() .then(result => { if (result.status == 200) { - this.updateNotificaitonModal("Success", name + " was removed as Admin", true, "success"); + this.updateNotificaitonModal("Success", name + " was removed as Admin", true, "success"); } else { - this.updateNotificaitonModal("Failed", name + " could not be removed as Admin!", true, "danger"); + this.updateNotificaitonModal("Failed", name + " could not be removed as Admin!", true, "danger"); } }).catch(error => { this.updateNotificaitonModal("Failed", name + " could not be removed as Admin!", true, "danger"); }); } - public removeMember(groupid: number, memberid: number,userid:number, name: string, facility_id: number) { - this.groupservice.removeMember(groupid, memberid,userid, facility_id).toPromise() + public removeMember(groupid: number, memberid: number, userid: number, name: string, facility_id: number) { + this.groupservice.removeMember(groupid, memberid, userid, facility_id).toPromise() .then(result => { if (result.status == 200) { From bc7bd9de4724ebe9092acaf6c08a4ce17146604a Mon Sep 17 00:00:00 2001 From: David Weinholz Date: Sat, 23 Jun 2018 14:14:49 +0200 Subject: [PATCH 138/148] feat(project):changed to simple vm project --- src/app/layouts/full-layout.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/layouts/full-layout.component.html b/src/app/layouts/full-layout.component.html index 53d87324df..10eec0893f 100755 --- a/src/app/layouts/full-layout.component.html +++ b/src/app/layouts/full-layout.component.html @@ -42,7 +42,7 @@ [routerLink]="['/applications/newSingleVmApplication']"> - Single VMs + Simple VM Project From 55d6728a885a39cf4d0f8e28e3856c71f275ab6e Mon Sep 17 00:00:00 2001 From: DavidWein94 Date: Tue, 26 Jun 2018 14:52:06 +0200 Subject: [PATCH 139/148] Refactor/volume counter limit (#164) * feat(user):getLogins request to djnago * refactor(user):getLoggedUser to django * refactor(authzresolver): removed authzresolver * refactor(resourcesManager):removed resourceManager * feat(usersmanager):removed usersmanager * fix(usersmanager):removed usersmanager * feat(member):getMemberbyUser to djnago * refactor(memersmanager): changed getMembersofdenbi vo to vo.service * feat(groupmanager):changed mroe methods * refactor(membersmanager):removed membersmanager * refactor(membersmanager):removed membersmanager * refactor(groupmanager):removed some methods * refactor(grousmanager):refactored all methods * refactor(groupsmanager):removed grupsmanger * feat(volume):added volume counter * refactor(application):changed to volume limit * feat(projets):addded set volumecounter method * fix(application):fixed form * fix(addvm):fixed small bug * feat(vm):added vm counter * fix(vm):fixed small type bug * fix(application):fixed wrong type * fix(application):fixed facility * fix(memerguard):fixed bug --- src/app/api-connector/applications.service.ts | 2 + src/app/api-connector/group.service.ts | 158 ++++++++++++++---- src/app/api-connector/user.service.ts | 116 +++++++++---- src/app/api-connector/vo.service.ts | 16 +- src/app/app.module.ts | 10 +- .../addcloudapplication.component.html | 43 +++-- .../addcloudapplication.component.ts | 5 +- .../applications/addsinglevm.component.html | 48 ++++-- src/app/applications/addsinglevm.component.ts | 1 + src/app/applications/application.model.ts | 20 ++- .../applications/applications.component.html | 100 ++++++----- .../applications/applications.component.ts | 79 +++++---- .../facilityprojectsoverview.component.ts | 7 +- src/app/layouts/full-layout.component.ts | 23 +-- src/app/member-guard.service.ts | 17 +- src/app/perun-connector/attributes-manager.ts | 26 --- .../perun-connector/authz-resolver.service.ts | 30 ---- .../perun-connector/groups-manager.service.ts | 152 ----------------- .../members-manager.service.ts | 50 ------ src/app/perun-connector/resources_manager.ts | 28 ---- .../perun-connector/users-manager.service.ts | 36 ---- .../projectmanagement/overview.component.ts | 43 ++--- src/app/userinfo/userinfo.component.ts | 16 +- src/app/virtualmachines/addvm.component.html | 23 ++- src/app/virtualmachines/addvm.component.ts | 40 ++++- .../virtualmachines/vmClients.component.ts | 16 +- .../virtualmachines/vmOverview.component.ts | 142 +++++++++------- 27 files changed, 616 insertions(+), 631 deletions(-) delete mode 100644 src/app/perun-connector/attributes-manager.ts delete mode 100644 src/app/perun-connector/authz-resolver.service.ts delete mode 100644 src/app/perun-connector/groups-manager.service.ts delete mode 100644 src/app/perun-connector/members-manager.service.ts delete mode 100644 src/app/perun-connector/resources_manager.ts delete mode 100644 src/app/perun-connector/users-manager.service.ts diff --git a/src/app/api-connector/applications.service.ts b/src/app/api-connector/applications.service.ts index f56f1cbb6e..6a5eae5125 100644 --- a/src/app/api-connector/applications.service.ts +++ b/src/app/api-connector/applications.service.ts @@ -54,4 +54,6 @@ export class ApplicationsService { }); } + + } diff --git a/src/app/api-connector/group.service.ts b/src/app/api-connector/group.service.ts index 0ddde91568..f66c55ba93 100644 --- a/src/app/api-connector/group.service.ts +++ b/src/app/api-connector/group.service.ts @@ -55,11 +55,12 @@ export class GroupService { } - isUserAdminOfGroup(groupid: string,userid:string): Observable { + + isUserAdminOfGroup(groupid: string, userid: string): Observable { return this.http.get(this.settings.getApiBaseURL() + 'group/isUserPi/', { withCredentials: true, - params: {group_id:groupid,user_id:userid} + params: {group_id: groupid, user_id: userid} }).map((res: Response) => res.json()).catch((error: any) => Observable.throw(error.json().error || 'Server error')) } @@ -69,7 +70,16 @@ export class GroupService { return this.http.get(this.settings.getApiBaseURL() + 'group/getGroupAdminsId/', { withCredentials: true, - params: {group_id:groupid} + params: {group_id: groupid} + }).map((res: Response) => res.json()).catch((error: any) => Observable.throw(error.json().error || 'Server error')) + + } + + getGroupRichMembers(groupid: number): Observable { + + return this.http.get(this.settings.getApiBaseURL() + 'group/getGroupRichMembers/', { + withCredentials: true, + params: {groupid: groupid} }).map((res: Response) => res.json()).catch((error: any) => Observable.throw(error.json().error || 'Server error')) } @@ -90,7 +100,7 @@ export class GroupService { } - addAdmin(group_id: number, user_id: number, facility_id: number) { + addAdmin(group_id: number, user_id: number, facility_id: number) { let urlSearchParams = new URLSearchParams(); let header = new Headers({ 'X-CSRFToken': this.settings.getCSRFToken(), @@ -105,7 +115,7 @@ export class GroupService { } - removeMember(group_id: number, member_id: number,user_id:number, facility_id: number) { + removeMember(group_id: number, member_id: number, user_id: number, facility_id: number) { let urlSearchParams = new URLSearchParams(); let header = new Headers({ 'X-CSRFToken': this.settings.getCSRFToken(), @@ -113,7 +123,7 @@ export class GroupService { urlSearchParams.append('facility_id', facility_id.toString()); urlSearchParams.append('group_id', group_id.toString()); urlSearchParams.append('member_id', member_id.toString()) - urlSearchParams.append('user_id', user_id.toString()) + urlSearchParams.append('user_id', user_id.toString()) return this.http.post(this.settings.getApiBaseURL() + 'group/removeMember/', urlSearchParams, { withCredentials: true, headers: header @@ -121,7 +131,7 @@ export class GroupService { } - removeAdmin(group_id: number,user_id:number, facility_id: number) { + removeAdmin(group_id: number, user_id: number, facility_id: number) { let urlSearchParams = new URLSearchParams(); let header = new Headers({ 'X-CSRFToken': this.settings.getCSRFToken(), @@ -129,7 +139,7 @@ export class GroupService { urlSearchParams.append('facility_id', facility_id.toString()); urlSearchParams.append('group_id', group_id.toString()); - urlSearchParams.append('user_id', user_id.toString()) + urlSearchParams.append('user_id', user_id.toString()) return this.http.post(this.settings.getApiBaseURL() + 'group/removeAdmin/', urlSearchParams, { withCredentials: true, headers: header @@ -137,8 +147,7 @@ export class GroupService { } - - setDescription(groupid: string, description: string): Observable { + setDescription(groupid: string, description: string): Observable { let urlSearchParams = new URLSearchParams(); let header = new Headers({ @@ -155,7 +164,61 @@ export class GroupService { } - setName(groupid: string, name: string): Observable { + setPerunGroupStatus(group_id: number, status: number) { + let urlSearchParams = new URLSearchParams(); + let header = new Headers({ + 'X-CSRFToken': this.settings.getCSRFToken(), + }); + urlSearchParams.append('groupid', group_id.toString()); + urlSearchParams.append('status', status.toString()); + return this.http.post(this.settings.getApiBaseURL() + 'group/setStatus/', urlSearchParams, { + withCredentials: true, + headers: header + }) + } + + setGroupVolumeLimit(group_id: number, value: number) { + let urlSearchParams = new URLSearchParams(); + let header = new Headers({ + 'X-CSRFToken': this.settings.getCSRFToken(), + }); + urlSearchParams.append('groupid', group_id.toString()); + urlSearchParams.append('value', value.toString()); + return this.http.post(this.settings.getApiBaseURL() + 'group/setGroupVolumeLimit/', urlSearchParams, { + withCredentials: true, + headers: header + }) + } + + + setGroupVolumeCounter(group_id: number, value: number) { + let urlSearchParams = new URLSearchParams(); + let header = new Headers({ + 'X-CSRFToken': this.settings.getCSRFToken(), + }); + urlSearchParams.append('groupid', group_id.toString()); + urlSearchParams.append('value', value.toString()); + return this.http.post(this.settings.getApiBaseURL() + 'group/setGroupVolumeCounter/', urlSearchParams, { + withCredentials: true, + headers: header + }) + } + + setdeNBIDirectAcces(group_id: number, value: boolean) { + let urlSearchParams = new URLSearchParams(); + let header = new Headers({ + 'X-CSRFToken': this.settings.getCSRFToken(), + }); + urlSearchParams.append('groupid', group_id.toString()); + urlSearchParams.append('value', value.toString()); + return this.http.post(this.settings.getApiBaseURL() + 'group/setdeNBIDirectAccess/', urlSearchParams, { + withCredentials: true, + headers: header + }) + } + + + setName(groupid: string, name: string): Observable { let urlSearchParams = new URLSearchParams(); let header = new Headers({ 'X-CSRFToken': this.settings.getCSRFToken(), @@ -171,7 +234,6 @@ export class GroupService { } - getName(groupid: string): Observable { let header = new Headers({ 'X-CSRFToken': this.settings.getCSRFToken(), @@ -185,7 +247,7 @@ export class GroupService { } - setShortname(groupid: string, shortname: string): Observable { + setShortname(groupid: string, shortname: string): Observable { let urlSearchParams = new URLSearchParams(); let header = new Headers({ 'X-CSRFToken': this.settings.getCSRFToken(), @@ -201,10 +263,8 @@ export class GroupService { } - getShortame(groupid: string): Observable { - let header = new Headers({ - 'X-CSRFToken': this.settings.getCSRFToken(), - }); + getShortame(groupid: string): Observable { + return this.http.get(this.settings.getApiBaseURL() + 'group/getShortname/', { withCredentials: true, params: {groupid: groupid} @@ -213,6 +273,20 @@ export class GroupService { } + getMemberGroupsStatus() { + + return this.http.get(this.settings.getApiBaseURL() + 'group/getMemberGroupsStatus/', { + withCredentials: true, + }); + + } + + getMemberGroups(member_id: number) { + return this.http.get(this.settings.getApiBaseURL() + 'group/getMemberGroups/', { + withCredentials: true, + params: {memberid: member_id} + }); + } setLifetime(groupid: string, lifetime: string): Observable { @@ -230,6 +304,21 @@ export class GroupService { } + createGroup(group_name: string, group_description: string) { + let urlSearchParams = new URLSearchParams(); + let header = new Headers({ + 'X-CSRFToken': this.settings.getCSRFToken(), + }); + urlSearchParams.append('group_name', group_name); + urlSearchParams.append('group_description', group_description.substring(0, 512)); + + return this.http.post(this.settings.getApiBaseURL() + 'group/createGroup/', urlSearchParams, + { + withCredentials: true, + headers: header + }); + } + getLifetime(groupid: string): Observable { let header = new Headers({ @@ -274,9 +363,6 @@ export class GroupService { getGroupMaxDiskspace(groupid: string): Observable { - let header = new Headers({ - 'X-CSRFToken': this.settings.getCSRFToken(), - }); return this.http.get(this.settings.getApiBaseURL() + 'project/getApprovedDiskSpace/', { withCredentials: true, params: {groupid: groupid} @@ -286,21 +372,37 @@ export class GroupService { } getGroupUsedDiskspace(groupid: string): Observable { - let header = new Headers({ - 'X-CSRFToken': this.settings.getCSRFToken(), - }); return this.http.get(this.settings.getApiBaseURL() + 'project/getUsedDiskSpace/', { withCredentials: true, params: {groupid: groupid} }).map((res: Response) => res.json()).catch((error: any) => Observable.throw(error.json().error || 'Server error')) + } + + + + + getVolumesUsed(groupid: string): Observable { + return this.http.get(this.settings.getApiBaseURL() + 'project/getUsedVolumes/', { + withCredentials: true, + params: {groupid: groupid} + }).map((res: Response) => res.json()).catch((error: any) => Observable.throw(error.json().error || 'Server error')) + + + } + + getVolumeCounter(groupid: string): Observable { + return this.http.get(this.settings.getApiBaseURL() + 'project/getVolumesCounter/', { + withCredentials: true, + params: {groupid: groupid} + }).map((res: Response) => res.json()).catch((error: any) => Observable.throw(error.json().error || 'Server error')) + + } getGroupApprovedVms(groupid: string): Observable { - let header = new Headers({ - 'X-CSRFToken': this.settings.getCSRFToken(), - }); + return this.http.get(this.settings.getApiBaseURL() + 'project/getNumberApprovedVms/', { withCredentials: true, params: {groupid: groupid} @@ -310,9 +412,7 @@ export class GroupService { } getGroupUsedVms(groupid: string): Observable { - let header = new Headers({ - 'X-CSRFToken': this.settings.getCSRFToken(), - }); + return this.http.get(this.settings.getApiBaseURL() + 'project/getUsedVms/', { withCredentials: true, params: {groupid: groupid} diff --git a/src/app/api-connector/user.service.ts b/src/app/api-connector/user.service.ts index 9af6fc3dd5..03d5212210 100644 --- a/src/app/api-connector/user.service.ts +++ b/src/app/api-connector/user.service.ts @@ -9,46 +9,98 @@ import 'rxjs/add/operator/catch'; @Injectable() export class UserService { - constructor(private http: Http, private settings: ApiSettings) { - } - - setUserFacilityPassword(facility: string): Observable { - let header = new Headers({ - 'X-CSRFToken': this.settings.getCSRFToken(), - }); - let urlSearchParams = new URLSearchParams(); - urlSearchParams.append('facility',facility); - - return this.http.post(this.settings.getConnectorBaseUrl() + 'user/setUserPassword/', urlSearchParams, { - withCredentials: true, - headers: header, - }); - } - - setNewsletterSubscription(subscribed: boolean): Observable { - let header = new Headers({ - 'X-CSRFToken': this.settings.getCSRFToken(), - }); - let urlSearchParams = new URLSearchParams(); - urlSearchParams.append('subscribed',subscribed.toString()); - - return this.http.post(this.settings.getApiBaseURL() + 'newsletter/setNewsletterSubscription/', urlSearchParams, { - withCredentials: true, - headers: header, - }); - } - - getNewsletterSubscription(): Observable { - let header = new Headers({ + constructor(private http: Http, private settings: ApiSettings) { + } + + setUserFacilityPassword(facility: string): Observable { + let header = new Headers({ 'X-CSRFToken': this.settings.getCSRFToken(), }); - return this.http.get(this.settings.getApiBaseURL() + 'newsletter/getNewsletterSubscription/', { + let urlSearchParams = new URLSearchParams(); + urlSearchParams.append('facility', facility); + + return this.http.post(this.settings.getConnectorBaseUrl() + 'user/setUserPassword/', urlSearchParams, { withCredentials: true, + headers: header, }); + } + + getLogins(user: number): Observable { + return this.http.get(this.settings.getApiBaseURL() + 'user/getLogins/', + { + withCredentials: true, + params: {user: user} + }); + } + + getLoggedUser() { + return this.http.get(this.settings.getApiBaseURL() + 'user/getLoggedUser/', + { + withCredentials: true, + }); } + getMemberByUser(user_id: number) { + + return this.http.get(this.settings.getApiBaseURL() + `user/getMemberByUser/`, { + withCredentials: true, + params: {user: user_id} + }); + } + + + getMemberByExtSourceNameAndExtLogin(ext_login: string) { + + return this.http.get(this.settings.getApiBaseURL() + `user/getMemberByExtSourceNameAndExtLogin/`, { + withCredentials: true, + params: { + + extLogin: ext_login, + + } + }); + } + + + getVosWhereUserIsAdmin(user_id: number) { + return this.http.get(this.settings.getApiBaseURL() + 'user/getVosWhereUserIsAdmin/', { + withCredentials: true, + params: {userid: user_id} + }); + } + + getGroupsWhereUserIsAdmin(user_id: number) { + return this.http.get(this.settings.getApiBaseURL() + 'user/getGroupsWhereUserIsAdmin/', { + withCredentials: true, + params: {userid: user_id} + }); + } + + setNewsletterSubscription(subscribed: boolean): Observable { + let header = new Headers({ + 'X-CSRFToken': this.settings.getCSRFToken(), + }); + let urlSearchParams = new URLSearchParams(); + urlSearchParams.append('subscribed', subscribed.toString()); + + return this.http.post(this.settings.getApiBaseURL() + 'newsletter/setNewsletterSubscription/', urlSearchParams, { + withCredentials: true, + headers: header, + }); + } + + getNewsletterSubscription(): Observable { + let header = new Headers({ + 'X-CSRFToken': this.settings.getCSRFToken(), + }); + return this.http.get(this.settings.getApiBaseURL() + 'newsletter/getNewsletterSubscription/', { + withCredentials: true, + }); + + + } } diff --git a/src/app/api-connector/vo.service.ts b/src/app/api-connector/vo.service.ts index 1f789e693c..beff0f8c51 100644 --- a/src/app/api-connector/vo.service.ts +++ b/src/app/api-connector/vo.service.ts @@ -30,7 +30,7 @@ export class VoService { }).map((res: Response) => res.json()).catch((error: any) => Observable.throw(error.json().error || 'Server error'))} - + getAllVoGroups(): Observable { @@ -55,6 +55,20 @@ export class VoService { } + getMembersOfdeNBIVo(firstname: string, lastName: string, groupid: string) { + + return this.http.get(this.settings.getApiBaseURL() + 'filter_deNBIMembers/', { + withCredentials: true, + params: { + firstName: firstname, + lastName: lastName, + groupid: groupid + } + }).map((res: Response) => res.json()).catch((error: any) => Observable.throw(error.json().error || 'Server error')) + + + } + } diff --git a/src/app/app.module.ts b/src/app/app.module.ts index bb0505d4f5..d8f04df162 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -12,8 +12,6 @@ import {SIDEBAR_TOGGLE_DIRECTIVES} from './shared/sidebar.directive'; import {AsideToggleDirective} from './shared/aside.directive'; import {BreadcrumbsComponent} from './shared/breadcrumb.component'; import {HttpModule} from '@angular/http'; -import {AuthzResolver} from "./perun-connector/authz-resolver.service"; -import {MembersManager} from "./perun-connector/members-manager.service"; import {PerunSettings} from "./perun-connector/connector-settings.service"; import {ApiSettings} from "./api-connector/api-settings.service"; // Routing Module @@ -24,6 +22,7 @@ import {FullLayoutComponent} from './layouts/full-layout.component'; import {SimpleLayoutComponent} from './layouts/simple-layout.component'; import {ModalModule} from "ngx-bootstrap"; import {RegistrationInfoComponent} from "./registration-info.component"; +import {UserService} from "./api-connector/user.service"; @NgModule({ imports: [ @@ -48,10 +47,11 @@ import {RegistrationInfoComponent} from "./registration-info.component"; providers: [{ provide: LocationStrategy, useClass: HashLocationStrategy - }, MembersManager, - AuthzResolver, + }, + PerunSettings, - ApiSettings + ApiSettings, + UserService ], bootstrap: [AppComponent] }) diff --git a/src/app/applications/addcloudapplication.component.html b/src/app/applications/addcloudapplication.component.html index 326cc0a126..2da1702fa5 100755 --- a/src/app/applications/addcloudapplication.component.html +++ b/src/app/applications/addcloudapplication.component.html @@ -125,7 +125,7 @@
    Resources
    + type="number" min="1" step="1" [(ngModel)]="project_application_vms_requested"> VMs

    @@ -176,30 +176,51 @@
    Resources
    -
    - GB
    - How many storage should every VM have? + How many extra storage do you need for your Vms? +
    +
    + +
    + +
    +
    + + GB + +
    + How many storage volumes do you want to use?
    diff --git a/src/app/applications/addcloudapplication.component.ts b/src/app/applications/addcloudapplication.component.ts index 5cb61a1b59..d6a5912ba5 100644 --- a/src/app/applications/addcloudapplication.component.ts +++ b/src/app/applications/addcloudapplication.component.ts @@ -23,6 +23,7 @@ export class AddcloudapplicationComponent { public notificationModalIsClosable: boolean = false; public notificationModalStay: boolean = true; public error: string[]; + public project_application_vms_requested=5; public acknowledgeModalMessage: string = 'The development and support of the cloud is possible above all through the funding of the cloud infrastructure by the Federal Ministry of Education and Research (BMBF)!\n' + @@ -63,7 +64,7 @@ export class AddcloudapplicationComponent { if ('project_application_cores_per_vm' in values && values['project_application_cores_per_vm'] > 0 && 'project_application_ram_per_vm' in values - && values['project_application_ram_per_vm'] > 0 && 'project_application_disk_space' in values && values['project_application_disk_space'] > 0) { + && values['project_application_ram_per_vm'] > 0 && 'project_application_volume_limit' in values && values['project_application_volume_limit'] > 0) { return true; } @@ -78,6 +79,7 @@ export class AddcloudapplicationComponent { onSubmit(f: NgForm) { this.error = null; if (this.wronginput == true) { + this.updateNotificaitonModal('Failed', 'The application was not submitted, please check the required fields and try again.', true, 'danger'); this.notificationModalStay = true; } @@ -91,6 +93,7 @@ export class AddcloudapplicationComponent { } } if (this.check_not_zero(values) == false) { + console.log('error') this.updateNotificaitonModal('Failed', 'The application was not submitted, please check the required fields and try again.', true, 'danger'); this.notificationModalStay = true; return; diff --git a/src/app/applications/addsinglevm.component.html b/src/app/applications/addsinglevm.component.html index 7c2c978b25..a1cf401b64 100644 --- a/src/app/applications/addsinglevm.component.html +++ b/src/app/applications/addsinglevm.component.html @@ -25,9 +25,9 @@
    General Information
    @@ -144,23 +145,48 @@
    Resources
    - +
    - GB
    - How much storage do you need per VM? + How many extra storage do you need for your Vms? +
    +
    + +
    + +
    +
    + + GB + +
    + How many storage volumes do you want to use?
    + +
    diff --git a/src/app/applications/addsinglevm.component.ts b/src/app/applications/addsinglevm.component.ts index cd8be720fc..e9fe10df51 100644 --- a/src/app/applications/addsinglevm.component.ts +++ b/src/app/applications/addsinglevm.component.ts @@ -23,6 +23,7 @@ export class AddsinglevmComponent { public notificationModalIsClosable: boolean = false; public notificationModalStay: boolean = true; public error: string[]; + public project_application_vms_requested=3; public acknowledgeModalMessage: string = 'The development and support of the cloud is possible above all through the funding of the cloud infrastructure by the Federal Ministry of Education and Research (BMBF)!\n' + diff --git a/src/app/applications/application.model.ts b/src/app/applications/application.model.ts index 98d87bf1ac..21830a8f28 100644 --- a/src/app/applications/application.model.ts +++ b/src/app/applications/application.model.ts @@ -8,7 +8,8 @@ export class Application { private _VMsRequested: number; private _CoresPerVM: number; private _RamPerVM: number; - private _DiskSpace: number; + private _VolumeLimit: number; + private _VolumeCounter: number; private _ObjectStorage: number; private _SpecialHardware: number; private _Description: string; @@ -138,12 +139,21 @@ export class Application { this._RamPerVM = value; } - get DiskSpace(): number { - return this._DiskSpace; + get VolumeLimit(): number { + return this._VolumeLimit; } - set DiskSpace(value: number) { - this._DiskSpace = value; + set VolumeLimit(value: number) { + this._VolumeLimit = value; + } + + + get VolumeCounter(): number { + return this._VolumeCounter; + } + + set VolumeCounter(value: number) { + this._VolumeCounter = value; } get ObjectStorage(): number { diff --git a/src/app/applications/applications.component.html b/src/app/applications/applications.component.html index 633e5b95a1..a0fe08982d 100755 --- a/src/app/applications/applications.component.html +++ b/src/app/applications/applications.component.html @@ -42,8 +42,9 @@

    Applications Overview

    Information - @@ -67,23 +68,27 @@

    Applications Overview

    VMs {{ application.VMsRequested }} VMs - + Cores/VM {{ application.CoresPerVM }} Cores per VM - + RAM {{ application.RamPerVM }} GB - Storage - {{ application.DiskSpace }} GB + Storage Limit + {{ application.VolumeLimit }} GB + Volume Counter + {{ application.VolumeCounter }} GB + + ObjectStorage {{ application.ObjectStorage }} GB - + Special Hardware {{ sh["special_hardware_name"] }} @@ -134,7 +139,7 @@

    Applications Overview

    {{ application.Name }} - {{application.Shortname}} + {{application.Shortname}} {{ application.DateSubmitted }} {{ application.User }} @@ -154,7 +159,7 @@

    Applications Overview

    - -
    -
    + +
    + + +
    + - + diff --git a/src/app/applications/applications.component.ts b/src/app/applications/applications.component.ts index 6f89ce02ea..6074ba1429 100644 --- a/src/app/applications/applications.component.ts +++ b/src/app/applications/applications.component.ts @@ -4,23 +4,19 @@ import {ApplicationsService} from '../api-connector/applications.service' import {SpecialHardwareService} from '../api-connector/special-hardware.service' import {ApplicationStatusService} from '../api-connector/application-status.service' import {ApiSettings} from '../api-connector/api-settings.service' -import {AuthzResolver} from '../perun-connector/authz-resolver.service' -import {UsersManager} from '../perun-connector/users-manager.service' -import {MembersManager} from '../perun-connector/members-manager.service' -import {GroupsManager} from '../perun-connector/groups-manager.service' import {PerunSettings} from "../perun-connector/connector-settings.service"; import {Application} from "./application.model"; import {ApplicationStatus} from "./application_status.model"; import {SpecialHardware} from "./special_hardware.model"; import {ModalDirective} from 'ngx-bootstrap/modal/modal.component'; -import {ResourcesManager} from "../perun-connector/resources_manager"; import {GroupService} from "../api-connector/group.service"; import * as moment from 'moment'; +import {UserService} from "../api-connector/user.service"; @Component({ templateUrl: 'applications.component.html', - providers: [GroupService, ResourcesManager, AuthzResolver, UsersManager, MembersManager, GroupsManager, PerunSettings, ApplicationsService, ApplicationStatusService, SpecialHardwareService, ApiSettings] + providers: [UserService,GroupService, PerunSettings, ApplicationsService, ApplicationStatusService, SpecialHardwareService, ApiSettings] }) export class ApplicationsComponent { @@ -46,16 +42,12 @@ export class ApplicationsComponent { constructor(private applicataionsservice: ApplicationsService, private applicationstatusservice: ApplicationStatusService, private specialhardwareservice: SpecialHardwareService, - private authzresolver: AuthzResolver, private perunsettings: PerunSettings, - private groupsmanager: GroupsManager, - private usersmanager: UsersManager, - private membersmanager: MembersManager, - private resourceManager: ResourcesManager, + private userservice:UserService, private groupservice: GroupService) { this.getUserApplications(); - this.getAllApplications(usersmanager); + this.getAllApplications(); this.getApplicationStatus(); this.getSpecialHardware(); this.getComputeCenters(); @@ -87,7 +79,8 @@ export class ApplicationsComponent { a.VMsRequested = aj["project_application_vms_requested"]; a.RamPerVM = aj["project_application_ram_per_vm"]; a.CoresPerVM = aj["project_application_cores_per_vm"]; - a.DiskSpace = aj["project_application_disk_space"]; + a.VolumeLimit = aj["project_application_volume_limit"]; + a.VolumeCounter = aj["project_application_volume_counter"]; a.ObjectStorage = aj["project_application_object_storage"]; a.SpecialHardware = aj["project_application_special_hardware"]; a.OpenStackProject = aj["project_application_openstack_project"]; @@ -122,17 +115,17 @@ export class ApplicationsComponent { }); } - getAllApplications(usersmanager: UsersManager) { + getAllApplications() { //todo check if user is VO Admin let user_id: number; let admin_vos: {}; - - this.authzresolver + console.log(this.userservice) + this.userservice .getLoggedUser().toPromise() - .then(function (userdata) { + .then(userdata =>{ //TODO catch errors user_id = userdata.json()["id"]; - return usersmanager.getVosWhereUserIsAdmin(user_id).toPromise(); + return this.userservice.getVosWhereUserIsAdmin(user_id).toPromise(); }).then(function (adminvos) { admin_vos = adminvos.json(); }).then(result => { @@ -157,7 +150,9 @@ export class ApplicationsComponent { a.VMsRequested = aj["project_application_vms_requested"]; a.RamPerVM = aj["project_application_ram_per_vm"]; a.CoresPerVM = aj["project_application_cores_per_vm"]; - a.DiskSpace = aj["project_application_disk_space"]; + a.VolumeLimit = aj["project_application_volume_limit"]; + a.VolumeCounter = aj["project_application_volume_counter"]; + a.ObjectStorage = aj["project_application_object_storage"]; a.SpecialHardware = aj["project_application_special_hardware"]; @@ -177,7 +172,25 @@ export class ApplicationsComponent { a.Comment= aj["project_application_comment"]; a.OpenStackProject = aj["project_application_openstack_project"]; if (a.Status !== 1) { - if (a.Shortname){ + if (aj['project_application_perun_id']){ + this.groupservice.getFacilityByGroup(aj['project_application_perun_id']).subscribe(result => { + + let details = result['Details']; + let details_array = []; + for (let detail in details) { + let detail_tuple = [detail, details[detail]]; + details_array.push(detail_tuple); + } + + a.ComputecenterDetails = details_array; + a.ComputeCenter = [result['Facility'],result['FacilityID']]; + + this.all_applications.push(a) + + }) + + } + else if (a.Shortname){ this.groupservice.getFacilityByGroup(a.Shortname).subscribe(result => { let details = result['Details']; @@ -281,38 +294,39 @@ export class ApplicationsComponent { } - public createGroup(name, description, manager_elixir_id, application_id, compute_center, openstack_project,numberofVms,diskspace,lifetime,longname) { + public createGroup(name, description, manager_elixir_id, application_id, compute_center, openstack_project,numberofVms,volumelimit,lifetime,longname,volumecounter) { //get memeber id in order to add the user later as the new member and manager of the group let manager_member_id: number; let manager_member_user_id: number; let new_group_id: number; let re = /[-:. ,]/gi - let shortNameDate=name + (new Date(Date.now()).toLocaleString().replace(re,'')) - this.membersmanager.getMemberByExtSourceNameAndExtLogin(manager_elixir_id).toPromise() + let shortNameDate=name + (new Date(Date.now()).toLocaleString().replace(re,'')); + this.userservice.getMemberByExtSourceNameAndExtLogin(manager_elixir_id).toPromise() .then(member_raw => { let member = member_raw.json(); manager_member_id = member["id"]; manager_member_user_id = member["userId"]; // create new group - return this.groupsmanager.createGroup(shortNameDate, description).toPromise(); + return this.groupservice.createGroup(shortNameDate, description).toPromise(); } ).then(group_raw => { let group = group_raw.json(); new_group_id = group["id"]; //add the application user to the group - return this.groupsmanager.addMember(new_group_id, manager_member_id).toPromise(); + return this.groupservice.addMember(new_group_id, manager_member_id,compute_center).toPromise(); }).then(null_result => { - return this.groupsmanager.addAdmin(new_group_id, manager_member_user_id).toPromise(); + return this.groupservice.addAdmin(new_group_id, manager_member_user_id,compute_center).toPromise(); }).then(null_result => { return this.applicationstatusservice.setApplicationStatus(application_id, this.getIdByStatus("approved"), compute_center).toPromise(); }).then(null_result => { //setting approved status for Perun Group - this.groupsmanager.setPerunGroupStatus(new_group_id, 2).toPromise(); - this.groupsmanager.setdeNBIDirectAcces(new_group_id, openstack_project).toPromise(); + let APPRVOVED=2; + this.groupservice.setPerunGroupStatus(new_group_id, APPRVOVED).toPromise(); + this.groupservice.setdeNBIDirectAcces(new_group_id, openstack_project).toPromise(); if (compute_center != 'undefined'){ this.groupservice.assignGroupToResource(new_group_id.toString(), compute_center).subscribe();} this.groupservice.setShortname(new_group_id.toString(),name).subscribe(); @@ -321,14 +335,15 @@ export class ApplicationsComponent { this.groupservice.setDescription(new_group_id.toString(),description).subscribe(); this.groupservice.setLifetime(new_group_id.toString(),lifetime.toString()).subscribe(); this.groupservice.setPerunId(new_group_id.toString(),application_id).subscribe(); - this.groupsmanager.setGroupDiskSpace(new_group_id,diskspace,numberofVms).subscribe(); + this.groupservice.setGroupVolumeLimit(new_group_id,volumelimit).subscribe(); + this.groupservice.setGroupVolumeCounter(new_group_id,volumecounter).subscribe(); //update modal this.updateNotificaitonModal("Success", "The new project was created", true, "success"); //update applications this.all_applications = []; this.user_applications = []; this.getUserApplications(); - this.getAllApplications(this.usersmanager); + this.getAllApplications(); }).catch(error => { this.updateNotificaitonModal("Failed", "Project could not be created!", true, "danger"); }); @@ -341,7 +356,7 @@ export class ApplicationsComponent { this.all_applications = []; this.user_applications = []; this.getUserApplications(); - this.getAllApplications(this.usersmanager); + this.getAllApplications(); this.updateNotificaitonModal("Success", "The Application was declined", true, "success"); }) .catch(error => { @@ -357,7 +372,7 @@ export class ApplicationsComponent { this.user_applications=[]; this.all_applications=[]; this.getUserApplications(); - this.getAllApplications(this.usersmanager); + this.getAllApplications(); }) .catch(error => { this.updateNotificaitonModal("Failed", "Application could not be removed!", true, "danger"); diff --git a/src/app/facility_manager/facilityprojectsoverview.component.ts b/src/app/facility_manager/facilityprojectsoverview.component.ts index 2eab61fddb..ab493c2d33 100644 --- a/src/app/facility_manager/facilityprojectsoverview.component.ts +++ b/src/app/facility_manager/facilityprojectsoverview.component.ts @@ -1,14 +1,9 @@ import {Component, Input, ViewChild} from '@angular/core'; -import {AuthzResolver} from '../perun-connector/authz-resolver.service' -import {GroupsManager} from '../perun-connector/groups-manager.service' -import {MembersManager} from '../perun-connector/members-manager.service' -import {UsersManager} from '../perun-connector/users-manager.service' import {Http} from '@angular/http'; import {PerunSettings} from "../perun-connector/connector-settings.service"; import {Project} from '../projectmanagement/project.model'; import {ModalDirective} from 'ngx-bootstrap/modal/modal.component'; import {ProjectMember} from '../projectmanagement/project_member.model' -import {ResourcesManager} from "../perun-connector/resources_manager"; import 'rxjs/add/operator/toPromise'; import {environment} from '../../environments/environment' import {ApiSettings} from "../api-connector/api-settings.service"; @@ -20,7 +15,7 @@ import * as moment from 'moment'; @Component({ templateUrl: 'facilityprojectsoverview.component.html', - providers: [FacilityService,UserService, GroupService, ResourcesManager, AuthzResolver, GroupsManager, MembersManager, UsersManager, PerunSettings, ApiSettings] + providers: [FacilityService,UserService, GroupService, PerunSettings, ApiSettings] }) export class FacilityProjectsOverviewComponent { diff --git a/src/app/layouts/full-layout.component.ts b/src/app/layouts/full-layout.component.ts index b0c0552f3c..64252f339e 100644 --- a/src/app/layouts/full-layout.component.ts +++ b/src/app/layouts/full-layout.component.ts @@ -1,17 +1,16 @@ import {Component, OnInit} from '@angular/core'; -import {UsersManager} from "../perun-connector/users-manager.service"; -import {AuthzResolver} from "../perun-connector/authz-resolver.service"; import {PerunSettings} from "../perun-connector/connector-settings.service"; import {ApiSettings} from "../api-connector/api-settings.service"; import {ClientService} from "../api-connector/vmClients.service"; -import {GroupsManager} from "../perun-connector/groups-manager.service"; import {FacilityService} from "../api-connector/facility.service"; +import {UserService} from "../api-connector/user.service"; +import {GroupService} from "../api-connector/group.service"; @Component({ selector: 'app-dashboard', templateUrl: './full-layout.component.html', - providers: [FacilityService, GroupsManager, ClientService, AuthzResolver, UsersManager, PerunSettings, ApiSettings] + providers: [GroupService,UserService,FacilityService, ClientService, PerunSettings, ApiSettings] }) export class FullLayoutComponent implements OnInit { @@ -24,7 +23,7 @@ export class FullLayoutComponent implements OnInit { navbar_state = 'closed' client_avaiable; - constructor(private facilityservice: FacilityService, private groupsManager: GroupsManager, private clientservice: ClientService, private perunsettings: PerunSettings, private usersmanager: UsersManager, private authzresolver: AuthzResolver) { + constructor(private groupService:GroupService,private userservice:UserService,private facilityservice: FacilityService, private clientservice: ClientService, private perunsettings: PerunSettings) { this.is_client_avaiable(); this.is_vm_project_member(); this.get_is_facility_manager(); @@ -54,7 +53,7 @@ export class FullLayoutComponent implements OnInit { } is_vm_project_member() { - this.groupsManager.getMemberGroupsStatus().subscribe(result => { + this.groupService.getMemberGroupsStatus().subscribe(result => { if (result.json().length > 0) { this.vm_project_member = true } @@ -89,15 +88,18 @@ export class FullLayoutComponent implements OnInit { } } - checkVOstatus(usersmanager: UsersManager) { + checkVOstatus(userservice:UserService) { let user_id: number; let admin_vos: {}; - this.authzresolver + + this.userservice .getLoggedUser().toPromise() .then(function (userdata) { //TODO catch errors user_id = userdata.json()["id"]; - return usersmanager.getVosWhereUserIsAdmin(user_id).toPromise(); + + + return userservice.getVosWhereUserIsAdmin(user_id).toPromise(); }).then(function (adminvos) { admin_vos = adminvos.json(); }).then(result => { @@ -112,6 +114,7 @@ export class FullLayoutComponent implements OnInit { } ngOnInit(): void { - this.checkVOstatus(this.usersmanager); + + this.checkVOstatus(this.userservice); } } diff --git a/src/app/member-guard.service.ts b/src/app/member-guard.service.ts index 193d132466..9533ed1926 100644 --- a/src/app/member-guard.service.ts +++ b/src/app/member-guard.service.ts @@ -1,22 +1,20 @@ import {Injectable} from "@angular/core"; import {CanActivate, Router, RouterStateSnapshot, ActivatedRouteSnapshot} from "@angular/router"; -import {MembersManager} from "./perun-connector/members-manager.service"; -import {AuthzResolver} from "./perun-connector/authz-resolver.service"; -import {Observable} from "rxjs/Observable"; import {environment} from "../environments/environment"; +import {UserService} from "./api-connector/user.service"; @Injectable() export class MemberGuardService implements CanActivate { - constructor(private router: Router, private authzresolver: AuthzResolver, private memberssmanager: MembersManager) { + constructor(private router: Router, private userservice: UserService) { } canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) { return new Promise((resolve, reject) => { - this.authzresolver.getLoggedUser().toPromise() + this.userservice.getLoggedUser().toPromise() .then(result => { let res = result.json(); @@ -25,7 +23,12 @@ export class MemberGuardService implements CanActivate { }).then(res => { - this.memberssmanager.getMemberByUser(res['id']).toPromise().then(memberinfo => { + this.userservice.getMemberByUser(res['id']).toPromise().then(memberinfo => { + if (memberinfo.json()['name'] === 'MemberNotExistsException') { + this.router.navigate(['/registration-info']); + resolve(false); + + } return resolve(true); }).catch(rejection => { @@ -37,7 +40,7 @@ export class MemberGuardService implements CanActivate { }).catch(rejection => { //this.router.navigate(['/portal']); - window.location.href=environment.login + window.location.href = environment.login resolve(false); }); diff --git a/src/app/perun-connector/attributes-manager.ts b/src/app/perun-connector/attributes-manager.ts deleted file mode 100644 index 4a35765e05..0000000000 --- a/src/app/perun-connector/attributes-manager.ts +++ /dev/null @@ -1,26 +0,0 @@ -import {Injectable} from '@angular/core'; -import {Http, Response, Headers, RequestOptions} from '@angular/http'; -import {PerunSettings} from './connector-settings.service' -import {Observable} from 'rxjs/Rx'; -import 'rxjs/add/operator/map'; -import 'rxjs/add/operator/catch'; -import {ApiSettings} from '../api-connector/api-settings.service'; - - -@Injectable() -export class AttributesManager { - constructor(private http: Http, private perunSettings: PerunSettings, private apiSettings: ApiSettings) { - } - - getLogins(user: number): Observable { - - return this.http.get(this.perunSettings.getPerunBaseURL() + 'attributesManager/getLogins', - { - headers: new Headers({'Authorization': 'Bearer ' + this.apiSettings.getAccessToken()}), - params: {user: user} - - }); - } - - -} diff --git a/src/app/perun-connector/authz-resolver.service.ts b/src/app/perun-connector/authz-resolver.service.ts deleted file mode 100644 index 37fb4123df..0000000000 --- a/src/app/perun-connector/authz-resolver.service.ts +++ /dev/null @@ -1,30 +0,0 @@ -import {Injectable} from '@angular/core'; -import {Http, Response, Headers, RequestOptions} from '@angular/http'; -import {PerunSettings} from './connector-settings.service' -import {Observable} from 'rxjs/Rx'; -import 'rxjs/add/operator/map'; -import 'rxjs/add/operator/catch'; -import {ApiSettings} from '../api-connector/api-settings.service'; - - -@Injectable() -export class AuthzResolver { - constructor(private http: Http, private perunSettings: PerunSettings, private apiSettings: ApiSettings) { - } - - getLoggedUser() { - return this.http.get(this.perunSettings.getPerunBaseURL() + 'authzResolver/getLoggedUser', - { - headers: new Headers({'Authorization': 'Bearer ' + this.apiSettings.getAccessToken()}), - }); - } - - getPerunPrincipal(): Observable { - return this.http.get(this.perunSettings.getPerunBaseURL() + 'authzResolver/getPerunPrincipal', - { - headers: new Headers({'Authorization': 'Bearer ' + this.apiSettings.getAccessToken()}), - }); - - } - -} diff --git a/src/app/perun-connector/groups-manager.service.ts b/src/app/perun-connector/groups-manager.service.ts deleted file mode 100644 index 8f5cb17328..0000000000 --- a/src/app/perun-connector/groups-manager.service.ts +++ /dev/null @@ -1,152 +0,0 @@ -import {Injectable} from '@angular/core'; -import {Http, Response, Headers, RequestOptions} from '@angular/http'; -import {PerunSettings} from './connector-settings.service' -import {Observable} from 'rxjs/Rx'; -import 'rxjs/add/operator/map'; -import 'rxjs/add/operator/catch'; -import 'rxjs/add/operator/toPromise'; -import {ApiSettings} from "../api-connector/api-settings.service"; -import {Project} from "../projectmanagement/project.model"; - -@Injectable() -export class GroupsManager { - baseConnectorUrl = 'https://portal-dev.denbi.de/connector/' - denbiProjectDiskSpace_ID=3288 - - constructor(private http: Http, private settings: PerunSettings, private apiSettings: ApiSettings) { - } - - getMemberGroups(member_id: number) { - return this.http.get(this.settings.getPerunBaseURL() + 'groupsManager/getMemberGroups', { - headers: new Headers({'Authorization': 'Bearer ' + this.apiSettings.getAccessToken()}), - params: {member: member_id} - }); - } - - - getMemberGroupsStatus() { - return this.http.get(this.apiSettings.getApiBaseURL() + 'approved_projects/', { - withCredentials: true, - headers: new Headers({'Authorization': 'Bearer ' + this.apiSettings.getAccessToken()}), - }); - - } - - - getGroupByVoandName(groupname: string) { - - return this.http.get(this.settings.getPerunBaseURL() + 'groupsManager/getGroupByName', { - - headers: new Headers({'Authorization': 'Bearer ' + this.apiSettings.getAccessToken()}), - params: {vo: this.settings.getPerunVO(), name: groupname} - }); - - } - - createGroup(group_name: string, group_description: string) { - var parameter = JSON.stringify({ - vo: this.settings.getPerunVO(), - group: {name: group_name, description: group_description.substring(0,512)} - }); - return this.http.post(this.settings.getPerunBaseURL() + 'groupsManager/createGroup', parameter, - { - headers: new Headers({'Authorization': 'Bearer ' + this.apiSettings.getAccessToken()}), - }); - } - - setdeNBIDirectAcces(group_id: number, value: boolean) { - var parameter = JSON.stringify({ - group: group_id, - attribute: {id: 3279, - namespace: 'urn:perun:group:attribute-def:opt', - friendlyName: 'denbiDirectAccess', type: 'java.lang.Boolean', - value: value - } - }); - return this.http.post(this.settings.getPerunBaseURL() + 'attributesManager/setAttribute', parameter, - { - headers: new Headers({'Authorization': 'Bearer ' + this.apiSettings.getAccessToken()}), - }); - } - - - setGroupDiskSpace(group_id: number, value :number ,numberofVms:number){ - value=value * numberofVms; - var parameter = JSON.stringify({ - group: group_id, - attribute: {id: this.denbiProjectDiskSpace_ID, - namespace: 'urn:perun:group:attribute-def:opt', - friendlyName: 'denbiProjectDiskSpace', type: 'java.lang.Integer', - value: value - } - }); - return this.http.post(this.settings.getPerunBaseURL() + 'attributesManager/setAttribute', parameter, - { - headers: new Headers({'Authorization': 'Bearer ' + this.apiSettings.getAccessToken()}), - }); - - } - - - - setPerunGroupStatus(group_id: number, status: number) { - /* 1:submitted - 2: approved - 3: declined - */ - - var parameter = JSON.stringify({ - group: group_id, - attribute: { - id: 3291, namespace: 'urn:perun:group:attribute-def:opt', - friendlyName: 'denbiProjectStatus', type: 'java.lang.Integer', - value: status, - } - }); - return this.http.post(this.settings.getPerunBaseURL() + 'attributesManager/setAttribute', parameter, - { - headers: new Headers({'Authorization': 'Bearer ' + this.apiSettings.getAccessToken()}), - }); - } - - getGroupRichMembers(group_id: number) { - return this.http.get(this.settings.getPerunBaseURL() + 'groupsManager/getGroupRichMembers', { - headers: new Headers({'Authorization': 'Bearer ' + this.apiSettings.getAccessToken()}), - params: {group: group_id} - }); - } - - addMember(group_id: number, member_id: number) { - var parameter = JSON.stringify({ - group: group_id, - member: member_id - }); - return this.http.post(this.settings.getPerunBaseURL() + 'groupsManager/addMember', parameter, - { - headers: new Headers({'Authorization': 'Bearer ' + this.apiSettings.getAccessToken()}), - }); - } - - addAdmin(group_id: number, user_id: number) { - var parameter = JSON.stringify({ - group: group_id, - user: user_id - }); - return this.http.post(this.settings.getPerunBaseURL() + 'groupsManager/addAdmin', parameter, - { - headers: new Headers({'Authorization': 'Bearer ' + this.apiSettings.getAccessToken()}), - }); - } - - removeMember(group_id: number, member_id: number) { - var parameter = JSON.stringify({ - group: group_id, - member: member_id - }); - return this.http.post(this.settings.getPerunBaseURL() + 'groupsManager/removeMember', parameter, - { - headers: new Headers({'Authorization': 'Bearer ' + this.apiSettings.getAccessToken()}), - }); - } - -} diff --git a/src/app/perun-connector/members-manager.service.ts b/src/app/perun-connector/members-manager.service.ts deleted file mode 100644 index 122520d8e2..0000000000 --- a/src/app/perun-connector/members-manager.service.ts +++ /dev/null @@ -1,50 +0,0 @@ -import {Injectable} from '@angular/core'; -import {Http, Response, Headers, RequestOptions} from '@angular/http'; -import {PerunSettings} from './connector-settings.service' -import {Observable} from 'rxjs/Rx'; -import 'rxjs/add/operator/map'; -import 'rxjs/add/operator/catch'; -import {ApiSettings} from '../api-connector/api-settings.service'; -import {URLSearchParams} from "@angular/http"; - -@Injectable() -export class MembersManager { - constructor(private http: Http, private settings: PerunSettings, private apiSettings: ApiSettings) { - } - - getMemberByUser(user_id: number) { - var vo = this.settings.getPerunVO(); - return this.http.get(this.settings.getPerunBaseURL() + `membersManager/getMemberByUser`, { - headers: new Headers({'Authorization': 'Bearer ' + this.apiSettings.getAccessToken()}), - params: {user: user_id, vo: vo} - }); - } - - getMemberByExtSourceNameAndExtLogin(ext_login: string) { - let vo = this.settings.getPerunVO(), - idp = this.settings.getUserExtSource(); - - return this.http.get(this.settings.getPerunBaseURL() + `membersManager/getMemberByExtSourceNameAndExtLogin`, { - headers: new Headers({'Authorization': 'Bearer ' + this.apiSettings.getAccessToken()}), - params: { - extSourceName: idp, - extLogin: ext_login, - vo: vo - } - }); - } - - getMembersOfdeNBIVo(firstname: string, lastName: string, groupid: string) { - - return this.http.get(this.apiSettings.getApiBaseURL() + 'filter_deNBIMembers/', { - withCredentials: true, - params: { - firstName: firstname, - lastName: lastName, - groupid: groupid - } - }).map((res: Response) => res.json()).catch((error: any) => Observable.throw(error.json().error || 'Server error')) - - - } -} diff --git a/src/app/perun-connector/resources_manager.ts b/src/app/perun-connector/resources_manager.ts deleted file mode 100644 index d1015cafde..0000000000 --- a/src/app/perun-connector/resources_manager.ts +++ /dev/null @@ -1,28 +0,0 @@ -import {Injectable} from '@angular/core'; -import {Http, Response, Headers, RequestOptions} from '@angular/http'; -import {PerunSettings} from './connector-settings.service' -import {Observable} from 'rxjs/Rx'; -import 'rxjs/add/operator/map'; -import 'rxjs/add/operator/catch'; -import 'rxjs/add/operator/toPromise'; -import {ApiSettings} from "../api-connector/api-settings.service"; - -@Injectable() -export class ResourcesManager { - constructor(private http: Http, private settings: PerunSettings, private apiSettings: ApiSettings) { - } - - getGroupAssignedResources(group_id: number) { - return this.http.get(this.settings.getPerunBaseURL() + 'resourcesManager/getAssignedResources', { - headers: new Headers({'Authorization': 'Bearer ' + this.apiSettings.getAccessToken()}), - params: {group: group_id} - }); - } - - getFacilityByResource(resource_id: number) { - return this.http.get(this.settings.getPerunBaseURL() + 'resourcesManager/getFacility', { - headers: new Headers({'Authorization': 'Bearer ' + this.apiSettings.getAccessToken()}), - params: {resource: resource_id} - }); - } -} diff --git a/src/app/perun-connector/users-manager.service.ts b/src/app/perun-connector/users-manager.service.ts deleted file mode 100644 index c7d7b52d1f..0000000000 --- a/src/app/perun-connector/users-manager.service.ts +++ /dev/null @@ -1,36 +0,0 @@ -import {Injectable} from '@angular/core'; -import {Http, Response, Headers, RequestOptions} from '@angular/http'; -import {PerunSettings} from './connector-settings.service' -import {Observable} from 'rxjs/Rx'; -import 'rxjs/add/operator/map'; -import 'rxjs/add/operator/catch'; -import 'rxjs/add/operator/toPromise'; -import {ApiSettings} from "../api-connector/api-settings.service"; - -@Injectable() -export class UsersManager { - constructor(private http: Http, private settings: PerunSettings, private apiSettings: ApiSettings) { - } - - getRichUser(user_id: number) { - return this.http.get(this.settings.getPerunBaseURL() + 'usersManager/getRichUser', { - headers: new Headers({'Authorization': 'Bearer ' + this.apiSettings.getAccessToken()}), - params: {user: user_id} - }); - - } - - getGroupsWhereUserIsAdmin(user_id: number) { - return this.http.get(this.settings.getPerunBaseURL() + 'usersManager/getGroupsWhereUserIsAdmin', { - headers: new Headers({'Authorization': 'Bearer ' + this.apiSettings.getAccessToken()}), - params: {user: user_id, vo: this.settings.getPerunVO()} - }); - } - - getVosWhereUserIsAdmin(user_id: number) { - return this.http.get(this.settings.getPerunBaseURL() + 'usersManager/getVosWhereUserIsAdmin', { - headers: new Headers({'Authorization': 'Bearer ' + this.apiSettings.getAccessToken()}), - params: {user: user_id} - }); - } -} diff --git a/src/app/projectmanagement/overview.component.ts b/src/app/projectmanagement/overview.component.ts index 5e43b4396e..0b77ce3fa2 100644 --- a/src/app/projectmanagement/overview.component.ts +++ b/src/app/projectmanagement/overview.component.ts @@ -1,26 +1,22 @@ import {Component, Input, ViewChild} from '@angular/core'; -import {AuthzResolver} from '../perun-connector/authz-resolver.service' -import {GroupsManager} from '../perun-connector/groups-manager.service' -import {MembersManager} from '../perun-connector/members-manager.service' -import {UsersManager} from '../perun-connector/users-manager.service' import {Http} from '@angular/http'; import {PerunSettings} from "../perun-connector/connector-settings.service"; import {Project} from './project.model'; import {ModalDirective} from 'ngx-bootstrap/modal/modal.component'; import {ProjectMember} from './project_member.model' -import {ResourcesManager} from "../perun-connector/resources_manager"; import 'rxjs/add/operator/toPromise'; import {isNumber} from "util"; import {environment} from '../../environments/environment' import {ApiSettings} from "../api-connector/api-settings.service"; import {GroupService} from "../api-connector/group.service"; import {UserService} from "../api-connector/user.service"; -import * as moment from 'moment'; +import * as moment from 'moment'; +import {VoService} from "../api-connector/vo.service"; @Component({ templateUrl: 'overview.component.html', - providers: [UserService, GroupService, ResourcesManager, AuthzResolver, GroupsManager, MembersManager, UsersManager, PerunSettings, ApiSettings] + providers: [VoService,UserService, GroupService, PerunSettings, ApiSettings] }) export class OverviewComponent { @@ -66,15 +62,12 @@ export class OverviewComponent { public passwordModalFacility: string = ''; public passwordModalEmail: string = ''; - constructor(private authzresolver: AuthzResolver, + constructor( private perunsettings: PerunSettings, - private useresmanager: UsersManager, - private groupsmanager: GroupsManager, - private membersmanager: MembersManager, - private resourceManager: ResourcesManager, private groupservice: GroupService, - private userservice: UserService) { - this.getUserProjects(groupsmanager, membersmanager, useresmanager); + private userservice: UserService, + private voservice:VoService) { + this.getUserProjects(groupservice, userservice); } @@ -107,9 +100,8 @@ export class OverviewComponent { }) } - getUserProjects(groupsmanager: GroupsManager, - membersmanager: MembersManager, - usersmanager: UsersManager) { + getUserProjects(groupservice: GroupService, + userservice: UserService) { let user_id: number; let member_id: number; let user_projects: {}; @@ -117,27 +109,28 @@ export class OverviewComponent { let admin_groups: {}; let admin_vos: {}; - this.authzresolver + this.userservice .getLoggedUser().toPromise() .then(function (userdata) { //TODO catch errors let userid = userdata.json()["id"]; user_id = userid; user_data = userdata.json(); - return membersmanager.getMemberByUser(userid).toPromise(); + return userservice.getMemberByUser(userid).toPromise(); }) .then(function (memberdata) { let memberid = memberdata.json()["id"]; member_id = memberid; - return groupsmanager.getMemberGroups(memberid).toPromise(); + return groupservice.getMemberGroups(memberid).toPromise(); }).then(function (groupsdata) { user_projects = groupsdata.json(); }).then(function () { - return usersmanager.getGroupsWhereUserIsAdmin(user_id).toPromise(); + return userservice.getGroupsWhereUserIsAdmin(user_id).toPromise(); }).then(function (admingroups) { admin_groups = admingroups.json(); }).then(function () { - return usersmanager.getVosWhereUserIsAdmin(user_id).toPromise(); + + return userservice.getVosWhereUserIsAdmin(user_id).toPromise(); }).then(function (adminvos) { admin_vos = adminvos.json(); }).then(result => { @@ -248,16 +241,16 @@ export class OverviewComponent { } filterMembers(firstName: string, lastName: string, groupid: number) { - this.membersmanager.getMembersOfdeNBIVo(firstName, lastName, groupid.toString()).subscribe(result => { + this.voservice.getMembersOfdeNBIVo(firstName, lastName, groupid.toString()).subscribe(result => { this.filteredMembers = result; }) } getMembesOfTheProject(projectid: number, projectname: string) { - this.groupsmanager.getGroupRichMembers(projectid).toPromise() + this.groupservice.getGroupRichMembers(projectid).toPromise() .then(function (members_raw) { - return members_raw.json(); + return members_raw; }).then(members => { this.usersModalProjectID = projectid; this.usersModalProjectName = projectname; diff --git a/src/app/userinfo/userinfo.component.ts b/src/app/userinfo/userinfo.component.ts index 595ce19ed1..e186634abc 100644 --- a/src/app/userinfo/userinfo.component.ts +++ b/src/app/userinfo/userinfo.component.ts @@ -2,19 +2,15 @@ import {Component,OnInit} from '@angular/core'; import 'rxjs/add/operator/toPromise'; import {Userinfo} from './userinfo.model' -import {AuthzResolver} from '../perun-connector/authz-resolver.service' import {PerunSettings} from "../perun-connector/connector-settings.service"; -import {MembersManager} from '../perun-connector/members-manager.service' import {ApiSettings} from '../api-connector/api-settings.service' import {keyService} from "../api-connector/key.service"; -import {UsersManager} from "../perun-connector/users-manager.service"; -import {AttributesManager} from "../perun-connector/attributes-manager"; import {UserService} from "../api-connector/user.service"; @Component({ templateUrl: 'userinfo.component.html', - providers: [UserService, AuthzResolver, PerunSettings, MembersManager, ApiSettings, keyService, UsersManager, AttributesManager] + providers: [UserService, PerunSettings, ApiSettings, keyService] }) export class UserinfoComponent implements OnInit{ userinfo: Userinfo; @@ -23,7 +19,7 @@ export class UserinfoComponent implements OnInit{ newsletter_subscribed :boolean; public_key: string=''; - constructor(private userservice: UserService,private authzresolver: AuthzResolver, private memberssmanager: MembersManager, private keyService: keyService, private usersmanager: UsersManager, private attributemanager: AttributesManager) { + constructor(private userservice: UserService, private keyService: keyService) { this.userinfo = new Userinfo(); this.getUserinfo(); @@ -75,7 +71,7 @@ export class UserinfoComponent implements OnInit{ } - + getUserPublicKey() { this.keyService.getKey(this.userinfo.ElxirId).subscribe(result => { @@ -84,7 +80,7 @@ export class UserinfoComponent implements OnInit{ } getUserinfo() { - this.authzresolver.getLoggedUser().toPromise() + this.userservice.getLoggedUser().toPromise() .then(result => { let res = result.json(); @@ -92,11 +88,11 @@ export class UserinfoComponent implements OnInit{ this.userinfo.LastName = res["lastName"]; this.userinfo.Id = res["id"]; - return this.memberssmanager.getMemberByUser(res["id"]).toPromise(); + return this.userservice.getMemberByUser(res["id"]).toPromise(); }).then(memberinfo => { this.userinfo.MemberId = memberinfo.json()["id"]; - this.attributemanager.getLogins(this.userinfo.Id).toPromise().then(result => { + this.userservice.getLogins(this.userinfo.Id).toPromise().then(result => { let logins = result.json() for (let login of logins) { if (login['friendlyName'] === 'login-namespace:elixir-persistent') { diff --git a/src/app/virtualmachines/addvm.component.html b/src/app/virtualmachines/addvm.component.html index 7a7eb7b9a1..7c131032c6 100755 --- a/src/app/virtualmachines/addvm.component.html +++ b/src/app/virtualmachines/addvm.component.html @@ -79,7 +79,7 @@
    GB + GB -
    +
    {{selectedProjectDiskspaceUsed}} / {{selectedProjectDiskspaceMax}} GB
    +
    +
    + + + +
    +
    + {{selectedProjectVolumesUsed}} / {{selectedProjectVolumesMax}} + +
    +
    + + +
    +
    @@ -163,7 +171,7 @@

    Send email

    +
    + +
    + + +
    +
    +
    @@ -161,7 +170,7 @@

    Send email

    -
    - -
    - - -
    -
    -
    - -
    - - -
    +
    +
    +
    + +
    + + +
    +
    + +
    + +
    + + +
    +
    + +
    + +
    + +
    +
    +
    - - -
    - -
    - -
    +
    + +
    -
    - - -
    @@ -171,7 +188,7 @@

    Send email

    - -