last error

e2e/protractor.conf.js

@@ -1,28 +0,0 @@
-// Protractor configuration file, see link for more information
-// https://github.com/angular/protractor/blob/master/lib/config.ts
-
-const { SpecReporter } = require('jasmine-spec-reporter');
-
-exports.config = {
-  allScriptsTimeout: 11000,
-  specs: [
-    './src/**/*.e2e-spec.ts'
-  ],
-  capabilities: {
-    'browserName': 'chrome'
-  },
-  directConnect: true,
-  baseUrl: 'http://localhost:4200/',
-  framework: 'jasmine',
-  jasmineNodeOpts: {
-    showColors: true,
-    defaultTimeoutInterval: 30000,
-    print: function() {}
-  },
-  onPrepare() {
-    require('ts-node').register({
-      project: require('path').join(__dirname, './tsconfig.e2e.json')
-    });
-    jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
-  }
-};

e2e/src/app.e2e-spec.ts

@@ -1,14 +0,0 @@
-import { AppPage } from './app.po';
-
-describe('workspace-project App', () => {
-  let page: AppPage;
-
-  beforeEach(() => {
-    page = new AppPage();
-  });
-
-  it('should display welcome message', () => {
-    page.navigateTo();
-    expect(page.getTitleText()).toEqual('Welcome to medical-project!');
-  });
-});

e2e/src/app.po.ts

@@ -1,11 +0,0 @@
-import { browser, by, element } from 'protractor';
-
-export class AppPage {
-  navigateTo() {
-    return browser.get('/');
-  }
-
-  getTitleText() {
-    return element(by.css('app-root h1')).getText();
-  }
-}

e2e/tsconfig.e2e.json

@@ -1,13 +0,0 @@
-{
-  "extends": "../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../out-tsc/app",
-    "module": "commonjs",
-    "target": "es5",
-    "types": [
-      "jasmine",
-      "jasminewd2",
-      "node"
-    ]
-  }
-}

package-lock.json

@@ -1483,7 +1483,6 @@
       "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
       "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
       "dev": true,
