From 3d970a9ea2d0985cb8cb86f32c8f41a09cf8dad9 Mon Sep 17 00:00:00 2001
From: "CHIEFSOFT\\ameye" <ameye@chiefsfot.com>
Date: Tue, 7 Nov 2023 21:34:43 -0500
Subject: [PATCH] top menu

---
 src/app/accounts/addbank/addbank.page.html    | 18 ++++++++--
 src/app/pages/family/family.page.html         | 30 +++++++++++-----
 .../pages/familymember/familymember.page.html | 32 ++++++++++++-----
 .../pages/familymember/familymember.page.ts   |  6 +++-
 .../pages/marketdetail/marketdetail.page.html | 34 +++++++++++++------
 .../pages/marketdetail/marketdetail.page.ts   |  5 +++
 src/app/pages/mycoupons/mycoupons.page.html   | 26 ++++++++++----
 src/app/pages/myfiles/myfiles.page.html       | 18 ++++++++--
 src/app/pages/redeem/redeem.page.html         | 17 +++++++++-
 .../store/session-data-provider.service.ts    |  4 ++-
 10 files changed, 150 insertions(+), 40 deletions(-)

diff --git a/src/app/accounts/addbank/addbank.page.html b/src/app/accounts/addbank/addbank.page.html
index 72a02fb..19ad721 100644
--- a/src/app/accounts/addbank/addbank.page.html
+++ b/src/app/accounts/addbank/addbank.page.html
@@ -1,8 +1,22 @@
-
+<ion-header mode="ios" class="ion-no-border">
+    <ion-toolbar>
+        <ion-buttons slot="start" (click)="onBack()">
+            <ion-button>
+                <ion-icon name="arrow-back-outline"></ion-icon>
+            </ion-button>
+        </ion-buttons>
+        <ion-buttons slot="end">
+            <!--      <ion-button>-->
+            <!--        <ion-icon name="ellipsis-horizontal-circle-outline"></ion-icon>-->
+            <!--      </ion-button>-->
+        </ion-buttons>
+        <ion-title>{{currency_description}} Add New {{currency_code}} Account</ion-title>
+    </ion-toolbar>
+</ion-header>
 <ion-content>
   <div class="bg_image back_image" [style.backgroundImage]="'url(https://www.wrenchboard.com/assets/images/apps/redeem.jpg)'">
     <div class="ion-padding">
-      <ion-icon slot="start" name="arrow-back" class="back" (click)="onBack()"></ion-icon>
+<!--      <ion-icon slot="start" name="arrow-back" class="back" (click)="onBack()"></ion-icon>-->
     </div>
   </div>
     <div class="boxed_contents">
diff --git a/src/app/pages/family/family.page.html b/src/app/pages/family/family.page.html
index a331050..419b1f2 100644
--- a/src/app/pages/family/family.page.html
+++ b/src/app/pages/family/family.page.html
@@ -1,4 +1,18 @@
-
+<ion-header mode="ios" class="ion-no-border">
+  <ion-toolbar>
+    <ion-buttons slot="start" (click)="onBack()">
+      <ion-button>
+        <ion-icon name="arrow-back-outline"></ion-icon>
+      </ion-button>
+    </ion-buttons>
+    <ion-buttons slot="end">
+      <!--      <ion-button>-->
+      <!--        <ion-icon name="ellipsis-horizontal-circle-outline"></ion-icon>-->
+      <!--      </ion-button>-->
+    </ion-buttons>
+    <ion-title>Family Account</ion-title>
+  </ion-toolbar>
+</ion-header>
 <ion-content>
   <div class="boxed_contents">
     <div class="bg_image back_image" [style.backgroundImage]="'url(assets/images/family.jpg)'">
@@ -206,10 +220,10 @@
 
 </ion-content>
 
