Merge branch 'master' into abraham

src/app/body/aboutus/aboutus.component.html

@@ -96,7 +96,7 @@
                 <div class="col-md-5">
                     <div class="value_col">
                         <div class="value_img">
-                            <img src="../../../assets/img/vector-smart-object@3x.png" alt="hand">
+                            <img src="../../../assets/img/excellence.png" alt="hand">
                         </div>
                         <h6>EXCELLENCE</h6>
                         <p>We work to inspire and bring innovation to each of our products. Our primary goal is for our clients to excel at all levels of their business. We make sure our products are highly efficient and are customized precisely for success. </p>
@@ -105,7 +105,7 @@
                 <div class="col-md-5">
                     <div class="value_col">
                         <div class="value_img">
-                            <img src="../../../assets/img/bulb.png" alt="bulb">
+                            <img src="../../../assets/img/creativity.png" alt="bulb">
                         </div>
                         <h6>CREATIVITY</h6>
                         <p>We believe in the power of creativity to transform our products and make them highly captivating. With innovation and perfectionism guiding our team, we strive to deliver premium quality products, in the most artistic form. 
@@ -117,7 +117,7 @@
                 <div class="col-md-5">
                     <div class="value_col">
                         <div class="value_img">
-                            <img src="../../../assets/img/vector-smart-object@3x.png" alt="hand">
+                            <img src="../../../assets/img/cleancode.png" alt="hand">
                         </div>
                         <h6>CLEAN CODE</h6>
                         <p>We ensure adaptability and clarity with each of our products by providing well-structured, easily understandable code, to guarantee 100% customizability and usability, without any compromise in efficiency and performance.</p>
@@ -126,7 +126,7 @@
                 <div class="col-md-5">
                     <div class="value_col">
                         <div class="value_img">
-                            <img src="../../../assets/img/bulb.png" alt="bulb">
+                            <img src="../../../assets/img/integrity.png" alt="bulb">
                         </div>
                         <h6>INTEGRITY</h6>
                         <p>With effective communication and team work, our workforce upholds integrity and honesty with prime importance. We ensure our quality of integrity and confidence in work is reflected well into each of our products. </p>

src/app/body/body-routing.module.ts

@@ -4,6 +4,7 @@ import { LandingpageComponent } from './landingpage/landingpage.component';
 import { AboutusComponent } from './aboutus/aboutus.component';
 import {ContactComponent} from './contact/contact.component';
 import {ProductsComponent} from './products/products.component';
