upgraded and changed some packages that were not compatible with Angular 10.
Chris Veilleux
parent
f5ab540992
commit
757216e4cc
|
|
@ -357,9 +357,9 @@
|
|||
}
|
||||
},
|
||||
"@angular/cdk": {
|
||||
"version": "10.2.2",
|
||||
"resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-10.2.2.tgz",
|
||||
"integrity": "sha512-DVMnj7QY1prZblRjYfDeyEH79p1TDI0JGgg2D2BAWwzMoPKCgVCqy1uRuvi+WNhYoDR3QJJJ8tXLKucUoShuIw==",
|
||||
"version": "10.2.3",
|
||||
"resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-10.2.3.tgz",
|
||||
"integrity": "sha512-ne3uSnWLQyUfYQ32zTvDauudyPONRPPBSbdOzFSsvFQuPxUcMQ3mFHJuq2OXei47TfSatmmyuKSuw9EtmTRbQw==",
|
||||
"requires": {
|
||||
"parse5": "^5.0.0",
|
||||
"tslib": "^2.0.0"
|
||||
|
|
@ -787,9 +787,9 @@
|
|||
"dev": true
|
||||
},
|
||||
"@angular/material": {
|
||||
"version": "10.2.2",
|
||||
"resolved": "https://registry.npmjs.org/@angular/material/-/material-10.2.2.tgz",
|
||||
"integrity": "sha512-xRt8FsjY/MdC/dMBhitCXmOfXo4uhzLZ+kBqkKwY8gBsJ7FjhJIPbe/kRPBuzvVkVphrEfi/pMeDOge8v5ETbA==",
|
||||
"version": "10.2.3",
|
||||
"resolved": "https://registry.npmjs.org/@angular/material/-/material-10.2.3.tgz",
|
||||
"integrity": "sha512-xqMC1A/CVX7RESnVm5EcK46MVXe1ROSMOf1RBuUeS6K+fnvx8kUxwmUcSY3LNREvW5hncFup7+MxSPfeFxv71A==",
|
||||
"requires": {
|
||||
"tslib": "^2.0.0"
|
||||
}
|
||||
|
|
@ -2002,32 +2002,32 @@
|
|||
}
|
||||
},
|
||||
"@fortawesome/fontawesome-common-types": {
|
||||
"version": "0.2.30",
|
||||
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.30.tgz",
|
||||
"integrity": "sha512-TsRwpTuKwFNiPhk1UfKgw7zNPeV5RhNp2Uw3pws+9gDAkPGKrtjR1y2lI3SYn7+YzyfuNknflpBA1LRKjt7hMg=="
|
||||
"version": "0.2.31",
|
||||
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.31.tgz",
|
||||
"integrity": "sha512-xfnPyH6NN5r/h1/qDYoGB0BlHSID902UkQzxR8QsoKDh55KAPr8ruAoie12WQEEQT8lRE2wtV7LoUllJ1HqCag=="
|
||||
},
|
||||
"@fortawesome/fontawesome-svg-core": {
|
||||
"version": "1.2.30",
|
||||
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.30.tgz",
|
||||
"integrity": "sha512-E3sAXATKCSVnT17HYmZjjbcmwihrNOCkoU7dVMlasrcwiJAHxSKeZ+4WN5O+ElgO/FaYgJmASl8p9N7/B/RttA==",
|
||||
"version": "1.2.31",
|
||||
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.31.tgz",
|
||||
"integrity": "sha512-lqUWRK+ylHQJG5Kiez4XrAZAfc7snxCc+X59quL3xPfMnxzfyf1lt+/hD7X1ZL4KlzAH2KFzMuEVrolo/rAkog==",
|
||||
"requires": {
|
||||
"@fortawesome/fontawesome-common-types": "^0.2.30"
|
||||
"@fortawesome/fontawesome-common-types": "^0.2.31"
|
||||
}
|
||||
},
|
||||
"@fortawesome/free-brands-svg-icons": {
|
||||
"version": "5.14.0",
|
||||
"resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-5.14.0.tgz",
|
||||
"integrity": "sha512-WsqPFTvJFI7MYkcy0jeFE2zY+blC4OrnB9MJOcn1NxRXT/sSfEEhrI7CwzIkiYajLiVDBKWeErYOvpsMeodmCQ==",
|
||||
"version": "5.15.0",
|
||||
"resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-5.15.0.tgz",
|
||||
"integrity": "sha512-Qy6sOeSIYfjCQ2CFa/VKQZUo1ycOzoRP7AtITHRp0lmWP1DTgEa1Ow22CgaSh7lNcDbRs5u/v/h2wtjSb2ox4A==",
|
||||
"requires": {
|
||||
"@fortawesome/fontawesome-common-types": "^0.2.30"
|
||||
"@fortawesome/fontawesome-common-types": "^0.2.31"
|
||||
}
|
||||
},
|
||||
"@fortawesome/free-solid-svg-icons": {
|
||||
"version": "5.14.0",
|
||||
"resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.14.0.tgz",
|
||||
"integrity": "sha512-M933RDM8cecaKMWDSk3FRYdnzWGW7kBBlGNGfvqLVwcwhUPNj9gcw+xZMrqBdRqxnSXdl3zWzTCNNGEtFUq67Q==",
|
||||
"version": "5.15.0",
|
||||
"resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.0.tgz",
|
||||
"integrity": "sha512-4dGRsOnGBPM7c0fd3LuiU6LgRSLn01rw1LJ370yC2iFMLUcLCLLynZhQbMhsiJmMwQM/YmPQblAdyHKVCgsIAA==",
|
||||
"requires": {
|
||||
"@fortawesome/fontawesome-common-types": "^0.2.30"
|
||||
"@fortawesome/fontawesome-common-types": "^0.2.31"
|
||||
}
|
||||
},
|
||||
"@istanbuljs/schema": {
|
||||
|
|
@ -2211,6 +2211,11 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"@stripe/stripe-js": {
|
||||
"version": "1.9.0",
|
||||
"resolved": "https://registry.npmjs.org/@stripe/stripe-js/-/stripe-js-1.9.0.tgz",
|
||||
"integrity": "sha512-/8+zfeRHlsEsxj0qmq9qbrnyF3fx+r97sDxfv7kqOyZFUFzC7DBwQwZlmss6XiV3ez5vz1G1QIjEW29PmLmsAw=="
|
||||
},
|
||||
"@types/color-name": {
|
||||
"version": "1.1.1",
|
||||
"resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
|
||||
|
|
@ -2674,15 +2679,13 @@
|
|||
"integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
|
||||
"dev": true
|
||||
},
|
||||
"angular-6-social-login": {
|
||||
"version": "1.1.1",
|
||||
"resolved": "https://registry.npmjs.org/angular-6-social-login/-/angular-6-social-login-1.1.1.tgz",
|
||||
"integrity": "sha512-/JCUhzHIRP8I+0m5yWQY3A7HjxgLQPjxLTyjxlQpQ7TEyZhd2Uy1NOvSPnBxODwFwTLnfAyJXlubzssYFhqzdw=="
|
||||
},
|
||||
"angular-font-awesome": {
|
||||
"version": "3.1.2",
|
||||
"resolved": "https://registry.npmjs.org/angular-font-awesome/-/angular-font-awesome-3.1.2.tgz",
|
||||
"integrity": "sha1-k3hzJhLY6MceDXwvqg+t3H+Fjsk="
|
||||
"angularx-social-login": {
|
||||
"version": "3.2.2",
|
||||
"resolved": "https://registry.npmjs.org/angularx-social-login/-/angularx-social-login-3.2.2.tgz",
|
||||
"integrity": "sha512-3LQTC4g7Vmct00B0URctCSdF5lqoVb2QYGQVdF5IiOX8gablaixR38NorJ/C2Nva19IKN4JtkZtSjAUSCrWvOQ==",
|
||||
"requires": {
|
||||
"tslib": "^2.0.0"
|
||||
}
|
||||
},
|
||||
"ansi-colors": {
|
||||
"version": "3.2.4",
|
||||
|
|
@ -3996,6 +3999,12 @@
|
|||
"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
|
||||
"integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
|
||||
"dev": true
|
||||
},
|
||||
"zone.js": {
|
||||
"version": "0.10.3",
|
||||
"resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.10.3.tgz",
|
||||
"integrity": "sha512-LXVLVEq0NNOqK/fLJo3d0kfzd4sxwn2/h67/02pjCjfKDxgx1i9QqpvtHD8CrBnSSwMw5+dy11O7FRX5mkO7Cg==",
|
||||
"dev": true
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -15773,9 +15782,12 @@
|
|||
"dev": true
|
||||
},
|
||||
"zone.js": {
|
||||
"version": "0.10.3",
|
||||
"resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.10.3.tgz",
|
||||
"integrity": "sha512-LXVLVEq0NNOqK/fLJo3d0kfzd4sxwn2/h67/02pjCjfKDxgx1i9QqpvtHD8CrBnSSwMw5+dy11O7FRX5mkO7Cg=="
|
||||
"version": "0.11.1",
|
||||
"resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.11.1.tgz",
|
||||
"integrity": "sha512-KcZawpmVgS+3U2rzKTM6fLKaCX1QDv3//NxiSOOsqpQY/r5hl+xpYikPwY93Sp7CAB+J5mZJpb/YubxEYLGK5g==",
|
||||
"requires": {
|
||||
"tslib": "^2.0.0"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
26
package.json
26
package.json
|
|
@ -15,29 +15,29 @@
|
|||
"private": true,
|
||||
"dependencies": {
|
||||
"@angular/animations": "~10.1.3",
|
||||
"@angular/cdk": "^10.2.2",
|
||||
"@angular/cdk": "^10.2.3",
|
||||
"@angular/common": "~10.1.3",
|
||||
"@angular/compiler": "~10.1.3",
|
||||
"@angular/core": "~10.1.3",
|
||||
"@angular/flex-layout": "^10.0.0-beta.32",
|
||||
"@angular/forms": "~10.1.3",
|
||||
"@angular/material": "^10.2.2",
|
||||
"@angular/material": "^10.2.3",
|
||||
"@angular/platform-browser": "~10.1.3",
|
||||
"@angular/platform-browser-dynamic": "~10.1.3",
|
||||
"@angular/router": "~10.1.3",
|
||||
"@fortawesome/angular-fontawesome": "^0.7.0",
|
||||
"@fortawesome/fontawesome-svg-core": "^1.2.30",
|
||||
"@fortawesome/free-brands-svg-icons": "^5.14.0",
|
||||
"@fortawesome/free-solid-svg-icons": "^5.14.0",
|
||||
"angular-6-social-login": "^1.1.1",
|
||||
"angular-font-awesome": "^3.1.2",
|
||||
"@fortawesome/fontawesome-svg-core": "^1.2.31",
|
||||
"@fortawesome/free-brands-svg-icons": "^5.15.0",
|
||||
"@fortawesome/free-solid-svg-icons": "^5.15.0",
|
||||
"@stripe/stripe-js": "^1.9.0",
|
||||
"angularx-social-login": "^3.2.2",
|
||||
"core-js": "^3.6.5",
|
||||
"font-awesome": "^4.7.0",
|
||||
"ngx-cookie-service": "^10.0.1",
|
||||
"ngx-stripe": "^10.1.2",
|
||||
"rxjs": "~6.6.3",
|
||||
"tslib": "^2.0.0",
|
||||
"zone.js": "~0.10.2"
|
||||
"tslib": "^2.0.1",
|
||||
"zone.js": "~0.11.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@angular-devkit/build-angular": "~0.1001.3",
|
||||
|
|
@ -53,10 +53,10 @@
|
|||
"jasmine-spec-reporter": "~6.0.0",
|
||||
"karma": "~5.2.3",
|
||||
"karma-chrome-launcher": "~3.1.0",
|
||||
"karma-coverage-istanbul-reporter": "~3.0.2",
|
||||
"karma-jasmine": "~4.0.0",
|
||||
"karma-jasmine-html-reporter": "^1.5.0",
|
||||
"ng-packagr": "^10.1.0",
|
||||
"karma-coverage-istanbul-reporter": "~3.0.3",
|
||||
"karma-jasmine": "~4.0.1",
|
||||
"karma-jasmine-html-reporter": "^1.5.4",
|
||||
"ng-packagr": "^10.1.2",
|
||||
"protractor": "~7.0.0",
|
||||
"ts-node": "~9.0.0",
|
||||
"tslint": "~6.1.0",
|
||||
|
|
|
|||
|
|
@ -20,7 +20,8 @@ import { Component, Inject, OnInit, ViewChild } from '@angular/core';
|
|||
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
||||
import { MatSnackBar } from '@angular/material/snack-bar';
|
||||
|
||||
import { ElementOptions, StripeCardComponent, StripeService } from 'ngx-stripe';
|
||||
import { StripeCardComponent, StripeService } from 'ngx-stripe';
|
||||
import { StripeCardElementOptions} from '@stripe/stripe-js';
|
||||
|
||||
import { ProfileService } from '@account/http/profile.service';
|
||||
|
||||
|
|
@ -34,7 +35,7 @@ const twoSeconds = 2000;
|
|||
})
|
||||
export class PaymentComponent implements OnInit {
|
||||
@ViewChild(StripeCardComponent) card: StripeCardComponent;
|
||||
public cardOptions: ElementOptions = {
|
||||
public cardOptions: StripeCardElementOptions = {
|
||||
style: {
|
||||
base: {
|
||||
iconColor: '#22a7f0',
|
||||
|
|
@ -60,7 +61,7 @@ export class PaymentComponent implements OnInit {
|
|||
}
|
||||
|
||||
submitPaymentInfo() {
|
||||
this.stripeService.createToken(this.card.getCard(), {}).subscribe(
|
||||
this.stripeService.createToken(this.card.element, {}).subscribe(
|
||||
result => {
|
||||
if (result.token) {
|
||||
this.dialogRef.close(result.token.id);
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@ import { CommonModule } from '@angular/common';
|
|||
import { FlexLayoutModule } from '@angular/flex-layout';
|
||||
import { FormsModule } from '@angular/forms';
|
||||
|
||||
import { AngularFontAwesomeModule } from 'angular-font-awesome';
|
||||
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
|
||||
|
||||
import { InstallButtonComponent } from './install-button/install-button.component';
|
||||
|
|
@ -40,7 +39,6 @@ import { SkillSummaryComponent } from './skill-summary/skill-summary.component';
|
|||
@NgModule(
|
||||
{
|
||||
imports: [
|
||||
AngularFontAwesomeModule,
|
||||
CommonModule,
|
||||
FlexLayoutModule,
|
||||
FontAwesomeModule,
|
||||
|
|
|
|||
|
|
@ -19,10 +19,9 @@ and limitations under the License.
|
|||
import { Component, EventEmitter, Output } from '@angular/core';
|
||||
|
||||
import { faFacebook } from '@fortawesome/free-brands-svg-icons';
|
||||
import { AuthService, FacebookLoginProvider } from 'angular-6-social-login';
|
||||
import { SocialAuthService, FacebookLoginProvider } from 'angularx-social-login';
|
||||
|
||||
import { LoginToken } from '../../models/login-token.model';
|
||||
import { environment } from '../../../../environments/environment';
|
||||
|
||||
@Component( {
|
||||
selector: 'sso-facebook-button',
|
||||
|
|
@ -33,13 +32,12 @@ export class FacebookButtonComponent {
|
|||
public facebookIcon = faFacebook;
|
||||
@Output() facebookToken = new EventEmitter<LoginToken>();
|
||||
|
||||
constructor(private authService: AuthService) { }
|
||||
constructor(private authService: SocialAuthService) { }
|
||||
|
||||
facebookLogin() {
|
||||
const platformProvider = FacebookLoginProvider.PROVIDER_ID;
|
||||
this.authService.signIn(platformProvider).then(
|
||||
this.authService.signIn(FacebookLoginProvider.PROVIDER_ID).then(
|
||||
(userData) => {
|
||||
this.facebookToken.emit({platform: 'Facebook', token: userData.token});
|
||||
this.facebookToken.emit({platform: 'Facebook', token: userData.authToken});
|
||||
}
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ and limitations under the License.
|
|||
import { Component, EventEmitter, Output } from '@angular/core';
|
||||
|
||||
import { faGoogle } from '@fortawesome/free-brands-svg-icons';
|
||||
import { AuthService, GoogleLoginProvider } from 'angular-6-social-login';
|
||||
import { SocialAuthService, GoogleLoginProvider } from 'angularx-social-login';
|
||||
|
||||
import { LoginToken } from '../../models/login-token.model';
|
||||
|
||||
|
|
@ -33,11 +33,10 @@ export class GoogleButtonComponent {
|
|||
public googleIcon = faGoogle;
|
||||
@Output() googleToken = new EventEmitter<LoginToken>();
|
||||
|
||||
constructor(private authService: AuthService) { }
|
||||
constructor(private authService: SocialAuthService) { }
|
||||
|
||||
googleLogin() {
|
||||
const platformProvider = GoogleLoginProvider.PROVIDER_ID;
|
||||
this.authService.signIn(platformProvider).then(
|
||||
this.authService.signIn(GoogleLoginProvider.PROVIDER_ID).then(
|
||||
(userData) => {
|
||||
this.googleToken.emit({platform: 'Google', token: userData.idToken});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,11 +25,11 @@ import { MatFormFieldModule } from '@angular/material/form-field';
|
|||
import { MatInputModule } from '@angular/material/input';
|
||||
|
||||
import {
|
||||
AuthServiceConfig,
|
||||
FacebookLoginProvider,
|
||||
GoogleLoginProvider,
|
||||
SocialAuthServiceConfig,
|
||||
SocialLoginModule
|
||||
} from 'angular-6-social-login';
|
||||
} from 'angularx-social-login';
|
||||
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
|
||||
|
||||
import { EmailInputComponent } from './components/email-input/email-input.component';
|
||||
|
|
@ -40,23 +40,6 @@ import { PasswordInputComponent } from './components/password-input/password-inp
|
|||
import { environment } from '../../environments/environment';
|
||||
|
||||
|
||||
export function getAuthServiceConfigs() {
|
||||
return new AuthServiceConfig(
|
||||
[
|
||||
{
|
||||
id: FacebookLoginProvider.PROVIDER_ID,
|
||||
provider: new FacebookLoginProvider(environment.facebookClientId)
|
||||
},
|
||||
{
|
||||
id: GoogleLoginProvider.PROVIDER_ID,
|
||||
provider: new GoogleLoginProvider(environment.googleClientId)
|
||||
}
|
||||
]
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@NgModule({
|
||||
declarations: [
|
||||
EmailInputComponent,
|
||||
|
|
@ -84,8 +67,23 @@ export function getAuthServiceConfigs() {
|
|||
GoogleButtonComponent,
|
||||
PasswordInputComponent
|
||||
],
|
||||
providers: [
|
||||
{ provide: AuthServiceConfig, useFactory: getAuthServiceConfigs }
|
||||
],
|
||||
providers: [
|
||||
{
|
||||
provide: 'SocialAuthServiceConfig',
|
||||
useValue: {
|
||||
autoLogin: false,
|
||||
providers: [
|
||||
{
|
||||
id: GoogleLoginProvider.PROVIDER_ID,
|
||||
provider: new GoogleLoginProvider(environment.facebookClientId),
|
||||
},
|
||||
{
|
||||
id: FacebookLoginProvider.PROVIDER_ID,
|
||||
provider: new FacebookLoginProvider(environment.googleClientId),
|
||||
},
|
||||
],
|
||||
} as SocialAuthServiceConfig,
|
||||
}
|
||||
],
|
||||
})
|
||||
export class SharedModule { }
|
||||
|
|
|
|||
Loading…
Reference in New Issue