-<ion-footer>
-  <ion-toolbar>
-    <div class="button" (click)="onBack()">
-      <ion-label class="text">Return</ion-label>
-    </div>
-  </ion-toolbar>
-</ion-footer>
+<!--<ion-footer>-->
+<!--  <ion-toolbar>-->
+<!--    <div class="button" (click)="onBack()">-->
+<!--      <ion-label class="text">Return</ion-label>-->
+<!--    </div>-->
+<!--  </ion-toolbar>-->
+<!--</ion-footer>-->
diff --git a/src/app/pages/familymember/familymember.page.html b/src/app/pages/familymember/familymember.page.html
index 8892654..99d24df 100644
--- a/src/app/pages/familymember/familymember.page.html
+++ b/src/app/pages/familymember/familymember.page.html
@@ -1,9 +1,23 @@
-
+<ion-header mode="ios" class="ion-no-border">
+    <ion-toolbar>
+        <ion-buttons slot="start" (click)="onBack()">
+            <ion-button>
+                <ion-icon name="arrow-back-outline"></ion-icon>
+            </ion-button>
+        </ion-buttons>
+        <ion-buttons slot="end">
+            <!--      <ion-button>-->
+            <!--        <ion-icon name="ellipsis-horizontal-circle-outline"></ion-icon>-->
+            <!--      </ion-button>-->
+        </ion-buttons>
+        <ion-title>{{member_firstname}} {{member_lastname}}</ion-title>
+    </ion-toolbar>
+</ion-header>
 <ion-content>
     <div class="boxed_contents">
 
 
-  <div class="bg_image back_image" [style.backgroundImage]="'url(https://www.wrenchboard.com/assets/images/apps/family.svg)'">
+  <div class="bg_image back_image" [style.backgroundImage]="'url('+session_image_server+'/'+curr_session+'/family/'+family_uid+')'">
     <div class="ion-padding">
       <ion-icon slot="start" name="arrow-back" class="back" (click)="onBack()"></ion-icon>
     </div>
@@ -204,10 +218,10 @@
     </div>
 </ion-content>
 
