diff --git a/src/app/accounts/addcredit/addcredit.page.html b/src/app/accounts/addcredit/addcredit.page.html index a1d93e9..ab99385 100644 --- a/src/app/accounts/addcredit/addcredit.page.html +++ b/src/app/accounts/addcredit/addcredit.page.html @@ -296,4 +296,4 @@ - \ No newline at end of file + diff --git a/src/app/components/add-family/add-family.component.html b/src/app/components/add-family/add-family.component.html index a774f1c..215451b 100644 --- a/src/app/components/add-family/add-family.component.html +++ b/src/app/components/add-family/add-family.component.html @@ -1,3 +1,50 @@ -

- add-family works! -

+
+ Add Family +
+ + +
+ + + + + + + Add Family + + Close + + + + + + + + + + + + + + + + + + + + + +
+ {{profileMessage}} + Update +
+ + + + + Close + + + + +
\ No newline at end of file diff --git a/src/app/components/add-family/add-family.component.scss b/src/app/components/add-family/add-family.component.scss index e69de29..ed493e8 100644 --- a/src/app/components/add-family/add-family.component.scss +++ b/src/app/components/add-family/add-family.component.scss @@ -0,0 +1,22 @@ +.common_modal{ + z-index: 9999; +} +ion-backdrop { + opacity: 0.9; + background: var(--ion-color-primary); +} + +#box { + position: absolute; + top: 50%; + left: 50%; + transform: translateY(-50%) translateX(-50%); + z-index: 100; + display: flex; + align-items: center; + justify-content: center; + background: var(--ion-background-color, #fff); + width: 90%; + height: 100px; + border-radius: 10px; +} \ No newline at end of file diff --git a/src/app/components/add-family/add-family.component.ts b/src/app/components/add-family/add-family.component.ts index 3ae5f38..1a8845b 100644 --- a/src/app/components/add-family/add-family.component.ts +++ b/src/app/components/add-family/add-family.component.ts @@ -6,9 +6,23 @@ import { Component, OnInit } from '@angular/core'; styleUrls: ['./add-family.component.scss'], }) export class AddFamilyComponent implements OnInit { - + isModalOpen:boolean = false; + isModalOpenBackdrop:boolean = false; constructor() { } ngOnInit() {} + addStart(){ + this.isModalOpen = true; + this.isModalOpenBackdrop= true; + } + + setCloseModal(){ + this.isModalOpen = false; + setTimeout(()=>{ + this.isModalOpenBackdrop= false; + //this.myWallet(); + },1000); + } + } diff --git a/src/app/pages-family/playground/playground.page.html b/src/app/pages-family/playground/playground.page.html index 86d67c5..ba6bebf 100644 --- a/src/app/pages-family/playground/playground.page.html +++ b/src/app/pages-family/playground/playground.page.html @@ -1,81 +1,92 @@ + + + + + + + + Playgroud + + -
-
- -
-
- -
-
- A.I. Playground - -
- - - - - - - - - - - -
-
- - {{item.name}} +
+
+
+
- - - - - - - -
+
+
+ A.I. Playground + +
+ + + + + + + + - -
- - - - -
- -
- {{item.name}} - +
+
+ + {{item.name}}
+ + + + + + + + +
-
-
-
-
- {{iteml.title}} - {{iteml.description}} + + +
+ + + + +
+ +
+ {{item.name}} + +
+ +
+
+
+ +
+ {{iteml.title}} + {{iteml.description}} +
+
+
+
-
- -
+ +
- -
- - -
- Return -
- - + + + + + + + diff --git a/src/app/pages-family/playground/playground.page.scss b/src/app/pages-family/playground/playground.page.scss index 1c3cf7a..bd4f5ba 100644 --- a/src/app/pages-family/playground/playground.page.scss +++ b/src/app/pages-family/playground/playground.page.scss @@ -155,9 +155,10 @@ ion-content { } .men_image { - height: 40px; - width: 40px; + height: 50px; + width: 50px; border-radius: 100%; + min-width: 50px; } .text { diff --git a/src/app/pages/familysettings/familysettings.module.ts b/src/app/pages/familysettings/familysettings.module.ts index f7e0d33..f5ca706 100644 --- a/src/app/pages/familysettings/familysettings.module.ts +++ b/src/app/pages/familysettings/familysettings.module.ts @@ -7,6 +7,7 @@ import { IonicModule } from '@ionic/angular'; import { FamilysettingsPageRoutingModule } from './familysettings-routing.module'; import { FamilysettingsPage } from './familysettings.page'; +import {AddFamilyComponent} from "../../components/add-family/add-family.component"; @NgModule({ imports: [ @@ -15,6 +16,6 @@ import { FamilysettingsPage } from './familysettings.page'; IonicModule, FamilysettingsPageRoutingModule ], - declarations: [FamilysettingsPage] + declarations: [FamilysettingsPage,AddFamilyComponent] }) export class FamilysettingsPageModule {} diff --git a/src/app/pages/familysettings/familysettings.page.html b/src/app/pages/familysettings/familysettings.page.html index 9b07567..92fd041 100644 --- a/src/app/pages/familysettings/familysettings.page.html +++ b/src/app/pages/familysettings/familysettings.page.html @@ -21,9 +21,11 @@ - Add Family + Family -
Adding New Member
+
+ +
diff --git a/src/app/pages/startscan/startscan.page.ts b/src/app/pages/startscan/startscan.page.ts index f7e18b4..fd79ca0 100644 --- a/src/app/pages/startscan/startscan.page.ts +++ b/src/app/pages/startscan/startscan.page.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import {AlertController, NavController} from "@ionic/angular"; +import {AlertController, LoadingController, NavController} from "@ionic/angular"; import {Router} from "@angular/router"; import { BarcodeScanner } from '@capacitor-community/barcode-scanner'; import {WrenchService} from "../../services/wrench.service"; @@ -21,6 +21,7 @@ export class StartscanPage implements OnInit { private wrenchService: WrenchService, public sessionDataProviderService:SessionDataProviderService, public blogDataService:BlogDataService, + private loadingCtrl: LoadingController, private alertController: AlertController ) { } loginResult: any; @@ -40,18 +41,24 @@ export class StartscanPage implements OnInit { action: number, login_mode: number }; - startQRLogin(qrString) { + async startQRLogin(qrString) { if (qrString == null || qrString == '' ) { return; } + const loading = await this.loadingCtrl.create({ + message: 'Connecting your account...', + duration: 6000 + }); // alert(qrString); this.loginQrData = { username: qrString, sessionid: 'DUMMY-APP-SESSION-STARTER', action: 11022, login_mode: 1105 }; // alert(1000); + loading.present(); this.wrenchService.qrLoginUser(this.loginQrData).subscribe( loginResult => { + loading.dismiss(); // alert("Here 00009"); this.loginResult = loginResult; console.log("INTERNAL RETURN->" + this.loginResult.internal_return);