ui-changes

Hyper-M_UserPortal/src/app/common/dashboard-dse-details/dashboard-dse-details.component.html

@@ -2,7 +2,7 @@
 <div class="bottom_content">
   <div class="row align-items-center">
     <div class="col point"   >
-        <h6 class="title" (click)="showDetails(1)">SALES</h6>
+        <h6 class="title" (click)="showDetails(1)">PERFORMANCE </h6>
       <div class="box_left" *ngIf="user_dashboard!=undefined" (click)="showDetails(1)">
         <circle-progress
           [percent]="percentage"
@@ -22,7 +22,7 @@
           
         <!-- <div class="timer" *ngIf="user_dashboard!=undefined"> {{user_dashboard.sales.achieved}}</div> -->
         <div class="load_content" (click)="showDetails(1)">
-          <h6>MY SALES PERFORMANCE</h6>
+          <h6>MY PERFORMANCE</h6>
           <p *ngIf="user_dashboard!=undefined">{{user_dashboard.sales.achieved}} / {{user_dashboard.sales.target}} TARGETED SALES</p>
         </div>
       </div>
@@ -87,7 +87,7 @@
       <div class="box_left">
         <div class="load_content">
           <h1  *ngIf="user_dashboard!=undefined">{{user_dashboard.earning}}<span> POINTS</span></h1>
-          <h6 > Minimum {{min_point}} points required for redemption</h6>
+          <h6 > Your passport to competitive learning</h6>
         </div>
       </div>
       <div class="box_right">

Hyper-M_UserPortal/src/app/common/login/login.component.html

@@ -1,128 +1,136 @@
-<app-main-header></app-main-header>
+<!-- <app-main-header></app-main-header> -->
 <app-signup-modal *ngIf="show_div"></app-signup-modal>
 <app-forgot-password *ngIf="show_div"></app-forgot-password>
 <div class="login">
-    <div class="login_box">
-        <div class="star_logo" *ngIf="!viewForgot">
-            <!-- <h3>Welcome to </h3>
-            <h1>
-                <span class="primary_color">Hyper-M</span></h1> -->
-                <img class="star_img" src="assets/img/star_logo.png">
-        </div>
-        <div *ngIf="viewForgot">
-            <div class="top_icon">
-                <img src="assets/img/setpassword.png">
-            </div>
-            <div>
-                <h1 class="text-center sub">
-                    <span class="">FORGOT PASSWORD</span>
-                </h1>
+    <div class="left-part">
+        <h4>HYPER- M  <br>
+            AI based Ecosystem Addresses Children Digital Risk</h4>
+        <img src="assets/img/Hyper-M-Web_bg.png" alt="">
+    </div>
+    <div class="right-part">
+        <div class="login_box">
+            <div class="star_logo" *ngIf="!viewForgot">
+                <!-- <h3>Welcome to </h3>
+                <h1>
+                    <span class="primary_color">Hyper-M</span></h1> -->
+                    <img class="star_img" src="assets/img/star_logo.png">
             </div>
-        </div>
-        <form [formGroup]="lform" class="form1" [ngClass]="viewSignUp==true||viewForgot==true ?'sliding_close':viewSignIn==true ?'sliding_open':''">
-            <div class="form-group">
-                <input type="text" id="smpin"  class="form-control user" [(ngModel)]="smpin" [maxlength]="20" formControlName="smpin" autocomplete="off"
-                    required>
-                <label for="smpin" class="control-label form-control-placeholder">SMPIN/Employee ID</label>
-                <div class="color_error shake" *ngIf="!lform.controls['smpin'].valid &&signIn_click&&signin_error==''">
-                    <a class="text-left shake">
-                        <img src="assets/img/error.png" />Please enter the SMPIN/Employee ID</a>
+            <div *ngIf="viewForgot">
+                <div class="top_icon">
+                    <img src="assets/img/setpassword.png">
                 </div>
-                <div class="info" (click)="showInfo()">
-                    <img src="assets/img/info.png" />
-                    <div class="info_box" *ngIf="show_info">
-                        <p>
-                            <b>SMPIN/Employee ID:</b>
-                        </p>
-                        <p class="info_point">If you are dealer staff enter the SMPIN for registering and logging into the system. </p>
-                        <p class="info_point">If you are Hyper-M staff enter your Employee ID for registering and logging into the system.</p>
-                    </div>
+                <div>
+                    <h1 class="text-center sub">
+                        <span class="">FORGOT PASSWORD</span>
+                    </h1>
                 </div>
             </div>
