Bladeren bron

mega edit

IbrahimNour 4 jaren geleden
bovenliggende
commit
5ae0565044

+ 4 - 4
src/app/External-Page/external-policy/external-policy.component.html

@@ -7,8 +7,8 @@
               <ng-template [ngIf]="authSer.arabicTemplate" [ngIfElse]="englishTemplate">
                 <div class="row">
                   <div class="col-12">
-                    <h2 class="text-center">{{data.name}}</h2>
-                    <p>{{data.description}}</p>
+                    <h2 class="text-center" [innerHTML]="data.name"></h2>
+                    <p [innerHTML]="data.description"></p>
                   </div>
                 </div>
               </ng-template>
@@ -16,8 +16,8 @@
               <ng-template #englishTemplate>
                 <div class="row" style="direction:ltr">
                   <div class="col-12">
-                    <h2 class="text-center">{{data.name_en}}</h2>
-                    <p>{{data.description_en}}</p>
+                    <h2 class="text-center" [innerHTML]="data.name_en"></h2>
+                    <p [innerHTML]="data.description_en"></p>
                   </div>
                 </div>
               </ng-template>

+ 4 - 4
src/app/Internal-Page/internal-policy/internal-policy.component.html

@@ -7,8 +7,8 @@
               <ng-template [ngIf]="authSer.arabicTemplate" [ngIfElse]="englishTemplate">
                 <div class="row">
                   <div class="col-12">
-                    <h2 class="text-center">{{data.name}}</h2>
-                    <p>{{data.description}}</p>
+                    <h2 class="text-center" [innerHTML]="data.name"></h2>
+                    <p [innerHTML]="data.description"></p>
                   </div>
                 </div>
               </ng-template>
@@ -16,8 +16,8 @@
               <ng-template #englishTemplate>
                 <div class="row" style="direction:ltr">
                   <div class="col-12">
-                    <h2 class="text-center">{{data.name_en}}</h2>
-                    <p>{{data.description_en}}</p>
+                    <h2 class="text-center" [innerHTML]="data.name_en"></h2>
+                    <p [innerHTML]="data.description_en"></p>
                   </div>
                 </div>
               </ng-template>

+ 7 - 0
src/app/dashboard/footer/add-footer/add-footer.component.ts

@@ -112,6 +112,13 @@ export class AddFooterComponent implements OnInit {
               this.footer.link = responce['footer'].link;
               this.footer.status = responce['footer'].status;
               this.footer.type = responce['footer'].type;
+              if(this.footer.type == '0') {
+                this.showDescriptionField = true;
+                this.showDescriptionField = false;
+              } else if(this.footer.type == '1' || this.footer.type == '2') {
+                this.showEmailField = true;
+                this.showDescriptionField = false;
+              }
               this.footer.email = responce['footer'].email;
               this.footer.description = responce['footer'].description;
               this.footer.description_en = responce['footer'].description_en;

+ 1 - 1
src/app/dashboard/header/header.component.html

@@ -79,7 +79,7 @@
             </div>
             <div class="col-6 col-sm-6 col-md-4 col-lg-4 hidden-xs">
               <div class="leftLogo-w">
-				  <img src="../../assets/image/logo2.png" alt="logo" title="alt" /> 
+				         <img src="../../assets/image/logo2.png" alt="logo" title="alt" /> 
               </div>
             </div>
           </div>

+ 1 - 1
src/app/servicesItems/services.component.ts

@@ -61,7 +61,7 @@ export class ServicesComponent implements OnInit {
   );
 }
 
-getDataService(dataService){
+getDataService(dataService) {
 
   console.log('dataServiccce', dataService);
   console.log(dataService.id);

+ 2 - 2
src/app/shared/auth-service.service.ts

@@ -53,8 +53,8 @@ export class AuthServiceService {
   //pathApi: string = 'http://10.93.50.2/kfmc_back_end/index.php/api';
   //pathImg: string = "http://10.93.50.2/kfmc_back_end/public/";
 
-  pathApi: string = 'http://kfmc.info/back_end/api';
-  pathImg: string = "http://kfmc.info/back_end/public/";
+  pathApi: string = 'https://kfmct.med.sa/kfmc_back_end/index.php/api';
+  pathImg: string = "https://kfmct.med.sa/kfmc_back_end/public/";
   
   myInnerHeight = window.innerHeight;
   imgSrc: string =  '../../assets/image/avatar.png'; //page profile default