diff --git a/src/app/admin/admin.component.ts b/src/app/admin/admin.component.ts index b738b88..f41a4d1 100644 --- a/src/app/admin/admin.component.ts +++ b/src/app/admin/admin.component.ts @@ -10,6 +10,7 @@ import {FullScreenModalComponent} from "../openaireLibrary/utils/modal/full-scre import {EmailService} from "../openaireLibrary/utils/email/email.service"; import {Email} from "../openaireLibrary/utils/email/email"; import {properties} from "../../environments/environment"; +import {error} from "@angular/compiler-cli/src/transformers/util"; @Component({ selector: 'admin', @@ -356,6 +357,7 @@ export class AdminComponent implements OnInit, OnDestroy{ } sendEmail() { + this.loading = true; let email = new Email(); email.body = this.emailForm.get('body').value; email.subject = this.emailForm.get('subject').value; @@ -366,6 +368,10 @@ export class AdminComponent implements OnInit, OnDestroy{ } else { NotificationHandler.rise('An error has occurred. Please try again later!', 'danger'); } + this.loading = false; + }, error => { + NotificationHandler.rise('An error has occurred. Please try again later!', 'danger'); + this.loading = false; }) } } diff --git a/src/app/apis/apis.component.ts b/src/app/apis/apis.component.ts index 4fa6266..77cfabd 100644 --- a/src/app/apis/apis.component.ts +++ b/src/app/apis/apis.component.ts @@ -27,8 +27,7 @@ declare var copy;
You can register up to 5 services. - For more information please read the OpenAIRE API Authentication documentation. + For more information please read the OpenAIRE API Authentication documentation.
@@ -100,8 +99,8 @@ declare var copy;
Register your service to get a client id and a client - secret. Use the client id and secret to make your requests. Read more... + secret. Use the client id and secret to make your requests. + Read more...
diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index c6c6482..ab52bc3 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -8,7 +8,7 @@ import {Component, OnInit} from "@angular/core";
The OpenAIRE APIs can be accessed over HTTPS both by authenticated and unauthenticated requests. To achieve better rate limits you need to make authenticated requests.
- For more information please read the OpenAIRE API Authentication documentation. + For more information please read the OpenAIRE API Authentication documentation.
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index c7c1aec..2679441 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit c7c1aec26ea7ff3decda4675a7bdb0e6ea83a4ae +Subproject commit 267944103f6f06ced39bb37e4c70d1834b742601 diff --git a/src/app/personal-token/personal-token.component.ts b/src/app/personal-token/personal-token.component.ts index 7c00e43..06c9788 100644 --- a/src/app/personal-token/personal-token.component.ts +++ b/src/app/personal-token/personal-token.component.ts @@ -14,7 +14,7 @@ declare var copy; For further information on how to use the tokens please visit the - OpenAIRE API Authentication documentation. + OpenAIRE API Authentication documentation.
diff --git a/src/assets/common-assets b/src/assets/common-assets index b68f375..4d41ba3 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit b68f375714b679743e586bb2fb4721e633e43fc1 +Subproject commit 4d41ba373dfb2dfd09ada4061bb1450dadb96993 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 7aa9e57..860bd52 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 7aa9e577193e3a77415434fd5e6e856a21d5efeb +Subproject commit 860bd52a5f4becb94f5c3bf2bee9ae5944513b7a diff --git a/src/environments/environment.ts b/src/environments/environment.ts index b40b696..29ca181 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -10,10 +10,8 @@ export let properties: EnvProperties = { dashboard: 'developers', useCache: false, adminToolsAPIURL: "http://duffy.di.uoa.gr:19280/uoa-admin-tools/", - loginUrl: "http://mpagasas.di.uoa.gr:19580/developers-api/openid_connect_login", - userInfoUrl: "http://mpagasas.di.uoa.gr:19580/developers-api/userInfo", + loginServiceURL: "http://mpagasas.di.uoa.gr:19580/developers-api/", developersApiUrl: "http://mpagasas.di.uoa.gr:19580/developers-api", - logoutUrl: "http://mpagasas.di.uoa.gr:19580/developers-api/openid_logout", domain: 'http://mpagasas.di.uoa.gr:5001', errorLink: '/error', baseLink: '', diff --git a/tsconfig.json b/tsconfig.json index 668d981..250b7cb 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -19,5 +19,8 @@ "dom" ], "useDefineForClassFields": false + }, + "angularCompilerOptions": { + "allowSyntheticDefaultImports": true } }