updated portfolio

Mansoor-P · Mar 19, 2024 · 6a39408 · 6a39408
1 parent 8c6fa8f
commit 6a39408
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 173 deletions.
diff --git a/src/App.css b/src/App.css
@@ -15,19 +15,7 @@ a {
   text-decoration: none;
   color: inherit;
 }
-<<<<<<< HEAD
-
-@keyframes typing {
-  from {
-    width: 0;
-  }
-  to {
-    width: 100%;
-  }
-}
-=======
 #contact{
   width: 100%;
   margin-left: 30px;
-}
->>>>>>> version-2.0-react
+}
diff --git a/src/App.jsx b/src/App.jsx
@@ -1,33 +1,17 @@
 import React from "react";
 import "./App.css";
-<<<<<<< HEAD
-import Navbar from "./components/Navbar/Navbar";
-import About from "./components/About/About";
-import Skills from "./components/Skills/Skills";
-import Projects from "./components/Projects/Projects";
-import Footer from "./components/Footer/Footer";
-=======
 import { Routes, Route } from "react-router-dom";
 import LandingPage from "./pages/LandingPage";
 import Aboutme from "./pages/Aboutme/Aboutme";
 
->>>>>>> version-2.0-react
 
 function App() {
   return (
     <>
-<<<<<<< HEAD
-      <Navbar />
-      <About />
-      <Skills />
-      <Projects />
-      <Footer />
-=======
       <Routes>
           <Route path="/" element={<LandingPage/>} />
           <Route path="/about" element={<Aboutme />} />
         </Routes>
->>>>>>> version-2.0-react
     </>
   );
 }

diff --git a/src/components/About/About.css b/src/components/About/About.css
@@ -1,40 +1,19 @@
 #about {
   height: 100vh;
   display: flex;
-<<<<<<< HEAD
-  justify-content: center;
-  align-items: center;
-}
-.profile-image {
-  max-width: 100%;
-  height: auto;
-  display: block;
-  border: 4px solid #ddd;
-  border-radius: 50%;
-  margin: 0 auto;
-  margin-bottom: 20px;
-  max-height: 350px;
-}
-.about-content {
-  padding: 20px;
-=======
   justify-content: center; /* Center content horizontally */
   align-items: center;
 }
 
 .mt-4 {
   margin-top: 6.5rem !important;
   padding-left: 20px;
->>>>>>> version-2.0-react
 }
 .fs-3 h2 {
   font-size: 50px;
   overflow: hidden;
   border-right: 2px solid #000;
   white-space: nowrap;
-<<<<<<< HEAD
-  animation: typing 3s steps(60, end) 1 forwards;
-=======
   animation: typing 3s steps(60, end) 1 forwards; /* Animation repeats 4 times and stops at the final state */
 }
 
@@ -45,7 +24,6 @@
   to {
     width: 100%;
   }
->>>>>>> version-2.0-react
 }
 
 .fs-3 h2 span {
@@ -58,22 +36,6 @@
     text;
   -webkit-text-fill-color: transparent;
 }