-<ion-footer>
-  <ion-toolbar>
-    <div class="button" (click)="onBack()">
-      <ion-label class="text">Return</ion-label>
-    </div>
-  </ion-toolbar>
-</ion-footer>
+<!--<ion-footer>-->
+<!--  <ion-toolbar>-->
+<!--    <div class="button" (click)="onBack()">-->
+<!--      <ion-label class="text">Return</ion-label>-->
+<!--    </div>-->
+<!--  </ion-toolbar>-->
+<!--</ion-footer>-->
diff --git a/src/app/pages/familymember/familymember.page.ts b/src/app/pages/familymember/familymember.page.ts
index d05ec0d..5daddd5 100644
--- a/src/app/pages/familymember/familymember.page.ts
+++ b/src/app/pages/familymember/familymember.page.ts
@@ -23,7 +23,9 @@ export class FamilymemberPage implements OnInit {
   member_pin:string='';
   family_uid:string='';
   jobManagerActiveData:any;
-
+  session_image_server:string='';
+  curr_session:string='';
+ // family_member_uid:string='';
   member_qr_string ='0000000';
 
   constructor(
@@ -41,6 +43,8 @@ export class FamilymemberPage implements OnInit {
   }
 
   ngOnInit() {
+    this.session_image_server = this.sessionDataProviderService.session_image_server;
+    this.curr_session=this.sessionDataProviderService.session;
     this.getThisFamilyAccount();
     this.getFamilyWalletsData();
   }
diff --git a/src/app/pages/marketdetail/marketdetail.page.html b/src/app/pages/marketdetail/marketdetail.page.html
index 1f7302f..312f884 100644
--- a/src/app/pages/marketdetail/marketdetail.page.html
+++ b/src/app/pages/marketdetail/marketdetail.page.html
@@ -1,6 +1,20 @@
-
+<ion-header mode="ios" class="ion-no-border">
+  <ion-toolbar>
+    <ion-buttons slot="start" (click)="onBack()">
+      <ion-button>
+        <ion-icon name="arrow-back-outline"></ion-icon>
+      </ion-button>
+    </ion-buttons>
+    <ion-buttons slot="end">
+      <!--      <ion-button>-->
+      <!--        <ion-icon name="ellipsis-horizontal-circle-outline"></ion-icon>-->
+      <!--      </ion-button>-->
+    </ion-buttons>
+    <ion-title>{{jobData.title}}</ion-title>
+  </ion-toolbar>
+</ion-header>
 <ion-content>
-  <div class="bg_image back_image" [style.backgroundImage]="'url(assets/images/market.jpg)'">
+  <div class="bg_image back_image" [style.backgroundImage]="'url('+session_image_server+'/'+curr_session+'/job/'+jobData.job_uid+')'">
     <div class="ion-padding">
       <ion-icon slot="start" name="arrow-back" class="back" (click)="onBack()"></ion-icon>
     </div>
@@ -52,7 +66,7 @@
         <!--      <div class="mentor" (click)="onMentor()">-->
         <div class="mentor">
           <div class="left">
-            <div class="bg_image men_image" [style.backgroundImage]="'url(assets/images/taskbanners/default.jpg)'"></div>
+            <div class="bg_image men_image" [style.backgroundImage]="'url('+session_image_server+'/'+curr_session+'/job/'+jobData.job_uid+')'"></div>
             <div style="margin-left: 10px;">
               <ion-label class="bold">Expires</ion-label>
               <ion-label class="grey">{{jobData.expire}}</ion-label>
@@ -205,11 +219,11 @@
   </div>
 </ion-content>
 
-<ion-footer>
-  <ion-toolbar>
-    <div class="button" (click)="onBack()">
-      <ion-label class="text">Return</ion-label>
-    </div>
-  </ion-toolbar>
-</ion-footer>
+<!--<ion-footer>-->
+<!--  <ion-toolbar>-->
+<!--    <div class="button" (click)="onBack()">-->
+<!--      <ion-label class="text">Return</ion-label>-->
+<!--    </div>-->
+<!--  </ion-toolbar>-->
+<!--</ion-footer>-->
 
diff --git a/src/app/pages/marketdetail/marketdetail.page.ts b/src/app/pages/marketdetail/marketdetail.page.ts
index 4eb2ef0..bde2176 100644
--- a/src/app/pages/marketdetail/marketdetail.page.ts
+++ b/src/app/pages/marketdetail/marketdetail.page.ts
@@ -13,6 +13,8 @@ import {SessionDataProviderService} from "../../store/session-data-provider.serv
 export class MarketdetailPage implements OnInit {
   @ViewChild('yourmessage') yourmessage;
   tabs = 'about';
+  session_image_server:string='';
+  curr_session:string='';
 
   jobData: any;
   constructor(
@@ -30,8 +32,11 @@ export class MarketdetailPage implements OnInit {
 
 
   ngOnInit() {
+    this.session_image_server = this.sessionDataProviderService.session_image_server;
+    this.curr_session=this.sessionDataProviderService.session;
   }
 
+
   onBack() {
     this.navctr.back();
   }
diff --git a/src/app/pages/mycoupons/mycoupons.page.html b/src/app/pages/mycoupons/mycoupons.page.html
index 7835b5f..8ca377e 100644
--- a/src/app/pages/mycoupons/mycoupons.page.html
+++ b/src/app/pages/mycoupons/mycoupons.page.html
@@ -1,10 +1,24 @@
-
+<ion-header mode="ios" class="ion-no-border">
+    <ion-toolbar>
+        <ion-buttons slot="start" (click)="onBack()">
+            <ion-button>
+                <ion-icon name="arrow-back-outline"></ion-icon>
+            </ion-button>
+        </ion-buttons>
+        <ion-buttons slot="end">
+            <!--      <ion-button>-->
+            <!--        <ion-icon name="ellipsis-horizontal-circle-outline"></ion-icon>-->
+            <!--      </ion-button>-->
+        </ion-buttons>
+        <ion-title>Coupons</ion-title>
+    </ion-toolbar>
+</ion-header>
 <ion-content>
-    <div class="bg_image back_image" [style.backgroundImage]="'url(https://www.wrenchboard.com/assets/images/apps/p2.jpg)'">
-        <div class="ion-padding">
-            <ion-icon slot="start" name="arrow-back" class="back" (click)="onBack()"></ion-icon>
-        </div>
-    </div>
+<!--    <div class="bg_image back_image" [style.backgroundImage]="'url(https://www.wrenchboard.com/assets/images/apps/p2.jpg)'">-->
+<!--        <div class="ion-padding">-->
+<!--            <ion-icon slot="start" name="arrow-back" class="back" (click)="onBack()"></ion-icon>-->
+<!--        </div>-->
+<!--    </div>-->
     <div class="boxed_contents">
 
 
diff --git a/src/app/pages/myfiles/myfiles.page.html b/src/app/pages/myfiles/myfiles.page.html
index d7a0c59..5a5c5db 100644
--- a/src/app/pages/myfiles/myfiles.page.html
+++ b/src/app/pages/myfiles/myfiles.page.html
@@ -1,8 +1,22 @@
-
+<ion-header mode="ios" class="ion-no-border">
+  <ion-toolbar>
+    <ion-buttons slot="start" (click)="onBack()">
+      <ion-button>
+        <ion-icon name="arrow-back-outline"></ion-icon>
+      </ion-button>
+    </ion-buttons>
+    <ion-buttons slot="end">
+      <!--      <ion-button>-->
+      <!--        <ion-icon name="ellipsis-horizontal-circle-outline"></ion-icon>-->
+      <!--      </ion-button>-->
+    </ion-buttons>
+    <ion-title>My Files</ion-title>
+  </ion-toolbar>
+</ion-header>
 <ion-content>
   <div class="bg_image back_image" [style.backgroundImage]="'url(https://www.wrenchboard.com/assets/images/apps/p3.jpg)'">
     <div class="ion-padding">
-      <ion-icon slot="start" name="arrow-back" class="back" (click)="onBack()"></ion-icon>
+<!--      <ion-icon slot="start" name="arrow-back" class="back" (click)="onBack()"></ion-icon>-->
     </div>
   </div>
   <div class="boxed_contents">
diff --git a/src/app/pages/redeem/redeem.page.html b/src/app/pages/redeem/redeem.page.html
index f08ac70..8fef811 100644
--- a/src/app/pages/redeem/redeem.page.html
+++ b/src/app/pages/redeem/redeem.page.html
@@ -1,7 +1,22 @@
+<ion-header mode="ios" class="ion-no-border">
+    <ion-toolbar>
+        <ion-buttons slot="start" (click)="onBack()">
+            <ion-button>
+                <ion-icon name="arrow-back-outline"></ion-icon>
+            </ion-button>
+        </ion-buttons>
+        <ion-buttons slot="end">
+            <!--      <ion-button>-->
+            <!--        <ion-icon name="ellipsis-horizontal-circle-outline"></ion-icon>-->
+            <!--      </ion-button>-->
+        </ion-buttons>
+        <ion-title>{{currency_description}} Wallet</ion-title>
+    </ion-toolbar>
+</ion-header>
 <ion-content>
   <div class="bg_image back_image" [style.backgroundImage]="'url(https://www.wrenchboard.com/assets/images/apps/redeem.jpg)'">
     <div class="ion-padding">
-      <ion-icon slot="start" name="arrow-back" class="back" (click)="onBack()"></ion-icon>
+<!--      <ion-icon slot="start" name="arrow-back" class="back" (click)="onBack()"></ion-icon>-->
     </div>
   </div>
 
diff --git a/src/app/store/session-data-provider.service.ts b/src/app/store/session-data-provider.service.ts
index 37e034f..076e54b 100644
--- a/src/app/store/session-data-provider.service.ts
+++ b/src/app/store/session-data-provider.service.ts
@@ -77,7 +77,7 @@ export class SessionDataProviderService {
   promo:number=0;
   active_job_count:number =0;
   tracking:number = 0;
-
+  session_image_server: string='';
 
  session_contructed:boolean = false;
 
@@ -111,6 +111,8 @@ export class SessionDataProviderService {
       this.promo=loginResult.promo;
       this.active_job_count = loginResult.active_job_count;
       this.tracking = loginResult.tracking;
+      this.session_image_server = loginResult.session_image_server;
+
       //this.pushNotificationProvider.tagUser(this.session);
 
       this.session_contructed = true;