-      "optional": true,
       "requires": {
         "delegates": "^1.0.0",
         "readable-stream": "^2.0.6"
@@ -2752,8 +2751,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
       "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "constants-browserify": {
       "version": "1.0.0",
@@ -3167,8 +3165,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
       "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "depd": {
       "version": "1.1.2",
@@ -4251,8 +4248,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4273,14 +4269,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4295,20 +4289,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -4425,8 +4416,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -4438,7 +4428,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -4453,7 +4442,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -4461,14 +4449,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -4487,7 +4473,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -4568,8 +4553,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -4581,7 +4565,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -4667,8 +4650,7 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -4704,7 +4686,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -4724,7 +4705,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -4768,14 +4748,12 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -4784,7 +4762,6 @@
       "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
       "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
       "dev": true,
-      "optional": true,
       "requires": {
         "graceful-fs": "^4.1.2",
         "inherits": "~2.0.0",
@@ -4797,7 +4774,6 @@
       "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
       "dev": true,
-      "optional": true,
       "requires": {
         "aproba": "^1.0.3",
         "console-control-strings": "^1.0.0",
@@ -4829,8 +4805,7 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
       "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "get-stream": {
       "version": "3.0.0",
@@ -5085,8 +5060,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
       "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "has-value": {
       "version": "1.0.0",
@@ -5783,8 +5757,7 @@
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
       "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-windows": {
       "version": "1.0.2",
@@ -6460,7 +6433,6 @@
       "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
       "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
       "dev": true,
-      "optional": true,
       "requires": {
         "graceful-fs": "^4.1.2",
         "parse-json": "^2.2.0",
@@ -6473,8 +6445,7 @@
           "version": "2.3.0",
           "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
           "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -6657,8 +6628,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
       "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "map-visit": {
       "version": "1.0.0",
@@ -7428,7 +7398,6 @@
       "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
       "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
       "dev": true,
-      "optional": true,
       "requires": {
         "are-we-there-yet": "~1.1.2",
         "console-control-strings": "~1.1.0",
@@ -8407,7 +8376,6 @@
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
       "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
       "dev": true,
-      "optional": true,
       "requires": {
         "load-json-file": "^1.0.0",
         "normalize-package-data": "^2.3.2",
@@ -8419,7 +8387,6 @@
           "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
           "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
           "dev": true,
-          "optional": true,
           "requires": {
             "graceful-fs": "^4.1.2",
             "pify": "^2.0.0",
@@ -8430,8 +8397,7 @@
           "version": "2.3.0",
           "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
           "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -8440,7 +8406,6 @@
       "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
       "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
       "dev": true,
-      "optional": true,
       "requires": {
         "find-up": "^1.0.0",
         "read-pkg": "^1.0.0"
@@ -8451,7 +8416,6 @@
           "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
           "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
           "dev": true,
-          "optional": true,
           "requires": {
             "path-exists": "^2.0.0",
             "pinkie-promise": "^2.0.0"
@@ -8462,7 +8426,6 @@
           "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
           "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
           "dev": true,
-          "optional": true,
           "requires": {
             "pinkie-promise": "^2.0.0"
           }
@@ -9737,7 +9700,6 @@
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
       "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
       "dev": true,
-      "optional": true,
       "requires": {
         "is-utf8": "^0.2.0"
       }
@@ -10205,7 +10167,7 @@
       "dependencies": {
         "minimist": {
           "version": "1.2.0",
-          "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
           "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
           "dev": true
         }
@@ -11155,7 +11117,6 @@
       "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
       "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
       "dev": true,
-      "optional": true,
       "requires": {
         "string-width": "^1.0.2 || 2"
       }

package.json

@@ -22,6 +22,7 @@
     "@angular/router": "~7.0.0",
     "@auth0/angular-jwt": "^2.1.0",
     "@ng-bootstrap/ng-bootstrap": "^4.0.0",
+    "@types/es6-promise": "^3.3.0",
     "@types/jwt-decode": "^2.2.1",
     "alife-file-to-base64": "0.0.2",
     "angular-calendar": "^0.26.4",

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

@@ -1,5 +1,5 @@
 input,button {
-    outline: none;
+    outline: none !important;
 }
 
 .contentPage-w {
@@ -347,11 +347,11 @@ input,button {
 
 .servicesContent-w .hyperLink .serviceItem-w:hover{
     color: #fff;
-    background: radial-gradient(#00a99d, #bda380);
+    background: radial-gradient(#8c7171, #bda380);
 }
 
 .servicesContent-w .hyperLink .serviceItem-w:hover img{
-    -webkit-filter: grayscale(100%); 
+    -webkit-filter: grayscale(100%);
     filter: grayscale(100%);
 }
 
@@ -586,6 +586,7 @@ input,button {
 .secondServices-w .contentSecondSer-w .contentSer .fieldData-w {
     width: 100%;
     padding: 5px 0;
+    transition: all 0.5s;
 }
 
 .secondServices-w .contentSecondSer-w .contentSer .fieldData-w img{
@@ -593,6 +594,18 @@ input,button {
     height: 30px;
 }
 
+/* .secondServices-w .contentSecondSer-w .contentSer .fieldData-w:hover img{
+  -webkit-filter: grayscale(100%); /* Safari 6.0 - 9.0 */
+  /* filter: grayscale(100%); */
+
+
+.iconeActive {
+  width: 30px;
+  height: 30px;
+  -webkit-filter: grayscale(100%); /* Safari 6.0 - 9.0 */
+  filter: grayscale(100%);
+}
+
 .secondServices-w .contentSecondSer-w .contentSer .fieldData-w p{
     text-align: center;
     font-size: 12px;
@@ -693,7 +706,7 @@ input,button {
     min-height: 350px;
     border: 1px solid #ccc;
     padding: 0 12px;
-} 
+}
 
 .tabs .recods .recordsContent-w ol {
     width: 100%;
@@ -735,7 +748,7 @@ input,button {
         min-height: 55px !important;
     }
 
-   
+
 
     .eventPart-w .event .now{
         text-align: center;
@@ -837,11 +850,11 @@ input,button {
         width: 100%;
         height: 220px;
     }
-    
+
     .eventPart-w .event {
         width: 100%;
         height: 205px;
-     
+
     }
 
     .lectureHeading {
@@ -859,7 +872,11 @@ input,button {
     .contentsData-w .joinUs-w .dataContent  .profileData-w {
         text-align: center;
     }
-    
+
+    .slider{
+        margin-bottom: 10px;
+    }
+
 }
 
 @media (min-width:767px) and (max-width:991px){
@@ -872,11 +889,11 @@ input,button {
         width: 100%;
         height: 220px;
     }
-    
+
     .eventPart-w .event {
         width: 100%;
         height: 205px;
-     
+
     }
 
     .lectureHeading {
@@ -891,7 +908,7 @@ input,button {
         min-height: 55px !important;
     }
 
-   
+
 
     .eventPart-w .event .now{
         text-align: center;

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

@@ -1,9 +1,9 @@
-<ng-template [ngIf]="authSer.arabicTemplate" [ngIfElse]="englishTemplate">  
+<ng-template [ngIf]="authSer.arabicTemplate" [ngIfElse]="englishTemplate">
     <div class="container">
         <div class="contentPage-w">
             <div class="servicesContent-w">
                 <div class="container">
-                    <div class="row"> 
+                    <div class="row">
                         <div class="col-12 col-md-4">
                             <div class="row">
                                 <div class="col-6 col-md-6" *ngFor="let service of externalServices">
@@ -16,10 +16,9 @@
                                 </div>
                             </div>
                         </div>
-        
-                        <div class="col-12 col-md-8">
+
+                        <div class="col-12 col-md-8 order-first">
                             <div class="slider">
-                                    
                                 <ngb-carousel #myCarousel="ngbCarousel">
                                     <ng-template ngbSlide *ngFor="let report of reportsData; let i = index" id={{i}} >
                                         <img [src]="[authSer.pathImg + report.photo]" alt="Random first slide">
@@ -34,13 +33,11 @@
                     </div>
                 </div>
             </div>
-                        
+
             <div class="eventPart-w">
                 <div class="container">
                     <div class="event">
                         <div class="row">
-                            <div class="col-12 col-sm-12 ol-md-12 col-lg-4">
-                            </div>
                             <div class="col-12 col-sm-12 col-md-12 col-lg-4">
                                 <p class="now"> <img src="../../../assets/image/live.png" style="margin-left:20px"/>  يعرض الأن :<span>{{live_event ? live_event.name : 'لايوجد حدث حاليا'}}</span></p>
                             </div>
@@ -54,7 +51,7 @@
                     </div>
                 </div>
             </div>
-                        
+
             <div class="contentsData-w">
                 <div class="container">
                     <div class="row">
@@ -70,7 +67,7 @@
                                     <div class="row">
                                         <div class="col-12 col-md-12 col-lg-4">
                                             <div class="joinUs-photo">
-                                                <img src="{{authSer.pathImg + joinUs.photo}}" /> 
+                                                <img src="{{authSer.pathImg + joinUs.photo}}" />
                                             </div>
                                         </div>
                                         <div class="col-12 col-md-12 col-lg-8">
@@ -116,7 +113,7 @@
                     </div>
                 </div>
             </div>
-                        
+
             <div class="secondServices-w">
                 <div class="container" style="height:560px; overflow-y:auto">
                     <div class="row">
@@ -128,10 +125,12 @@
                                 <div class="contentSer" style="overflow:auto; overflow-x:hidden">
                                     <div class="row" style="padding: 0 10px; margin-left: 0; margin-right: 0">
                                         <div class="col-6 col-md-4"  *ngFor="let field of ser['fields']">
+                                          <a href="{{ field.apperance == 1 ? field.link : '' }}" style="text-decoration:none">
                                             <div class="fieldData-w text-center">
-                                                <img src="{{authSer.pathImg ? authSer.pathImg + field.photo : authSer.iconImg}}" />
+                                                <img src="{{authSer.pathImg ? authSer.pathImg + field.photo : authSer.iconImg}}" [className]=" field.apperance == 1 ? 'iconeActive' : ''" />
                                                 <p style="color:#767676; font-size:13px;">{{field.name ? field.name : 'إضافه خدمه'}}</p>
                                             </div>
+                                          </a>
                                         </div>
                                     </div>
                                 </div>
@@ -140,7 +139,7 @@
                     </div>
                 </div>
             </div>
-                        
+
             <div class="tabs">
                 <div class="container">
                     <div class="row">
@@ -172,16 +171,16 @@
                                 </div>
                                 <div class="recordsContent-w">
                                     <ol>
-                                        <li *ngFor="let achiev of achievements; let i = index" (click)="open(achiev,i)" style="cursor: pointer;">  
-                                            <p>{{achiev.title}}</p>     
-                                            <div *ngIf="i == expandedIndex">  
-                                                <div class="collapse">  
-                                                    <div>  
-                                                        <p>{{achiev.title}}</p>  
-                                                        <p>{{achiev.descripton}}</p>  
-                                                    </div>  
-                                                </div>  
-                                            </div>                                  
+                                        <li *ngFor="let achiev of achievements; let i = index" (click)="open(achiev,i)" style="cursor: pointer;">
+                                            <p>{{achiev.title}}</p>
+                                            <div *ngIf="i == expandedIndex">
+                                                <div class="collapse">
+                                                    <div>
+                                                        <p>{{achiev.title}}</p>
+                                                        <p>{{achiev.descripton}}</p>
+                                                    </div>
+                                                </div>
+                                            </div>
                                         </li>
                                     </ol>
                                 </div>
@@ -191,197 +190,200 @@
                 </div>
             </div>
         </div>
-    </div> 
+    </div>
 
 </ng-template>
 
-    
+
 
 
 <ng-template #englishTemplate>
-  <div class="servicesContent-w" style="direction:ltr">
-    <div class="container">
-      <div class="row">
+<div class="container">
+  <div class="contentPage-w">
+    <div class="servicesContent-w" style="direction:ltr">
+      <div class="container">
+        <div class="row">
 
-        <div class="col-12 col-md-4">
-          <div class="row">
-            <div class="col-12 col-md-6" *ngFor="let service of externalServices">
-              <div class="serviceItem-w">
-                <a href="{{service.link}}" target="_blank">
-                  <img src="{{authSer.pathImg + service.photo}}" />
-                  <p>{{service.name_en}}</p>
-                </a>
+          <div class="col-12 col-md-4">
+            <div class="row">
+              <div class="col-6 col-md-6" *ngFor="let service of externalServices">
+                  <a class="hyperLink" href="{{service.link}}">
+                      <div class="serviceItem-w">
+                          <img src="{{authSer.pathImg + service.photo}}" />
+                          <p>{{service.name_en}}</p>
+                      </div>
+                  </a>
               </div>
             </div>
           </div>
-        </div>
 
-        <div class="col-12 col-md-8">
-          <div class="slider">
-            <ngb-carousel>
-              <ng-template *ngFor="let report of reportsData" ngbSlide>
-                <img src="{{authSer.pathImg + report.photo}}" alt="Random first slide">
-                <div class="carousel-caption">
-                  <p [innerHTML] = "report.description_en"></p>
-                  <a class="extra" (click)="onExtraPage(report.id)">More</a>
-                </div>
-              </ng-template>
-            </ngb-carousel>
+          <div class="col-12 col-md-8 order-first">
+            <div class="slider">
+              <ngb-carousel>
+                <ng-template *ngFor="let report of reportsData" ngbSlide>
+                  <img src="{{authSer.pathImg + report.photo}}" alt="Random first slide">
+                  <div class="carousel-caption">
+                    <p class="paragraphTemplate-w" [innerHTML] = "report.description_en"></p>
+                    <a class="extra" (click)="onExtraPage(report.id)">More</a>
+                  </div>
+                </ng-template>
+              </ngb-carousel>
+            </div>
           </div>
-        </div>
 
+        </div>
       </div>
     </div>
-  </div>
 
-  <div class="eventPart-w" style="direction:ltr">
-    <div class="container">
-      <div class="event">
-        <div class="row">
-          <div class="col-12 col-sm-12 ol-md-12 col-lg-4">
-          </div>
-          <div class="col-12 col-sm-12 col-md-12 col-lg-4">
-            <p class="now"> <img src="../../../assets/image/live.png" style="margin-left:20px;"/>   Live Now :<span>{{live_event ? live_event.name : ' now event now '}}</span></p>
-          </div>
-          <div class="col-12 col-sm-12 col-md-12 col-lg-4">
-            <p class="next"> <img src="../../../assets/image/back.png"> Soon :<span>{{next_lecture ? next_lecture.name : 'now event now'}}</span></p>
-          </div>
+    <div class="eventPart-w" style="direction:ltr">
+      <div class="container">
+        <div class="event">
+          <div class="row">
             <div class="col-12 col-sm-12 col-md-12 col-lg-4">
-                <p class="lectureHeading" (click)="onLectureTable()"> <img class="lectureCalenderImg" src="../../../assets/image/calendar.png" /> Lecture Table</p>
+              <p class="now"> <img src="../../../assets/image/live.png" style="margin-left:20px;"/>   Live Now :<span>{{live_event ? live_event.name : ' now event now '}}</span></p>
             </div>
+            <div class="col-12 col-sm-12 col-md-12 col-lg-4">
+              <p class="next"> <img src="../../../assets/image/back.png"> Soon :<span>{{next_lecture ? next_lecture.name : 'now event now'}}</span></p>
+            </div>
+              <div class="col-12 col-sm-12 col-md-12 col-lg-4">
+                  <p class="lectureHeading" (click)="onLectureTable()"> <img class="lectureCalenderImg" src="../../../assets/image/calendar.png" /> Lecture Table</p>
+              </div>
+          </div>
         </div>
       </div>
     </div>
-  </div>
 
-  <div class="contentsData-w" style="direction:ltr">
-    <div class="container">
-      <div class="row">
-        <div class="col-12 col-sm-12 col-md-4">
-          <div class="joinUs-w"  [className]=" arabicTemplate ? '' : 'joinUsEn-w' ">
-            <div class="joinHeader-w">
-              Join Us
-            </div>
-            <div class="joinHeading-w">
-              <h2>Welcome to join the medical center</h2>
-            </div>
-            <div class="dataContent">
-              <div class="row">
-                <div class="col-12 col-md-12 col-lg-4">
-                  <div class="joinUs-photo">
-                    <img src="{{authSer.pathImg + joinUs.photo}}" />
+    <div class="contentsData-w" style="direction:ltr">
+      <div class="container">
+        <div class="row">
+          <div class="col-12 col-sm-12 col-md-4">
+            <div class="joinUs-w"  [className]=" arabicTemplate ? '' : 'joinUsEn-w' ">
+              <div class="joinHeader-w">
+                Join Us
+              </div>
+              <div class="joinHeading-w">
+                <h2>Welcome to join the medical center</h2>
+              </div>
+              <div class="dataContent">
+                <div class="row">
+                  <div class="col-12 col-md-12 col-lg-4">
+                    <div class="joinUs-photo">
+                      <img src="{{authSer.pathImg + joinUs.photo}}" />
+                    </div>
                   </div>
-                </div>
-                <div class="col-12 col-md-12 col-lg-8">
-                  <div class="profileData-w">
-                    <p> Employee : <span>{{joinUs.name_en}}</span></p>
-                    <p> Administration : <span>{{joinUs.adminstration_name_en ? joinUs.adminstration_name_en : 'not found'}}</span></p>
-                    <p> Date : <span>{{joinUs.created_at ? joinUs.created_at : 'not found'}}</span></p>
+                  <div class="col-12 col-md-12 col-lg-8">
+                    <div class="profileData-w">
+                      <p> Employee : <span>{{joinUs.name_en}}</span></p>
+                      <p> Administration : <span>{{joinUs.adminstration_name_en ? joinUs.adminstration_name_en : 'not found'}}</span></p>
+                      <p> Date : <span>{{joinUs.created_at ? joinUs.created_at : 'not found'}}</span></p>
+                    </div>
                   </div>
                 </div>
               </div>
             </div>
           </div>
-        </div>
-        <div class="col-12 col-md-8">
-          <div class="sharingEvent-w">
-            <div class="sharingHeader-w">
-              <h2>Share moments</h2>
-            </div>
-            <div class="row">
-              <div class="col-12 col-md-6">
-                <div class="congeratolation">
-                  <h2>Congratulations</h2>
-                </div>
-                <div class="content">
-                  <p>Employee : <span>{{congratulations.created_by_name}}</span></p>
-                  <p class="event">{{congratulations.name_en}}</p>
-                  <p>Date : <span>{{congratulations.event_time ? congratulations.event_time : 'not found'}}</span></p>
-                </div>
+          <div class="col-12 col-md-8">
+            <div class="sharingEvent-w">
+              <div class="sharingHeader-w">
+                <h2>Share moments</h2>
               </div>
-              <div class="col-12 col-md-6">
-                <div class="sadDead-w">
-                  <h2>Condolences</h2>
+              <div class="row">
+                <div class="col-12 col-md-6">
+                  <div class="congeratolation">
+                    <h2>Congratulations</h2>
+                  </div>
+                  <div class="content">
+                    <p>Employee : <span>{{congratulations.created_by_name}}</span></p>
+                    <p class="event">{{congratulations.name_en}}</p>
+                    <p>Date : <span>{{congratulations.event_time ? congratulations.event_time : 'not found'}}</span></p>
+                  </div>
                 </div>
-                <div class="content">
-                  <p>Empolyee : <span>{{condolences.created_by_name}}</span></p>
-                  <p class="event">{{condolences.name_en}}</p>
-                  <p>Date : <span>{{condolences.event_time ? condolences.event_time : 'not found'}}</span></p>
+                <div class="col-12 col-md-6">
+                  <div class="sadDead-w">
+                    <h2>Condolences</h2>
+                  </div>
+                  <div class="content">
+                    <p>Empolyee : <span>{{condolences.created_by_name}}</span></p>
+                    <p class="event">{{condolences.name_en}}</p>
+                    <p>Date : <span>{{condolences.event_time ? condolences.event_time : 'not found'}}</span></p>
+                  </div>
                 </div>
               </div>
             </div>
           </div>
-        </div>
 
 
-        <div class="secondServices-w">
-                <div class="container" style="height:560px; overflow-y:auto">
-                    <div class="row">
-                        <div class="col-12 col-sm-6 col-md-4" *ngFor="let ser of internalServices">
-                            <div class="contentSecondSer-w">
-                                <div class="headerSer-w">
-                                    {{ser.name_en}}
-                                </div>
-                                <div class="contentSer" style="overflow:auto; overflow-x:hidden">
-                                    <div class="row" style="padding: 0 10px; margin-left: 0; margin-right: 0">
-                                        <div class="col-6 col-md-4"  *ngFor="let field of ser['fields']">
-                                            <div class="fieldData-w text-center">
-                                                <img src="{{authSer.pathImg ? authSer.pathImg + field.photo : authSer.iconImg}}" />
-                                                <p style="color:#767676; font-size:13px;">{{field.name_en ? field.name_en : 'إضافه خدمه'}}</p>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-    
-       <div class="tabs">
-          <div class="container">
-            <div class="row">
-              <div class="col-12 col-md-8">
-                <div class="lastTab-w">
-                  <div class="headerTab-w">
-                      Latest Circulars
-                  </div>
-                  <div class="menuTab-w">
-                    <ul class="list-unstyled">
-                        <li (click)="onGetData(0)"> Internal Circulars</li>
-                        <li (click)="onGetData(1)">External Circulars</li>
-                        <li (click)="onGetData(2)">Policies</li>
-                    </ul>
+          <div class="secondServices-w">
+                  <div class="container" style="height:560px; overflow-y:auto">
+                      <div class="row">
+                          <div class="col-12 col-sm-6 col-md-4" *ngFor="let ser of internalServices">
+                              <div class="contentSecondSer-w">
+                                  <div class="headerSer-w">
+                                      {{ser.name_en}}
+                                  </div>
+                                  <div class="contentSer" style="overflow:auto; overflow-x:hidden">
+                                      <div class="row" style="padding: 0 10px; margin-left: 0; margin-right: 0">
+                                          <div class="col-6 col-md-4"  *ngFor="let field of ser['fields']">
+                                            <a href="{{ field.apperance == 1 ? field.link : '' }}" style="text-decoration:none">
+                                              <div class="fieldData-w text-center">
+                                                  <img src="{{authSer.pathImg ? authSer.pathImg + field.photo : authSer.iconImg}}" [className]=" field.apperance == 1 ? 'iconeActive' : ''" />
+                                                  <p style="color:#767676; font-size:13px;">{{field.name_en ? field.name_en : 'إضافه خدمه'}}</p>
+                                              </div>
+                                            </a>
+                                          </div>
+                                      </div>
+                                  </div>
+                              </div>
+                          </div>
+                      </div>
                   </div>
-                  <div class="menuTabContent-w">
-                    <h2 class="text-center" *ngIf="checkShowData"> no data to show , now </h2>
-                    <ol [className]=" arabicTemplate ? '' : 'achievementsLang-w' ">
-                        <li *ngFor="let data of tabsData">{{data.name_en}}</li>
-                    </ol>
-                    <button class="btn btn-primary" (click)="onPageCir()" style="margin:0 auto; display:block; background-color:#bda380; width:150px; border:none;">more</button>
-                  </div>
-                </div>
               </div>
-              <div class="col-12 col-md-4">
-                <div class="recods">
-                    <div class="headerRecords-w">
-                        General Statistics - Achievements
+
+         <div class="tabs">
+            <div class="container">
+              <div class="row">
+                <div class="col-12 col-md-8">
+                  <div class="lastTab-w">
+                    <div class="headerTab-w">
+                        Latest Circulars
+                    </div>
+                    <div class="menuTab-w">
+                      <ul class="list-unstyled">
+                          <li (click)="onGetData(0)"> Internal Circulars</li>
+                          <li (click)="onGetData(1)">External Circulars</li>
+                          <li (click)="onGetData(2)">Policies</li>
+                      </ul>
                     </div>
-                    <div class="recordsContent-w">
+                    <div class="menuTabContent-w">
+                      <h2 class="text-center" *ngIf="checkShowData"> no data to show , now </h2>
                       <ol [className]=" arabicTemplate ? '' : 'achievementsLang-w' ">
-                        <li *ngFor="let achiev of achievements; let i = index" (click)="open(achiev,i)" style="cursor: pointer;">  
-                            <p>{{achiev.title_en}}</p>     
-                            <div *ngIf="i == expandedIndex">  
-                                <div class="collapse">  
-                                    <div>  
-                                        <p>{{achiev.title_en}}</p>  
-                                        <p>{{achiev.descripton_en}}</p>  
-                                    </div>  
-                                </div>  
-                            </div>                                  
-                        </li>
+                          <li *ngFor="let data of tabsData">{{data.name_en}}</li>
                       </ol>
+                      <button class="btn btn-primary" (click)="onPageCir()" style="margin:0 auto; display:block; background-color:#bda380; width:150px; border:none;">more</button>
                     </div>
+                  </div>
+                </div>
+                <div class="col-12 col-md-4">
+                  <div class="recods">
+                      <div class="headerRecords-w">
+                          General Statistics - Achievements
+                      </div>
+                      <div class="recordsContent-w">
+                        <ol [className]=" arabicTemplate ? '' : 'achievementsLang-w' ">
+                          <li *ngFor="let achiev of achievements; let i = index" (click)="open(achiev,i)" style="cursor: pointer;">
+                              <p>{{achiev.title_en}}</p>
+                              <div *ngIf="i == expandedIndex">
+                                  <div class="collapse">
+                                      <div>
+                                          <p>{{achiev.title_en}}</p>
+                                          <p>{{achiev.descripton_en}}</p>
+                                      </div>
+                                  </div>
+                              </div>
+                          </li>
+                        </ol>
+                      </div>
+                  </div>
                 </div>
               </div>
             </div>
@@ -390,8 +392,5 @@
       </div>
     </div>
   </div>
+</div>
 </ng-template>
-   
-
-
-    

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

@@ -33,7 +33,7 @@ export class InternalPageContentComponent implements OnInit {
      }
 
 
-  
+
 
 
     joinUs = [];
@@ -80,9 +80,9 @@ export class InternalPageContentComponent implements OnInit {
        //get profile data
     this.userservice.getUserDataProfile();
 
-  
 
-  
+
+
     //get slider data
     this.internalService.getSliderData().subscribe(
       (responce) => {
@@ -234,4 +234,5 @@ export class InternalPageContentComponent implements OnInit {
 
 
 
+
 }

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

@@ -4,7 +4,7 @@
     <div class="internalHeader-w">
         <div class="container">
             <div class="row">
-                <div class="col-6 col-sm-6 col-md-4 col-lg-4"  style="margin:0;padding:0">
+                <div class="col-5 col-sm-5 col-md-4 col-lg-4"  style="margin:0;padding:0">
                     <ul class="list-unstyled notificationList-w" *ngIf="!authSer.isAuthenticated()">
                         <li class="profileData-w">
                             <div class="btn-group" ngbDropdown role="group" aria-label="Button group with nested dropdown">
@@ -18,20 +18,20 @@
                         </li>
                         <!-- <li><span><i class="fas fa-comments"></i></span></li>
                         <li><span><i class="fas fa-bell"></i></span></li> -->
-                    </ul> 
+                    </ul>
                     <p *ngIf="authSer.isAuthenticated()" class="login" (click)="onLogin()"><a>تسجيل دخول </a></p>
                 </div>
-                <div class="col-6 col-sm-6 col-md-4 col-lg-4 backgroundXS">
+                <div class="col-5 col-sm-5 col-md-4 col-lg-4 backgroundXS">
                     <div class="form-group" style="display:flex;text-align:center; justify-content:center">
                         <input type="text" placeholder="أبحث"/><button class="searchBtn" style="cursor: pointer;"><i class="fas fa-search"></i></button>
                     </div>
                 </div>
-                <div class="col-6 col-sm-6 col-md-4 col-lg-4 hidden-xs hidden-sm">
+                <div class="col-2 col-sm-2 col-md-4 col-lg-4 d-none d-sm-none">
                     <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>
                 </div>
-                <div class="col-6 col-sm-6 col-md-4 col-lg-4 hidden-md hidden-lg">
+                <div class="col-2 col-sm-2 col-md-4 col-lg-4 d-md-none d-lg-none">
                     <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>
                 </div>
@@ -67,7 +67,7 @@
             <div class="row">
                 <div class="navbar" style="padding:0">
                     <div ngbDropdown class="d-inline-block d-lg-none mobileMenu-w">
-                        <button class="btn btn-outline-primary menuMobile-w" id="dropdownBasic1" ngbDropdownToggle><i class="fas fa-bars"></i></button>
+                        <button class="btn btn-outline-primary menuMobile-w" id="dropdownBasic1" ngbDropdownToggle style="color:#61a59b"><i class="fas fa-bars"></i></button>
                         <div ngbDropdownMenu aria-labelledby="dropdownBasic1" class="dropDownMobile-w">
                             <button class="dropdown-item" (click)="goToHome()" style="font-weight:bold; color:#00A99D;font-size:14px;">الرئيسيه</button>
                             <div *ngFor="let parent of parentsPage; let i = index" class="dropdown">
@@ -132,7 +132,7 @@
     <div class="internalHeader-w">
         <div class="container">
             <div class="row">
-                <div class="col-12 col-sm-12 col-md-4 col-lg-4"  style="margin:0;padding:0">
+                <div class="col-5 col-sm-5 col-md-4 col-lg-4"  style="margin:0;padding:0">
                     <ul class="list-unstyled notificationList-w" *ngIf="!authSer.isAuthenticated()">
                         <li class="profileData-w">
                             <div class="btn-group" ngbDropdown role="group" aria-label="Button group with nested dropdown">
@@ -149,17 +149,17 @@
                     </ul>
                     <p *ngIf="authSer.isAuthenticated()" class="login" (click)="onLogin()"><a>LOG IN</a></p>
                 </div>
-                <div class="col-12 col-sm-12 col-md-4 col-lg-4 backgroundXS hidden-xs hidden-sm">
+                <div class="col-5 col-sm-5 col-md-4 col-lg-4 backgroundXS">
                     <div class="form-group" style="display:flex;text-align:center; justify-content:center">
                         <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-6 col-sm-6 col-md-4 col-lg-4">
+                <div class="col-2 col-sm-2 col-md-4 col-lg-4 d-none d-sm-none">
                     <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>
                 </div>
-                <div class="col-6 col-sm-6 col-md-4 col-lg-4 hidden-md hidden-lg">
+                <div class="col-2 col-sm-2 col-md-4 col-lg-4 d-md-none d-lg-none">
                     <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>
                 </div>
@@ -170,9 +170,9 @@
     <div class="logoHeader-w">
         <div class="container">
             <div class="row">
-                <div class="col-6 col-sm-6 col-md-4 col-lg-4">
+                <div class="col-12 col-sm-12 col-md-4 col-lg-4">
                     <div class="rightLogo-w">
-                        <img src="../../assets/image/logo1.png" alt="logo" title="logo" style="margin-right:15px"/>
+                        <img src="../../assets/image/logo1.png" alt="logo" title="logo" style="margin-right:-15px"/>
                     </div>
                 </div>
                 <div class="col-12 col-sm-6 col-md-4 col-lg-4">
@@ -195,7 +195,7 @@
             <div class="row">
                 <div class="navbar">
                         <div ngbDropdown class="d-inline-block d-lg-none mobileMenu-w">
-                                <button class="btn btn-outline-primary menuMobile-w" id="dropdownBasic1" ngbDropdownToggle><i class="fas fa-bars"></i></button>
+                                <button class="btn btn-outline-primary menuMobile-w" id="dropdownBasic1" style="color:#61a59b" ngbDropdownToggle><i class="fas fa-bars"></i></button>
                                 <div ngbDropdownMenu aria-labelledby="dropdownBasic1" class="dropDownMobile-w">
                                     <button class="dropdown-item" (click)="goToHome()" [className]=" arabicTemplate ? '' : 'activeHomeMenu' ">Home</button>
                                     <div *ngFor="let parent of parentsPage; let i = index" class="dropdown" [className]=" arabicTemplate ? '' : 'activeHeaderMenu' ">

src/app/app.module.ts

@@ -94,7 +94,8 @@ import { FlatpickrModule } from 'angularx-flatpickr';
 import { CalendarModule, DateAdapter } from 'angular-calendar';
 import { adapterFactory } from 'angular-calendar/date-adapters/date-fns';
 import { ShortenPipe } from './shorten.pipe';
-
+import 'zone.js/dist/zone';
+import 'zone.js/dist/long-stack-trace-zone';
 
 
 

src/app/dashboard/external-services/add-external/add-external.component.html

@@ -1,6 +1,6 @@
 <div class="addHospital-w">
   <div class="container">
-    
+
     <div class="row" style="margin-bottom: 30px;">
         <div class="col-12">
           <ul class="list-unstyled titileLi-w">
@@ -15,16 +15,16 @@
     <div class="containerContent-w">
         <div class="row">
             <div class="col-12">
-      
+
               <form (ngSubmit)="onSubmitted()" #f="ngForm">
                 <div class="row">
                   <div class="col-12 col-sm-12 col-md-12 col-lg-12" style="margin-bottom:30px">
                     <div class="form-group text-center imgContainer">
-                        <img [src]="urlImg" class="imgProfile" height="200"> 
+                        <img [src]="urlImg" class="imgProfile" height="200">
                         <input type="file" name="file" id="file" class="inputfile" alife-file-to-base64 (onFileChanged)="onFileChanges($event)" (change)="getUrl($event)" [(fileModel)]="files" />
                         <label for="file" class="iconUpload-w"><i class="fas fa-upload"></i></label>
                     </div>
-                    <span class="validateImageMsg" *ngIf="checkValidImg">must be in 'png' format</span>
+                    <!-- <span class="validateImageMsg" *ngIf="checkValidImg">must be in 'png' format</span> -->
                   </div>
                   <div class="col-12 col-sm-12 col-md-4 col-lg-4">
                     <div class="form-group">
@@ -47,7 +47,7 @@
                   <div class="col-12 col-sm-12 col-md-4 col-lg-4">
                     <div class="form-group">
                       <label for="ranking" style="float: right; margin-right: 5px">الترتيب  <span class="spanReqired-w">*</span></label>
-                      <select class="form-control" name="ranking" [ngModel]="external.ranking" id="ranking" required>  
+                      <select class="form-control" name="ranking" [ngModel]="external.ranking" id="ranking" required>
                         <option value="10000">المزيد</option>
                         <option value="1">1</option>
                         <option value="2">2</option>
@@ -58,20 +58,20 @@
                       </select>
                     </div>
                   </div>
-        
+
                   <div class="col-12 col-sm-12 col-md-4">
                     <label for="status" style="float: right; margin-right: 5px">الحاله  <span class="spanReqired-w">*</span></label>
-                    <select class="form-control" name="status" [ngModel]="external.status" id="status" required>  
+                    <select class="form-control" name="status" [ngModel]="external.status" id="status" required>
                       <option value="1">فعال</option>
                       <option value="0">غير فعال</option>
                     </select>
                   </div>
                 </div>
-                
+
                 <button type="submit" class="btn btn-success rightW" [disabled]="!f.valid">حفظ</button>
-      
+
               </form>
-      
+
             </div>
           </div>
     </div>

src/app/dashboard/footer/add-footer/add-footer.component.html

@@ -23,7 +23,7 @@
                   <input type="file" name="file" id="file" class="inputfile" alife-file-to-base64 (onFileChanged)="onFileChanges($event)" (change)="getUrl($event)" [(fileModel)]="files" />
                   <label for="file" class="iconUpload-w"><i class="fas fa-upload"></i></label>
                 </div>
-                <span *ngIf="checkValidImg" style="color: red; position: absolute; right:0;bottom:0">must be in 'png' format</span>
+                <!-- <span *ngIf="checkValidImg" style="color: red; position: absolute; right:0;bottom:0">must be in 'png' format</span> -->
               </div>
               <div class="col-12 col-sm-12 col-md-4">
                 <div class="form-group">