-            <div class="form-group">
-                <input type="{{type}}" id="password" class="form-control password" [(ngModel)]="password" [maxlength]="20" formControlName="password"
-                    autocomplete="off" required>
-                <label for="password" class="control-label form-control-placeholder">Password</label>
-                <div class="color_error shake" *ngIf="!lform.controls['password'].valid&&signIn_click&&signin_error==''">
-                    <a class="text-left shake">
-                        <img src="assets/img/error.png" />Please enter the password</a>
+            <form [formGroup]="lform" class="form1" [ngClass]="viewSignUp==true||viewForgot==true ?'sliding_close':viewSignIn==true ?'sliding_open':''">
+                <div class="form-group">
+                    <input type="text" id="smpin"  class="form-control user" [(ngModel)]="smpin" [maxlength]="20" formControlName="smpin" autocomplete="off"
+                        required>
+                    <label for="smpin" class="control-label form-control-placeholder">Username</label>
+                    <div class="color_error shake" *ngIf="!lform.controls['smpin'].valid &&signIn_click&&signin_error==''">
+                        <a class="text-left shake">
+                            <img src="assets/img/error.png" />Please enter the Username</a>
+                    </div>
+                    <div class="info" (click)="showInfo()">
+                        <img src="assets/img/info.png" />
+                        <div class="info_box" *ngIf="show_info">
+                            <p>
+                                <b>Username:</b>
+                            </p>
+                            <p class="info_point">If you are dealer staff enter the SMPIN for registering and logging into the system. </p>
+                            <p class="info_point">If you are Hyper-M staff enter your Employee ID for registering and logging into the system.</p>
+                        </div>
+                    </div>
                 </div>
-                <div class="color_error shake" *ngIf="signin_error!=''">
-                    <a class="text-left shake">
-                        <img src="assets/img/error.png" />{{signin_error}} </a>
+                <div class="form-group">
+                    <input type="{{type}}" id="password" class="form-control password" [(ngModel)]="password" [maxlength]="20" formControlName="password"
+                        autocomplete="off" required>
+                    <label for="password" class="control-label form-control-placeholder">Password</label>
+                    <div class="color_error shake" *ngIf="!lform.controls['password'].valid&&signIn_click&&signin_error==''">
+                        <a class="text-left shake">
+                            <img src="assets/img/error.png" />Please enter the password</a>
+                    </div>
+                    <div class="color_error shake" *ngIf="signin_error!=''">
+                        <a class="text-left shake">
+                            <img src="assets/img/error.png" />{{signin_error}} </a>
+                    </div>
+                    <div class="view_eye" *ngIf="type=='text'" (click)="toggleShow()">
+                        <img src="assets/img/show.png" />
+                    </div>
+                    <div class="hide_eye" *ngIf="type=='password'" (click)="toggleShow()">
+                        <img src="assets/img/hide.png" />
+                    </div>
                 </div>
-                <div class="view_eye" *ngIf="type=='text'" (click)="toggleShow()">
-                    <img src="assets/img/show.png" />
+                <div class="forgot text-right">
+                    <a (click)="onForgotPassword()">Forgot Password?</a>
                 </div>
-                <div class="hide_eye" *ngIf="type=='password'" (click)="toggleShow()">
-                    <img src="assets/img/hide.png" />
+                <button type="submit" class="btn primary" (click)="onSignIn()">LOGIN</button>
+                <div class="instuction text-center">
+                    Not Yet Registered?
+                    <a>
+                        <span (click)="goToSingUp()">Signup</span>
+                    </a>
                 </div>
-            </div>
-            <div class="forgot text-right">
-                <a (click)="onForgotPassword()">Forgot Password?</a>
-            </div>
-            <button type="submit" class="btn primary" (click)="onSignIn()">LOGIN</button>
-            <div class="instuction text-center">
-                Not Yet Registered?
-                <a>
-                    <span (click)="goToSingUp()">Signup</span>
-                </a>
-            </div>
-        </form>
-        <form (keyup.enter)="onSignIn()" class="form2" [ngClass]="viewSignUp==true ?'sliding_open':viewSignIn==true ?'sliding_close':''">
-            <div class="form-group">
-                <input type="text" id="smpinid" class="form-control user"  [maxlength]="10" [(ngModel)]="smpinid" name="smpinid" autocomplete="off"
-                    required>
-                <label for="smpinid" class="control-label form-control-placeholder">SMPIN/Employee ID</label>
-                <div class="color_error shake" *ngIf="signUpSubmit && smpinid==''&&signup_error==''">
-                    <a class="text-left shake">
-                        <img src="assets/img/error.png" />Please enter the SMPIN/Employee ID</a>
+            </form>
+            <form (keyup.enter)="onSignIn()" class="form2" [ngClass]="viewSignUp==true ?'sliding_open':viewSignIn==true ?'sliding_close':''">
+                <div class="form-group">
+                    <input type="text" id="smpinid" class="form-control user"  [maxlength]="10" [(ngModel)]="smpinid" name="smpinid" autocomplete="off"
+                        required>
+                    <label for="smpinid" class="control-label form-control-placeholder">Username</label>
+                    <div class="color_error shake" *ngIf="signUpSubmit && smpinid==''&&signup_error==''">
+                        <a class="text-left shake">
+                            <img src="assets/img/error.png" />Please enter the Username</a>
+                    </div>
+                    <div class="color_error shake" *ngIf="signup_error!=''">
+                        <a class="text-left shake">
+                            <img src="assets/img/error.png" />{{signup_error}} </a>
+                    </div>
                 </div>
