conflict resolved

khubaibkm · Dec 17, 2023 · df6e40f · df6e40f
2 parents 59c5c58 + 038f279
commit df6e40f
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 27 deletions.
diff --git a/.firebase/hosting.ZGlzdA.cache b/.firebase/hosting.ZGlzdA.cache
@@ -11,9 +11,8 @@ job_01.png,1685608872139,3e4a183a0e930faae381735f35cd3cae9632e342b8145b08362b9cd
 logo.svg,1702805755363,106fd0e0e25e62773089d32eafec6046eb8f0d1a196e632a72cdfd2280812357
 signin.svg,1686127288433,f60118db2a3203e28dc8285cf5d2dafbc799618ee6b2a4d0d3a63f36ba584c8e
 vite.svg,1680593882164,59ec4b6085a0cb1bf712a5e48dd5f35b08e34830d49c2026c18241be04e05d5a
-index.html,1702824495090,6b2872b9f9488fa8ef32c611300d92603ec98debfef5a91a7d50f8b449693c24
-assets/ajax-loader-e7b44c86.gif,1702824495090,e9699a225e244ba8bb48532313e5c56a76fe08358c6dd684fb3234f2f63e7961
-assets/slick-12459f22.svg,1702824495088,d00477d40ed40fa1dd3bdee27d9286804121b15fea83bae7d5415d902b055de0
-assets/index-74e1f3f4.css,1702824495090,6b22f182bd995caa1bf1fcf746bab13911dffbf1e35c30b098d58da0a8f71d28
-arish.jpg,1702814037235,41a74b64d05fb25fd96520f00e84ab889565939792fb4f247a69339171199681
-assets/index-8efb5104.js,1702824495090,898ff9bdd18e659eb558aa9c5cef57376445799cf42d484388ea482d54153dac
+index.html,1702810836592,3ec03d686095c62dc869d0f9b7e6da2372754b769027a5ad07563398e04db11d
+assets/ajax-loader-e7b44c86.gif,1702810836591,e9699a225e244ba8bb48532313e5c56a76fe08358c6dd684fb3234f2f63e7961
+assets/slick-12459f22.svg,1702810836592,d00477d40ed40fa1dd3bdee27d9286804121b15fea83bae7d5415d902b055de0
+assets/index-a3abd8c9.css,1702810836591,466e5b3366ac9088ad479a4d08290710d99fc000d87d04f46348ad9888fe000e
+assets/index-6dd6deec.js,1702810836592,4102fc8f7f7aeb29e3ce340a4ff950e749f3569e7912a48539a68817c310f1bf
diff --git a/.firebaserc b/.firebaserc
@@ -1,5 +1,8 @@
 {
   "projects": {
-    "default": "alumniconnect-fd233"
-  }
-}
+    "default": "alumniconnect-fd233",
+    "deploy": "alumniconnect-fd233"
+  },
+  "targets": {},
+  "etags": {}
+}
diff --git a/public/favicon (2).png → public/favicon-removebg-preview.png b/public/favicon (2).png → public/favicon-removebg-preview.png
diff --git a/public/khubaib.jpeg b/public/khubaib.jpeg
diff --git a/src/pages/Team.jsx b/src/pages/Team.jsx
@@ -5,11 +5,11 @@ const Team = () => {
   return (
     <section className="container p-5 ">
       <h2 className="text-4xl xl:text-5xl text-center text-primary font-bold mt-5">
-        Minds behind AlumniConnect
+        Minds behind Alumni Connect
       </h2>
       <hr className="mx-auto w-12 h-1 bg-success my-4" />
       <p className="text-center text-lg text-gray-800">
-        hope you like our work !
+        We hope you like our work !
       </p>
 
       <div className="row mt-4">
@@ -34,28 +34,31 @@ const Team = () => {
                   target="_blank"
                   rel="noopener noreferrer"
                   className="mr-4 text-2xl text-primary"
+                  style={{marginRight:"2rem"}}
                 >
-                  <FaTwitter />
+                  <FaTwitter size={30} />
                 </a>
                 <a
                   href="https://www.linkedin.com/in/arish-siddiqui/"
                   target="_blank"
                   rel="noopener noreferrer"
                   className="mr-3 text-2xl text-primary"
+                  style={{marginRight:"2rem"}}
                 >
-                  <FaLinkedin />
+                  <FaLinkedin size={30} />
                 </a>
                 <a
                   href="https://github.com/arish-shah"
                   target="_blank"
                   rel="noopener noreferrer"
-                  className="text-2xl text-primary"
+                  className="social-icon text-2xl text-primary"
+                  style={{marginRight:"2rem"}}
                 >
-                  <FaGithub />
+                  <FaGithub size={30} />
                 </a>
-              </div>
+              </div><br />
               <p className=" ">
-                Greetings! <br />
+                Greetings! <br /><br />
                 If you have found your way to this page, we extend our sincere
                 congratulations. I am Arish Siddiqui, the visionary behind the
                 inception of AlumniConnect—a platform born out of the idea to
@@ -75,43 +78,50 @@ const Team = () => {
         <div className="col-lg-6">
           <div className="card mb-4">
             <img
-              src="/vite.svg"
+              src="/khubaib.jpeg"
               alt="Hanna Lubin"
               className="card-img-top rounded-3xl"
             />
             <div className="card-body bg-light">
               <h3 className="text-2xl capitalize font-semibold">
                 Khubaib Ahmad
               </h3>
-              <span className="d-block capitalize text-lg text-primary font-light mb-3"></span>
+              <span className="d-block capitalize text-lg text-primary font-light mb-3">Front-end Developer / UI/UX Designer / Coder </span>
               <div className="mt-3">
                 <a
-                  href="https://twitter.com/arish_siddiqui"
+                  href="https://twitter.com/Khubaib56058732"
                   target="_blank"
                   rel="noopener noreferrer"
                   className="mr-4 text-2xl text-primary"
+                  style={{marginRight:"2rem"}}
                 >
-                  <FaTwitter />
+                  <FaTwitter size={30} />
                 </a>
                 <a
-                  href="https://www.linkedin.com/in/arish-siddiqui/"
+                  href="https://www.linkedin.com/in/khubaibahmad122/"
                   target="_blank"
                   rel="noopener noreferrer"
                   className="mr-3 text-2xl text-primary"
+                  style={{marginRight:"2rem"}}
                 >
-                  <FaLinkedin />
+                  <FaLinkedin size={30}/>
                 </a>
                 <a
-                  href="https://github.com/arish-shah"
+                  href="https://github.com/khubaibkm"
                   target="_blank"
                   rel="noopener noreferrer"
                   className="text-2xl text-primary"
+                  style={{marginRight:"2rem"}}
                 >
-                  <FaGithub />
+                  <FaGithub size={30} />
                 </a>
-              </div>
+              </div><br />
               <p className=" ">
-                Greetings! <br />
+                Greetings! <br /><br />
+                Hello! I am Khubaib Ahmad, the passionate mind behind Alumni Connect, a platform dedicated to fostering connections between alumni and students of Integral University. As the architect of this initiative, my vision is to create a vibrant network that provide a bridge for collaborative opportunities. <br /><br />
+                I specialize in crafting visually striking, responsive interfaces that offer delightful user experiences. From wireframes to robust coding, I leverage my skills to turn concepts into reality. Always open to new opportunities and collaborations, I invite alumni, students, and fellow tech enthusiasts to connect. Let's build a future where knowledge knows no bounds. 
+
+
               </p>
             </div>
           </div>