Merge pull request #551 from Afzal84/nicprichayissue

Nicprichayissue
sunbird-cb · Sep 5, 2022 · 67e8918 · 67e8918
2 parents eb87989 + 4695694
commit 67e8918
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 11 deletions.
diff --git a/src/app/component/app-nav-bar/app-nav-bar.component.html b/src/app/component/app-nav-bar/app-nav-bar.component.html
@@ -4,7 +4,7 @@
     class="mat-elevation-z3 custom mobile">
     <div class="fix-ww" id="root-tool-bar" title="toolbar" i18n-aria-label role="toolbar">
       <ng-container *ngIf="mode === 'top'">
-        <a [routerLink]="!forPreview ? '/page/home' : '/public/home'" class="logo-dim" role="link" title="Home"
+        <a [routerLink]="!isforPreview ? '/page/home' : '/public/home'" class="logo-dim" role="link" title="Home"
           i18n-aria-title i18n-aria-label>
           <img [src]="appIcon" alt="Application Logo" class="app-logo" />
         </a>
@@ -13,13 +13,13 @@
           <ng-container [ngTemplateOutlet]="navbarSide" [ngTemplateOutletContext]="{ item: item }"
             *ngFor="let item of primaryNavbarConfig?.mediumScreen?.left">
           </ng-container>
-          <ng-container *ngIf="!forPreview">
+          <ng-container *ngIf="!isforPreview">
             <ws-app-search-input-home placeHolder="Search for learning contents" class="my-search flex-1"
               [ref]="'home'">
             </ws-app-search-input-home>
           </ng-container>
           <span class="spacer"></span>
-          <div *ngIf="!forPreview" ngClass="search-small-logo">
+          <div *ngIf="!isforPreview" ngClass="search-small-logo">
             <ng-container [wsResolverWidget]="{
         'widgetType': 'actionButton',
         'widgetSubType': 'buttonFeature',
@@ -35,12 +35,12 @@
           <div class="flex items-center">
             <img [src]="appIconSecondary" alt="Application Logo" class="app-logo" />
           </div>
-          <span *ngIf="!forPreview"  class="spacer"></span>
+          <span *ngIf="!isforPreview"  class="spacer"></span>
           <!-- <button class="home-help" mat-icon-button id='helper' [matMenuTriggerFor]="helpMenu" *ngIf="!isHelpMenuRestricted"
         >
         <mat-icon>help_outline</mat-icon>
       </button> -->
-          <ng-container *ngIf="!forPreview">
+          <ng-container *ngIf="!isforPreview">
             <ng-container [ngTemplateOutlet]="navbarSide" [ngTemplateOutletContext]="{ item: item }"
               *ngFor="let item of primaryNavbarConfig?.mediumScreen?.right">
             </ng-container>
@@ -89,11 +89,11 @@
       <ng-container *ngIf="mode === 'top'">
         <div class="flex flex-1">
           <a class="logo-dim" role="link" title="Home" i18n-aria-title i18n-aria-label routerLink="/page/home"
-            *ngIf="isSetUpPage">
+            *ngIf="isThisSetUpPage">
             <img [src]="appIcon" alt="Application Logo" class="app-logo" />
           </a>
           <a class="logo-dim" role="link" title="Home" i18n-aria-title i18n-aria-label routerLink="/public/home"
-            *ngIf="!isSetUpPage && forPreview">
+            *ngIf="!isThisSetUpPage && isforPreview">
             <img [src]="appIcon" alt="Application Logo" class="app-logo" />
           </a>
         </div>

diff --git a/src/app/component/app-nav-bar/app-nav-bar.component.ts b/src/app/component/app-nav-bar/app-nav-bar.component.ts
@@ -188,4 +188,18 @@ export class AppNavBarComponent implements OnInit, OnChanges {
   get needToHide(): boolean {
     return this.currentRoute.includes('all/assessment/')
   }
+  // parichay changes
+  get isforPreview(): boolean {
+    this.forPreview = window.location.href.includes('/public/')
+    || window.location.href.includes('&preview=true')
+    return this.forPreview
+  }
+  get isThisSetUpPage(): boolean {
+    if (window.location.pathname.includes('/app/setup')) {
+      this.isSetUpPage = true
+    } else {
+      this.isSetUpPage = false
+    }
+    return this.isSetUpPage
+  }
 }
diff --git a/src/app/routes/public/welcome/public-welcome.component.scss b/src/app/routes/public/welcome/public-welcome.component.scss
@@ -99,10 +99,10 @@
 // ::ng-deep .top-nav-bar {
 //   display: none;
 // }
-
-::ng-deep .height-on-top {
-    padding-top: 0 !important;
-}
+//for parichay changes
+// ::ng-deep .height-on-top {
+//     padding-top: 0 !important;
+// }
 
 .slideshow-container {
     padding: 5rem 0 2rem 0;