-                <div class="color_error shake" *ngIf="signup_error!=''">
-                    <a class="text-left shake">
-                        <img src="assets/img/error.png" />{{signup_error}} </a>
+                <button type="submit" class="btn primary" (click)="onSignUp()">SIGN UP</button>
+                <div class="instuction text-center">
+                    Already Registered?
+                    <a>
+                        <span (click)="goToLogin()">Login</span>
+                    </a>
                 </div>
-            </div>
-            <button type="submit" class="btn primary" (click)="onSignUp()">SIGN UP</button>
-            <div class="instuction text-center">
-                Already Registered?
-                <a>
-                    <span (click)="goToLogin()">Login</span>
-                </a>
-            </div>
-        </form>
-
-        <form class="form3 form_2" [ngClass]="viewForgot==true ?'sliding_open':viewSignIn==true ?'sliding_close':''">
-            <div class="form-group user">
-                <input type="text" id="smpin_forgot" class="form-control"  [maxlength]="10" [(ngModel)]="smpin_forgot" name="smpin_forgot"
-                    autocomplete="off" required>
-                <label for="smpin_forgot" class="control-label form-control-placeholder">SMPIN/Employee ID</label>
-                <div class="info" (click)="showInfo()">
-                    <img src="assets/img/info.png" />
-                    <div class="info_box" *ngIf="show_info">
-                        <p>
-                            <b>SMPIN/Employee ID:</b>
-                        </p>
-                        <p class="info_point">If you are dealer staff enter the SMPIN for registering and logging into the system </p>
-                        <p class="info_point">If you are Hyper-M staff enter your Employee ID for registering and logging into the system</p>
+            </form>
+    
+            <form class="form3 form_2" [ngClass]="viewForgot==true ?'sliding_open':viewSignIn==true ?'sliding_close':''">
+                <div class="form-group user">
+                    <input type="text" id="smpin_forgot" class="form-control"  [maxlength]="10" [(ngModel)]="smpin_forgot" name="smpin_forgot"
+                        autocomplete="off" required>
+                    <label for="smpin_forgot" class="control-label form-control-placeholder">Username</label>
+                    <div class="info" (click)="showInfo()">
+                        <img src="assets/img/info.png" />
+                        <div class="info_box" *ngIf="show_info">
+                            <p>
+                                <b>Username:</b>
+                            </p>
+                            <p class="info_point">If you are dealer staff enter the SMPIN for registering and logging into the system </p>
+                            <p class="info_point">If you are Hyper-M staff enter your Employee ID for registering and logging into the system</p>
+                        </div>
+                    </div>
+                    <div class="color_error shake" *ngIf="forgot_Submit&& smpin_forgot==''&&forgot_error==''">
+                        <a class="text-left shake">
+                            <img src="assets/img/error.png" />Please enter the Username</a>
+                    </div>
+                    <div class="color_error shake" *ngIf="forgot_error!=''">
+                        <a class="text-left shake">
+                            <img src="assets/img/error.png" />{{forgot_error}} </a>
                     </div>
                 </div>
-                <div class="color_error shake" *ngIf="forgot_Submit&& smpin_forgot==''&&forgot_error==''">
-                    <a class="text-left shake">
-                        <img src="assets/img/error.png" />Please enter the SMPIN/Employee ID</a>
-                </div>
-                <div class="color_error shake" *ngIf="forgot_error!=''">
-                    <a class="text-left shake">
-                        <img src="assets/img/error.png" />{{forgot_error}} </a>
+                <button type="submit" class="btn primary" (click)="forgotSubmit()">GET OTP</button>
+                <div class="instuction text-center">
+                    Already Registered?
+                    <a>
+                        <span (click)="backToLogin()">Login</span>
+                    </a>
                 </div>
-            </div>
-            <button type="submit" class="btn primary" (click)="forgotSubmit()">GET OTP</button>
-            <div class="instuction text-center">
-                Already Registered?
-                <a>
-                    <span (click)="backToLogin()">Login</span>
-                </a>
-            </div>
-        </form>
+            </form>
+        </div>
     </div>
