final

package-lock.json

@@ -935,6 +935,14 @@
       "integrity": "sha512-qjkHL3wF0JMHMqgm/kmL8Pf8rIiqvueEiZ0g6NVTcBX1WN46GWDr+V5z+gsHUeL0n8TfAmXnYmF7ajsxmBp4PQ==",
       "dev": true
     },
+    "@types/es6-promise": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/@types/es6-promise/-/es6-promise-3.3.0.tgz",
+      "integrity": "sha512-ixCIAEkLUKv9movnHKCzx2rzAJgEnSALDXPrOSSwOjWwXFs0ssSZKan+O2e3FExPPCbX+DfA9NcKsbvLuyUlNA==",
+      "requires": {
+        "es6-promise": "*"
+      }
+    },
     "@types/jasmine": {
       "version": "2.8.12",
       "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.8.12.tgz",
@@ -1349,11 +1357,6 @@
         }
       }
     },
-    "angular2": {
-      "version": "2.0.0-beta.0",
-      "resolved": "https://registry.npmjs.org/angular2/-/angular2-2.0.0-beta.0.tgz",
-      "integrity": "sha1-l0E/q8Hq8VR6CBujrUxhcy21SDc="
-    },
     "angular2-collapsible": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/angular2-collapsible/-/angular2-collapsible-0.6.1.tgz",
@@ -1367,45 +1370,6 @@
       "resolved": "https://registry.npmjs.org/angular2-jwt/-/angular2-jwt-0.2.3.tgz",
       "integrity": "sha1-VO/do87tuoX2o3sWXyKsIrit8CE="
     },
-    "angular2-slimscroll": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/angular2-slimscroll/-/angular2-slimscroll-0.3.0.tgz",
-      "integrity": "sha1-wtvmnGh61ltENAhQnB4RCcqXdok=",
-      "requires": {
-        "angular2": "2.0.0-beta.0",
-        "es6-promise": "^3.0.2",
-        "es6-shim": "^0.33.3",
-        "reflect-metadata": "0.1.2",
-        "rxjs": "5.0.0-beta.0",
-        "systemjs": "0.19.6",
-        "zone.js": "0.5.10"
-      },
-      "dependencies": {
-        "es6-promise": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz",
-          "integrity": "sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM="
-        },
-        "reflect-metadata": {
-          "version": "0.1.2",
-          "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.2.tgz",
-          "integrity": "sha1-6iPlgj3IMPKSgivT2puJ/Ve/+wM="
-        },
-        "rxjs": {
-          "version": "5.0.0-beta.0",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.0.0-beta.0.tgz",
-          "integrity": "sha1-GUWsWqxm0zhFbAwKZqkdiK6BQQ8="
-        },
-        "zone.js": {
-          "version": "0.5.10",
-          "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.5.10.tgz",
-          "integrity": "sha1-Bbyc8DTxInjHoiPgIdELNP2s+4E=",
-          "requires": {
-            "es6-promise": "^3.0.2"
-          }
-        }
-      }
-    },
     "angularx-flatpickr": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/angularx-flatpickr/-/angularx-flatpickr-6.1.0.tgz",
@@ -3462,26 +3426,10 @@
         "is-arrayish": "^0.2.1"
       }
     },
-    "es6-module-loader": {
-      "version": "0.17.11",
-      "resolved": "https://registry.npmjs.org/es6-module-loader/-/es6-module-loader-0.17.11.tgz",
-      "integrity": "sha1-CU8ELjtNMIa8/Rc4Cv+r38mfNdc=",
-      "requires": {
-        "when": "^3.7.2"
-      },
-      "dependencies": {
-        "when": {
-          "version": "3.7.8",
-          "resolved": "https://registry.npmjs.org/when/-/when-3.7.8.tgz",
-          "integrity": "sha1-xxMLan6gRpPoQs3J56Hyqjmjn4I="
-        }
-      }
-    },
     "es6-promise": {
       "version": "4.2.5",
       "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.5.tgz",
-      "integrity": "sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg==",
-      "dev": true
+      "integrity": "sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg=="
     },
     "es6-promisify": {
       "version": "5.0.0",
@@ -3492,11 +3440,6 @@
         "es6-promise": "^4.0.3"
       }
     },
