Merge pull request #555 from sunbird-cb/profile-btn-issue

Profile btn issue
sunbird-cb · Sep 7, 2022 · 2cd9a46 · 2cd9a46
2 parents b1a7274 + f079ed5
commit 2cd9a46
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 11 deletions.
diff --git a/library/ws-widget/collection/src/lib/card-content/card-content.component.html b/library/ws-widget/collection/src/lib/card-content/card-content.component.html
@@ -655,11 +655,35 @@ <h3 class="ws-mat-warn-text">Reply</h3>
           [queryParams]="(widgetData.content | pipeContentRoute).queryParams" class="rounded-t" role="link"
           aria-label="Content" i18n-aria-label="Content | Click to view"> -->
         <div style="position: relative; z-index: 1;">
-          <img mat-card-image [src]="widgetData.content.posterImage | pipePublicURL" loading="lazy" style="position: absolute; z-index: 2;"
-            class="card-img ws-mat-primary-lite-background" [wsUtilsDefaultThumbnail]="defaultThumbnail"
+          <ng-container *ngIf="widgetData.content.posterImage">
+            <img mat-card-image [src]="widgetData.content.posterImage | pipePublicURL" loading="lazy" style="position: absolute; z-index: 2;"
+            class="card-img ws-mat-primary-lite-background"
             [alt]="widgetData.content.name" />
+          </ng-container>
+          <ng-container *ngIf="!widgetData.content.posterImage">
+            <ng-container *ngIf="widgetData.content.appIcon; else defaultImg">
+              <img mat-card-image [src]="widgetData.content.appIcon | pipePublicURL" loading="lazy" style="position: absolute; z-index: 2;"
+              class="card-img ws-mat-primary-lite-background"  [wsUtilsDefaultThumbnail]="defaultThumbnail"
+              [alt]="widgetData.content.name" />
+            </ng-container>
+            <ng-template #defaultImg>
+              <img mat-card-image [src]="defaultThumbnail" loading="lazy" style="position: absolute; z-index: 2;"
+              class="card-img ws-mat-primary-lite-background"
+              [alt]="widgetData.content.name" />
+            </ng-template>
+          </ng-container>
+
+
+
+
+
+            <!-- <img mat-card-image [src]="widgetData.content.appIcon | pipePublicURL" loading="lazy" style="position: absolute; z-index: 2;"
+            class="card-img ws-mat-primary-lite-background"
+            [alt]="widgetData.content.name" /> -->
 
             <!-- image overlay box-->
+
+
             <div class="course_logo_box">
               <img [src]="widgetData.content.creatorLogo | pipePublicURL " class="source-icon" [wsUtilsDefaultThumbnail]="defaultSLogo"
               [alt]="(widgetData.content.sourceName + '_' + widgetData.content.identifier)" />

diff --git a/...ect/ws/app/src/lib/routes/app-toc/components/app-toc-banner/app-toc-banner.component.html b/...ect/ws/app/src/lib/routes/app-toc/components/app-toc-banner/app-toc-banner.component.html
@@ -5,12 +5,32 @@
             <div class="header-title flex-col sm:flex-row">
                 <!-- image -->
                 <div *ngIf="content?.posterImage" class="float-left">
-                    <img [src]="content?.posterImage | pipePublicURL" [id]="'source_' + content.identifier" class="app-icon" [wsUtilsDefaultThumbnail]="defaultSLogo" [alt]="content.sourceName || iGOT" />
+                    <!-- <img [src]="content?.posterImage | pipePublicURL" [id]="'source_' + content.identifier" [wsUtilsDefaultThumbnail]="defaultSLogo" class="app-icon"  [alt]="content.sourceName || iGOT"
+
+                    /> -->
+                  <img [src]="content?.posterImage | pipePublicURL" [id]="'source_' + content.identifier" class="app-icon" [wsUtilsDefaultThumbnail]="defaultSLogo" [alt]="content.sourceName || iGOT" />
                 </div>
                 <div *ngIf="!content?.posterImage" class="float-left">
+                  <ng-container *ngIf="content?.appIcon; else defaultImg">
+                    <img [src]="content?.appIcon | pipePublicURL" [id]="'source_' + content.identifier" class="app-icon" [wsUtilsDefaultThumbnail]="defaultSLogo" [alt]="content.sourceName || iGOT" />
+                  </ng-container>
+                  <ng-template #defaultImg>
                     <img src="/assets/instances/eagle/app_logos/default.png" [id]="'source_' + content.identifier" class="app-icon" [alt]="content.sourceName || iGOT" />
-                </div>
+                  </ng-template>
+              </div>
+                <!-- <div *ngIf="!content?.posterImage" class="float-left">
+                  <ng-container *ngIf="content?.appIcon; else defaultImg">
+                    <img [src]="content?.appIcon | pipePublicURL" [id]="'source_' + content.identifier" class="app-icon" [alt]="content.sourceName || iGOT" />
+                  </ng-container>
+                  <ng-template #defaultImg class="float-left">
+                    <img [src]="defaultSLogo" loading="lazy" style="position: absolute; z-index: 2;"
+                    class="card-img ws-mat-primary-lite-background"
+                    [alt]="content.sourceName || iGOT" />
+                  </ng-template>
+                </div> -->
                 <!-- data -->
