cleanup
This commit is contained in:
parent
f8a2bd34fa
commit
c3085a944d
|
@ -5,7 +5,6 @@ import { switchMap, filter, map, takeUntil } from 'rxjs/operators';
|
||||||
import { AfterViewInit, Component, OnInit, ViewChild } from '@angular/core';
|
import { AfterViewInit, Component, OnInit, ViewChild } from '@angular/core';
|
||||||
import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
|
import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
|
||||||
import { TranslateService } from '@ngx-translate/core';
|
import { TranslateService } from '@ngx-translate/core';
|
||||||
import { environment } from '../environments/environment';
|
|
||||||
import { AuthService, LoginStatus } from './core/services/auth/auth.service';
|
import { AuthService, LoginStatus } from './core/services/auth/auth.service';
|
||||||
import { CultureService } from './core/services/culture/culture-service';
|
import { CultureService } from './core/services/culture/culture-service';
|
||||||
// import { BreadCrumbResolverService } from './ui/misc/breadcrumb/service/breadcrumb.service';
|
// import { BreadCrumbResolverService } from './ui/misc/breadcrumb/service/breadcrumb.service';
|
||||||
|
|
|
@ -605,7 +605,6 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
|
||||||
this.dmp.entityDois.unshift(entityDoi);
|
this.dmp.entityDois.unshift(entityDoi);
|
||||||
}
|
}
|
||||||
|
|
||||||
// createDoiLink(doiModel: DoiModel): string {
|
|
||||||
createDoiLink(doiModel: any): string {
|
createDoiLink(doiModel: any): string {
|
||||||
//TODO: needs rewriting
|
//TODO: needs rewriting
|
||||||
const repository = this.depositRepos.find(r => r.repositoryId == doiModel.repositoryId);
|
const repository = this.depositRepos.find(r => r.repositoryId == doiModel.repositoryId);
|
||||||
|
|
|
@ -4,8 +4,6 @@ import { map, takeUntil } from 'rxjs/operators';
|
||||||
import { UiNotificationService, SnackBarNotificationLevel } from '@app/core/services/notification/ui-notification-service';
|
import { UiNotificationService, SnackBarNotificationLevel } from '@app/core/services/notification/ui-notification-service';
|
||||||
import { TranslateService } from '@ngx-translate/core';
|
import { TranslateService } from '@ngx-translate/core';
|
||||||
import { ActivatedRoute, Router } from '@angular/router';
|
import { ActivatedRoute, Router } from '@angular/router';
|
||||||
import { isNullOrUndefined } from '@app/utilities/enhancers/utils';
|
|
||||||
import { environment } from 'environments/environment';
|
|
||||||
import { ConfigurationService } from '@app/core/services/configuration/configuration.service';
|
import { ConfigurationService } from '@app/core/services/configuration/configuration.service';
|
||||||
import { AuthService } from '@app/core/services/auth/auth.service';
|
import { AuthService } from '@app/core/services/auth/auth.service';
|
||||||
import { MatomoService } from '@app/core/services/matomo/matomo-service';
|
import { MatomoService } from '@app/core/services/matomo/matomo-service';
|
||||||
|
|
|
@ -73,15 +73,6 @@
|
||||||
<ng-container *ngFor="let providerIcon of getProviderIcons(userCredential, userLanguage)">
|
<ng-container *ngFor="let providerIcon of getProviderIcons(userCredential, userLanguage)">
|
||||||
<span [ngClass]="providerIcon"></span>
|
<span [ngClass]="providerIcon"></span>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
<!-- <span *ngIf="hasProvider(userCredential, 'Google')" class="googleIcon"></span> -->
|
|
||||||
<!-- <span *ngIf="hasProvider(userCredential, 'Facebook')" class="facebookIcon"></span> -->
|
|
||||||
<!-- <span *ngIf="hasProvider(userCredential.data.provider, authProviderEnum.Twitter)" class="twitterIcon"></span>
|
|
||||||
<span *ngIf="hasProvider(userCredential.data.provider, authProviderEnum.LinkedIn)" class="linkedInIcon"></span>
|
|
||||||
<span *ngIf="hasProvider(userCredential.data.provider, authProviderEnum.B2Access)" class="b2AccessIcon"></span>
|
|
||||||
<span *ngIf="hasProvider(userCredential.data.provider, authProviderEnum.ORCID)" class="orcidIconMedium"></span>
|
|
||||||
<span *ngIf="hasProvider(userCredential.data.provider, authProviderEnum.OpenAire)" class="openaireIcon"></span>
|
|
||||||
<span *ngIf="hasProvider(userCredential.data.provider, authProviderEnum.Configurable)" class="configurableIcon"></span>
|
|
||||||
<span *ngIf="hasProvider(userCredential.data.provider, authProviderEnum.Zenodo)" class="zenodoIcon"></span> -->
|
|
||||||
<div *ngIf="i != 0" class="col-auto d-flex align-items-center unlink-mail" (click)="userCredential.data.email !== firstEmail && removeAccount(userCredential)">
|
<div *ngIf="i != 0" class="col-auto d-flex align-items-center unlink-mail" (click)="userCredential.data.email !== firstEmail && removeAccount(userCredential)">
|
||||||
<mat-icon
|
<mat-icon
|
||||||
[matTooltip]="(userCredential.data?.email !== firstEmail ) ? ('USER-PROFILE.ACTIONS.UNLINK-ACCOUNT' | translate) : ('USER-PROFILE.ACTIONS.UNLINK-ACCOUNT-DISABLED' | translate)"
|
[matTooltip]="(userCredential.data?.email !== firstEmail ) ? ('USER-PROFILE.ACTIONS.UNLINK-ACCOUNT' | translate) : ('USER-PROFILE.ACTIONS.UNLINK-ACCOUNT-DISABLED' | translate)"
|
||||||
|
|
|
@ -254,8 +254,7 @@
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
|
||||||
span.googleIcon,
|
span.googleIcon,
|
||||||
span.facebookIcon,
|
span.facebookIcon {
|
||||||
span.twitterIcon {
|
|
||||||
float: left;
|
float: left;
|
||||||
transform: scale(0.4);
|
transform: scale(0.4);
|
||||||
width: 45px;
|
width: 45px;
|
||||||
|
@ -270,52 +269,6 @@
|
||||||
span.facebookIcon {
|
span.facebookIcon {
|
||||||
background: url("../../../assets/images/login/facebook.png") no-repeat;
|
background: url("../../../assets/images/login/facebook.png") no-repeat;
|
||||||
}
|
}
|
||||||
|
|
||||||
span.twitterIcon {
|
|
||||||
background: url("../../../assets/images/login/twitter.png") no-repeat;
|
|
||||||
}
|
|
||||||
|
|
||||||
span.linkedInIcon {
|
|
||||||
}
|
|
||||||
|
|
||||||
span.configurableIcon {
|
|
||||||
}
|
|
||||||
|
|
||||||
span.b2AccessIcon {
|
|
||||||
background: url(../../ui/auth/login/img/b2access_small.png) no-repeat;
|
|
||||||
float: left;
|
|
||||||
width: 45px;
|
|
||||||
height: 25px;
|
|
||||||
margin-left: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
span.orcidIconMedium {
|
|
||||||
background: url("../../../assets/images/login/orcid.png") no-repeat;
|
|
||||||
background-position: center;
|
|
||||||
float: left;
|
|
||||||
transform: scale(0.45);
|
|
||||||
width: 50px;
|
|
||||||
height: 45px;
|
|
||||||
}
|
|
||||||
|
|
||||||
span.openaireIcon {
|
|
||||||
background: url("../../../assets/images/login/openaire.png") no-repeat;
|
|
||||||
background-position: center;
|
|
||||||
float: right;
|
|
||||||
transform: scale(0.4);
|
|
||||||
width: 50px;
|
|
||||||
height: 45px;
|
|
||||||
}
|
|
||||||
|
|
||||||
span.zenodoIcon {
|
|
||||||
background: url("../../../assets/images/login/zenodo.png") no-repeat;
|
|
||||||
background-position: center;
|
|
||||||
float: right;
|
|
||||||
transform: scale(0.58);
|
|
||||||
width: 200px;
|
|
||||||
height: 45px;
|
|
||||||
margin-left: -58px;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
::ng-deep .name-form .mat-form-field-appearance-outline .mat-form-field-outline {
|
::ng-deep .name-form .mat-form-field-appearance-outline .mat-form-field-outline {
|
||||||
|
|
|
@ -12,6 +12,6 @@
|
||||||
"FreeTextFieldDataEditorModel.label",
|
"FreeTextFieldDataEditorModel.label",
|
||||||
"SelectFieldDataEditorModel.label",
|
"SelectFieldDataEditorModel.label",
|
||||||
"FieldDataOptionEditorModel.label",
|
"FieldDataOptionEditorModel.label",
|
||||||
"FieldSetEditorModel.schematics",
|
"FieldSetEditorModel.semantics",
|
||||||
"FieldSetEditorModel.export"
|
"FieldSetEditorModel.export"
|
||||||
]
|
]
|
||||||
|
|
|
@ -2,7 +2,6 @@ import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/c
|
||||||
import { Observable } from 'rxjs';
|
import { Observable } from 'rxjs';
|
||||||
import { BaseHttpParams } from '../base-http-params';
|
import { BaseHttpParams } from '../base-http-params';
|
||||||
import { InterceptorType } from './interceptor-type';
|
import { InterceptorType } from './interceptor-type';
|
||||||
import { environment } from '../../../environments/environment';
|
|
||||||
import { ConfigurationService } from '@app/core/services/configuration/configuration.service';
|
import { ConfigurationService } from '@app/core/services/configuration/configuration.service';
|
||||||
|
|
||||||
export abstract class BaseInterceptor implements HttpInterceptor {
|
export abstract class BaseInterceptor implements HttpInterceptor {
|
||||||
|
|
|
@ -1,19 +1,3 @@
|
||||||
export const environment = {
|
export const environment = {
|
||||||
production: true,
|
production: true,
|
||||||
Server: 'https://devel.opendmp.eu/srv/api/',
|
|
||||||
App: 'https://devel.opendmp.eu/',
|
|
||||||
HelpService: {
|
|
||||||
Enabled: false,
|
|
||||||
Url: 'https://devel.opendmp.eu/content-service/',
|
|
||||||
},
|
|
||||||
defaultCulture: 'en-US',
|
|
||||||
zenodoConfiguration: {
|
|
||||||
clientId: "",
|
|
||||||
oauthUrl: "",
|
|
||||||
redirectUri: ""
|
|
||||||
},
|
|
||||||
logging: {
|
|
||||||
enabled: false,
|
|
||||||
logLevels: ["debug", "info", "warning", "error"]
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,19 +1,3 @@
|
||||||
export const environment = {
|
export const environment = {
|
||||||
production: true,
|
production: true,
|
||||||
Server: 'https://devel.opendmp.eu/srv/api/',
|
|
||||||
App: 'https://devel.opendmp.eu/',
|
|
||||||
HelpService: {
|
|
||||||
Enabled: false,
|
|
||||||
Url: 'https://devel.opendmp.eu/content-service/',
|
|
||||||
},
|
|
||||||
defaultCulture: 'en-US',
|
|
||||||
zenodoConfiguration: {
|
|
||||||
clientId: "",
|
|
||||||
oauthUrl: "",
|
|
||||||
redirectUri: ""
|
|
||||||
},
|
|
||||||
logging: {
|
|
||||||
enabled: false,
|
|
||||||
logLevels: ["debug", "info", "warning", "error"]
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,21 +1,3 @@
|
||||||
export const environment = {
|
export const environment = {
|
||||||
production: false,
|
production: false,
|
||||||
Server: 'http://localhost:8080/api/',
|
|
||||||
App: 'http://localhost:4200/',
|
|
||||||
HelpService: {
|
|
||||||
Enabled: false,
|
|
||||||
Url: 'localhost:5000/',
|
|
||||||
},
|
|
||||||
defaultCulture: 'en-US',
|
|
||||||
zenodoConfiguration: {
|
|
||||||
clientId: "",
|
|
||||||
oauthUrl: "",
|
|
||||||
redirectUri: ""
|
|
||||||
},
|
|
||||||
logging: {
|
|
||||||
enabled: true,
|
|
||||||
logLevels: ["debug", "info", "warning", "error"]
|
|
||||||
},
|
|
||||||
lockInterval: 60000,
|
|
||||||
guideAssets: "assets/images/guide"
|
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue