Merge branch 'abraham' 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 { TermsComponent } from './terms/terms.component';
 import { from } from 'rxjs';
 const ModuleRoutes: Routes = [
     {
@@ -18,6 +19,10 @@ const ModuleRoutes: Routes = [
      },
      {
         path:'contact',component:ContactComponent
+     },
+     {
+      path:'terms',component:TermsComponent
      }
+
     ];
      export const moduleRouting: ModuleWithProviders = RouterModule.forChild(ModuleRoutes)
\ No newline at end of file

src/app/body/body.module.ts

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

src/app/body/landingpage/landingpage.component.html

@@ -40,7 +40,7 @@
              </div>
              <div class="col-md-7">
                <div class="right_side">
-                 <img src="../../../assets/img/asset_banner_img.png">
+                 <img src="../../../assets/img/SliderImg_1.png">
                </div>
              </div>
            </div>
@@ -60,7 +60,7 @@
              </div>
              <div class="col-md-7">
                <div class="right_side">
-                 <img src="../../../assets/img/asset_banner_img.png">
+                 <img src="../../../assets/img/SliderImg_2.png">
                </div>
              </div>
            </div>
@@ -81,7 +81,7 @@
              </div>
              <div class="col-md-7">
                <div class="right_side">
-                 <img src="../../../assets/img/asset_banner_img.png">
+                 <img src="../../../assets/img/SliderImg_3.png">
                </div>
              </div>
            </div>

src/app/body/terms/terms.component.scss

+.terms{
+    padding-top: 150px;
+    .map_overlay{
+        margin: 0 auto;
+        background-size: contain;
+        background-position: center;
+        background-repeat: no-repeat;
+        max-width: 1160px;
+        background-image: url("../../../assets//img/map_about.png");
+        padding-bottom: 140px;
+        padding-left: 15px;
+        padding-right: 15px;
+        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;
+            }
+            hr{
+                border: 5px solid rgb(125,181,50);
+                width: 57px;
+                background-color: rgb(125,181,50);
+            }
+        ul{
+            padding-top: 30px;
+            padding-left: 80px;
+            li{
+                font-size: 26px;
+                font-weight: 500;
+                cursor: pointer;
+            }
+        }
+        h1{
+            padding-top: 30px;
+            font-size: 30px;
+
+        }
+        h3{
+            font-size: 26px;
+            margin-left: -25px
+        }
+        p{
+            font-size: 18px;
+            margin-left: -40px;
+        }
+        ol{
+            h1{
+                margin-left:-40px; 
+            }
+            li{
+                font-size: 18px;
+                line-height: 1.8;
+                span{
+                    font-weight: 500;
+                }
+                a{
+                    text-decoration-line: underline;
+                    color: #0000EE;
+                    cursor: pointer;
+                }
+            }
+        }
+    }
+}
\ No newline at end of file

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

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

src/app/body/terms/terms.component.ts

+import { Component, OnInit } from '@angular/core';
+import { Router,ActivatedRoute } from '@angular/router';
+@Component({
+  selector: 'app-terms',
+  templateUrl: './terms.component.html',
+  styleUrls: ['./terms.component.scss']
+})
+export class TermsComponent implements OnInit {
+
+  constructor(private router: Router,
+    private route: ActivatedRoute) { }
+
+  ngOnInit() {
+  }
+  goToPage(path,data=null){
+    this.router.navigateByUrl(path,{queryParams:data});
+    }
+    onClick(){
+      let x = document.querySelector("#sec");
+      if (x){
+          x.scrollIntoView();
+      }
+  }
+  accept(){
+    let y = document.querySelector("#accept");
+      if (y){
+          y.scrollIntoView();
+      }
+  }
+  browse(){
+    let z = document.querySelector("#browse");
+      if (z){
+          z.scrollIntoView();
+      }
+  }
+  buy(){
+    let k = document.querySelector("#buy");
+      if (k){
+          k.scrollIntoView();
+      }
+  }
+  intellect(){
+    let i = document.querySelector("#intel");
+      if (i){
+          i.scrollIntoView();
+      }
+  }
+  info(){
+    let h = document.querySelector("#info");
+      if (h){
+          h.scrollIntoView();
+      }
+  }
+  play(){
+    let g = document.querySelector("#play");
+      if (g){
+          g.scrollIntoView();
+      }
+  }
+  legal(){
+    let m = document.querySelector("#legal");
+      if (m){
+          m.scrollIntoView();
+      }
+  }
+}

src/app/footer/footer.component.html

@@ -35,7 +35,7 @@
                                 
                               
                                         <li><a href="#!">Support@codeinfotec.com</a></li>
-                                        <li><a href="#!">Terms of Service</a></li>
+                                        <li><a (click)="goToPage('terms')">Terms of Service</a></li>
                                         <li><a href="#!"> Privacy Policy</a></li>
                                         <li><a href="#!">Blogs</a></li>
                                      <!----   <li><a href="#!">Google Play (Android)</a></li>-->

src/app/footer/footer.component.ts

 import { Component, OnInit } from '@angular/core';
-
+import { Router,ActivatedRoute } from '@angular/router';
 @Component({
   selector: 'app-footer',
   templateUrl: './footer.component.html',
@@ -7,9 +7,12 @@ import { Component, OnInit } from '@angular/core';
 })
 export class FooterComponent implements OnInit {
 
-  constructor() { }
+  constructor(private router: Router,
+    private route: ActivatedRoute) { }
 
   ngOnInit() {
   }
-
+  goToPage(path,data=null){
+    this.router.navigateByUrl(path,{queryParams:data});
+    }
 }

src/app/header/header.component.html

 <nav class="navbar navbar-expand-sm">
   <div class="container">
-      <div class="logo" href="#"><img src="../../assets/img/vector-smart-object.png"></div>
+      <div class="logo" (click)="goToPage('landing')"><img src="../../assets/img/vector-smart-object.png"></div>
   <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#collapsibleNavbar">
     <span class="navbar-toggler-icon"><i class="fa fa-bars"></i></span>
   </button>
   <div class="collapse navbar-collapse" id="collapsibleNavbar">
     <ul class="navbar-nav">
       <li class="nav-item">
-        <a class="Text-Style nav-link">Home</a>
+        <a class="Text-Style nav-link" (click)="goToPage('landing')">Home</a>
       </li>
       <li class="nav-item">
         <a class="Text-Style nav-link" (click)="goToPage('about')">About us</a>

src/app/header/header.component.scss

@@ -17,6 +17,7 @@ nav{
         margin-left: 160px;
         ul{
             li{
+                cursor: pointer;
                 width: 101px;
                 height: 41px;
                 border: 2px solid transparent;

src/assets/responsive.scss

@@ -48,8 +48,9 @@ nav{
 		margin-left: 0px !important;
 		ul{
 			flex-direction: row !important;
+			justify-content: space-between;
 			li{
-				width: 75px !important;
+				width: 80px !important;
 				a{
 					text-align: center !important;
 				}