diff --git a/src/app/accounts/addcredit/addcredit.page.html b/src/app/accounts/addcredit/addcredit.page.html index 5a141bb..d8026c3 100644 --- a/src/app/accounts/addcredit/addcredit.page.html +++ b/src/app/accounts/addcredit/addcredit.page.html @@ -15,10 +15,368 @@ - addcredit + {{currency_description}} Wallet - +
+
+ +
+
+
+
+ + + + Balance: {{curr_balance| number : '1.2-2'}} {{currency_description}} + + + + + To Bank + + + + + + Reports + + + +
+
+ + + Redeem from {{currency_code}} Wallet + + + + + + + + Amount({{currency_code}}) + + + + + + Fee + + + + + + Total + + + + + + Recipient + + + + + + {{item.recipient}} + + + + + + + + + + + + + {{recipient_name}} + + + + + + Continue + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + Confirm Wallet Withdraw + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Amount({{currency_code}}) + + + + + + Fee + + + + + + Total + + + + + + Recipient + + + + + + + + + + + + + {{recipient_name}} + + + + + + Confirm + + + + + + + + + + +
+ + +
+ + + Withdraw Result + + + + + + + Amount({{currency_code}}) + + + + + + Fee + + + + + + Total + + + + + + Recipient + + + + + {{recipient_name}} + + + + + Confirmation + + {{confirmation}} + + + + + + Estimated delivery time is 2 to 4 Hours. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ +
+
+
+ +
+ + + +
+ {{item.confirmation}}- {{item.amount}} +
+
+
+ +
+
+ + + + + + + + + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/app/accounts/addcredit/addcredit.page.scss b/src/app/accounts/addcredit/addcredit.page.scss index e69de29..3207fcc 100644 --- a/src/app/accounts/addcredit/addcredit.page.scss +++ b/src/app/accounts/addcredit/addcredit.page.scss @@ -0,0 +1,407 @@ + +ion-content { + ion-card{ + margin: 10px 0px 10px 0px; + } + ion-card-title{ + font-size: 18px; + } + .back_image { + width: 100%; + height: 110px; + + .back { + font-size: 25px; + color: white; + } + } + + .send-grid{ + background-color: #eff2f4; + border-radius: 10px; + font-size: 14px; + font-weight: bolder; + ion-select, ion-input{ + border-radius: 10px; + border-color: #383a3e; + background-color: white; + text-align: right; + } + .intr{ + text-align: right; + margin-top: 10px; + } + } + .flex { + display: flex; + justify-content: space-between; + align-items: center; + + ion-icon { + font-size: 22px; + } + } + + .row { + display: flex; + align-items: center; + margin-top: 10px; + + .bg_text { + color: var(--ion-color-primary); + background: #dfe1f3; + font-size: 12px; + padding: 2px 5px; + border-radius: 5px; + margin-right: 10px; + } + + .rate { + display: flex; + align-items: center; + + .review { + margin-left: 5px; + } + } + } + + .color_text { + margin-top: 10px; + font-size: 22px; + font-family: 'semi-bold'; + color: var(--ion-color-primary); + } + + .items { + display: flex; + justify-content: space-between; + margin-top: 10px; + margin-bottom: 20px; + border-bottom: 1px solid lightgrey; + padding-bottom: 10px; + + .stud { + display: flex; + align-items: center; + + ion-icon { + margin-right: 5px; + } + + ion-label { + color: grey; + } + } + } + + .about { + margin-top: 10px; + + .head_text { + font-size: 18px; + font-family: 'semi-bold'; + margin-bottom: 10px; + } + + .mentor { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 20px; + + .left { + display: flex; + + .men_image { + height: 50px; + width: 50px; + border-radius: 100%; + } + + .bold { + font-family: 'semi-bold'; + } + + .grey { + color: grey; + font-size: 14px; + } + } + + ion-icon { + font-size: 25px; + } + } + + .description { + color: grey; + margin-bottom: 5px; + } + } + + .lesson { + margin-top: 20px; + + .bold { + font-family: 'semi-bold'; + } + + .color { + color: var(--ion-color-primary); + } + + .grey { + color: grey; + } + + .sec { + display: flex; + justify-content: space-between; + align-items: center; + margin-top: 10px; + } + + .video { + display: flex; + justify-content: space-between; + align-items: center; + background-color: white; + padding: 15px; + box-shadow: 0px 0px 20px 1px rgba(0, 0, 0, 0.1); + border-radius: 10px; + margin-top: 20px; + + .left { + display: flex; + } + + .men_image { + height: 40px; + width: 40px; + border-radius: 100%; + } + + .text { + margin-left: 10px; + } + + .bold_text { + font-size: 16px; + font-family: 'bold'; + } + + .grey_text { + font-size: 14px; + color: grey; + } + } + } + + .review_tab { + margin-top: 20px; + + .total { + display: flex; + align-items: center; + justify-content: space-between; + + .star-rate { + display: flex; + align-items: center; + + .bold { + font-size: 17px; + font-family: 'semi-bold'; + margin-left: 5px; + } + } + + .color { + color: var(--ion-color-primary); + font-size: 14px; + } + } + + + .story-item { + overflow: scroll; + display: flex; + flex-direction: row; + margin-top: 20px; + + .menu { + width: 100%; + display: flex; + flex-direction: row; + + .item { + padding: 5px; + margin: 5px; + display: flex; + flex-direction: column; + align-items: center; + text-align: center; + + ion-thumbnail { + border-radius: 15px; + width: max-content; + height: 60px; + width: 60px; + --border-radius: 50%; + } + + ion-label { + font-size: 14px; + font-family: "medium"; + color: var(--ion-color-medium); + } + } + + .text { + + display: flex; + align-items: center; + text-align: center; + + .select { + display: flex; + align-items: center; + border: 1px solid var(--ion-color-primary); + border-radius: 20px; + padding: 2px 15px; + margin-right: 10px; + + .rate_num { + margin-left: 5px; + color: var(--ion-color-primary); + } + } + + .show { + background-color: var(--ion-color-primary); + } + + .white { + color: white !important; + } + + .choice { + display: flex; + } + } + } + } + + .reviw_list { + margin-top: 25px; + + .profile { + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: 10px; + + .left { + display: flex; + align-items: center; + + .men_image { + height: 40px; + width: 40px; + border-radius: 100%; + } + + + .bold { + font-family: 'semi-bold'; + } + + .grey { + color: grey; + font-size: 14px; + } + } + + .right { + display: flex; + align-items: center; + + .select { + display: flex; + align-items: center; + border: 1px solid var(--ion-color-primary); + border-radius: 20px; + padding: 2px 15px; + margin-right: 10px; + + .rate_num { + margin-left: 5px; + color: var(--ion-color-primary); + } + } + + ion-icon { + font-size: 20px; + } + } + } + + .like { + display: flex; + align-items: center; + margin-top: 10px; + + .heart { + font-size: 25px; + margin-right: 5px; + } + + .count { + margin-right: 10px; + } + + .time { + color: grey; + font-size: 14px; + } + } + } + } + + + + .bold_text { + font-size: 20px; + font-family: 'bold'; + } +} + + +ion-footer { + --background: white; + + ion-toolbar { + --border-width: 0px; + padding: 10px; + align-items: center; + + ion-icon { + color: white; + font-size: 25px; + } + + .button { + background-color: var(--ion-color-primary); + display: flex; + align-items: center; + justify-content: space-around; + border-radius: 30px; + padding: 12px 0; + + .text { + color: white; + } + } + } +} diff --git a/src/app/accounts/addcredit/addcredit.page.ts b/src/app/accounts/addcredit/addcredit.page.ts index 38a3a18..70de2de 100644 --- a/src/app/accounts/addcredit/addcredit.page.ts +++ b/src/app/accounts/addcredit/addcredit.page.ts @@ -1,5 +1,10 @@ import { Component, OnInit } from '@angular/core'; import {NavController} from "@ionic/angular"; +import {Router} from "@angular/router"; +import {SessionDataProviderService} from "../../store/session-data-provider.service"; +import {WrenchService} from "../../services/wrench.service"; +import {BlogDataService} from "../../store/blog-data.service"; +import {UserWalletService} from "../../store/user-wallet.service"; @Component({ selector: 'app-addcredit', @@ -7,12 +12,66 @@ import {NavController} from "@ionic/angular"; styleUrls: ['./addcredit.page.scss'], }) export class AddcreditPage implements OnInit { + walletData:any; + tabs = 'bank_redeem'; + curr_balance:number =0; + currency_description : string=''; + currency_code:string=''; + wallet_uid:string=''; + isDisabled:boolean=false; + curr_page:string= 'redeem_start'; - constructor(private navctr: NavController) { } + constructor(private navctr: NavController, + private router: Router, + public sessionDataProviderService: SessionDataProviderService, + private wrenchService: WrenchService, + public blogDataService: BlogDataService, + public userWalletService: UserWalletService) { + this.walletData = this.router.getCurrentNavigation().extras.state; + if ( this.walletData != undefined ){ + this.curr_balance = this.walletData.amount*0.01; + this.currency_code = this.walletData.code; + this.currency_description = this.walletData.description; + this.wallet_uid= this.walletData.wallet_uid; + } + else{ + this.onBack(); + } + + } ngOnInit() { } onBack() { this.navctr.back(); } + + usrData: { + action:number, member_id: number, uid: string, sessionid: string, limit:20, page:1,offset: 0 + }; + + usersCardsTotalData:any; + usersCardsData: []; + getUsersCardsList(){ + this.usrData = + { + action:11055, + member_id: this.sessionDataProviderService.member_id, + uid: this.sessionDataProviderService.member_uid, + sessionid: this.sessionDataProviderService.session , + limit:20, page:1,offset: 0 + }; + + this.wrenchService.getusersCardList(this.usrData).subscribe( + usersCardsTotalData => { + this.usersCardsTotalData = usersCardsTotalData; + console.log("usersCardsTotalData TOTAL RETURN->", this.usersCardsTotalData); + this.usersCardsData = this.usersCardsTotalData.result_list; + // debugger; + console.log("usersCardsData RETURN DATA->", this.usersCardsData); + //this.total_family = this.familyData.length; + } + ); + + } } diff --git a/src/app/components/fastreward/fastreward.component.html b/src/app/components/fastreward/fastreward.component.html index efda27a..9943c39 100644 --- a/src/app/components/fastreward/fastreward.component.html +++ b/src/app/components/fastreward/fastreward.component.html @@ -1,40 +1,56 @@ - - - Reward a Kid - - - - - - - - - - WrenchBoard - - {{item.firstname}} ({{item.age}}) - - - - - - - - - - - - - - Family Acounts - - - +
+
+
+ + + Reward a Kid + + + + + + + + + + + + + {{item.firstname}} ({{item.age}}) + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + Family Acounts + + + +
- diff --git a/src/app/components/fastreward/fastreward.component.scss b/src/app/components/fastreward/fastreward.component.scss index ac8f075..ceb6b22 100644 --- a/src/app/components/fastreward/fastreward.component.scss +++ b/src/app/components/fastreward/fastreward.component.scss @@ -10,9 +10,14 @@ ion-card{ } } .left-col_pic{ - background-image: url("/assets/images/reward.png"); + // background-image: url("/assets/images/reward.png"); background-size: contain; background-repeat: no-repeat; + margin: auto 5px auto 5px; + img { + border-radius: 4px; + width: 150px; + } } .fast1{ ion-list{ @@ -22,6 +27,7 @@ ion-card{ } } .title{ + //font-family: "Lucida Console", "Courier New", monospace; font-weight: bolder; margin-left: 20px; font-size: 28px; @@ -32,7 +38,7 @@ ion-card{ border-radius: 100%; } margin:20px 0px 0px 0px; - height: 250px; + //height: 250px; padding: 0px; background: aliceblue; // rgba(78, 61, 130, 0.86); border-radius: 20px; diff --git a/src/app/pages/transaction/transaction.page.html b/src/app/pages/transaction/transaction.page.html index 8047862..42644c2 100644 --- a/src/app/pages/transaction/transaction.page.html +++ b/src/app/pages/transaction/transaction.page.html @@ -56,7 +56,7 @@ - Add Credit + Add Credit diff --git a/src/app/pages/transaction/transaction.page.ts b/src/app/pages/transaction/transaction.page.ts index bbbcbd4..9ce7764 100644 --- a/src/app/pages/transaction/transaction.page.ts +++ b/src/app/pages/transaction/transaction.page.ts @@ -33,7 +33,8 @@ export class TransactionPage implements OnInit { } addCredit(item){ - this.router.navigate(['addcredit']); + // debugger; + this.router.navigate(['addcredit'],{state: item}); } onReceipt(item) { this.router.navigate(['receipt']); diff --git a/src/global.scss b/src/global.scss index b851ff0..c765372 100644 --- a/src/global.scss +++ b/src/global.scss @@ -243,8 +243,10 @@ ion-content{ } .common_segment{ background-color: #3dc2ff; + border-radius: 20px; font-weight: bolder; ion-segment-button{ + border-radius: 20px; ion-label{ font-weight: bolder; } diff --git a/src/index.html b/src/index.html index 7df9dc0..746e97a 100644 --- a/src/index.html +++ b/src/index.html @@ -6,7 +6,7 @@ WrenchBoard - WrenchBoard Team + @@ -32,7 +32,11 @@ - +