Merge branch 'aksa' into 'master'

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

@@ -36,7 +36,7 @@
                               
                                         <li><a href="#!">[email protected]</a></li>
                                         <li><a (click)="goToPage('terms')">Terms of Service</a></li>
-                                        <li><a href="#!"> Privacy Policy</a></li>
+                                        <li><a (click)="goToPage('privacypolicy')"> Privacy Policy</a></li>
                                         <li><a href="#!">Blogs</a></li>
                                      <!----   <li><a href="#!">Google Play (Android)</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/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;