+                <!-- {{ defaultThumbnail | json }}//
+                {{ defaultSLogo | json }} // -->
                 <div class="sm:ml-5 flex flex-auto" [id]="'m-c-'+ content.identifier">
 
                     <div class="sm:ml-5 flex flex-col flex-auto">

diff --git a/...ect/ws/app/src/lib/routes/app-toc/components/app-toc-banner/app-toc-banner.component.scss b/...ect/ws/app/src/lib/routes/app-toc/components/app-toc-banner/app-toc-banner.component.scss
@@ -8,8 +8,8 @@
 }
 
 .app-icon {
-    max-height: 180px;
-    max-width: 280px;
+    height: 180px;
+    width: 280px;
 }
 
 .banner-container {

diff --git a/...p/src/lib/routes/competencies/components/competencies-view/competencies-view.component.ts b/...p/src/lib/routes/competencies/components/competencies-view/competencies-view.component.ts
@@ -80,7 +80,7 @@ export class CompetenceViewComponent implements OnInit {
           ],
           'competencies_v3.name': [
             this.dData.name,
-          ]
+          ],
         },
         query: '',
         sort_by: {

diff --git a/project/ws/app/src/lib/routes/search-v2/routes/learn-search/learn-search.component.html b/project/ws/app/src/lib/routes/search-v2/routes/learn-search/learn-search.component.html
@@ -56,9 +56,20 @@
 
                 <mat-card class="learn-card margin-bottom-m padding-remove position-relative"
                     *ngFor="let content of searchResults" (click)="raiseTelemetry(content)">
-                    <div class="imageholder float-left">
+                    <!-- <div class="imageholder float-left">
                         <img mat-card-image class="margin-remove" [src]="content.posterImage | pipePublicURL"
                             [wsUtilsDefaultThumbnail]="defaultThumbnail" alt="">
+                    </div> -->
+                    <div *ngIf="content?.posterImage" class="imageholder float-left">
+                      <img mat-card-image class="margin-remove" [src]="content?.posterImage | pipePublicURL" alt="" />
+                    </div>
+                    <div *ngIf="!content?.posterImage" class="imageholder float-left">
+                      <ng-container  *ngIf="content?.appIcon; else defaultImg" class="imageholder float-left">
+                        <img mat-card-image class="margin-remove" [src]="content?.appIcon | pipePublicURL" alt="" />
+                    </ng-container>
+                      <ng-template #defaultImg>
+                        <img mat-card-image class="margin-remove" src="/assets/instances/eagle/app_logos/default.png" alt="" />
+                      </ng-template>
                     </div>
                     <mat-card-content>
                         <!-- <p class="mat-caption margin-bottom-xxs ws-mat-black60-text" *ngIf="content.contentType === 'Course'">
@@ -141,7 +152,7 @@
                                     <li *ngFor="let tag of content.keywords">{{tag}}</li>
                                 </ul>
                                 <!-- <p class="display-inline-block ws-mat-black60-text actionbtns">
-                                    <mat-icon class="margin-right-s">more_vert_outlined</mat-icon> 
+                                    <mat-icon class="margin-right-s">more_vert_outlined</mat-icon>
                                     <mat-icon>playlist_add</mat-icon>
                                 </p> -->
                             </div>
@@ -179,4 +190,4 @@ <h3 class="mat-h3" i18n="search route you may try">Try removing the filters or s
                 </div> -->
         </mat-sidenav>
     </mat-sidenav-container>
-</div>
+</div>
diff --git a/project/ws/app/src/lib/routes/search-v2/routes/learn-search/learn-search.component.ts b/project/ws/app/src/lib/routes/search-v2/routes/learn-search/learn-search.component.ts
@@ -179,6 +179,7 @@ export class LearnSearchComponent implements OnInit, OnChanges, OnDestroy {
         this.totalpages = Math.ceil(this.totalResults / 100)
         this.getFacets(response.result.facets)
       })
+
     }
     // if ((this.paramFilters && this.paramFilters.length > 0) || (this.myFilters && this.myFilters.length > 0)) {
     // queryparam.request.filters = this.paramFilters

diff --git a/project/ws/app/src/lib/routes/user-profile/components/user-profile/user-profile.component.ts b/project/ws/app/src/lib/routes/user-profile/components/user-profile/user-profile.component.ts
@@ -1257,7 +1257,7 @@ export class UserProfileComponent implements OnInit, OnDestroy {
               this.router.navigate(['/app/person-profile', (this.userProfileData.userId || this.userProfileData.id)])
             }
           } else {
-            this.uploadSaveData = false
+            // this.uploadSaveData = false
             this.openSnackbar(this.toastError.nativeElement.value, this.userProfileData.id)
           }
         }