-<<<<<<< HEAD
-.social-icons {
-  height: 60px;
-}
-.social-icons a .icon {
-  width: 40px;
-  height: 50px;
-  margin: 10px 10px 10px 0px;
-  color: rgb(49, 44, 44);
-}
-@media (max-width: 768px) {
-  .about-content,
-  .profile-image {
-    text-align: start;
-    margin: auto;
-=======
 .profile-image {
   max-width: 100%;
   height: auto;
@@ -91,6 +53,5 @@
 @media (max-width: 768px) {
   .col-md-6 img{
     margin-left: 50px;
->>>>>>> version-2.0-react
   }
 }
diff --git a/src/components/About/About.jsx b/src/components/About/About.jsx
@@ -1,11 +1,6 @@
 import React from "react";
 import "./About.css";
-<<<<<<< HEAD
-import { FaLinkedin } from "react-icons/fa";
-import { BsGithub } from "react-icons/bs";
-=======
 
->>>>>>> version-2.0-react
 function About() {
   return (
     <div id="about" className="py-3 m-0 bg-white">
@@ -25,20 +20,10 @@ function About() {
                   <h4>I'm a Software Developer.</h4>
                  <p> <span role="img" aria-label="email">📧 </span> mansoorpathikonda@gmail.com</p>
               </div>
-<<<<<<< HEAD
-              <div className="social-icons">
-                <a href="https://www.codechef.com/users/mansoor07"><FaLinkedin className="icon" /></a>
-                <a href="https://github.com/Mansoor-P"><BsGithub className="icon"/></a>
-              </div>
-              <p className="mt-2">
-                <a
-                  className="btn btn-outline-dark btn-lg "
-=======
               <div className="social-icons"></div>
               <p>
                 <a
                   className="btn btn-outline-dark btn-lg"
->>>>>>> version-2.0-react
                   href="https://drive.google.com/file/d/1IiaZyDoXDIM38-UGxEcnxSamJYq9snX2/view?usp=sharing"
                 >
                   Resume

diff --git a/src/components/Footer/Footer.jsx b/src/components/Footer/Footer.jsx
@@ -8,11 +8,7 @@ const Footer = () => {
       className="mt-auto py-5 text-center"
       style={{ backgroundColor: "rgb(245, 245, 245)" }}
     >
-<<<<<<< HEAD
-      <div className="container">
-=======
       <div className="container footer">
->>>>>>> version-2.0-react
         <h2 className="display-4 pb-3 text-center">Get In Touch</h2>
         <p className="lead text-center pb-3">
           I'm currently looking for full-time Software Engineering

diff --git a/src/components/Navbar/Navbar.css b/src/components/Navbar/Navbar.css
@@ -4,18 +4,12 @@
   border-radius: 60px;
   position: absolute;
 }
-<<<<<<< HEAD
-=======
 
->>>>>>> version-2.0-react
 .nav-link {
   margin: 6px;
   padding: 30px;
 }
-<<<<<<< HEAD
-=======
 
->>>>>>> version-2.0-react
 .nav-link:hover {
   background: -webkit-linear-gradient(
     135deg,
@@ -27,16 +21,6 @@
   color: transparent;
 }
 
-<<<<<<< HEAD
-@media (max-width: 750px) {
-  .navbar-nav {
-    position: absolute;
-
-    left: 50%;
-    margin: 0px 20px 20px 20px;
-    transform: translateX(-50%);
-    border-radius: 60px;
-=======
 @media screen and (max-width: 768px) {
   .navbar-nav {
     width: 100%;
@@ -51,6 +35,5 @@
     display: block;
     padding: 25px 0;
     margin: 0;
->>>>>>> version-2.0-react
   }
 }
diff --git a/src/components/Navbar/Navbar.jsx b/src/components/Navbar/Navbar.jsx
@@ -1,40 +1,18 @@
 import React from "react";
-<<<<<<< HEAD
-=======
 import { Link } from "react-router-dom";
->>>>>>> version-2.0-react
 import "./Navbar.css";
 
 const Navbar = () => {
   const navLinks = [
-<<<<<<< HEAD
-
-    { id: 1, href: "#about", text: "About" },
-    { id: 2, href: "#skills", text: "Skills" },
-    { id: 3, href: "#projects", text: "Projects" },
-    { id: 4, href: "#contact", text: "Contact" },
-=======
     { id: 1, to: "/", text: "Home" },
     { id: 2, to: "/about", text: "About" },
     { id: 3, href: "#skills", text: "Skills" },
     { id: 4, href: "#projects", text: "Projects" },
     { id: 5, href: "#contact", text: "Contact" },
->>>>>>> version-2.0-react
   ];
 
   return (
     <>
-<<<<<<< HEAD
-      <nav className="navbar navbar-expand  ">
-        <div className="container text-center navbar-container">
-          <div>
-            <div className="navbar-nav fs-2 ">
-              {navLinks.map((link) => (
-                <a key={link.id} className="nav-link" href={link.href}>
-                  {link.text}
-                </a>
-              ))}
-=======
       <nav className="navbar navbar-expand">
         <div className="container text-center navbar-container">
           <div>
@@ -50,7 +28,6 @@ const Navbar = () => {
                   </a>
                 )
               )}
->>>>>>> version-2.0-react
             </div>
           </div>
         </div>
@@ -59,8 +36,4 @@ const Navbar = () => {
   );
 };
 
-<<<<<<< HEAD
-export default Navbar;
-=======
 export default Navbar;
->>>>>>> version-2.0-react
diff --git a/src/components/Projects/Projects.css b/src/components/Projects/Projects.css
@@ -16,30 +16,21 @@
 .custom-card {
   width: 100%;
   max-width: 600px;
-<<<<<<< HEAD
-}
-=======
   margin-left: 40px;
 }
 
->>>>>>> version-2.0-react
 .badge {
   border: 1px solid rgb(84, 221, 191);
   border-radius: 10px;
   margin-right: 10px;
 }
 
-<<<<<<< HEAD
-=======
 /* Responsive styles */
->>>>>>> version-2.0-react
 @media (min-width: 768px) {
   .custom-card {
     max-width: 800px;
   }
 }
-<<<<<<< HEAD
-=======
 
 @media (max-width: 576px) {
   .custom-card {
@@ -54,4 +45,3 @@
     margin-bottom: 5px;
   }
 }
->>>>>>> version-2.0-react
diff --git a/src/components/Projects/data.js b/src/components/Projects/data.js
@@ -1,21 +1,6 @@
 export const projectsData = [
   {
     id: 1,
-<<<<<<< HEAD
-    title: "Food Delivering Application",
-    description:
-      "An online platform for food delivery, offering a seamless experience for users to order their favorite meals. Built using ReactJS, HTML, CSS, and JavaScript.",
-    cloneLink: "https://github.com/Mansoor-P/food-delivery-app",
-    liveDemo: "https://mansoorfoodapp.netlify.app/",
-    languages: [
-      { name: "React JS", percentage: "40%" },
-      { name: "HTML", percentage: "20%" },
-      { name: "CSS", percentage: "15%" },
-      { name: "JavaScript", percentage: "25%" },
-    ],
-  },
-
-=======
     title: "Portfolio React",
     description:
       " A responsive showcase of my best works, projects, and passion. Interactive and built with cutting-edge tech, its more than a website—its a journey into my world. Lets connect and build the future together",
@@ -28,7 +13,6 @@ export const projectsData = [
       { name: "React Js", percentage: "50%" },
     ],
   },
->>>>>>> version-2.0-react
   {
     id: 2,
     title: "Job Searching",
@@ -45,18 +29,6 @@ export const projectsData = [
   },
   {
     id: 3,
-<<<<<<< HEAD
-    title: "Portfolio React",
-    description:
-      " A responsive showcase of my best works, projects, and passion. Interactive and built with cutting-edge tech, its more than a website—its a journey into my world. Lets connect and build the future together",
-    cloneLink: "https://github.com/Mansoor-P/responsive-portfolio-2.git",
-    liveDemo: "https://mansoorsportfolio.netlify.app/",
-    languages: [
-      { name: "HTML", percentage: "15%" },
-      { name: "CSS", percentage: "10.2%" },
-      { name: "JS", percentage: "25%" },
-      { name: "React Js", percentage: "50%" },
-=======
     title: "Food Delivering Application",
     description:
       "An online platform for food delivery, offering a seamless experience for users to order their favorite meals. Built using ReactJS, HTML, CSS, and JavaScript.",
@@ -67,7 +39,6 @@ export const projectsData = [
       { name: "HTML", percentage: "20%" },
       { name: "CSS", percentage: "15%" },
       { name: "JavaScript", percentage: "25%" },
->>>>>>> version-2.0-react
     ],
   },
 ];
diff --git a/src/components/Skills/Skills.css b/src/components/Skills/Skills.css
@@ -16,10 +16,7 @@
 }
 
 .skills-container {
-<<<<<<< HEAD
-=======
   margin-left: 60px;
->>>>>>> version-2.0-react
   width: 100%;
   display: flex;
   flex-wrap: wrap;