diff --git a/angular.json b/angular.json index d21035c..74e8a49 100644 --- a/angular.json +++ b/angular.json @@ -271,6 +271,5 @@ } } } - }, - "defaultProject": "connect" + } } diff --git a/package.json b/package.json index d021375..a85c687 100644 --- a/package.json +++ b/package.json @@ -21,18 +21,18 @@ }, "private": true, "dependencies": { - "@angular/animations": "~13.3.11", + "@angular/animations": "^14.2.3", "@angular/cdk": "^13.3.9", - "@angular/common": "~13.3.11", - "@angular/compiler": "~13.3.11", - "@angular/core": "~13.3.11", - "@angular/forms": "~13.3.11", - "@angular/localize": "^13.3.11", + "@angular/common": "^14.2.3", + "@angular/compiler": "^14.2.3", + "@angular/core": "^14.2.3", + "@angular/forms": "^14.2.3", + "@angular/localize": "^14.2.3", "@angular/material": "^13.3.9", - "@angular/platform-browser": "~13.3.11", - "@angular/platform-browser-dynamic": "~13.3.11", - "@angular/platform-server": "~13.3.11", - "@angular/router": "~13.3.11", + "@angular/platform-browser": "^14.2.3", + "@angular/platform-browser-dynamic": "^14.2.3", + "@angular/platform-server": "^14.2.3", + "@angular/router": "^14.2.3", "@nguniversal/express-engine": "^13.1.1", "@node-minify/clean-css": "^6.2.0", "@node-minify/core": "^6.2.0", @@ -50,10 +50,10 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@angular-devkit/build-angular": "~13.3.9", - "@angular/cli": "~13.3.9", - "@angular/compiler-cli": "~13.3.11", - "@angular/language-service": "~13.3.11", + "@angular-devkit/build-angular": "^14.2.3", + "@angular/cli": "^14.2.3", + "@angular/compiler-cli": "^14.2.3", + "@angular/language-service": "^14.2.3", "@nguniversal/builders": "^13.1.1", "@types/compression": "^1.7.0", "@types/express": "^4.17.0", diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 7c1963e..9723f86 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -21,7 +21,7 @@ import {SmoothScroll} from "./openaireLibrary/utils/smooth-scroll"; import {Meta} from "@angular/platform-browser"; import {CommunityInfo} from "./openaireLibrary/connect/community/communityInfo"; import {SEOService} from "./openaireLibrary/sharedComponents/SEO/SEO.service"; -import {FormBuilder, FormGroup, Validators} from "@angular/forms"; +import {UntypedFormBuilder, UntypedFormGroup, Validators} from "@angular/forms"; import {QuickContactService} from "./openaireLibrary/sharedComponents/quick-contact/quick-contact.service"; import {EmailService} from "./openaireLibrary/utils/email/email.service"; import {AlertModal} from "./openaireLibrary/utils/modal/alert"; @@ -120,7 +120,7 @@ export class AppComponent implements OnInit, OnDestroy { /* Contact */ public showQuickContact: boolean; public showGetStarted: boolean = true; - public contactForm: FormGroup; + public contactForm: UntypedFormGroup; public sending = false; public images: string[] = []; @ViewChild('modal') modal: AlertModal; @@ -138,7 +138,7 @@ export class AppComponent implements OnInit, OnDestroy { private configurationService: ConfigurationService, private _communityService: CommunityService, private customizationService: CustomizationService, private _meta: Meta, private seoService: SEOService, private quickContactService: QuickContactService, - private fb: FormBuilder, + private fb: UntypedFormBuilder, private emailService: EmailService, @Inject(DOCUMENT) private document, private rendererFactory: RendererFactory2 ) { diff --git a/src/app/contact/contact.component.ts b/src/app/contact/contact.component.ts index e960924..ae6b944 100644 --- a/src/app/contact/contact.component.ts +++ b/src/app/contact/contact.component.ts @@ -9,7 +9,7 @@ import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service"; import {HelperFunctions} from "../openaireLibrary/utils/HelperFunctions.class"; import {HelperService} from "../openaireLibrary/utils/helper/helper.service"; import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service"; -import {FormBuilder, FormGroup, Validators} from "@angular/forms"; +import {UntypedFormBuilder, UntypedFormGroup, Validators} from "@angular/forms"; import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.component"; import {Subscriber} from "rxjs"; import {properties} from "../../environments/environment"; @@ -30,7 +30,7 @@ export class ContactComponent implements OnInit { public pageContents = null; public divContents = null; public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'Contact us'}]; - public contactForm: FormGroup; + public contactForm: UntypedFormGroup; @ViewChild('modal') modal; private subscriptions = []; @@ -49,7 +49,7 @@ export class ContactComponent implements OnInit { private _title: Title, private seoService: SEOService, private _piwikService: PiwikService, - private fb: FormBuilder, + private fb: UntypedFormBuilder, private helper: HelperService) { } diff --git a/src/app/get-started/get-started.component.ts b/src/app/get-started/get-started.component.ts index 62536b3..4591caa 100644 --- a/src/app/get-started/get-started.component.ts +++ b/src/app/get-started/get-started.component.ts @@ -7,7 +7,7 @@ import {Meta, Title} from "@angular/platform-browser"; import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service"; import {HelperService} from "../openaireLibrary/utils/helper/helper.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 {properties} from "../../environments/environment"; import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.component"; @@ -27,7 +27,7 @@ export class GetStartedComponent implements OnInit { public pageContents = null; public divContents = null; public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'Get started'}]; - public contactForm: FormGroup; + public contactForm: UntypedFormGroup; @ViewChild('modal') modal; private subscriptions = []; @@ -38,7 +38,7 @@ export class GetStartedComponent implements OnInit { private _title: Title, private seoService: SEOService, private _piwikService: PiwikService, - private fb: FormBuilder, + private fb: UntypedFormBuilder, private helper: HelperService) { } diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index db7f34a..105e506 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit db7f34a21d6d4b4cdf71049fd217225f63540d3b +Subproject commit 105e5066f28497fcd0d51c31e3f30df3d0043ccf diff --git a/src/assets/common-assets b/src/assets/common-assets index b3b48a9..85ad768 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit b3b48a9fe73282d7e80dc81b8fba58ab23c0cde3 +Subproject commit 85ad768a46df5e59843fa5d97780ab754d0429a0 diff --git a/tsconfig.json b/tsconfig.json index 85001d5..fc8b4c1 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -10,7 +10,7 @@ "moduleResolution": "node", "experimentalDecorators": true, "importHelpers": true, - "target": "es2015", + "target": "es2020", "typeRoots": [ "node_modules/@types" ],