Merge pull request #577 from Cafnanc/release-3.1.1

Final 3.1.1 commit

Dockerfile

@@ -8,6 +8,8 @@ RUN npm install -g @ionic/[email protected]
 
 RUN rm -rf node_modules
 
+RUN rm -rf www
+
 COPY package*.json ./
 
 RUN npm install --force

src/app/core/services/profile/profile.service.ts

@@ -176,7 +176,7 @@ export class ProfileService {
     var roles = userDetails.user_roles.map(function(item) {
       return item['title'];
     });
-    this.isMentor = roles.includes('mentor')?true:false;
+    this.isMentor = roles.map(s => s.toLowerCase()).includes('mentor')?true:false;
     return roles
   }
 

src/app/modules/private/private.page.html

@@ -1,6 +1,6 @@
 <ion-split-pane contentId="main-content">
   <ion-menu contentId="main-content" menuId="side-menu" type="overlay" swipeGesture="false" class="width-20">
-    <ion-header  [translucent]="true" class="ion-no-border" [ngClass]="{'disable-div': user?.profile_mandatory_fields.length && !isAuthBypassed || !user?.about && !isAuthBypassed }">
+    <ion-header class="ion-no-border" [ngClass]="{'disable-div': user?.profile_mandatory_fields.length && !isAuthBypassed || !user?.about && !isAuthBypassed }">
       <div *ngIf="user" >
         <div class="sub-menu-toolbar">
           <div slot="start" class="img-mainDiv">

src/app/pages/home-search/home-search.page.html

@@ -2,7 +2,7 @@
   <div class="d-flex flex-justify-center my-8">
     <ion-searchbar class="search-bar" [debounce]="1000" placeholder="{{'HOME_SEARCH_PLACEHOLDER' | translate}}"  
     #event [value]="searchText"
-    (keyup.enter)="search(event.value)"
+    (ionChange)="search(event.value)"
     type="search"
     inputmode="search"
     cdkOverlayOrigin #trigger="cdkOverlayOrigin" (click)="isOpen = !isOpen">

src/app/pages/home-search/home-search.page.scss

@@ -7,7 +7,7 @@
     font-size:16px;
     height: 36px;
     max-width: 600px;
-    min-width: 350px;
+    min-width: 300px;
 }
 ion-content {
     --padding: 0;
@@ -60,7 +60,7 @@ ion-content {
     width: 20px;
     height: 20px;
     border-radius: 50%;
-    background-color: #832215;
+    background-color: var(--ion-color-primary);
     display: flex;
     align-items: center;
     justify-content: center;

src/app/pages/mentor-search-directory/mentor-search-directory.page.html

@@ -2,7 +2,7 @@
   <div class="d-flex flex-justify-center">
     <ion-searchbar class="top-padding search-style"  debounce="1000" placeholder="{{'MENTOR_SEARCH_PLACEHOLDER' | translate}}"
     #event [value]="searchText"
-    (keyup.enter)="onSearch(event.value)"
+    (ionChange)="onSearch(event.value)"
     type="search"
     inputmode="search"
     cdkOverlayOrigin #trigger="cdkOverlayOrigin" (click)="isOpen = !isOpen"></ion-searchbar>

src/app/pages/tabs/home/home.page.html

@@ -12,7 +12,7 @@ <h3>
          [(ngModel)]="searchText"
          type="search"
          inputmode="search"
-        (keyup.enter)="search(searchText)">
+         (ionChange)="search(searchText)">
         </ion-searchbar>
       </div>
     <!--</ion-col>

src/app/pages/tabs/home/home.page.scss

@@ -19,7 +19,7 @@ h3{
     font-size:16px;
     height: 36px;
     max-width: 600px;
-    min-width: 350px;
+    min-width: 300px;
 }
 .segment-wrapper{
     padding: 6px 0px 6px 0px;

src/app/shared/components/dynamic-form/dynamic-form.component.html

@@ -95,8 +95,8 @@
           autocomplete="new-password"
           [disabled]="control?.disabled"
           (dateChange)="dateSelected($event, control)"
-          (click)="dateInputClick(control,picker)">
-        <mat-datepicker-toggle matSuffix [for]="$any(picker)">
+          (click)="!isMobile && dateInputClick(control,picker)">
+          <mat-datepicker-toggle matSuffix (click)="dateInputClick(control,picker)">
         </mat-datepicker-toggle>
         <ngx-mat-datetime-picker #picker 
           [showSpinners]="showSpinners" 

src/app/shared/components/dynamic-form/dynamic-form.component.ts

@@ -132,6 +132,7 @@ export class DynamicFormComponent implements OnInit {
   dependedChildDate="";
   dependedParent: any;
   dependedParentDate: any;
+  isMobile = window.innerWidth <= 950;
 
   constructor(private fb: FormBuilder, private toast: ToastService) {}
   ngOnInit() {
@@ -247,7 +248,9 @@ export class DynamicFormComponent implements OnInit {
   dateInputClick(control, datetimePicker: NgxMatDatetimePicker<any>) {
     if (this.myForm.get(control.name).value)
       datetimePicker._selected = this.myForm.get(control.name).value;
-    datetimePicker.open();
+    setTimeout(()=>{
+      datetimePicker.open();
+    },500)
   }
 
   selectionChanged(control, event){

src/app/shared/components/filter-popup/filter-popup.component.scss

@@ -11,14 +11,14 @@
 .wrapper-class {
     display: flex;
     justify-content: space-between;
-    background-color:#af3f38;
+    background-color: var(--ion-color-primary);
     color:white;
     padding: 16px;
 }
 .footer{
     display: flex;
     justify-content: center;
-    background-color:#af3f38;
+    background-color: var(--ion-color-primary);
     color:white;
     padding: 16px;
     cursor: pointer;

src/app/shared/components/filter-tree/filter-tree.component.scss

@@ -17,7 +17,10 @@
     font-size: 16px;
 }
 ion-checkbox {
-    --border-color: var(--ion-color-primary)
+    --border-color: var(--ion-color-primary);
+    --size: 18px;
+    min-width: 18px;
+    min-height: 18px;
 }
 .header{
     padding-right: 65%;

src/app/shared/components/generic-profile-header/generic-profile-header.component.html

@@ -2,7 +2,7 @@
   <ion-row class="content-wrapper">
     <ion-col size="4">
       <div class="d-flex flex-justify-center">
-        <img *ngIf="!headerData?.image || headerData?.image==''; else Img; let image" src="../../../../assets/prof-img/user.png" />
+        <img *ngIf="!headerData?.image || headerData?.image==''; else Img; let image" src="assets/prof-img/user.png" />
         <ng-template #Img>
           <img src="{{headerData?.image}}" />
         </ng-template>