ELEVATE-Project · Cafnanc · Jun 27, 2023 · Jun 28, 2023 · Jul 3, 2023 · Jul 4, 2023
diff --git a/src/app/app.component.html b/src/app/app.component.html
@@ -1,6 +1,6 @@
 <ion-app>
   <ion-split-pane contentId="main-content">
-    <ion-menu contentId="main-content" type="overlay">
+    <ion-menu contentId="main-content" type="overlay" swipeGesture="false">
       <ion-header [translucent]="true" class="ion-no-border">
         <div class="sub-menu-toolbar">
           <div slot="start" class="img-mainDiv">

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -65,13 +65,13 @@ export class AppComponent {
             {
               text: texts['CANCEL'],
               role: 'cancel',
-              cssClass: "alert-button",
+              cssClass: "alert-button-bg-white",
               handler: () => { }
             },
             {
               text: texts['CONFIRM'],
               role: 'confirm',
-              cssClass: "alert-button-bg-white",
+              cssClass: "alert-button",
               handler: () => { 
                 navigator['app'].exitApp();
               }

diff --git a/src/app/core/constants/formConstant.ts b/src/app/core/constants/formConstant.ts
@@ -43,8 +43,8 @@ export const PLATFORMS: IFORM = {
 }
 
 export const HELP: IFORM = {
-	"type": "help",
-	"subType": "helpForm",
-	"action": "helpFields",
+	"type": "helpApp",
+	"subType": "helpAppForm",
+	"action": "helpAppFields",
 	"templateName":"defaultTemplate"
 }
diff --git a/src/app/core/services/attachment/attachment.service.ts b/src/app/core/services/attachment/attachment.service.ts
@@ -66,7 +66,15 @@ export class AttachmentService {
     let data ={
         type:'removeCurrentPhoto'
     }
+    this.translate
+            .get([
+                "REMOVE_CURRENT_PHOTO"
+            ])
+            .subscribe((data) => {
+                this.texts = data;
+            });
     this.actionSheetController.dismiss(data);
+    this.presentToast(this.texts["REMOVE_CURRENT_PHOTO"], "success");
     }
     async selectImage(type) {
         this.translate

diff --git a/src/app/core/services/auth/auth.service.ts b/src/app/core/services/auth/auth.service.ts
@@ -17,6 +17,7 @@ import { TranslateService } from '@ngx-translate/core';
 })
 export class AuthService {
   baseUrl: any;
+  user: any;
   constructor(
     private localStorage: LocalStorageService,
     private httpService: HttpService,
@@ -67,7 +68,8 @@ export class AuthService {
     if (!result.access_token) { throw Error(); };
     this.userService.token = result;
     await this.localStorage.setLocalData(localKeys.TOKEN, result);
-    const userData = await this.profileService.getProfileDetailsAPI();
+    this.user = data.result.user;
+    const userData = await this.profileService.getProfileDetailsFromAPI(this.user.isAMentor,this.user._id);
     if (!userData) {
       this.localStorage.delete(localKeys.TOKEN);
       throw Error();
@@ -82,7 +84,6 @@ export class AuthService {
   }
 
   async logoutAccount(skipApiCall?: boolean) {
-    await this.loaderService.startLoader();
     const config = {
       url: urlConstants.API_URLS.LOGOUT_ACCOUNT,
       payload: {
@@ -97,13 +98,11 @@ export class AuthService {
       this.localStorage.delete(localKeys.TOKEN);
       this.userService.token = null;
       this.userService.userEvent.next(null);
-      await this.loaderService.stopLoader();
       this.router.navigate([`/${CommonRoutes.AUTH}/${CommonRoutes.LOGIN}`], {
         replaceUrl: true
       });
     }
     catch (error) {
-      await this.loaderService.stopLoader();
     }
   }
 

diff --git a/src/app/core/services/http/http.service.ts b/src/app/core/services/http/http.service.ts
@@ -166,7 +166,12 @@ export class HttpService {
         break
       case 401:
         let auth = this.injector.get(AuthService);
-        auth.logoutAccount(true);
+        this.localStorage.getLocalData(localKeys.USER_DETAILS).then(async (data)=>{
+          if(data._id){
+            await auth.logoutAccount(true);
+            this.toastService.showToast(msg ? msg.message : 'SOMETHING_WENT_WRONG', 'danger')
+          }
+        })
         break
       default:
         this.toastService.showToast(msg ? msg.message : 'SOMETHING_WENT_WRONG', 'danger')

diff --git a/src/app/core/services/profile/profile.service.ts b/src/app/core/services/profile/profile.service.ts
@@ -39,8 +39,9 @@ export class ProfileService {
       let userDetails = await this.localStorage.getLocalData(localKeys.USER_DETAILS);
       userDetails.user = null;
       let profileData = await this.getProfileDetailsAPI();
-      await this.localStorage.setLocalData(localKeys.USER_DETAILS, profileData);
-      this.userService.userEvent.next(profileData);
+      let profileDatas = await {...userDetails, ...profileData};
+      await this.localStorage.setLocalData(localKeys.USER_DETAILS, profileDatas);
+      this.userService.userEvent.next(profileDatas);
       this.loaderService.stopLoader();
       this._location.back();
       (showToast)?this.toast.showToast(data.message, "success"):null;

diff --git a/src/app/core/services/util/util.service.ts b/src/app/core/services/util/util.service.ts
@@ -51,20 +51,21 @@ export class UtilService {
         header: texts[msg.header],
         message: texts[msg.message],
         buttons: [
+          {
+            text: texts[msg.submit],
+            cssClass: 'alert-button-bg-white',
+            handler: () => {
+              resolve(true);
+            }
+          },
           {
             text: texts[msg.cancel],
             role: 'cancel',
-            cssClass: 'alert-button-bg-white',
+            cssClass: 'alert-button-red',
             handler: (blah) => {
               resolve(false);
             }
-          }, {
-            text: texts[msg.submit],
-            cssClass: 'alert-button-red',
-            handler: () => {
-              resolve(true);
-            }
-          }
+          },
         ]
       });
       await alert.present();
@@ -76,7 +77,7 @@ export class UtilService {
     this.translate
       .get([
         "ADD_PHOTO",
-        "REMOVE_CURRENT_PHOTO",
+        "REMOVE_CURRENT_PHOTO_LABEL",
         "CHOOSE_FROM_LIBRARY",
         "TAKE_PHOTO",
         "CANCEL",
@@ -92,7 +93,7 @@ export class UtilService {
       case 'profile':
         buttons = [
           {
-            text: texts["REMOVE_CURRENT_PHOTO"],
+            text: texts["REMOVE_CURRENT_PHOTO_LABEL"],
             type: 'remove',
             action: 'remove'
           },
@@ -106,7 +107,7 @@ export class UtilService {
       case 'session':
         buttons = [
            {
-            text: texts["REMOVE_CURRENT_PHOTO"],
+            text: texts["REMOVE_CURRENT_PHOTO_LABEL"],
             type: 'remove',
             action: 'remove'
           },

diff --git a/src/app/pages/auth/login/login.page.ts b/src/app/pages/auth/login/login.page.ts
@@ -2,7 +2,6 @@ import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { MenuController } from '@ionic/angular';
 import { TranslateService } from '@ngx-translate/core';
-import { localKeys } from 'src/app/core/constants/localStorage.keys';
 import { AuthService, LocalStorageService } from 'src/app/core/services';
 import { DynamicFormComponent, JsonFormData } from 'src/app/shared/components/dynamic-form/dynamic-form.component';
 import { CommonRoutes } from 'src/global.routes';

diff --git a/src/app/pages/create-session/create-session.page.html b/src/app/pages/create-session/create-session.page.html
@@ -1,53 +1,56 @@
 <app-page-header [config]="headerConfig"></app-page-header>
-<div class="height">
-  <ion-segment (ionChange)="segmentChanged($event)" [value]="type">
-    <ion-segment-button value="default" layout="icon-start">
-      <div class="icon-2">1</div>
-      <ion-label>{{ firstStepperTitle | translate}}</ion-label>
-    </ion-segment-button>
-    <ion-segment-button value="segment"  [disabled]="!isSubmited" layout="icon-start">
-      <div class="icon-2">2</div>
-      <ion-label>{{"MEETING_LINK" | translate}}</ion-label>
-    </ion-segment-button>
-  </ion-segment>
-  <div class="height" [ngSwitch]="type">
-    <ion-list class="height" *ngSwitchCase="'default'">
-      <ion-content class="ion-padding">
-        <app-profile-image *ngIf="showForm" [profileImageData]='profileImageData' [uploadImage]="true" (imageUploadEvent)="imageUploadEvent($event)" (imageRemoveEvent)="imageRemoveEvent($event)"></app-profile-image>
-        <div *ngIf="formData && showForm">
-          <app-dynamic-form [jsonFormData]="formData" #form1 (formValid)="isValid($event)"> </app-dynamic-form>
-        </div>
-      </ion-content>
-    </ion-list>
-    <ion-list class="height" *ngSwitchCase="'segment'">
-      <ion-card>
-        <ion-card-header>
-          <ion-card-title class="ion-text-center card-title">{{"SELECT_MEETING_PLATFORM" | translate}}</ion-card-title>
-        </ion-card-header>
-        <ion-card-content>
-          <ion-list>
-            <ion-select #link class="select" [(ngModel)]="selectedLink" interface="popover" (ionChange)="clickOptions($event)" [compareWith]="compareWithFn" [value]="selectedLink">
-              <ion-select-option [value]="option" *ngFor="let option of meetingPlatforms">
-                {{ option.name }}
-              </ion-select-option>
-            </ion-select>
-            <ion-item lines="none">
-              <ion-icon class="hint-icon" name="alert-circle"></ion-icon>
-              <ion-label class="hint-label">{{selectedHint}}</ion-label>
-            </ion-item>
-          </ion-list>
-          <div *ngFor="let option of meetingPlatforms">
-            <app-dynamic-form *ngIf="selectedLink==option" [jsonFormData]=option.form #platformForm></app-dynamic-form>
-        </div>
-        </ion-card-content>
-      </ion-card>
-    </ion-list>
+<ion-content>
+  <div class="height">
+    <ion-segment (ionChange)="segmentChanged($event)" [value]="type">
+      <ion-segment-button value="default" layout="icon-start">
+        <div class="icon-2">1</div>
+        <ion-label>{{ firstStepperTitle | translate}}</ion-label>
+      </ion-segment-button>
+      <ion-segment-button value="segment"  [disabled]="!isSubmited" layout="icon-start">
+        <div class="icon-2">2</div>
+        <ion-label>{{"MEETING_LINK" | translate}}</ion-label>
+      </ion-segment-button>
+    </ion-segment>
+    <div class="height" [ngSwitch]="type">
+      <ion-list class="height" *ngSwitchCase="'default'">
+        <ion-content class="ion-padding">
+          <app-profile-image *ngIf="showForm" [profileImageData]='profileImageData' [uploadImage]="true" (imageUploadEvent)="imageUploadEvent($event)" (imageRemoveEvent)="imageRemoveEvent($event)"></app-profile-image>
+          <div *ngIf="formData && showForm">
+            <app-dynamic-form [jsonFormData]="formData" #form1 (formValid)="isValid($event)"> </app-dynamic-form>
+          </div>
+        </ion-content>
+      </ion-list>
+      <ion-list class="height" *ngSwitchCase="'segment'">
+        <ion-card  class="form-content">
+          <ion-card-header>
+            <ion-card-title class="ion-text-center card-title">{{"SELECT_MEETING_PLATFORM" | translate}}</ion-card-title>
+          </ion-card-header>
+          <ion-card-content>
+            <ion-list>
+              <ion-select #link class="select" [(ngModel)]="selectedLink" interface="popover" (ionChange)="clickOptions($event)" [compareWith]="compareWithFn" [value]="selectedLink">
+                <ion-select-option [value]="option" *ngFor="let option of meetingPlatforms">
+                  {{ option.name }}
+                </ion-select-option>
+              </ion-select>
+              <ion-item lines="none">
+                <ion-icon class="hint-icon" name="alert-circle"></ion-icon>
+                <ion-label class="hint-label">{{selectedHint}}</ion-label>
+              </ion-item>
+            </ion-list>
+            <div *ngFor="let option of meetingPlatforms">
+              <app-dynamic-form *ngIf="selectedLink==option" [jsonFormData]=option.form #platformForm></app-dynamic-form>
+          </div>
+          </ion-card-content>
+        </ion-card>
+      </ion-list>
+    </div>
   </div>
-</div>
+</ion-content>
 
 <section [ngClass]="{'btn-disabled': form1?.myForm.invalid , 'btn-valid':form1?.myForm.valid}">
   <div class="ion-no-border" submitButton>
-    <ion-button *ngIf="type == 'default'" expand="full" (click)="onSubmit()">{{'PUBLISH_AND_ADD_LINK' | translate}}</ion-button>
+    <ion-button *ngIf="type == 'default' && !id" expand="full" (click)="onSubmit()">{{'PUBLISH_AND_ADD_LINK' | translate}}</ion-button>
+    <ion-button *ngIf="type == 'default' && id" expand="full" (click)="onSubmit()">{{'SAVE' | translate}}</ion-button>
   </div>
   <div class="ion-no-border segment" submitButton *ngIf="type == 'segment'">
     <ion-button *ngIf="sessionDetails?.meetingInfo?.platform === 'OFF'" class="btns" size="default" fill="solid" (click)="setItLater()">{{'SET_IT_LATER' | translate}}</ion-button>

diff --git a/src/app/pages/create-session/create-session.page.scss b/src/app/pages/create-session/create-session.page.scss
@@ -25,6 +25,7 @@ ion-label{
 }
 .btns{
     width: 100%;
+    background: var(--white) !important;
 }
 .icon-2{
     background: var(--ion-color-primary);
@@ -35,4 +36,8 @@ ion-label{
     display: flex;
     align-items: center;
     justify-content: center;
+}
+.form-content{
+    max-height: 100% !important;    
+    overflow-y: scroll !important;
 }