Merge pull request #546 from rahulramakrishnan3/release-3.1.0

new bug fixes
ELEVATE-Project · Aug 7, 2024 · 2183371 · 2183371
2 parents ebedd8c + e64cdfc
commit 2183371
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/src/app/pages/mentor-details/mentor-details.page.html b/src/app/pages/mentor-details/mentor-details.page.html
@@ -52,7 +52,7 @@
   </div>
 </ion-content>
 <div *ngIf="this.userCantAccess && isloaded" class="d-flex flex-justify-center">
-    <app-no-data-found [messageHeader]="'USER_CANT_ACCESS_THIS_PROFILE'" [messageDescription]="'USER_CANT_ACCESS_PROFILE_GO_TO_HOME_PAGE'" [image]="'../../../../assets/no-data/unotherised-access.png'"> </app-no-data-found>
+    <app-no-data-found [messageHeader]="'USER_CANT_ACCESS_THIS_PROFILE'" [messageDescription]="'USER_CANT_ACCESS_PROFILE_GO_TO_HOME_PAGE'" [image]="'assets/no-data/unotherised-access.png'"> </app-no-data-found>
 </div>
 <ion-footer *ngIf="isloaded" class="ion-no-border footer-button">
   <ion-button (click)="goToHome()" expand="full">{{"HOME" | translate}}</ion-button>

diff --git a/src/app/pages/session-detail/session-detail.page.html b/src/app/pages/session-detail/session-detail.page.html
@@ -5,7 +5,7 @@
       <ion-row class="d-flex ">
         <ion-col padding size-xs="12" size-sm="12" size-md="4" size-lg="4">
     <div class="d-flex flex-justify-center image-container">
-      <img *ngIf="!detailData?.data?.image?.length || !detailData?.data?.image[0]; else elseBlock" src="../../../assets/default-session-img/session-img.png"/>
+      <img *ngIf="!detailData?.data?.image?.length || !detailData?.data?.image[0]; else elseBlock" src="assets/default-session-img/session-img.png"/>
       <ng-template #elseBlock>
         <img src="{{detailData?.data?.image}}"/>
       </ng-template>
@@ -51,7 +51,7 @@ <h6 class="title-font">{{detailData?.data?.title}}</h6>
   </ng-template>
 </ion-footer>
 <div *ngIf="this.userCantAccess && isLoaded">
-      <app-no-data-found [messageHeader]="'USER_CANT_ACCESS_THIS_SESSION'" [messageDescription]="'USER_CANT_ACCESS_SESSION_GO_TO_HOME_PAGE'" [image]="'../../../../assets/no-data/unotherised-access.png'"> </app-no-data-found>
+      <app-no-data-found [messageHeader]="'USER_CANT_ACCESS_THIS_SESSION'" [messageDescription]="'USER_CANT_ACCESS_SESSION_GO_TO_HOME_PAGE'" [image]="'assets/no-data/unotherised-access.png'"> </app-no-data-found>
 </div>
 <ion-footer class="ion-no-border footer-button" *ngIf="this.userCantAccess && isLoaded">
     <ion-button expand="full" (click)="goToHome()">{{"HOME" | translate}}</ion-button>

diff --git a/src/app/pages/tabs/home/home.page.html b/src/app/pages/tabs/home/home.page.html
@@ -49,7 +49,7 @@ <h3>
 
   <ion-card-content class="ion-no-padding">
     <div class="d-flex flex-justify-center">
-      <img src="../../../../assets/images/request-to-be-a-mentor.svg" alt="Image" />
+      <img src="assets/images/request-to-be-a-mentor.svg" alt="Image" />
     </div>
     <ion-label class="header-label content-label">{{"EMPOWER_THE_SCHOOL_LEADERS"|translate}}</ion-label>
   </ion-card-content>

diff --git a/src/app/pages/tabs/home/home.page.ts b/src/app/pages/tabs/home/home.page.ts
@@ -76,8 +76,8 @@ export class HomePage implements OnInit {
         }
       })
     });
