MaDgIK
/
monitor
13
0
Fork 0
Code Issues Pull Requests Projects Releases 13 Wiki Activity

Update angular core and cli to version 14

This commit is contained in:
Konstantinos Triantafyllou 2022-09-23 15:36:10 +03:00
parent 974a06ef5f
commit c984fb85bb
8 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
angular.json
View File

@ -269,6 +269,5 @@
} }
} }
} }
}, }
"defaultProject": "monitor"
} }

28
package.json
View File

@ -21,18 +21,18 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/animations": "~13.3.11", "@angular/animations": "^14.2.3",
"@angular/cdk": "^13.3.9", "@angular/cdk": "^13.3.9",
"@angular/common": "~13.3.11", "@angular/common": "^14.2.3",
"@angular/compiler": "~13.3.11", "@angular/compiler": "^14.2.3",
"@angular/core": "~13.3.11", "@angular/core": "^14.2.3",
"@angular/forms": "~13.3.11", "@angular/forms": "^14.2.3",
"@angular/localize": "^13.3.11", "@angular/localize": "^14.2.3",
"@angular/material": "^13.3.9", "@angular/material": "^13.3.9",
"@angular/platform-browser": "~13.3.11", "@angular/platform-browser": "^14.2.3",
"@angular/platform-browser-dynamic": "~13.3.11", "@angular/platform-browser-dynamic": "^14.2.3",
"@angular/platform-server": "~13.3.11", "@angular/platform-server": "^14.2.3",
"@angular/router": "~13.3.11", "@angular/router": "^14.2.3",
"@nguniversal/express-engine": "^13.1.1", "@nguniversal/express-engine": "^13.1.1",
"clipboard": "^1.5.16", "clipboard": "^1.5.16",
"core-js": "^2.5.4", "core-js": "^2.5.4",
@ -46,10 +46,10 @@
"zone.js": "~0.11.4" "zone.js": "~0.11.4"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "~13.3.9", "@angular-devkit/build-angular": "^14.2.3",
"@angular/cli": "~13.3.9", "@angular/cli": "^14.2.3",
"@angular/compiler-cli": "~13.3.11", "@angular/compiler-cli": "^14.2.3",
"@angular/language-service": "~13.3.11", "@angular/language-service": "^14.2.3",
"@nguniversal/builders": "^13.1.1", "@nguniversal/builders": "^13.1.1",
"@types/compression": "^1.7.0", "@types/compression": "^1.7.0",
"@types/express": "^4.17.0", "@types/express": "^4.17.0",

6
src/app/app.component.ts
View File

