changes in master

aadityaanaik · Mar 22, 2024 · 790bd7b · 790bd7b
1 parent 807aa38
commit 790bd7b
Show file tree

Hide file tree

Showing 22 changed files with 323 additions and 1,101 deletions.
diff --git a/images/masterPortfolioThemes.png b/images/masterPortfolioThemes.png
diff --git a/images/masterportfolio-banner-dark.png b/images/masterportfolio-banner-dark.png
diff --git a/images/masterportfolio-banner-light.png b/images/masterportfolio-banner-light.png
diff --git a/images/old-record.gif b/images/old-record.gif
diff --git a/public/skills/azure.png b/public/skills/azure.png
diff --git a/public/skills/cpp.png b/public/skills/cpp.png
diff --git a/public/skills/glue.png b/public/skills/glue.png
diff --git a/public/skills/java.png b/public/skills/java.png
diff --git a/public/skills/javascript.png b/public/skills/javascript.png
diff --git a/public/skills/python.png b/public/skills/python.png
diff --git a/public/skills/pytorch.png b/public/skills/pytorch.png
diff --git a/public/skills/r.png b/public/skills/r.png
diff --git a/public/skills/sci-kit.png b/public/skills/sci-kit.png
diff --git a/public/skills/teamcity.png b/public/skills/teamcity.png
diff --git a/public/skills/tensorflow.png b/public/skills/tensorflow.png
diff --git a/src/assests/images/ui_ux_design.svg b/src/assests/images/ui_ux_design.svg
diff --git a/src/assets/images/ui_ux_design.svg b/src/assets/images/ui_ux_design.svg
diff --git a/src/components/competitiveSites/CompetitiveSites.js b/src/components/competitiveSites/CompetitiveSites.js
@@ -1,45 +1,2 @@
 import React from "react";
-import "./CompetitiveSites.css";
 import { OverlayTrigger, Tooltip } from "react-bootstrap";
-
-class CompetitiveSites extends React.Component {
-  render() {
-    return (
-      <div className="competitive-sites-main-div">
-        <ul className="dev-icons">
-          {this.props.logos.map((logo) => {
-            return (
-              <OverlayTrigger
-                key={logo.siteName}
-                placement={"top"}
-                style={{ marginBottom: "5px" }}
-                overlay={
-                  <Tooltip id={`tooltip-top`}>
-                    <strong>{logo.siteName}</strong>
-                  </Tooltip>
-                }
-              >
-                <li className="competitive-sites-inline" name={logo.siteName}>
-                  <a
-                    href={logo.profileLink}
-                    target="_blank"
-                    rel="noopener noreferrer"
-                  >
-                    <span
-                      className="iconify"
-                      data-icon={logo.iconifyClassname}
-                      style={logo.style}
-                      data-inline="false"
-                    ></span>
-                  </a>
-                </li>
-              </OverlayTrigger>
-            );
-          })}
-        </ul>
-      </div>
-    );
-  }
-}
-
-export default CompetitiveSites;
diff --git a/src/containers/skills/SkillSection.js b/src/containers/skills/SkillSection.js
@@ -22,21 +22,44 @@ class SkillSection extends Component {
   render() {
     const theme = this.props.theme;
     return (
-      <div>
-        {skills.data.map((skill) => {
-          return (
-            <div className="skills-main-div">
-              <Fade left duration={2000}>
-                <div className="skills-image-div">
-                  {/* <img
-                    alt="Aditya is Analysing Data"
-                    src={require(`../../assets/images/${skill.imagePath}`)}
-                  ></img> */}
-                  <GetSkillSvg fileName={skill.fileName} theme={theme} />
-                </div>
-              </Fade>
+      <div className="skills-main-div">
+        {/* First Column */}
+        <div className="skills-column">
+          {skills.data1.map((skill) => {
+            return (
+              <div className="skills-div-1">
+                <Fade left duration={1000}>
+                  <h1 className="skills-heading" style={{ color: theme.text }}>
+                    {skill.title}
+                  </h1>
+                </Fade>
+                <Fade left duration={1500}>
+                  <SoftwareSkill logos={skill.softwareSkills} />
+                </Fade>
+                <Fade left duration={1500}>
+                  <div>
+                    {skill.skills.map((skillSentence) => {
+                      return (
+                        <p
+                          className="subTitle skills-text"
+                          style={{ color: theme.secondaryText }}
+                        >
+                          {skillSentence}
+                        </p>
+                      );
+                    })}
+                  </div>
+                </Fade>
+              </div>
+            );
+          })}
+        </div>
 
-              <div className="skills-text-div">
+        {/* Second Column */}
+        <div className="skills-column">
+          {skills.data2.map((skill) => {
+            return (
+              <div className="skills-div-2">
                 <Fade right duration={1000}>
                   <h1 className="skills-heading" style={{ color: theme.text }}>
                     {skill.title}
@@ -60,12 +83,13 @@ class SkillSection extends Component {
                   </div>
                 </Fade>
               </div>
-            </div>
-          );
-        })}
+            );
+          })}
+        </div>
       </div>
     );
   }
 }
 
+
 export default SkillSection;
diff --git a/src/containers/skills/Skills.css b/src/containers/skills/Skills.css
@@ -3,6 +3,14 @@
   overflow: hidden;
 }
 
+.skills-div-2 {
+  padding-left: 50px;
+}
+
+.skills-div-1 {
+  padding-right: 50px;
+}
+
 .skills-header {
   font-size: 60px;
   line-height: normal;

diff --git a/src/pages/education/EducationComponent.js b/src/pages/education/EducationComponent.js
@@ -4,9 +4,7 @@ import Footer from "../../components/footer/Footer";
 import TopButton from "../../components/topButton/TopButton";
 import Educations from "../../containers/education/Educations";
 import Certifications from "../../containers/certifications/Certifications";
-import CompetitiveSites from "../../components/competitiveSites/CompetitiveSites";
 import EducationImg from "./EducationImg";
-import { competitiveSites } from "../../portfolio";
 import { certifications } from "../../portfolio";
 import "./EducationComponent.css";
 import { Fade } from "react-reveal";