Merge pull request 'Updated profile' (#1) from updates into master

Reviewed-on: #1

.idea/.gitignore

@@ -0,0 +1,5 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/shafaat.in.iml" filepath="$PROJECT_DIR$/.idea/shafaat.in.iml" />
+    </modules>
+  </component>
+</project>

.idea/shafaat.in.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

index.html

@@ -84,7 +84,7 @@
                   <!-- <li class="nav-item"><a class="nav-link" href="https://www.instagram.com/templateflip" title="Instagram"><i class="fab fa-instagram"></i><span class="menu-title sr-only">Instagram</span></a></li> -->
                   <li class="nav-item"><a class="nav-link" href="https://www.linkedin.com/in/shafaat-khan/" target="_blank" title="LinkedIn"><i class="fab fa-linkedin"></i><span class="menu-title sr-only">LinkedIn</span></a></li>
                   <li class="nav-item"><a class="nav-link" href="https://git.shafaat.in/" title="Repo"  target="_blank"><i class="fab fa-github"></i><span class="menu-title sr-only">Git</span></a></li>
-                  <li class="nav-item"><a class="nav-link" href="https://api.whatsapp.com/send?phone=6585547055&text=Hi%20Shafaat!%20Just%20wanted%20to%20connect%20with%20you%20here%20on%20WhatsApp!" title="WhatsApp" target="_blank"><i class="fab fa-whatsapp"></i><span class="menu-title sr-only">Whatsapp</span></a></li>
+                  <li class="nav-item"><a class="nav-link" href="https://api.whatsapp.com/send?phone=97470493274&text=Hi%20Shafaat!%20Just%20wanted%20to%20connect%20with%20you%20here%20on%20WhatsApp!" title="WhatsApp" target="_blank"><i class="fab fa-whatsapp"></i><span class="menu-title sr-only">Whatsapp</span></a></li>
                 </ul>
               </nav>
             </div>
@@ -101,7 +101,7 @@
     <div class="row">
       <div class="col-md-6">
         <h2 class="h4 my-2">Hello! I’m Shafaat Khan.</h2>
-        <p>I am passionate about software design and development. I am a skilled full-stack developer and very effecient in using Java and React technologies. I am a quick learner and a team worker that gets the job done. With over 11 years of industrial experience, I can understand the business requirements and can quickly translate them technically to provide deliverables.</p>
+        <p>I am passionate about software design and development. I am a skilled full-stack developer and very efficient in using Java and React technologies. I am a quick learner and a team worker that gets the job done. With over 13 years of industrial experience, I can understand the business requirements and can quickly translate them technically to provide deliverables.</p>
         <div class="row mt-3">
           <!-- <div class="col-sm-2">
             <div class="pb-1">Age:</div>
@@ -125,13 +125,13 @@
             <div class="pb-1">Phone:</div>
           </div>
           <div class="col-sm-10">
-            <div class="pb-1 fw-bolder">+65 8554 7055</div>
+            <div class="pb-1 fw-bolder">+974 7049 3274</div>
           </div>
           <div class="col-sm-2">
             <div class="pb-1">Address:</div>
           </div>
           <div class="col-sm-10">
-            <div class="pb-1 fw-bolder">Singapore</div>
+            <div class="pb-1 fw-bolder">Doha, Qatar</div>
           </div>
           <!-- <div class="col-sm-2">
             <div class="pb-1">Staus:</div>
@@ -199,7 +199,7 @@
             </div>
           </div>
           <div class="py-1">
-            <div class="d-flex text-small fw-bolder"><span class="me-auto">React</span><span>75%</span></div>
+            <div class="d-flex text-small fw-bolder"><span class="me-auto">React</span><span>80%</span></div>
             <div class="progress my-1">
               <div class="progress-bar bg-primary" role="progressbar" data-aos="zoom-in-right" data-aos-delay="300" data-aos-anchor=".skills-section" style="width: 75%" aria-valuenow="75" aria-valuemin="0" aria-valuemax="100"></div>
             </div>
@@ -213,7 +213,7 @@
             </div>
           </div>
           <div class="py-1">
-            <div class="d-flex text-small fw-bolder"><span class="me-auto">Node</span><span>70%</span></div>
+            <div class="d-flex text-small fw-bolder"><span class="me-auto">Azure, AWS</span><span>70%</span></div>
             <div class="progress my-1">
               <div class="progress-bar bg-primary" role="progressbar" data-aos="zoom-in-right" data-aos-delay="500" data-aos-anchor=".skills-section" style="width: 70%" aria-valuenow="70" aria-valuemin="0" aria-valuemax="100"></div>
             </div>
@@ -225,7 +225,7 @@
             </div>
           </div>
           <div class="py-1">
-            <div class="d-flex text-small fw-bolder"><span class="me-auto">Jenkins, Docker</span><span>60%</span></div>
+            <div class="d-flex text-small fw-bolder"><span class="me-auto">CICD, Docker, Kubernetes, Ansible, Jenkins</span><span>60%</span></div>
             <div class="progress my-1">
               <div class="progress-bar bg-primary" role="progressbar" data-aos="zoom-in-right" data-aos-delay="600" data-aos-anchor=".skills-section" style="width: 60%" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100"></div>
             </div>
@@ -242,6 +242,20 @@
     </div>
     <div class="grid bp-gallery pb-3" data-aos="zoom-in-up" data-aos-delay="100">
       <div class="grid-sizer"></div>
+      <div class="grid-item"><a href="https://www.aquaeasy.life">
+        <figure class="portfolio-item"><img src="images/portfolio/aquaeasy-small.png" data-bp="images/portfolio/aquaeasy-small.png"/>
+          <figcaption>
+            <h4 class="h5 mb-0">Fullstack Development & Integration Engineer</h4>
+            <div>Visit link here</div>
+          </figcaption>
+        </figure></a></div>
+      <div class="grid-item"><a href="#">
+        <figure class="portfolio-item"><img src="images/portfolio/sia-port-small.jpg" data-bp="images/portfolio/sia-port.jpg"/>
+          <figcaption>
+            <h4 class="h5 mb-0">Fullstack Development</h4>
+            <div>Internal Website</div>
+          </figcaption>
+        </figure></a></div>
       <div class="grid-item"><a href="https://www.dbs.com.sg/corporate/solutions/climateimpactx">
           <figure class="portfolio-item"><img src="images/portfolio/cix-small.png" data-bp="images/portfolio/cix.png"/>
             <figcaption>
@@ -252,51 +266,38 @@
       <div class="grid-item"><a href="https://dash.com.sg/">
           <figure class="portfolio-item"><img src="images/portfolio/dash-small.png" data-bp="images/portfolio/dash.png" data-caption="Example of an optional caption."/>
             <figcaption> 
-              <h4 class="h5 mb-0">Full-Stack Development</h4>
+              <h4 class="h5 mb-0">Fullstack Development</h4>
               <div>Visit link here</div>
             </figcaption>
           </figure></a></div>
       <div class="grid-item"><a href="https://www.abeeway.com/orange-business-services-implements-a-cutting-edge-covid-safety-solution-in-singapore-with-actility-abeeway/">
           <figure class="portfolio-item"><img src="images/portfolio/facial-recog-small.png" data-bp="images/portfolio/facial-recog.png" data-caption="Example of an optional caption."/>
             <figcaption> 
-              <h4 class="h5 mb-0">Full-Stack Development</h4>
+              <h4 class="h5 mb-0">Fullstack Development</h4>
               <div>Visit link here</div>
             </figcaption>
           </figure></a></div>
-      <div class="grid-item"><a href="https://connectedsites.twimbit.com/iot-use-case-workforce-management">
+      <div class="grid-item"><a href="https://www.orange-business.com/en/case-study/mcconnell-dowell-creates-smarter-construction-sites">
           <figure class="portfolio-item"><img src="images/portfolio/mcd-small.png" data-bp="images/portfolio/mcd.png"/>
             <figcaption>
               <h4 class="h5 mb-0">Full-Stack Development</h4>
               <div>Visit link here</div>
             </figcaption>
           </figure></a></div>
-      <div class="grid-item"><a href="https://www.emcsg.com/">
+      <div class="grid-item"><a href="https://www.home.emcsg.com/">
           <figure class="portfolio-item"><img src="images/portfolio/emc-small.png" data-bp="images/portfolio/emc.png"/>
             <figcaption>
               <h4 class="h5 mb-0">Enterprise App Development</h4>
               <div>Visit link here</div>
             </figcaption>
           </figure></a></div>
-      <div class="grid-item"><a href="https://www.oracle.com/industries/hospitality/hotel-property-management/products/hotel-management-software/">
+      <div class="grid-item"><a href="https://www.oracle.com/hospitality/hotel-property-management/hotel-pms-software/">
           <figure class="portfolio-item"><img src="images/portfolio/opera-small.png" data-bp="images/portfolio/opera.png"/>
             <figcaption>
               <h4 class="h5 mb-0">Enterprise App Development</h4>
               <div>Visit link here</div>
             </figcaption>
           </figure></a></div>
-      <div class="grid-item"><a href="https://sanaacharts.com/">
-          <figure class="portfolio-item"><img src="images/portfolio/sanaacharts-small.png" data-bp="images/portfolio/sanaacharts.png"/>
-            <figcaption>
-              <h4 class="h5 mb-0">Frontend Development</h4>
-              <div>Visit link here</div>
-            </figcaption>
-          </figure></a></div>
-      <div class="grid-item"><a href="#">
-          <figure class="portfolio-item"><img src="images/portfolio/traccar-small.png" data-bp="images/portfolio/traccar.png"/>
-            <figcaption>
-              <h4 class="h5 mb-0">Product Customization</h4>              
-            </figcaption>
-          </figure></a></div>
     </div>
   </div>
 </div>
@@ -311,7 +312,55 @@
           <div class="card-header px-3 py-2">
             <div class="d-flex justify-content-between">
               <div>
-                <h3 class="h5 mb-1">Senior Software Developer</h3>
+                <h3 class="h5 mb-1">Software Engineer</h3>
+                <div class="text-muted text-small">UBS. <small>(2023-Present)</small></div>
+              </div><img src="images/experience/ubs.png" width="auto" height="34"/>
+            </div>
+          </div>
+          <!-- <div class="card-body px-3 py-2">
+            <p>Leverage agile frameworks to provide a robust synopsis for high level overviews. Iterative approaches to corporate strategy foster collaborative thinking to further the overall value proposition.</p>
+            <p>Organically grow the holistic world view of disruptive innovation via workplace diversity and empowerment.</p>
+          </div> -->
+        </div>
+      </div>
+      <div class="col-md-6">
+        <div class="card mb-3" data-aos="fade-right" data-aos-delay="100">
+          <div class="card-header px-3 py-2">
+            <div class="d-flex justify-content-between">
+              <div>
+                <h3 class="h5 mb-1">Senior Software Engineer</h3>
+                <div class="text-muted text-small">AquaEasy - Bosch Company. <small>(2022-2023)</small></div>
+              </div><img src="images/experience/aquaeasy.png" width="120" height="34"/>
+            </div>
+          </div>
+          <!-- <div class="card-body px-3 py-2">
+            <p>Leverage agile frameworks to provide a robust synopsis for high level overviews. Iterative approaches to corporate strategy foster collaborative thinking to further the overall value proposition.</p>
+            <p>Organically grow the holistic world view of disruptive innovation via workplace diversity and empowerment.</p>
+          </div> -->
+        </div>
+      </div>
+      <div class="col-md-6">
+        <div class="card mb-3" data-aos="fade-right" data-aos-delay="100">
+          <div class="card-header px-3 py-2">
+            <div class="d-flex justify-content-between">
+              <div>
+                <h3 class="h5 mb-1">Senior Software Engineer</h3>
+                <div class="text-muted text-small">Singapore Airlines. <small>(2021-2022)</small></div>
+              </div><img src="images/experience/sia.png" width="auto" height="34"/>
+            </div>
+          </div>
+          <!-- <div class="card-body px-3 py-2">
+            <p>Leverage agile frameworks to provide a robust synopsis for high level overviews. Iterative approaches to corporate strategy foster collaborative thinking to further the overall value proposition.</p>
+            <p>Organically grow the holistic world view of disruptive innovation via workplace diversity and empowerment.</p>
+          </div> -->
+        </div>
+      </div>
+      <div class="col-md-6">
+        <div class="card mb-3" data-aos="fade-right" data-aos-delay="100">
+          <div class="card-header px-3 py-2">
+            <div class="d-flex justify-content-between">
+              <div>
+                <h3 class="h5 mb-1">Senior Software Engineer</h3>
                 <div class="text-muted text-small">NCS. <small>(2020-2021)</small></div>                
               </div><img src="images/experience/ncs.png" width="auto" height="34"/>
             </div>
@@ -517,7 +566,7 @@
               <div class="pb-1">Phone:</div>
             </div>
             <div class="col-sm-10">
-              <div class="pb-1 fw-bolder">+65 8554 7055</div>
+              <div class="pb-1 fw-bolder">+974 7049 3274</div>
             </div>
           </div>
         </div>