From e9a767476663297b2621ed2766d038b20f6f6353 Mon Sep 17 00:00:00 2001 From: MichaelKaiser1 Date: Tue, 9 Mar 2021 19:23:12 +0100 Subject: [PATCH 1/8] added captcha to login component --- src/app/app.module.ts | 2 ++ .../onboarding/login/login.component.html | 5 ++-- .../onboarding/login/login.component.ts | 30 +++++++++++++++++-- src/assets/i18n/de.json | 1 + src/assets/i18n/en.json | 1 + src/environments/environment.prod.ts | 5 +++- src/environments/environment.ts | 8 +++-- 7 files changed, 44 insertions(+), 8 deletions(-) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 333246c9..653606b3 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -40,6 +40,7 @@ import { ErrorInterceptor } from './interceptors/error.interceptor'; import { ForgotPasswordComponent } from './components/onboarding/forgot-password/forgot-password.component'; import { LanguageMenuComponent } from './components/language-menu/language-menu.component'; import { ProfileComponent } from './components/onboarding/profile/profile.component'; +import {CaptchaModule} from 'primeng/captcha'; registerLocaleData(localeDe, 'de'); @@ -103,6 +104,7 @@ export function tokenGetter(): string | null { progressBar: true, positionClass: 'toast-top-full-width' }), + CaptchaModule, ], providers: [ { diff --git a/src/app/components/onboarding/login/login.component.html b/src/app/components/onboarding/login/login.component.html index 96e0d569..cc03e7e9 100644 --- a/src/app/components/onboarding/login/login.component.html +++ b/src/app/components/onboarding/login/login.component.html @@ -2,7 +2,7 @@

- +

@@ -15,6 +15,7 @@

+

@@ -22,7 +23,7 @@ diff --git a/src/app/components/onboarding/login/login.component.ts b/src/app/components/onboarding/login/login.component.ts index 547fe292..121dc899 100644 --- a/src/app/components/onboarding/login/login.component.ts +++ b/src/app/components/onboarding/login/login.component.ts @@ -1,10 +1,12 @@ +import { environment } from './../../../../environments/environment'; import { SubSink } from 'subsink'; -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnInit, OnDestroy, Renderer2 } from '@angular/core'; import { FormGroup, FormBuilder, Validators } from '@angular/forms'; import { Router } from '@angular/router'; import { AuthService } from '../../../services/auth.service'; import { ToastService } from '../../../services/toast.service'; import { LoadingService} from '../../../services/loading.service'; +import { TranslateService } from '@ngx-translate/core'; export const LOCAL_STORAGE_TOKEN_KEY = 'token'; @@ -19,12 +21,18 @@ export class LoginComponent implements OnInit, OnDestroy { loginRequest = false; private subs = new SubSink(); hide = true; + language: string; + captchaSuccess = false; + captchaKey = environment.captcha.key; + script: any; constructor(formBuilder: FormBuilder, private router: Router, private authService: AuthService, private toastService: ToastService, - private loadingService: LoadingService + private loadingService: LoadingService, + private translate: TranslateService, + private renderer: Renderer2 ) { this.loginFormGroup = formBuilder.group({ usernameOrEmail: [null, @@ -44,6 +52,20 @@ export class LoginComponent implements OnInit, OnDestroy { } ngOnInit(): void { + this.translate + .stream('SHORTCUT') + .subscribe(v => this.setLanguage(v)); + this.script = this.renderer.createElement('script'); + this.script = this.renderer.createElement('script'); + this.script.defer = true; + this.script.async = true; + this.script.src = 'https://www.google.com/recaptcha/api.js?render=explicit&onload=loadCaptcha'; + this.renderer.appendChild(document.body, this.script); + } + + setLanguage(param: any) { + this.language = param; + console.log(this.language); } ngOnDestroy(): void { @@ -88,6 +110,10 @@ export class LoginComponent implements OnInit, OnDestroy { }) ); } + + showResponse(response: any) { + this.captchaSuccess = true; + } } diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index dc05fd0f..1f57f037 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -1,4 +1,5 @@ { + "SHORTCUT": "de", "EMAILADDRESS": "E-Mailadresse", "USERNAME": "Benutzername", "GIVENNAME": "Vorname", diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 28f2dcaf..ffcd6303 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -1,4 +1,5 @@ { + "SHORTCUT": "en", "EMAILADDRESS": "Email address", "USERNAME": "Username", "GIVENNAME": "Given name", diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index a54fd285..6da9ab64 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,6 +1,9 @@ export const environment = { production: true, - api: { + captcha: { + key: '6Le-g3QaAAAAAJmIN-s37441yuZPBp1M7nqUwtED' + }, + api: { protocol: 'https', baseUrl: 'orso-arpa.azurewebsites.net' }, diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 29cbaf69..66bbcdad 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,10 +4,12 @@ export const environment = { production: false, + captcha: { + key: '6Le-g3QaAAAAAJmIN-s37441yuZPBp1M7nqUwtED' + }, api: { - protocol: 'http', - baseUrl: 'localhost:5000' - + protocol: 'https', + baseUrl: 'orso-arpa.azurewebsites.net' }, web: { From dbc1ae6d13115e2fc867270799ee29358b325fe4 Mon Sep 17 00:00:00 2001 From: MichaelKaiser1 Date: Tue, 9 Mar 2021 19:24:45 +0100 Subject: [PATCH 2/8] Revert "added captcha to login component" This reverts commit e9a767476663297b2621ed2766d038b20f6f6353. --- src/app/app.module.ts | 2 -- .../onboarding/login/login.component.html | 5 ++-- .../onboarding/login/login.component.ts | 30 ++----------------- src/assets/i18n/de.json | 1 - src/assets/i18n/en.json | 1 - src/environments/environment.prod.ts | 5 +--- src/environments/environment.ts | 8 ++--- 7 files changed, 8 insertions(+), 44 deletions(-) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 653606b3..333246c9 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -40,7 +40,6 @@ import { ErrorInterceptor } from './interceptors/error.interceptor'; import { ForgotPasswordComponent } from './components/onboarding/forgot-password/forgot-password.component'; import { LanguageMenuComponent } from './components/language-menu/language-menu.component'; import { ProfileComponent } from './components/onboarding/profile/profile.component'; -import {CaptchaModule} from 'primeng/captcha'; registerLocaleData(localeDe, 'de'); @@ -104,7 +103,6 @@ export function tokenGetter(): string | null { progressBar: true, positionClass: 'toast-top-full-width' }), - CaptchaModule, ], providers: [ { diff --git a/src/app/components/onboarding/login/login.component.html b/src/app/components/onboarding/login/login.component.html index cc03e7e9..96e0d569 100644 --- a/src/app/components/onboarding/login/login.component.html +++ b/src/app/components/onboarding/login/login.component.html @@ -2,7 +2,7 @@
@@ -23,7 +22,7 @@ diff --git a/src/app/components/onboarding/login/login.component.ts b/src/app/components/onboarding/login/login.component.ts index 121dc899..547fe292 100644 --- a/src/app/components/onboarding/login/login.component.ts +++ b/src/app/components/onboarding/login/login.component.ts @@ -1,12 +1,10 @@ -import { environment } from './../../../../environments/environment'; import { SubSink } from 'subsink'; -import { Component, OnInit, OnDestroy, Renderer2 } from '@angular/core'; +import { Component, OnInit, OnDestroy } from '@angular/core'; import { FormGroup, FormBuilder, Validators } from '@angular/forms'; import { Router } from '@angular/router'; import { AuthService } from '../../../services/auth.service'; import { ToastService } from '../../../services/toast.service'; import { LoadingService} from '../../../services/loading.service'; -import { TranslateService } from '@ngx-translate/core'; export const LOCAL_STORAGE_TOKEN_KEY = 'token'; @@ -21,18 +19,12 @@ export class LoginComponent implements OnInit, OnDestroy { loginRequest = false; private subs = new SubSink(); hide = true; - language: string; - captchaSuccess = false; - captchaKey = environment.captcha.key; - script: any; constructor(formBuilder: FormBuilder, private router: Router, private authService: AuthService, private toastService: ToastService, - private loadingService: LoadingService, - private translate: TranslateService, - private renderer: Renderer2 + private loadingService: LoadingService ) { this.loginFormGroup = formBuilder.group({ usernameOrEmail: [null, @@ -52,20 +44,6 @@ export class LoginComponent implements OnInit, OnDestroy { } ngOnInit(): void { - this.translate - .stream('SHORTCUT') - .subscribe(v => this.setLanguage(v)); - this.script = this.renderer.createElement('script'); - this.script = this.renderer.createElement('script'); - this.script.defer = true; - this.script.async = true; - this.script.src = 'https://www.google.com/recaptcha/api.js?render=explicit&onload=loadCaptcha'; - this.renderer.appendChild(document.body, this.script); - } - - setLanguage(param: any) { - this.language = param; - console.log(this.language); } ngOnDestroy(): void { @@ -110,10 +88,6 @@ export class LoginComponent implements OnInit, OnDestroy { }) ); } - - showResponse(response: any) { - this.captchaSuccess = true; - } } diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index 1f57f037..dc05fd0f 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -1,5 +1,4 @@ { - "SHORTCUT": "de", "EMAILADDRESS": "E-Mailadresse", "USERNAME": "Benutzername", "GIVENNAME": "Vorname", diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index ffcd6303..28f2dcaf 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -1,5 +1,4 @@ { - "SHORTCUT": "en", "EMAILADDRESS": "Email address", "USERNAME": "Username", "GIVENNAME": "Given name", diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 6da9ab64..a54fd285 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,9 +1,6 @@ export const environment = { production: true, - captcha: { - key: '6Le-g3QaAAAAAJmIN-s37441yuZPBp1M7nqUwtED' - }, - api: { + api: { protocol: 'https', baseUrl: 'orso-arpa.azurewebsites.net' }, diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 66bbcdad..29cbaf69 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,12 +4,10 @@ export const environment = { production: false, - captcha: { - key: '6Le-g3QaAAAAAJmIN-s37441yuZPBp1M7nqUwtED' - }, api: { - protocol: 'https', - baseUrl: 'orso-arpa.azurewebsites.net' + protocol: 'http', + baseUrl: 'localhost:5000' + }, web: { From 536ccfcfd71cc329d6219e04247121ce4a49ffc7 Mon Sep 17 00:00:00 2001 From: MichaelKaiser1 Date: Tue, 9 Mar 2021 19:25:28 +0100 Subject: [PATCH 3/8] Revert "Revert "added captcha to login component"" This reverts commit dbc1ae6d13115e2fc867270799ee29358b325fe4. --- src/app/app.module.ts | 2 ++ .../onboarding/login/login.component.html | 5 ++-- .../onboarding/login/login.component.ts | 30 +++++++++++++++++-- src/assets/i18n/de.json | 1 + src/assets/i18n/en.json | 1 + src/environments/environment.prod.ts | 5 +++- src/environments/environment.ts | 8 +++-- 7 files changed, 44 insertions(+), 8 deletions(-) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 333246c9..653606b3 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -40,6 +40,7 @@ import { ErrorInterceptor } from './interceptors/error.interceptor'; import { ForgotPasswordComponent } from './components/onboarding/forgot-password/forgot-password.component'; import { LanguageMenuComponent } from './components/language-menu/language-menu.component'; import { ProfileComponent } from './components/onboarding/profile/profile.component'; +import {CaptchaModule} from 'primeng/captcha'; registerLocaleData(localeDe, 'de'); @@ -103,6 +104,7 @@ export function tokenGetter(): string | null { progressBar: true, positionClass: 'toast-top-full-width' }), + CaptchaModule, ], providers: [ { diff --git a/src/app/components/onboarding/login/login.component.html b/src/app/components/onboarding/login/login.component.html index 96e0d569..cc03e7e9 100644 --- a/src/app/components/onboarding/login/login.component.html +++ b/src/app/components/onboarding/login/login.component.html @@ -2,7 +2,7 @@
@@ -22,7 +23,7 @@ diff --git a/src/app/components/onboarding/login/login.component.ts b/src/app/components/onboarding/login/login.component.ts index 547fe292..121dc899 100644 --- a/src/app/components/onboarding/login/login.component.ts +++ b/src/app/components/onboarding/login/login.component.ts @@ -1,10 +1,12 @@ +import { environment } from './../../../../environments/environment'; import { SubSink } from 'subsink'; -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnInit, OnDestroy, Renderer2 } from '@angular/core'; import { FormGroup, FormBuilder, Validators } from '@angular/forms'; import { Router } from '@angular/router'; import { AuthService } from '../../../services/auth.service'; import { ToastService } from '../../../services/toast.service'; import { LoadingService} from '../../../services/loading.service'; +import { TranslateService } from '@ngx-translate/core'; export const LOCAL_STORAGE_TOKEN_KEY = 'token'; @@ -19,12 +21,18 @@ export class LoginComponent implements OnInit, OnDestroy { loginRequest = false; private subs = new SubSink(); hide = true; + language: string; + captchaSuccess = false; + captchaKey = environment.captcha.key; + script: any; constructor(formBuilder: FormBuilder, private router: Router, private authService: AuthService, private toastService: ToastService, - private loadingService: LoadingService + private loadingService: LoadingService, + private translate: TranslateService, + private renderer: Renderer2 ) { this.loginFormGroup = formBuilder.group({ usernameOrEmail: [null, @@ -44,6 +52,20 @@ export class LoginComponent implements OnInit, OnDestroy { } ngOnInit(): void { + this.translate + .stream('SHORTCUT') + .subscribe(v => this.setLanguage(v)); + this.script = this.renderer.createElement('script'); + this.script = this.renderer.createElement('script'); + this.script.defer = true; + this.script.async = true; + this.script.src = 'https://www.google.com/recaptcha/api.js?render=explicit&onload=loadCaptcha'; + this.renderer.appendChild(document.body, this.script); + } + + setLanguage(param: any) { + this.language = param; + console.log(this.language); } ngOnDestroy(): void { @@ -88,6 +110,10 @@ export class LoginComponent implements OnInit, OnDestroy { }) ); } + + showResponse(response: any) { + this.captchaSuccess = true; + } } diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index dc05fd0f..1f57f037 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -1,4 +1,5 @@ { + "SHORTCUT": "de", "EMAILADDRESS": "E-Mailadresse", "USERNAME": "Benutzername", "GIVENNAME": "Vorname", diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 28f2dcaf..ffcd6303 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -1,4 +1,5 @@ { + "SHORTCUT": "en", "EMAILADDRESS": "Email address", "USERNAME": "Username", "GIVENNAME": "Given name", diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index a54fd285..6da9ab64 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,6 +1,9 @@ export const environment = { production: true, - api: { + captcha: { + key: '6Le-g3QaAAAAAJmIN-s37441yuZPBp1M7nqUwtED' + }, + api: { protocol: 'https', baseUrl: 'orso-arpa.azurewebsites.net' }, diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 29cbaf69..66bbcdad 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,10 +4,12 @@ export const environment = { production: false, + captcha: { + key: '6Le-g3QaAAAAAJmIN-s37441yuZPBp1M7nqUwtED' + }, api: { - protocol: 'http', - baseUrl: 'localhost:5000' - + protocol: 'https', + baseUrl: 'orso-arpa.azurewebsites.net' }, web: { From acbafd0780beed8293c8dcb699bf891159240add Mon Sep 17 00:00:00 2001 From: MichaelKaiser1 Date: Tue, 9 Mar 2021 19:27:30 +0100 Subject: [PATCH 4/8] minor change --- src/environments/environment.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 66bbcdad..76603096 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -8,8 +8,9 @@ export const environment = { key: '6Le-g3QaAAAAAJmIN-s37441yuZPBp1M7nqUwtED' }, api: { - protocol: 'https', - baseUrl: 'orso-arpa.azurewebsites.net' + protocol: 'http', + baseUrl: 'localhost:5000' + }, web: { From b2caaf0bae79429f334c3b82364a7ef6502322db Mon Sep 17 00:00:00 2001 From: MichaelKaiser1 Date: Tue, 9 Mar 2021 19:32:02 +0100 Subject: [PATCH 5/8] solved lint --- src/app/components/onboarding/login/login.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/components/onboarding/login/login.component.ts b/src/app/components/onboarding/login/login.component.ts index 121dc899..0967286c 100644 --- a/src/app/components/onboarding/login/login.component.ts +++ b/src/app/components/onboarding/login/login.component.ts @@ -63,7 +63,7 @@ export class LoginComponent implements OnInit, OnDestroy { this.renderer.appendChild(document.body, this.script); } - setLanguage(param: any) { + setLanguage(param: any): void { this.language = param; console.log(this.language); } @@ -111,7 +111,7 @@ export class LoginComponent implements OnInit, OnDestroy { ); } - showResponse(response: any) { + showResponse(response: any): void { this.captchaSuccess = true; } } From 106cea5fb967aeadd42a5cd1d3990d429c83317d Mon Sep 17 00:00:00 2001 From: MichaelKaiser1 Date: Tue, 9 Mar 2021 21:00:33 +0100 Subject: [PATCH 6/8] import captcha in prime-ng.module --- src/app/modules/prime-ng/prime-ng.module.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/app/modules/prime-ng/prime-ng.module.ts b/src/app/modules/prime-ng/prime-ng.module.ts index 96e1e01d..e7867fcf 100644 --- a/src/app/modules/prime-ng/prime-ng.module.ts +++ b/src/app/modules/prime-ng/prime-ng.module.ts @@ -27,6 +27,7 @@ import { InputNumberModule } from 'primeng/inputnumber'; import { FullCalendarModule } from 'primeng/fullcalendar'; import { ConfirmDialogModule } from 'primeng/confirmdialog'; import { DialogService, DynamicDialogModule } from 'primeng/dynamicdialog'; +import {CaptchaModule} from 'primeng/captcha'; const MODULES = [ InputTextModule, @@ -55,6 +56,7 @@ const MODULES = [ FullCalendarModule, ConfirmDialogModule, DynamicDialogModule, + CaptchaModule ]; @NgModule({ From edc8acc28163d1e87b8f601170efe6bb4ed42854 Mon Sep 17 00:00:00 2001 From: MichaelKaiser1 Date: Tue, 9 Mar 2021 21:05:40 +0100 Subject: [PATCH 7/8] implemented different option Transalation and Validation works but browser console throws exception: Unhandled Promise rejection: reCAPTCHA has already been rendered in this element ; Zone: ; Task: Promise.then ; Value: Error: reCAPTCHA has already been rendered in this element --- package.json | 1 + src/app/app.module.ts | 4 +- .../onboarding/login/login.component.html | 15 +++++-- .../onboarding/login/login.component.ts | 41 ++++++++++--------- src/environments/environment.ts | 1 - 5 files changed, 36 insertions(+), 26 deletions(-) diff --git a/package.json b/package.json index 533baa84..7962eb19 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,7 @@ "@ngx-translate/core": "^13.0.0", "@ngx-translate/http-loader": "^6.0.0", "lodash-es": "^4.17.20", + "ngx-captcha": "^9.0.1", "ngx-toastr": "^13.2.0", "node-modules": "^1.0.1", "primeflex": "^2.0.0", diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 653606b3..0cd1f98b 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -40,7 +40,7 @@ import { ErrorInterceptor } from './interceptors/error.interceptor'; import { ForgotPasswordComponent } from './components/onboarding/forgot-password/forgot-password.component'; import { LanguageMenuComponent } from './components/language-menu/language-menu.component'; import { ProfileComponent } from './components/onboarding/profile/profile.component'; -import {CaptchaModule} from 'primeng/captcha'; +import { NgxCaptchaModule } from 'ngx-captcha'; registerLocaleData(localeDe, 'de'); @@ -104,7 +104,7 @@ export function tokenGetter(): string | null { progressBar: true, positionClass: 'toast-top-full-width' }), - CaptchaModule, + NgxCaptchaModule, ], providers: [ { diff --git a/src/app/components/onboarding/login/login.component.html b/src/app/components/onboarding/login/login.component.html index cc03e7e9..01a12ae4 100644 --- a/src/app/components/onboarding/login/login.component.html +++ b/src/app/components/onboarding/login/login.component.html @@ -2,7 +2,7 @@
@@ -23,7 +32,7 @@ diff --git a/src/app/components/onboarding/login/login.component.ts b/src/app/components/onboarding/login/login.component.ts index 0967286c..b7a83039 100644 --- a/src/app/components/onboarding/login/login.component.ts +++ b/src/app/components/onboarding/login/login.component.ts @@ -21,10 +21,10 @@ export class LoginComponent implements OnInit, OnDestroy { loginRequest = false; private subs = new SubSink(); hide = true; - language: string; - captchaSuccess = false; + // language: string; + // captchaSuccess = false; captchaKey = environment.captcha.key; - script: any; + // script: any; constructor(formBuilder: FormBuilder, private router: Router, @@ -32,7 +32,7 @@ export class LoginComponent implements OnInit, OnDestroy { private toastService: ToastService, private loadingService: LoadingService, private translate: TranslateService, - private renderer: Renderer2 + private renderer: Renderer2, ) { this.loginFormGroup = formBuilder.group({ usernameOrEmail: [null, @@ -48,25 +48,26 @@ export class LoginComponent implements OnInit, OnDestroy { Validators.minLength(6), ], ], + recaptcha: ['', Validators.required], }); } ngOnInit(): void { - this.translate - .stream('SHORTCUT') - .subscribe(v => this.setLanguage(v)); - this.script = this.renderer.createElement('script'); - this.script = this.renderer.createElement('script'); - this.script.defer = true; - this.script.async = true; - this.script.src = 'https://www.google.com/recaptcha/api.js?render=explicit&onload=loadCaptcha'; - this.renderer.appendChild(document.body, this.script); + // this.translate + // .stream('SHORTCUT') + // .subscribe(v => this.setLanguage(v)); + // this.script = this.renderer.createElement('script'); + // this.script = this.renderer.createElement('script'); + // this.script.defer = true; + // this.script.async = true; + // this.script.src = 'https://www.google.com/recaptcha/api.js?render=explicit&onload=loadCaptcha'; + // this.renderer.appendChild(document.body, this.script); } - setLanguage(param: any): void { - this.language = param; - console.log(this.language); - } + // setLanguage(param: any): void { + // this.language = param; + // console.log(this.language); + // } ngOnDestroy(): void { this.subs.unsubscribe(); @@ -111,9 +112,9 @@ export class LoginComponent implements OnInit, OnDestroy { ); } - showResponse(response: any): void { - this.captchaSuccess = true; - } + // showResponse(response: any): void { + // this.captchaSuccess = true; + // } } diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 76603096..ee6129ca 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -10,7 +10,6 @@ export const environment = { api: { protocol: 'http', baseUrl: 'localhost:5000' - }, web: { From 48b9c57145d390e65c2291d267dc01ebb8931ce4 Mon Sep 17 00:00:00 2001 From: MichaelKaiser1 Date: Tue, 9 Mar 2021 21:23:41 +0100 Subject: [PATCH 8/8] minor changes --- .../onboarding/login/login.component.html | 5 ++- .../onboarding/login/login.component.ts | 40 +++++++++---------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/app/components/onboarding/login/login.component.html b/src/app/components/onboarding/login/login.component.html index 01a12ae4..bdef74ac 100644 --- a/src/app/components/onboarding/login/login.component.html +++ b/src/app/components/onboarding/login/login.component.html @@ -15,9 +15,10 @@

- + + [disabled]="loginFormGroup.invalid || loginFormGroup.pristine || !captchaSuccess"> diff --git a/src/app/components/onboarding/login/login.component.ts b/src/app/components/onboarding/login/login.component.ts index b7a83039..03f742e7 100644 --- a/src/app/components/onboarding/login/login.component.ts +++ b/src/app/components/onboarding/login/login.component.ts @@ -21,10 +21,10 @@ export class LoginComponent implements OnInit, OnDestroy { loginRequest = false; private subs = new SubSink(); hide = true; - // language: string; - // captchaSuccess = false; + language: string; + captchaSuccess = false; captchaKey = environment.captcha.key; - // script: any; + script: any; constructor(formBuilder: FormBuilder, private router: Router, @@ -48,26 +48,26 @@ export class LoginComponent implements OnInit, OnDestroy { Validators.minLength(6), ], ], - recaptcha: ['', Validators.required], + recaptcha: [null, Validators.required], }); } ngOnInit(): void { - // this.translate - // .stream('SHORTCUT') - // .subscribe(v => this.setLanguage(v)); - // this.script = this.renderer.createElement('script'); - // this.script = this.renderer.createElement('script'); - // this.script.defer = true; - // this.script.async = true; - // this.script.src = 'https://www.google.com/recaptcha/api.js?render=explicit&onload=loadCaptcha'; - // this.renderer.appendChild(document.body, this.script); + this.translate + .stream('SHORTCUT') + .subscribe(v => this.setLanguage(v)); + this.script = this.renderer.createElement('script'); + this.script = this.renderer.createElement('script'); + this.script.defer = true; + this.script.async = true; + this.script.src = 'https://www.google.com/recaptcha/api.js?render=explicit&onload=loadCaptcha'; + this.renderer.appendChild(document.body, this.script); } - // setLanguage(param: any): void { - // this.language = param; - // console.log(this.language); - // } + setLanguage(param: any): void { + this.language = param; + console.log(this.language); + } ngOnDestroy(): void { this.subs.unsubscribe(); @@ -112,9 +112,9 @@ export class LoginComponent implements OnInit, OnDestroy { ); } - // showResponse(response: any): void { - // this.captchaSuccess = true; - // } + showResponse(response: any): void { + this.captchaSuccess = true; + } }