-    "es6-shim": {
-      "version": "0.33.13",
-      "resolved": "https://registry.npmjs.org/es6-shim/-/es6-shim-0.33.13.tgz",
-      "integrity": "sha1-iU+4PSwuk3jI7CNlnytiso+ZQiU="
-    },
     "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
@@ -9794,22 +9737,6 @@
       "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
       "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="
     },
-    "systemjs": {
-      "version": "0.19.6",
-      "resolved": "https://registry.npmjs.org/systemjs/-/systemjs-0.19.6.tgz",
-      "integrity": "sha1-ZDB0ge0d1sB8Hx4jZ69yyZ6Y40c=",
-      "requires": {
-        "es6-module-loader": "^0.17.4",
-        "when": "^3.7.2"
-      },
-      "dependencies": {
-        "when": {
-          "version": "3.7.8",
-          "resolved": "https://registry.npmjs.org/when/-/when-3.7.8.tgz",
-          "integrity": "sha1-xxMLan6gRpPoQs3J56Hyqjmjn4I="
-        }
-      }
-    },
     "tapable": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.1.tgz",

package.json

@@ -29,7 +29,6 @@
     "angular-font-awesome": "^3.1.2",
     "angular2-collapsible": "^0.6.1",
     "angular2-jwt": "^0.2.3",
-    "angular2-slimscroll": "^0.3.0",
     "angularx-flatpickr": "^6.1.0",
     "bootstrap": "^4.1.3",
     "core-js": "^2.5.4",

src/app/Internal-Page/internal-page-content/internal-page-content.component.html

@@ -4,7 +4,7 @@
             <div class="servicesContent-w">
                 <div class="container">
                     <div class="row">
-                        <div class="col-12 col-md-4">
+                        <div class="col-12 col-md-4 order-2 order-sm-2 order-md-1">
                             <div class="row">
                                 <div class="col-6 col-md-6" *ngFor="let service of externalServices">
                                     <a class="hyperLink" href="{{service.link}}">
@@ -17,7 +17,7 @@
                             </div>
                         </div>
 
-                        <div class="col-12 col-md-8 order-first">
+                        <div class="col-12 col-md-8 order-1 order-sm-1 order-md-2">
                             <div class="slider">
                                 <ngb-carousel #myCarousel="ngbCarousel">
                                     <ng-template ngbSlide *ngFor="let report of reportsData; let i = index" id={{i}} >
@@ -204,7 +204,7 @@
       <div class="container">
         <div class="row">
 
-          <div class="col-12 col-md-4">
+          <div class="col-12 col-md-4 order-2 order-sm-2 order-md-1">
             <div class="row">
               <div class="col-6 col-md-6" *ngFor="let service of externalServices">
                   <a class="hyperLink" href="{{service.link}}">
@@ -217,7 +217,7 @@
             </div>
           </div>
 
-          <div class="col-12 col-md-8 order-first">
+          <div class="col-12 col-md-8 order-1 order-sm-1 order-md-2">
             <div class="slider">
               <ngb-carousel>
                 <ng-template *ngFor="let report of reportsData" ngbSlide>

src/app/Internal-Page/internal-page-content/internal-page-content.component.ts

@@ -5,7 +5,6 @@ import { Component, OnInit, AfterViewInit, ViewChild, EventEmitter } from '@angu
 import { InternalPageService } from '../../shared/internal-page.service';
 import { NgxSpinnerService } from 'ngx-spinner';
 import {NgbCarousel,NgbCarouselConfig} from '@ng-bootstrap/ng-bootstrap';