+
 </div>

Hyper-M_UserPortal/src/app/common/login/login.component.scss

@@ -1,105 +1,146 @@
 .login {
     width: 100%;
-    height: calc(100% - 85px);
-    background-image: url("assets/img/slider2.png");
+    height: 100%;
+    // background-image: url("assets/img/slider2.jpg");
     background-size: cover;
     background-repeat: no-repeat;
     position: relative;
-    .login_box {
-        width: 35%;
-        position: absolute;
-        height: 93%;
-        top: 0;
-        bottom: 0;
-        right: 0;
-        left: 0;
-        margin: 22px auto;
-        /*padding: 30px 50px;*/
-        background-color: rgba(255, 255, 255, 0.9);
-        overflow: hidden;
-        box-shadow: 3px 3px 6px 3px #888888;
-        .top_icon {
-            width: 100%;
-            float: left;
+    background: #00AFD7;
+    .left-part{
+        width: 50%;
+        position: relative;
+        float: left;
+        padding: 5rem 2rem;
+        text-align: center;
+        h4{
+            font-size: 26px;
+            color: #fff;
             text-align: center;
-            margin-bottom: 24px;
-            margin-top: 44px;
-            img {
-                width: 20%;
-                margin-bottom: 10px;
-            }
+            margin-bottom: 25px;
         }
-        .sub {
-            font-size: 20px;
+        img{
+            max-width: 100%; 
         }
-        h1 {
-            color: #333;
-            margin-bottom: 20px;
-            font-size: 24px;
-            span {
+    }
+    .right-part{
+        width: 50%;
+        float: left;
+        padding: 5rem;
+        margin: 0px auto;
+        height: 100%;
+    
+        .login_box {
+            // width: 100%;
+            // position: relative;
+            // float: left;
+            // height: auto;
+            // background-color: #fff;
+            // margin: 22px auto;
+            // padding: 30px 50px;
+            // overflow: hidden;
+            // box-shadow: 3px 3px 6px 3px #888888;
+
+            position: relative;
+            height: auto;
+            background-color: #fff;
+            overflow: hidden;
+            padding: 20px 0 30px 0;
+            display: inline-block;
+            min-width: 500px;
+            border-radius: 5px;
+            .top_icon {
+                width: 100%;
+                float: left;
+                text-align: center;
+                margin-bottom: 24px;
+                margin-top: 44px;
+                img {
+                    width: 20%;
+                    margin-bottom: 10px;
+                }
+            }
+            .sub {
+                font-size: 20px;
+            }
+            h1 {
+                color: #333;
+                margin-bottom: 20px;
                 font-size: 24px;
+                span {
+                    font-size: 24px;
+                }
+                .primary_color {
+                    font-weight: bold;
+                }
             }
-            .primary_color {
-                font-weight: bold;
+            h3 {
+                color: #666;
+                font-weight: 400;
+                font-size: 18px;
             }
-        }
-        h3 {
-            color: #666;
-            font-weight: 400;
-            font-size: 18px;
-        }
-        .star_img {
-            width: 40%;
-            margin-bottom: 10px;
-        }
-        .star_logo {
-            text-align: center;
-        }
-        // form{
-        //     .form-control{
-        //         height: 50px;
-        //         border-radius: 50px;
-        //         background-color: #ccc;
-        //     }
-        //     .form-control:focus{
-        //         border-color: #ccc;
-        //         box-shadow: 0 0 0 0.2rem rgba(0,0,0,.25);
-        //     }
-        //     .form-control::placeholder{
-        //         color:#333;
-        //     }
-        // }
-        .info {
-            width: 30px;
-            position: absolute;
-            top: 15px;
-            margin: 0;
-            right: 15px;
-            background-color: transparent;
-            img {
-                width: 100%
+            .star_img {
+                width: 40%;
+                margin-bottom: 10px;
             }
-            .info_box {
-                background-color: #fff;
-                width: auto;
-                position: absolute;
-                top: 40px;
-                width: 200px;
-                right: -48px;
-                z-index: 999;
-                padding: 15px;
-                box-shadow: 0 0 2px 2px #ccc;
-                border-radius: 3px;
+            .star_logo {
+                text-align: center;
             }
-            .info_box::before {
-                width: 10px;
-                height: 10px;
+            // form{
+            //     .form-control{
+            //         height: 50px;
+            //         border-radius: 50px;
+            //         background-color: #ccc;
+            //     }
+            //     .form-control:focus{
+            //         border-color: #ccc;
+            //         box-shadow: 0 0 0 0.2rem rgba(0,0,0,.25);
+            //     }
+            //     .form-control::placeholder{
+            //         color:#333;
+            //     }
+            // }
+            .info {
+                width: 30px;
                 position: absolute;
-                content: "";
-                background-color: #fff;
-                top: -5px;
-                right: 58px;
-                transform: rotate(45deg);
+                top: 15px;
+                margin: 0;
+                right: 15px;
+                background-color: transparent;
+                img {
+                    width: 100%
+                }
+                .info_box {
+                    background-color: #fff;
+                    width: auto;
+                    position: absolute;
+                    top: 40px;
+                    width: 200px;
+                    right: -48px;
+                    z-index: 999;
+                    padding: 15px;
+                    box-shadow: 0 0 2px 2px #ccc;
+                    border-radius: 3px;
+                }
+                .info_box::before {
+                    width: 10px;
+                    height: 10px;
+                    position: absolute;
+                    content: "";
+                    background-color: #fff;
+                    top: -5px;
+                    right: 58px;
+                    transform: rotate(45deg);
+                }
+            }
+            .form-group{
+                .form-control{
+                    border-radius: 5px;
+                    -webkit-border-radius: 5px;
+                    -moz-border-radius: 5px;
+                    -ms-border-radius: 5px;
+                    -o-border-radius: 5px;
+                    background-color: #f2f2f2;
+}
             }
         }
     }
@@ -150,4 +191,21 @@
             }
         }
     }
+}
+
+@media screen and (max-width: 767px) {
+    .login{
+        height: 100% !important;
+        .left-part{
+            display: none;
+        }
+        .right-part{
+            width: 100%;
+            padding: 0;
+            .login_box{
+                top: 0;
+                min-width: 100%;
+            }
+        }
+    }
 }

Hyper-M_UserPortal/src/app/common/main-header/main-header.component.html

@@ -1,5 +1,5 @@
 <app-confirm-popup></app-confirm-popup>
-<nav class="navbar navbar-expand-lg navbar-light">
+<nav class="navbar navbar-expand-lg navbar-light" *ngIf="logged_in">
     <a class="navbar-brand" [routerLink]="['/dashboard']">
         <img src="assets/img/logo.png" />
     </a>
@@ -25,13 +25,13 @@
             [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}">
             <a class="nav-link" [routerLink]="['/myschedules']">
                 <!-- <img src="assets/img/my_assessment.png"/>  -->
-                I-LEARN SCHEDULES</a>
+                LIVE SESSION</a>
         </li>
         <li class="nav-item" *ngIf="is_firsttime" [routerLinkActive]="['active']"
             [routerLinkActiveOptions]="{exact:true}">
             <a class="nav-link">
                 <!-- <img src="assets/img/my_assessment.png"/> -->
-                I-LEARN SCHEDULES</a>
+                LIVE SESSION</a>
         </li>
 
 
@@ -60,7 +60,7 @@
             </li> -->
 
                <!-- Enquiry Module -->
-               <li class="dropdown nav-item" [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}">
+               <!-- <li class="dropdown nav-item" [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}">
                 <a class="nav-link dropdown-toggle" id="dropdownMenu12" data-toggle="dropdown"
                     [routerLink]="['/myenquiries']" aria-haspopup="true" aria-expanded="true">MY 
                     ENQUIRIES<span class="caret"></span>
@@ -71,23 +71,12 @@
                         <a class="nav-link" [routerLink]="['/task/today-visit']">
                             TODAYS TASK</a>
                     </li>
-                    <!-- <li *ngIf="is_firsttime && user_role!=15" [routerLinkActive]="['active']"
-                        [routerLinkActiveOptions]="{exact:true}">
-                        <a class="nav-link">
-                            TODAYS TASK</a>
-                    </li> -->
 
                     <li *ngIf="(user_role == 4 || user_role == 6 || user_role == 7 || user_role == 10 || user_role == 14)"
                         [ngClass]="menu_item==12?'active':''" [routerLinkActive]="['active']"
                         [routerLinkActiveOptions]="{exact:true}">
                         <a class="nav-link"  [routerLink]="['/task/pending-visit']">PENDING TASK</a>
                     </li>
-                    <!-- <li *ngIf="is_firsttime && (user_role == 4 || user_role == 6 || user_role == 7 || user_role == 10 ||user_role == 14 )"
-                        [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}">
-                        <a class="nav-link">PENDING TASK
-                            <span class="sr-only">(current)</span>
-                        </a>
-                    </li> -->
 
                     <li *ngIf="(user_role == 4 || user_role == 6 || user_role == 7 || user_role == 10 || user_role == 14)"
                         [ngClass]="menu_item==12?'active':''" [routerLinkActive]="['active']"
@@ -95,25 +84,6 @@
                         <a class="nav-link" [routerLink]="['/enquiry-status/hot']">ENQUIRY
                             STATUS</a>
                     </li>
-                    <!-- <li *ngIf="is_firsttime && (user_role == 4 || user_role == 6 || user_role == 7 || user_role == 10 ||user_role == 14 )"
-                        [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}">
-                        <a class="nav-link">ENQUIRY STATUS
-                            <span class="sr-only">(current)</span>
-                        </a>
-                    </li> -->
-
-                    <!-- <li *ngIf="(user_role == 4 || user_role == 6 || user_role == 7 || user_role == 10 || user_role == 14)"
-                        [ngClass]="menu_item==12?'active':''" [routerLinkActive]="['active']"
-                        [routerLinkActiveOptions]="{exact:true}">
-                        <a class="nav-link" [routerLink]="['/enquiry-process']">ENQUIRY
-                            PROCESS</a>
-                    </li> -->
-                    <!-- <li *ngIf="is_firsttime && (user_role == 4 || user_role == 6 || user_role == 7 || user_role == 10 ||user_role == 14 )"
-                        [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}">
-                        <a class="nav-link">ENQUIRY PROCESS
-                            <span class="sr-only">(current)</span>
-                        </a>
-                    </li> -->
 
                     <li *ngIf="(user_role == 4 || user_role == 6 || user_role == 7 || user_role == 10 || user_role == 14)"
                         [ngClass]="menu_item==12?'active':''" [routerLinkActive]="['active']"
@@ -121,24 +91,13 @@
                         <a class="nav-link" [routerLink]="['/testride']">TEST
                             RIDE</a>
                     </li>
-                    <!-- <li *ngIf="is_firsttime && (user_role == 4 || user_role == 6 || user_role == 7 || user_role == 10 ||user_role == 14 )"
-                        [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}">
-                        <a class="nav-link">TEST RIDE
-                            <span class="sr-only">(current)</span>
-                        </a>
-                    </li> -->
 
                     <li *ngIf="(user_role == 4 || user_role == 6 || user_role == 7 || user_role == 10 || user_role == 14)"
                         [ngClass]="menu_item==12?'active':''" [routerLinkActive]="['active']"
                         [routerLinkActiveOptions]="{exact:true}" [routerLink]="['/quotation']">
                         <a class="nav-link" >QUOTATION</a>
                     </li>
-                    <!-- <li *ngIf="is_firsttime && (user_role == 4 || user_role == 6 || user_role == 7 || user_role == 10 ||user_role == 14 )"
-                        [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}">
-                        <a class="nav-link">QUOTATION
-                            <span class="sr-only">(current)</span>
-                        </a>
-                    </li> -->
+
 
                     <li *ngIf="(user_role == 4 || user_role == 6 || user_role == 7 || user_role == 10 || user_role == 14)"
                         [ngClass]="menu_item==12?'active':''" [routerLinkActive]="['active']" [routerLink]="['/price-list']"
@@ -146,12 +105,7 @@
                         <a class="nav-link" >PRICE
                             LIST</a>
                     </li>
-                    <!-- <li *ngIf="is_firsttime && (user_role == 4 || user_role == 6 || user_role == 7 || user_role == 10 ||user_role == 14 )"
-                        [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}">
-                        <a class="nav-link">PRICE LIST
-                            <span class="sr-only">(current)</span>
-                        </a>
-                    </li> -->
+
 
                     <li *ngIf="(user_role == 14)"
                         [ngClass]="menu_item==12?'active':''" [routerLinkActive]="['active']"
@@ -177,14 +131,8 @@
                         [routerLinkActiveOptions]="{exact:true}">
                         <a class="nav-link"  [routerLink]="['/emi-calculator']">EMI CALCULATOR</a>
                     </li>
-                    <!-- <li *ngIf="is_firsttime && (user_role == 4 || user_role == 6 || user_role == 7 || user_role == 10 ||user_role == 14 )"
-                        [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}">
-                        <a class="nav-link" [routerLink]="['/activityplanner']">MY ACTIVITY PLANNER
-                            <span class="sr-only">(current)</span>
-                        </a>
-                    </li> -->
                 </ul>
-            </li>
+            </li> -->
 
             <li class="nav-item" *ngIf="!is_firsttime" [ngClass]="menu_item == 1 ? 'active' : '' "
                 [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}">
@@ -724,7 +672,7 @@
                 </li> -->
 
 
-            <li class="dropdown nav-item" *ngIf="user_role!=3 && user_role!=14">
+            <!-- <li class="dropdown nav-item" *ngIf="user_role!=3 && user_role!=14">
                 <a class="nav-link dropdown-toggle" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true"
                     aria-expanded="true">MORE<span class="caret"></span>
                 </a>
@@ -732,7 +680,6 @@
                     <li *ngIf="!is_firsttime && (user_role!=3 && user_role!=14 )" [ngClass]="menu_item==5?'active':''"
                         [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}">
                         <a class="nav-link" [routerLink]="['/bulletin']">
-                            <!-- <img src="assets/img/bulletin.png"/> -->
                             BULLETIN</a>
                     </li>
                     <li *ngIf="is_firsttime" [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}">
@@ -749,7 +696,6 @@
                         </a>
                     </li>
 
-                    <!-- New Menu -->
                     <li *ngIf="!is_firsttime && user_role==5" [ngClass]="menu_item==8?'active':''"
                         [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}">
                         <a class="nav-link" [routerLink]="['/setsalestergetreport']">SET SALES TARGET REPORTS</a>
@@ -764,56 +710,24 @@
                     <li *ngIf="!is_firsttime && (user_role == 4 || user_role==5 || user_role == 6 || user_role == 7 || user_role == 10 || user_role == 14)"
                         [ngClass]="menu_item==12?'active':''" [routerLinkActive]="['active']"
                         [routerLinkActiveOptions]="{exact:true}">
-                        <!-- <a class="nav-link" (click)='gotoThreesixty()' [routerLink]="['/threesixty-dashboard']">MY PRODUCTS</a> -->
                         <a class="nav-link" (click)='gotoThreesixty()' [routerLink]="['/threesixty-dashboard']">PRODUCT
                             EXPERIENCE</a>
                     </li>
                     <li *ngIf="is_firsttime && (user_role == 4 || user_role==5 || user_role == 6 || user_role == 7 || user_role == 10 ||user_role == 14 )"
                         [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}">
-                        <!-- <a class="nav-link">MY PRODUCTS
-                                <span class="sr-only">(current)</span>
-                            </a> -->
                         <a class="nav-link">PRODUCT EXPERIENCE
                             <span class="sr-only">(current)</span>
                         </a>
                     </li>
 
-                    <!-- <li *ngIf="!is_firsttime && (user_role==7 || user_role == 14)" [ngClass]="menu_item==5?'active':''" [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}">
-                            <a class="nav-link" [routerLink]="['/myusers']">MY USERS</a>
-                        </li>
-                        <li *ngIf="is_firsttime" [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}">
-                            <a class="nav-link">MY USERS</a>
-                        </li> -->
-
-                    <!-- <li *ngIf="!is_firsttime && (user_role!=3 && user_role!=14 )" [ngClass]="menu_item==5?'active':''" [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}">
-                            <a class="nav-link" [routerLink]="['/myschedules']">
-                                I-LEARN SCHEDULES</a>
-                        </li>
-                        <li *ngIf="is_firsttime" [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}">
-                            <a class="nav-link">
-                                I-LEARN SCHEDULES</a>
-                        </li> -->
 
                   <li *ngIf="!is_firsttime && (user_role!=3 && user_role!=14 )"  [ngClass]="menu_item==1?'active':''" [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}">
                                     <a class="nav-link" [routerLink]="['/mytraining']">
                                         MY LEARNING</a>
                             </li> 
-            
-                            <!-- <li *ngIf="is_firsttime && user_role!=3" [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}">
-                                <a class="nav-link">
-                                    <span class="sr-only">(current)</span>
-                                </a>
-                            </li>
-                            <li  *ngIf="!is_firsttime && (user_role!=3 && user_role!=14 )" [ngClass]="menu_item==5?'active':''" [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}">
-                                <a class="nav-link" [routerLink]="['/bulletin']">
-                                    BULLETIN</a>
-                            </li>
-                            <li  *ngIf="is_firsttime" [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}">
-                                <a class="nav-link">
-                                    BULLETIN</a>
-                            </li>  -->
+
                 </ul>
-            </li>
+            </li> -->
             <!-- <li class="nav-item" [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}">
                     <a class="nav-link" [routerLink]="['/leadmodule']">
                         MY ENQUIRIES</a>
@@ -823,7 +737,9 @@
 
             <div class="head_pro dropdown">
                 <p class="dropdown-toggle" id="sdds" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                    <img src="{{userData.profile_photo}}" />{{userData.fname}}
+                    <!-- <img src="{{userData.profile_photo}}" /> -->
+                    <img src="assets/img/user.png" />
+                    {{userData.fname}}
                     <img class="left_arrow" src="assets/img/arrow.png">
                 </p>
                 <div class="dropdown-menu" aria-labelledby="sdds">

Hyper-M_UserPortal/src/app/common/user-profile/user-profile.component.html

@@ -8,9 +8,10 @@
             <div class="row align-items-center">
                 <div class="col-sm-2 pro text-center">
                     <div class="profile_img">
-                        <img class="pro_img" *ngIf="!croper_image.image" src="{{userData.profile_photo}}" />
+                        <img class="pro_img" src="assets/img/user_vc.png" />
+                        <!-- <img class="pro_img" *ngIf="!croper_image.image" src="{{userData.profile_photo}}" />
                         <img class="pro_img" *ngIf="croper_image.image" [src]='croper_image.image' />
-                        <img class="profile_cam" [ngClass]="is_edit ?'browser_disble':''" (click)="onFileBrowse()" src="assets/img/camera.png" />
+                        <img class="profile_cam" [ngClass]="is_edit ?'browser_disble':''" (click)="onFileBrowse()" src="assets/img/camera.png" /> -->
                         <div style="display:none!important;">
                             <input type="file" accept="image/*" (change)="onFileBrowserChange($event)" id='file_browser' #file_browser>
                         </div>

Hyper-M_UserPortal/src/app/sales_executive/bulletin/bulletin.component.html

@@ -33,7 +33,7 @@
             </div>
           </div> 
           <div class="tab-pane fade show active" id="0" role="tabpanel" aria-labelledby="home-tab" *ngIf="bullet_in.length==0">  
-             <p style="margin:0 auto;text-align: center;vertical-align:middle;font-weight:bold">No data found</p>
+             <p style="margin:0 auto;text-align: center;vertical-align:middle;font-weight:bold">No Circular Found</p>
                
             </div>
           </div> 

Hyper-M_UserPortal/src/app/sales_executive/lederboard/lederboard.component.html

@@ -50,7 +50,8 @@
             <div class="card box border">
               <div (click)="onSelect(list)" class="list_div">
                 <div class="card_img">
-                  <img src="{{user_data.profile_photo}}" />
+                  <!-- <img src="{{user_data.profile_photo}}" /> -->
+                  <img src="assets/img/user_vc.png" />
                 </div>
                 <div class="card_cont">
                   <h6>{{user_data.fname}}</h6>

Hyper-M_UserPortal/src/app/sales_executive/lederboard/lederboard.component.ts

@@ -40,7 +40,7 @@ export class LederboardComponent implements OnInit {
   }
      if(this.user_role!=15){
       this.leader_type = [
-        { title: "SALES", id: "0" },
+        { title: "PERFORMANCE", id: "0" },
         { title: "ASSESSMENT", id: "1" }
       ]
      }else{
@@ -68,7 +68,7 @@ export class LederboardComponent implements OnInit {
     this.changeRoleSales("area");
     if(this.user_role!=15){
       this.leader_type = [
-        { title: "SALES", id: "0" },
+        { title: "PERFORMANCE", id: "0" },
         { title: "ASSESSMENT", id: "1" }
       ]
      }else{

Hyper-M_UserPortal/src/app/trainersite/myschedule/myschedule.component.html

@@ -43,7 +43,7 @@
             </div>
           </div> 
           <div class="tab-pane fade show active" id="0" role="tabpanel" aria-labelledby="home-tab" *ngIf="bullet_in.length==0">  
-            <p style="margin:0 auto;text-align: center;vertical-align:middle;font-weight:bold">No data found</p>
+            <p style="margin:0 auto;text-align: center;vertical-align:middle;font-weight:bold">No Live Session Scheduled</p>
           </div>
           <!-- <div class="wid100">
             <div class="plus">

Hyper-M_UserPortal/src/styles.scss

@@ -455,32 +455,47 @@ form {
 // sliding
 .form1 {
     width: 80%;
-    position: absolute;
+    position: relative;
     left: 10%;
 }
 
 .form2 {
-    width: 80%;
-    position: absolute;
+    width: 0;
+    position: relative;
     left: 100%;
+    opacity: 0;
+    visibility: hidden;
+    height: 0;
 }
 
 .form3 {
-    width: 80%;
-    position: absolute;
+    width: 0;
+    position: relative;
     left: 100%;
+    opacity: 0;
+    visibility: hidden;
+    height: 0;
 }
 
 .form1.sliding_close {
-    left: -90%;
+    left: -100%;
+    position: absolute;
 }
 
 .form2.sliding_open {
     left: 10%;
+    width: 80%;
+    opacity: 1;
+    visibility: visible;
+    height: auto;
 }
 
 .form3.sliding_open {
     left: 10%;
+    width: 80%;
+    opacity: 1;
+    visibility: visible;
+    height: auto;
 }
 
 .sliding_close {