-    let isRoleRequested = this.localStorage.getLocalData(localKeys.IS_ROLE_REQUESTED)
-    let isBecomeMentorTileClosed = this.localStorage.getLocalData(localKeys.IS_BECOME_MENTOR_TILE_CLOSED)
+    let isRoleRequested = await this.localStorage.getLocalData(localKeys.IS_ROLE_REQUESTED)
+    let isBecomeMentorTileClosed = await this.localStorage.getLocalData(localKeys.IS_BECOME_MENTOR_TILE_CLOSED)
     this.showBecomeMentorCard = isRoleRequested || this.profileService.isMentor || isBecomeMentorTileClosed ? false : true;
     if(this.profileService.isMentor){
       this.getCreatedSessionDetails();
@@ -88,7 +88,7 @@ export class HomePage implements OnInit {
         this.user = data;
       }
     })
-    this.user = this.localStorage.getLocalData(localKeys.USER_DETAILS)
+    this.user = await this.localStorage.getLocalData(localKeys.USER_DETAILS)
     this.permissionService.getPlatformConfig().then((config)=>{
       this.chips = config.result.search_config.search.session.fields;
     })

diff --git a/src/app/shared/components/mentor-card/mentor-card.component.html b/src/app/shared/components/mentor-card/mentor-card.component.html
@@ -3,7 +3,7 @@
     <ion-row>
     <div class="card-avatar">
       <img *ngIf="!data?.image || data?.image==''; else Img; let image" class="thumbnail-image"
-        src="../../../../assets/prof-img/user.png" />
+        src="assets/prof-img/user.png" />
       <ng-template #Img>
         <img class="thumbnail-image" src="{{data?.image}}" />
       </ng-template>

diff --git a/src/app/shared/components/no-data-found/no-data-found.component.ts b/src/app/shared/components/no-data-found/no-data-found.component.ts
@@ -8,7 +8,7 @@ import { Component, Input, OnInit } from '@angular/core';
 export class NoDataFoundComponent implements OnInit {
 @Input() messageHeader;
 @Input() messageDescription;
-@Input() image = '../../../../assets/no-data/sad-face-2691.svg'
+@Input() image = 'assets/no-data/sad-face-2691.svg'
   constructor() { }
 
   ngOnInit() {}

diff --git a/src/app/shared/components/persona-selection-card/persona-selection-card.component.html b/src/app/shared/components/persona-selection-card/persona-selection-card.component.html
@@ -2,8 +2,8 @@
   <div *ngFor="let persona of personaList;let i=index">
     <div>
       <ion-row class="d-flex flex-justify-center">
-        <img *ngIf="persona?.name=='mentor'" src="../../../../assets/prof-img/mentor.png">
-        <img *ngIf="persona?.name=='mentee'" src="../../../../assets/prof-img/mentee.png">
+        <img *ngIf="persona?.name=='mentor'" src="assets/prof-img/mentor.png">
+        <img *ngIf="persona?.name=='mentee'" src="assets/prof-img/mentee.png">
       </ion-row>
       <ion-row class="d-flex flex-justify-center flex-align-items-flex-start selection-row">
         <ion-item lines="none" class="ion-no-padding ion-no-margin">

diff --git a/src/app/shared/components/profile-image/profile-image.component.html b/src/app/shared/components/profile-image/profile-image.component.html
@@ -2,7 +2,7 @@
   <div class="d-flex flex-justify-center">
     <div class="profile-container "
       *ngIf="!profileImageData?.image || profileImageData?.image==''; else Img; let image">
-      <img class="thumbnail-image" src="../../../../assets/prof-img/user.png" />
+      <img class="thumbnail-image" src="assets/prof-img/user.png" />
       <div class="camera-icon-container" *ngIf="isMobile">
         <ion-icon name="camera" class="camera-icon" (click)="uploadPhoto('CAMERA'); clearFileInput();"></ion-icon>
       </div>

diff --git a/src/app/shared/components/session-card/session-card.component.html b/src/app/shared/components/session-card/session-card.component.html
@@ -14,7 +14,7 @@
     <ion-row>
       <div class="session-image">
         <img *ngIf="!data?.image.length || data?.image==''; else Img; let image" class="thumbnail-image"
-          src="../../../../assets/default-session-img/session-img.png" />
+          src="assets/default-session-img/session-img.png" />
         <ng-template #Img>
           <img class="thumbnail-image" src="{{data?.image[0]}}" />
         </ng-template>