+import { PrivacypolicyComponent } from './privacypolicy/privacypolicy.component';
 import { TermsComponent } from './terms/terms.component';
 import { from } from 'rxjs';
 const ModuleRoutes: Routes = [
@@ -21,6 +22,9 @@ const ModuleRoutes: Routes = [
         path:'contact',component:ContactComponent
      },
      {
+        path:'privacypolicy',component:PrivacypolicyComponent
+     },
+     {
       path:'terms',component:TermsComponent
      }
 

src/app/body/body.module.ts

@@ -9,11 +9,13 @@ import { ContactComponent} from './contact/contact.component';
 import {ProductsComponent} from './products/products.component';
 
 import { SlickCarouselModule } from 'ngx-slick-carousel';
+import { PrivacypolicyComponent } from './privacypolicy/privacypolicy.component';
 import { TermsComponent } from './terms/terms.component';
 
 
+
 @NgModule({
-  declarations: [LandingpageComponent, AboutusComponent,ProductsComponent,ContactComponent, TermsComponent],
+  declarations: [LandingpageComponent, AboutusComponent,ProductsComponent,ContactComponent, TermsComponent, PrivacypolicyComponent],
   imports: [
     CommonModule,
     moduleRouting,

src/app/body/privacypolicy/privacypolicy.component.scss

+.about{
+    padding-top: 150px;
+    .map_overlay{
+        margin: 0 auto;
+        background-size: contain;
+        background-repeat: no-repeat;
+        max-width: 1160px;
+        background-image: url("../../../assets//img/map_about.png");
+        background-position: center;
+        padding-bottom: 170px;
+        h2{
+            padding-top: 72px;
+            object-fit: contain;
+            font-family: Roboto;
+            font-size: 48px;
+            font-weight: 900;
+            font-style: normal;
+            font-stretch: normal;
+            line-height: 1.04;
+            letter-spacing: normal;
+            text-align: center;
+            color: #171717;
+            }
+          /*  .h2_style{
+                color: #67af05;
+                display: inline;
+            }*/
+            hr{
+                border: 5px solid rgb(125,181,50);
+                width: 57px;
+                background-color: rgb(125,181,50);
+            }
+            h5{
+                margin-top: 30px;
+                object-fit: contain;
+                font-family: Roboto;
+                font-size: 25px;
+                font-weight: 500;
+                font-style: normal;
+                font-stretch: normal;
+                line-height: 2.59;
+                letter-spacing: normal;
+                text-align:left;
+                color: #464646;
+                margin-left:10px;
+            }
+         
+            ol{
+                font-size: 20px;
+                color: #464646;
+                margin-bottom: 0px;
+                line-height: 1.8;
+                text-align:justify;
+                margin-right:20px;
+                margin-left: 5px;
+                h6{
+                    margin-bottom: 8px;
+                    margin-top: 8px;
+                    font-weight: 600;
+                    font-size:21px;
+                }
+                span{
+                   font-weight:500; 
+                }
+                a{
+                    text-decoration: none;
+                    color: #007bff;
+                }
+               
+            }
+            p{
+                margin-top: 13px;
+                font-size: 20px;
+                margin-left: 20px;
+            
+            }
+    }
+}
\ No newline at end of file

src/app/body/privacypolicy/privacypolicy.component.spec.ts

+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { PrivacypolicyComponent } from './privacypolicy.component';
+
+describe('PrivacypolicyComponent', () => {
+  let component: PrivacypolicyComponent;
+  let fixture: ComponentFixture<PrivacypolicyComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ PrivacypolicyComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(PrivacypolicyComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/body/privacypolicy/privacypolicy.component.ts

+import { Component, OnInit } from '@angular/core';
+import { Router,ActivatedRoute } from '@angular/router';
+@Component({
+  selector: 'app-privacypolicy',
+  templateUrl: './privacypolicy.component.html',
+  styleUrls: ['./privacypolicy.component.scss']
+})
+export class PrivacypolicyComponent implements OnInit {
+
+  constructor(private route: ActivatedRoute, private router: Router) { }
+
+  ngOnInit() {
+  }
+  goToPage(path,data=null){
+    this.router.navigateByUrl(path,{queryParams:data});
+    }
+}

src/app/footer/footer.component.html

@@ -34,7 +34,7 @@
                                 <h5>Need Help</h5>
                                 
                               
-                                        <li><a href="#!">Support@codeinfotec.com</a></li>
+                                        <li><a  href="mailto:support@codeinfotec.com">Support@codeinfotec.com</a></li>
                                         <li><a (click)="goToPage('terms')">Terms of Service</a></li>
                                         <li><a (click)="goToPage('privacypolicy')"> Privacy Policy</a></li>
                                         <li><a href="#!">Blogs</a></li>

src/app/footer/footer.component.scss

@@ -72,7 +72,7 @@
         
     }
     p{
-        font-size: 14px;
+        font-size: 16px;
     }
  .fb-page{
      a{
@@ -106,7 +106,7 @@
         text-decoration: none;
         color:#fff;
         font-size: 14px;
-       
+       cursor: pointer;
 
     }
 }

src/app/footer/footer.component.ts

@@ -8,7 +8,7 @@ import { Router,ActivatedRoute } from '@angular/router';
 export class FooterComponent implements OnInit {
 
   constructor(private router: Router,
-    private route: ActivatedRoute) { }
+              private route: ActivatedRoute) { }
 
   ngOnInit() {
   }

src/app/header/header.component.ts

@@ -34,5 +34,6 @@ export class HeaderComponent implements OnInit {
 
   goToPage(path,data=null){
     this.router.navigateByUrl(path,{queryParams:data});
+    document.body.scrollTop = document.documentElement.scrollTop = 0;
     }
 }

src/assets/responsive.scss

@@ -505,7 +505,7 @@ nav{
 	.foot-codeinfo{
 		.margins{
 			border-right: none !important;
-			height: 173px !important;
+			
 		}
 		.col-md-4{ 
 		//	max-width: 220px !important;