diff --git a/REMEMBER.txt b/REMEMBER.txt index ddbe64c..af4cb7d 100644 --- a/REMEMBER.txt +++ b/REMEMBER.txt @@ -22,3 +22,8 @@ ionic generate component taskactivities npm install angularx-qrcode@14.0.0 --save npm install bn-ng-idle + +npm install @capacitor-community/barcode-scanner +npx cap sync + +https://github.com/capacitor-community/barcode-scanner \ No newline at end of file diff --git a/src/app/pages/familylogin/familylogin.page.html b/src/app/pages/familylogin/familylogin.page.html index 77cc91c..6105675 100644 --- a/src/app/pages/familylogin/familylogin.page.html +++ b/src/app/pages/familylogin/familylogin.page.html @@ -4,6 +4,8 @@
+ Scan Qr Code +
@@ -15,7 +17,7 @@ Family Login - + diff --git a/src/app/pages/familylogin/familylogin.page.ts b/src/app/pages/familylogin/familylogin.page.ts index 5d887f6..12a7e1b 100644 --- a/src/app/pages/familylogin/familylogin.page.ts +++ b/src/app/pages/familylogin/familylogin.page.ts @@ -5,6 +5,7 @@ import { SessionDataProviderService } from 'src/app/store/session-data-provider. import { BlogDataService } from 'src/app/store/blog-data.service'; import {NavController} from "@ionic/angular"; import { AlertController } from '@ionic/angular'; +import { BarcodeScanner } from '@capacitor-community/barcode-scanner'; @Component({ selector: 'app-familylogin', @@ -19,6 +20,7 @@ export class FamilyloginPage implements OnInit { @ViewChild('pin') pin; loginResult: any; blogResult:any; + content_visibility = ''; constructor( private router: Router, @@ -88,4 +90,50 @@ export class FamilyloginPage implements OnInit { userLogin(){ this.router.navigate(['login']); } + + + async checkPermission() { + try { + // check or request permission + const status = await BarcodeScanner.checkPermission({ force: true }); + if (status.granted) { + // the user granted permission + return true; + } + return false; + } catch(e) { + console.log(e); + } + } + scannedResult:any; + async startScan() { + try { + const permission = await this.checkPermission(); + if(!permission) { + return; + } + await BarcodeScanner.hideBackground(); + document.querySelector('body').classList.add('scanner-active'); + this.content_visibility = 'hidden'; + const result = await BarcodeScanner.startScan(); + console.log(result); + BarcodeScanner.showBackground(); + document.querySelector('body').classList.remove('scanner-active'); + this.content_visibility = ''; + if(result?.hasContent) { + this.scannedResult = result.content; + console.log(this.scannedResult); + } + } catch(e) { + console.log(e); + this.stopScan(); + } + } + + stopScan() { + BarcodeScanner.showBackground(); + BarcodeScanner.stopScan(); + document.querySelector('body').classList.remove('scanner-active'); + this.content_visibility = ''; + } } diff --git a/src/app/pages/my-course/my-course.page.html b/src/app/pages/my-course/my-course.page.html index 9e08d13..a11680d 100644 --- a/src/app/pages/my-course/my-course.page.html +++ b/src/app/pages/my-course/my-course.page.html @@ -1,4 +1,3 @@ - diff --git a/src/app/pages/profile/profile.page.html b/src/app/pages/profile/profile.page.html index 4df2c3b..80d492a 100644 --- a/src/app/pages/profile/profile.page.html +++ b/src/app/pages/profile/profile.page.html @@ -133,11 +133,11 @@ - - - - - + + + Payment & Accounts + + diff --git a/src/global.scss b/src/global.scss index 6943001..b4415c7 100644 --- a/src/global.scss +++ b/src/global.scss @@ -226,4 +226,12 @@ ion-modal.custom_modal_bottom { font-size: 15px; } } +} +ion-header{ + margin-top: 0px !important; +} + +body.scanner-active { + --background: transparent; + --ion-background-color: transparent; } \ No newline at end of file