Merge branch 'abraham' into 'master'

angular.json

@@ -23,7 +23,7 @@
             "polyfills": "src/polyfills.ts",
             "tsConfig": "src/tsconfig.app.json",
             "assets": [
-              "src/favicon.ico",
+              "src/assets/img/smalllogo.png",
               "src/assets"
             ],
             "styles": [

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

@@ -2,9 +2,9 @@
     <div class="map_overlay">
        <h2><div class="h2_style">WHAT IS </div>CODEINFOTEC ?</h2>
        <hr>
-       <h5>Lorem Ipsum is simply dummy text of the printing and typesetting industry.</h5>
-       <p>Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.</p>
-       <p>Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publis.</p>
+       <h5>Let’s together create the best apps, the way you want it</h5>
+       <p>We believe in the power of technology to change businesses and lives. We take pride in our passionate team of developers and designers, working hard to make sure that our apps converge with your ideas. We provide Smart Ready-To-Use App Solutions to startups, entrepreneurs and developers.</p>
+       <p>At CodeInfo Tec, we work to inspire and bring innovation with each of our products. Our smartly engineered Ready-made Mobile Apps will help you kickstart your business in no time . We take special care to ensure that our products are cost effective and highly customizable. We always try to impress and exceed the client’s expectations with fast turnaround time and quality products. We enjoy developing your idea with technology and strategic development. Engage with us and let's take your business to the next level.</p>
     </div>
     <div class="our_process">
       <div class="our_process_bg">

src/app/body/aboutus/aboutus.component.scss

@@ -2,11 +2,11 @@
     padding-top: 150px;
     .map_overlay{
         margin: 0 auto;
-        background-size: 100%;
+        background-size: contain;
         background-repeat: no-repeat;
-        max-width: 1319px;
+        max-width: 1160px;
         background-image: url("../../../assets//img/map_about.png");
-        padding-bottom: 85px;
+        padding-bottom: 170px;
         h2{
             padding-top: 72px;
             object-fit: contain;
@@ -43,7 +43,7 @@
                 color: #464646;
             }
             p{
-                max-width: 1116px;
+               
                 object-fit: contain;
                 font-family: Roboto;
                 font-size: 15px;

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

@@ -9,9 +9,9 @@
            <div class="row">
               <div class="col-md-5">
                 <div class="left_side">
-                   <span class="lorem">Lorem</span><span class="ipsum"> Ipsum </span><br>
-                    is simply dummy text
-                    <p>Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the</p>
+                   <span class="lorem">We</span><span class="ipsum"> Create</span><br>
+                   Customizable & Scalable Apps
+                    <p> Jumpstart your business with our cost-effective, ready-made and highly customizable apps, made by our team of creative app developers.</p>
                     <div class="get_info" href="#">
                       Get info
                       <img src="../../../assets/img/asset_white_arrow.png" alt="arrow">

src/app/header/header.component.html

@@ -7,16 +7,16 @@
   <div class="collapse navbar-collapse" id="collapsibleNavbar">
     <ul class="navbar-nav">
       <li class="nav-item">
-        <a class="Text-Style nav-link" href="#">Home</a>
+        <a class="Text-Style nav-link">Home</a>
       </li>
       <li class="nav-item">
-        <a class="Text-Style nav-link" href="about">About us</a>
+        <a class="Text-Style nav-link" (click)="goToPage('about')">About us</a>
       </li>
       <li class="nav-item">
-        <a class="Text-Style nav-link" href="products">Products</a>
+        <a class="Text-Style nav-link" (click)="goToPage('products')">Products</a>
       </li>
       <li class="nav-item">
-        <a class="Text-Style nav-link" href="contact">Contact us</a>
+        <a class="Text-Style nav-link" (click)="goToPage('contact')">Contact us</a>
       </li>
       <div class="icon_box"><img class="icon_facebook" src="../../assets/img/[email protected]"></div>
       <div class="icon_box"><img class="icon_twitter" src="../../assets/img/[email protected]"></div>

src/app/header/header.component.scss

@@ -19,6 +19,7 @@ nav{
             li{
                 width: 101px;
                 height: 41px;
+                border: 2px solid transparent;
                 a{
                    width: 100%;
                    height: 100%;

src/app/header/header.component.ts

 import { Component, OnInit } from '@angular/core';
+import { Router,ActivatedRoute } from '@angular/router';
 
 import * as $ from 'jquery';
 
@@ -9,7 +10,11 @@ declare const window: any;
   styleUrls: ['./header.component.scss']
 })
 export class HeaderComponent implements OnInit {
-  constructor() { 
+  constructor(
+    private router: Router,
+    private route: ActivatedRoute
+  ) { 
+ 
     
 
     $(window).scroll(function(){
@@ -27,4 +32,7 @@ export class HeaderComponent implements OnInit {
   ngOnInit() {
   }
 
+  goToPage(path,data=null){
+    this.router.navigateByUrl(path,{queryParams:data});
+    }
 }

src/assets/responsive.scss

@@ -419,6 +419,11 @@ nav{
 									margin-left: 1px !important;
 								}
 							}
+							.col-md-7{
+								.right_side{
+									margin-right: 1px !important;
+								}
+							}
 						}
 					}
 				}

src/index.html

@@ -6,7 +6,7 @@
   <base href="/">
   <script src="https://kit.fontawesome.com/d37b6e51ed.js"></script>
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="icon" type="image/x-icon" href="favicon.ico">
+  <link rel="icon" type="image/x-icon" href="./assets/img/smalllogo.png">
 </head>
 <body>
   <app-root></app-root>