diff --git a/src/app/layout/common/user/user.component.html b/src/app/layout/common/user/user.component.html index 2308703..cc866d0 100644 --- a/src/app/layout/common/user/user.component.html +++ b/src/app/layout/common/user/user.component.html @@ -1,22 +1,14 @@ - - + + - - - - - - - + \ No newline at end of file diff --git a/src/app/layout/common/user/user.component.ts b/src/app/layout/common/user/user.component.ts index 4e89a98..9683509 100644 --- a/src/app/layout/common/user/user.component.ts +++ b/src/app/layout/common/user/user.component.ts @@ -9,6 +9,8 @@ import { TesoBusinessDetail } from 'app/models/businessModel'; import { environment } from 'environments/environment'; import { MatDialog } from '@angular/material/dialog'; import { SettingsComponent } from 'app/pages/admin/Profile/Settings/settings.component'; +import { ProfileService } from 'app/pages/admin/Profile/profile.service'; +import { QrcodeDialogComponent } from 'app/pages/admin/Profile/QRCode/qrcode-dialog.component'; @Component({ selector: 'user', @@ -35,6 +37,7 @@ export class UserComponent implements OnInit, OnDestroy { private _router: Router, private _userService: UserService, private dialog: MatDialog, + private _profileService: ProfileService, ) { } @@ -110,4 +113,16 @@ export class UserComponent implements OnInit, OnDestroy { disableClose: true, }) } + generateCode() { + var dataImagge; + this._profileService.getQRCode().subscribe((response) => { + dataImagge = response; + this.dialog.open(QrcodeDialogComponent, { + hasBackdrop: true, + width: "400px", + height: "450px", + data: { image: dataImagge } + }); + }); + } } diff --git a/src/app/pages/auth/sign-in/sign-in.component.html b/src/app/pages/auth/sign-in/sign-in.component.html index 61b9f95..d5eba6d 100644 --- a/src/app/pages/auth/sign-in/sign-in.component.html +++ b/src/app/pages/auth/sign-in/sign-in.component.html @@ -117,7 +117,7 @@ + [enablePlaceholder]="true" [enableSearch]="false" name="phone" formControlName="phone" > Standard call, message, or data rates may apply. diff --git a/src/app/pages/auth/sign-in/sign-in.component.ts b/src/app/pages/auth/sign-in/sign-in.component.ts index 94fd179..0d5e0b3 100644 --- a/src/app/pages/auth/sign-in/sign-in.component.ts +++ b/src/app/pages/auth/sign-in/sign-in.component.ts @@ -8,11 +8,9 @@ import { AuthService } from 'app/core/auth/auth.service'; import { WindowService } from 'app/window.service'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; -import { getAuth, RecaptchaVerifier, signInWithPhoneNumber } from "firebase/auth"; import firebase from 'firebase/compat/app'; import 'firebase/compat/auth'; import 'firebase/compat/firestore'; -import { environment } from 'environments/environment'; import { MatDialog } from '@angular/material/dialog'; import { VerificationDialogComponent } from '../verification/verification-dialog.component'; import { ProfileImage } from 'app/models/generalModel'; @@ -98,12 +96,7 @@ export class AuthSignInComponent implements OnInit { * Sign in */ authenticate(): void { - console.log(this.tryagin) - console.log(this.phonenumber) - // if(!this.phonenumber && this.phonenumber != this.previousNumber){ this.phonenumber = this.signInForm.get('phone').value; - // } - console.log(this.phonenumber) this.showAlert = false; if (this.phonenumber) if (this.tryagin < 3 || this.phonenumber != this.previousNumber) { @@ -190,6 +183,11 @@ export class AuthSignInComponent implements OnInit { }); }).catch((error) => { // this.signInForm.reset(); + this.alert = { + type: "error", + message: "An error occurred while authenticating you please try again after a while this could be a result poor internet connection" + } + this.showAlert = true; grecaptcha.reset(this.recaptchedID); this.previousNumber = this.phonenumber; }); @@ -206,7 +204,7 @@ export class AuthSignInComponent implements OnInit { } else { this.alert = { type: "error", - message: "An error occurred while authenticating you please try again after a while this could poor internet connection" + message: "An error occurred while authenticating you please try again after a while this could be a result poor internet connection" } this.showAlert = true; } @@ -230,7 +228,6 @@ export class AuthSignInComponent implements OnInit { } clear() { - console.log(this.newProfilePicture) this.newProfilePicture = {}; }