@ -12,7 +12,7 @@ import {StakeholderService} from "./openaireLibrary/monitor/services/stakeholder
import {Header} from "./openaireLibrary/sharedComponents/navigationBar.component"; import {Header} from "./openaireLibrary/sharedComponents/navigationBar.component";
import {SmoothScroll} from "./openaireLibrary/utils/smooth-scroll"; import {SmoothScroll} from "./openaireLibrary/utils/smooth-scroll";
import {QuickContactService} from './openaireLibrary/sharedComponents/quick-contact/quick-contact.service'; import {QuickContactService} from './openaireLibrary/sharedComponents/quick-contact/quick-contact.service';
import {FormBuilder, FormGroup, Validators} from "@angular/forms"; import {UntypedFormBuilder, UntypedFormGroup, Validators} from "@angular/forms";
import {Composer} from "./openaireLibrary/utils/email/composer"; import {Composer} from "./openaireLibrary/utils/email/composer";
import {NotificationHandler} from "./openaireLibrary/utils/notification-handler"; import {NotificationHandler} from "./openaireLibrary/utils/notification-handler";
import {EmailService} from "./openaireLibrary/utils/email/email.service"; import {EmailService} from "./openaireLibrary/utils/email/email.service";
@ -82,7 +82,7 @@ export class AppComponent {
/* Contact */ /* Contact */
public showQuickContact: boolean; public showQuickContact: boolean;
public showGetStarted: boolean = true; public showGetStarted: boolean = true;
public contactForm: FormGroup; public contactForm: UntypedFormGroup;
public organizationTypes: string[] = [ public organizationTypes: string[] = [
'Funding agency', 'University / Research Center', 'Funding agency', 'University / Research Center',
'Research Infrastructure', 'Government', 'Research Infrastructure', 'Government',
@ -99,7 +99,7 @@ export class AppComponent {
private router: Router, private stakeholderService: StakeholderService, private smoothScroll: SmoothScroll, private router: Router, private stakeholderService: StakeholderService, private smoothScroll: SmoothScroll,
private userManagementService: UserManagementService, private userManagementService: UserManagementService,
private quickContactService: QuickContactService, private quickContactService: QuickContactService,
private fb: FormBuilder, private fb: UntypedFormBuilder,
private emailService: EmailService, private emailService: EmailService,
private resourcesService: ResourcesService) { private resourcesService: ResourcesService) {
this.subscriptions.push(router.events.forEach((event) => { this.subscriptions.push(router.events.forEach((event) => {

6
src/app/contact/contact.component.ts
View File

@ -7,7 +7,7 @@ import {Meta, Title} from "@angular/platform-browser";
import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service"; import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service";
import {HelperService} from "../openaireLibrary/utils/helper/helper.service"; import {HelperService} from "../openaireLibrary/utils/helper/helper.service";
import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service"; import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service";
import {FormBuilder, FormGroup, Validators} from "@angular/forms"; import {UntypedFormBuilder, UntypedFormGroup, Validators} from "@angular/forms";
import {Subscriber} from "rxjs"; import {Subscriber} from "rxjs";
import {properties} from "../../environments/environment"; import {properties} from "../../environments/environment";
import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.component"; import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.component";
@ -33,7 +33,7 @@ export class ContactComponent implements OnInit {
'Research Infrastructure', 'Government', 'Research Infrastructure', 'Government',
'Non-profit', 'Industry', 'Other' 'Non-profit', 'Industry', 'Other'
]; ];
public contactForm: FormGroup; public contactForm: UntypedFormGroup;
@ViewChild('modal') modal; @ViewChild('modal') modal;
private subscriptions = []; private subscriptions = [];
@ -44,7 +44,7 @@ export class ContactComponent implements OnInit {
private _title: Title, private _title: Title,
private seoService: SEOService, private seoService: SEOService,
private _piwikService: PiwikService, private _piwikService: PiwikService,
private fb: FormBuilder, private fb: UntypedFormBuilder,
private helper: HelperService) { private helper: HelperService) {
} }

6
src/app/get-started/get-started.component.ts
View File

@ -7,7 +7,7 @@ import {Meta, Title} from "@angular/platform-browser";
import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service"; import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service";
import {HelperService} from "../openaireLibrary/utils/helper/helper.service"; import {HelperService} from "../openaireLibrary/utils/helper/helper.service";
import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service"; import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service";
import {FormBuilder, FormGroup, Validators} from "@angular/forms"; import {UntypedFormBuilder, UntypedFormGroup, Validators} from "@angular/forms";
import {Subscriber} from "rxjs"; import {Subscriber} from "rxjs";
import {properties} from "../../environments/environment"; import {properties} from "../../environments/environment";
import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.component"; import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.component";
@ -34,7 +34,7 @@ export class GetStartedComponent implements OnInit {
'Research Infrastructure', 'Government', 'Research Infrastructure', 'Government',
'Non-profit', 'Industry', 'Other' 'Non-profit', 'Industry', 'Other'
]; ];
public contactForm: FormGroup; public contactForm: UntypedFormGroup;
@ViewChild('modal') modal; @ViewChild('modal') modal;
private subscriptions = []; private subscriptions = [];
public stakeholderEntities = StakeholderEntities; public stakeholderEntities = StakeholderEntities;
@ -46,7 +46,7 @@ export class GetStartedComponent implements OnInit {
private _title: Title, private _title: Title,
private seoService: SEOService, private seoService: SEOService,
private _piwikService: PiwikService, private _piwikService: PiwikService,
private fb: FormBuilder, private fb: UntypedFormBuilder,
private helper: HelperService) { private helper: HelperService) {
} }

2
src/app/openaireLibrary

@ -1 +1 @@
Subproject commit db7f34a21d6d4b4cdf71049fd217225f63540d3b Subproject commit 0854b9ddd0cddf0f87915743b40396b42958b349

2
src/assets/common-assets

@ -1 +1 @@
Subproject commit b3b48a9fe73282d7e80dc81b8fba58ab23c0cde3 Subproject commit 85ad768a46df5e59843fa5d97780ab754d0429a0

2
tsconfig.json
View File

@ -10,7 +10,7 @@
"moduleResolution": "node", "moduleResolution": "node",
"experimentalDecorators": true, "experimentalDecorators": true,
"importHelpers": true, "importHelpers": true,
"target": "es2015", "target": "es2020",
"typeRoots": [ "typeRoots": [
"node_modules/@types" "node_modules/@types"
], ],