-import {SlimScroll} from 'angular2-slimscroll';
 
 
 @Component({

src/app/Internal-Page/internal-page-header/internal-page-header.component.html

@@ -26,7 +26,7 @@
                         <input type="text" placeholder="أبحث"/><button class="searchBtn" style="cursor: pointer;"><i class="fas fa-search"></i></button>
                     </div>
                 </div>
-                <div class="col-2 col-sm-2 col-md-4 col-lg-4 d-none d-sm-none">
+                <div class="col-2 col-sm-2 col-md-4 col-lg-4 d-none d-sm-none d-md-block d-lg-block">
                     <p class="dateW"> {{currentDate}} </p>
                     <span class="ar" (click)="authSer.onLanguageContent('ar')" [ngClass]="{'activeLanguage':authSer. arabicLanguage}" *ngIf="authSer.showArabicIcon">Aa</span>
                     <span class="en" (click)="authSer.onLanguageContent('en')" [ngClass]="{'activeLanguage': authSer.englishLanguage}" *ngIf="authSer.showEnglishIcon">En</span>
@@ -154,7 +154,7 @@
                         <input type="text" placeholder="search" style=" text-align:left"/><button class="searchBtn" style="cursor: pointer;"><i class="fas fa-search"></i></button>
                     </div>
                 </div>
-                <div class="col-2 col-sm-2 col-md-4 col-lg-4 d-none d-sm-none">
+                <div class="col-2 col-sm-2 col-md-4 col-lg-4  d-none d-sm-none d-md-block d-lg-block">
                     <p class="dateW"> {{currentDate}} </p>
                     <span class="ar" (click)="authSer.onLanguageContent('ar')" [ngClass]="{'activeLanguage':authSer. arabicLanguage}" *ngIf="authSer.showArabicIcon">Aa</span>
                     <span class="en" (click)="authSer.onLanguageContent('en')" [ngClass]="{'activeLanguage': authSer.englishLanguage}" *ngIf="authSer.showEnglishIcon">En</span>

src/app/dashboard/service-item/service-item.component.html

@@ -1,9 +1,9 @@
 <div class="serviceItem-w" >
-  
+
   <div class="itemHeader-w">
     <div class="container">
         <nav class="navbar navbar-expand-lg navbar-light bg-light">
- 
+
           <div ngbDropdown class="d-inline-block d-lg-none">
             <button class="btn btn-outline-primary menuMobile-w" id="dropdownBasic1" ngbDropdownToggle><i class="fas fa-bars"></i></button>
             <div ngbDropdownMenu aria-labelledby="dropdownBasic1" class="dropDownMobile-w">
@@ -11,7 +11,7 @@
               <button class="dropdown-item" *ngFor="let page of mobilePages; let i = index" (click)="getListPage(page)">{{page.name}}</button>
             </div>
           </div>
-        
+
           <div class="collapse navbar-collapse" id="navbarSupportedContent">
             <ul class="navbar-nav mr-auto" style="margin: 0 auto">
               <li class="nav-item" style="color: #00a99d; font-weight:bold;margin-top:13px;margin-left:10px;" (click)="goToHome()">الرئيسيه</li>
@@ -39,8 +39,8 @@
   <div class="headerServices" (mouseover)="mouseOvered=true" [className]="mouseOvered ? 'showHeaderServices' : 'headerServices' ">
       <i class="fas fa-home" style="margin-left:10px;"></i>
   </div>
-  
-  <div class="serviceSideList-w" (mouseout)="mouseOvered=false" [className]="mouseOvered ? 'showServiceSideList-w' : 'serviceSideList-w' ">
+
+  <div class="serviceSideList-w" (mouseover)="mouseOvered=true" (mouseout)="mouseOvered=false" [className]="mouseOvered ? 'showServiceSideList-w' : 'serviceSideList-w' ">
     <ul class="list-unstyled">
       <li *ngFor="let service of services" (click)="onGetService(service)">
         <img src="{{authSer.pathImg + service.photo}}" />
@@ -48,11 +48,11 @@
       </li>
     </ul>
   </div>
-  
-  
+
+
 
   <div class="listData-w text-center">
       <router-outlet></router-outlet>
-  </div> 
+  </div>
 
 </div>